diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-06-07 16:23:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-07 16:23:30 +0000 |
| commit | 5c9c130fb9d6609ac1f0ebbf6945e63667c6b168 (patch) | |
| tree | bed0bc62c3f686109eb1512e3e724e3d6dee73e7 /lib/python | |
| parent | 1123fdcdda8a3b2191ef1eb9c8d403a21c59cbab (diff) | |
| parent | 4b7436673f7bc8422a793f94c9fed5c2fc671167 (diff) | |
Merge "Enabling python coverage tests in build.sh"
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/apex/deploy_env.py | 6 | ||||
| -rw-r--r-- | lib/python/apex/ip_utils.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/python/apex/deploy_env.py b/lib/python/apex/deploy_env.py index be8779a9..bfb94f50 100644 --- a/lib/python/apex/deploy_env.py +++ b/lib/python/apex/deploy_env.py @@ -45,10 +45,10 @@ class DeploySettings: if 'deploy_options' not in self.deploy_settings: raise DeploySettingsException("No deploy options provided in" - "deploy settings file") + " deploy settings file") if 'global_params' not in self.deploy_settings: raise DeploySettingsException("No global options provided in" - "deploy settings file") + " deploy settings file") deploy_options = self.deploy_settings['deploy_options'] if not isinstance(deploy_options, dict): @@ -61,7 +61,7 @@ class DeploySettings: for required_setting in REQ_DEPLOY_SETTINGS: if required_setting not in deploy_options: - self.deploy_settings['deploy_options'][required] = False + self.deploy_settings['deploy_options']['required'] = False if 'performance' in deploy_options: if not isinstance(deploy_options['performance'], dict): diff --git a/lib/python/apex/ip_utils.py b/lib/python/apex/ip_utils.py index d7099db5..f51f227a 100644 --- a/lib/python/apex/ip_utils.py +++ b/lib/python/apex/ip_utils.py @@ -56,7 +56,7 @@ def get_ip_range(start_offset=None, count=None, end_offset=None, end_index = -1 - end_offset else: raise IPUtilsException("Argument error: must pass in exactly 2 of" - "start_offset, end_offset and count") + " start_offset, end_offset and count") start_ip = cidr[start_index] end_ip = cidr[end_index] @@ -77,7 +77,7 @@ def get_ip_range(start_offset=None, count=None, end_offset=None, else: raise IPUtilsException( "Argument error: must pass in exactly 2 of" - "start_offset, end_offset and count") + " start_offset, end_offset and count") else: if count and start_offset and not end_offset: start_ip = network[start_offset] @@ -91,7 +91,7 @@ def get_ip_range(start_offset=None, count=None, end_offset=None, else: raise IPUtilsException( "Argument error: must pass in exactly 2 of" - "start_offset, end_offset and count") + " start_offset, end_offset and count") else: raise IPUtilsException("Must pass in cidr or interface to generate" |