tox fixes

Author: allmightyspiff

SoftLayer/API.py

@@ -405,7 +405,7 @@ def authenticate_with_password(self, username, password, security_question_id=No
             error = json.loads(response.text)
             raise exceptions.IAMError(response.status_code,
                                       error.get('errorMessage'),
-                                      'https://iam.cloud.ibm.com/identity/token')
+                                      'https://iam.cloud.ibm.com/identity/token') from ex
 
         self.settings['softlayer']['access_token'] = tokens['access_token']
         self.settings['softlayer']['refresh_token'] = tokens['refresh_token']
@@ -452,7 +452,7 @@ def authenticate_with_passcode(self, passcode):
             error = json.loads(response.text)
             raise exceptions.IAMError(response.status_code,
                                       error.get('errorMessage'),
-                                      'https://iam.cloud.ibm.com/identity/token')
+                                      'https://iam.cloud.ibm.com/identity/token') from ex
 
         self.settings['softlayer']['access_token'] = tokens['access_token']
         self.settings['softlayer']['refresh_token'] = tokens['refresh_token']
@@ -516,7 +516,7 @@ def refresh_iam_token(self, r_token, account_id=None, ims_account=None):
             error = json.loads(response.text)
             raise exceptions.IAMError(response.status_code,
                                       error.get('errorMessage'),
-                                      'https://iam.cloud.ibm.com/identity/token')
+                                      'https://iam.cloud.ibm.com/identity/token') from ex
 
         a_expire = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(tokens['expiration']))
         r_expire = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(tokens['refresh_token_expiration']))

SoftLayer/config.py

@@ -102,6 +102,14 @@ def get_config(config_file=None):
         config_file = '~/.softlayer'
     config = configparser.ConfigParser()
     config.read(os.path.expanduser(config_file))
+    # No configuration file found.
+    if not config.has_section('softlayer'):
+        config.add_section('softlayer')
+        config['softlayer']['username'] = ''
+        config['softlayer']['endpoint_url'] = ''
+        config['softlayer']['api_key'] = ''
+        config['softlayer']['timeout'] = 0
+
     return config
 
 

SoftLayer/exceptions.py

@@ -15,6 +15,7 @@ class SoftLayerError(Exception):
 class Unauthenticated(SoftLayerError):
     """Unauthenticated."""
 
+
 class IAMError(SoftLayerError):
     """Errors from iam.cloud.ibm.com"""
 

tests/CLI/modules/config_tests.py

@@ -165,12 +165,11 @@ def test_sso_login(self, api_call, token, passcode, get_accounts, get_sso_url, m
         token.return_value = {"access_token": "zzzzzz", "refresh_token": "fffffff"}
         test_key = "zz112233"
         user_object_1 = {
-            "apiAuthenticationKeys": [{"authenticationKey":test_key}],
-            "username":"testerson",
-            "id":99}
+            "apiAuthenticationKeys": [{"authenticationKey": test_key}],
+            "username": "testerson",
+            "id": 99}
         api_call.side_effect = [user_object_1]
 
         user, apikey = config.sso_login(self.env)
         self.assertEqual("testerson", user)
         self.assertEqual(test_key, apikey)
-