Merge pull request #1491 from psav/provider_tweak

DRY was bugging me
ManageIQ · Jan 6, 2015 · 6ee204b · 6ee204b
2 parents 4eac3d7 + 6fe64a7
commit 6ee204b
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/cfme/infrastructure/provider.py b/cfme/infrastructure/provider.py
@@ -599,15 +599,23 @@ def get_from_config(provider_config_name):
     prov_config = conf.cfme_data['management_systems'][provider_config_name]
     credentials = get_credentials_from_config(prov_config['credentials'])
     prov_type = prov_config.get('type')
+
+    if prov_config.get('discovery_range', None):
+        start_ip = prov_config['discovery_range']['start']
+        end_ip = prov_config['discovery_range']['end']
+    else:
+        start_ip = prov_config['ipaddress']
+        end_ip = prov_config['ipaddress']
+
     if prov_type == 'virtualcenter':
         return VMwareProvider(name=prov_config['name'],
                               hostname=prov_config['hostname'],
                               ip_address=prov_config['ipaddress'],
                               credentials=credentials,
                               zone=prov_config['server_zone'],
                               key=provider_config_name,
-                              start_ip=prov_config['discovery_range']['start'],
-                              end_ip=prov_config['discovery_range']['end'])
+                              start_ip=start_ip,
+                              end_ip=end_ip)
     elif prov_type == 'scvmm':
         creds = conf.credentials[prov_config['credentials']]
         credentials = SCVMMProvider.Credential(
@@ -620,8 +628,8 @@ def get_from_config(provider_config_name):
             ip_address=prov_config['ipaddress'],
             credentials=credentials,
             key=provider_config_name,
-            start_ip=prov_config['discovery_range']['start'],
-            end_ip=prov_config['discovery_range']['end'],
+            start_ip=start_ip,
+            end_ip=end_ip,
             sec_protocol=prov_config['sec_protocol'],
             sec_realm=prov_config['sec_realm'])
     elif prov_type == 'rhevm':
@@ -638,8 +646,8 @@ def get_from_config(provider_config_name):
                              candu=candu_credentials,
                              zone=prov_config['server_zone'],
                              key=provider_config_name,
-                             start_ip=prov_config['discovery_range']['start'],
-                             end_ip=prov_config['discovery_range']['end'])
+                             start_ip=start_ip,
+                             end_ip=end_ip)
     else:
         raise UnknownProviderType('{} is not a known infra provider type'.format(prov_type))