closes-bug: #1551882

Changes to update vcenter server properly in sanity_param.ini to comply
with new testbed.py format.
Fix if testbed.py doesnt have the key.
Change-Id: Ib387c4e780fd0b78ce844f4ed5718e21c4a3574b

fabfile/tasks/tester.py

@@ -205,8 +205,12 @@ def setup_test_env():
     if env.has_key('hosts_ipmi'):
         sanity_testbed_dict['hosts_ipmi'].append(env.hosts_ipmi)
     #get vcenter info
-    if env.has_key('vcenter'):
-        sanity_testbed_dict['vcenter'].append(env.vcenter)
+    vcenter_dc = ''
+    if env.has_key('vcenter_servers'):
+        # for sanity always use the first, multiple server not supported
+        vc_server = env.vcenter_servers.values()[0]
+        sanity_testbed_dict['vcenter'].append(vc_server)
+        vcenter_dc = vc_server['datacenter']
     #get sriov info
     if env.has_key('sriov'):
         sanity_testbed_dict['sriov'].append(env.sriov)
@@ -272,13 +276,9 @@ def setup_test_env():
             mail_server = env.mail_server
             mail_port = env.mail_port
 
-        vcenter_dc = ''
         if orch == 'vcenter':
             public_tenant_name='vCenter'
 
-        if env.has_key('vcenter'):
-            if env.vcenter:
-                vcenter_dc = env.vcenter['datacenter']
 
         sanity_params = sanity_ini_templ.safe_substitute(
             {'__testbed_json_file__'   : 'sanity_testbed.json',

fabfile/utils/host.py

@@ -102,29 +102,40 @@ def get_region_name_opt():
     region_name = get_region_name()
     return '--region_name %s' %(region_name)
 
+def get_vcenter_item(key, default_value):
+    # For sanity purpose use first vcenter, multiple servers not supported
+    # in sanity
+    vc_server = {}
+    if env.has_key('vcenter_servers'):
+        vc_server = env.vcenter_servers.values()[0]
+    try:
+        val = vc_server[key]
+    except KeyError:
+        val = default_value
+    return val
 
 def get_vcenter_ip():
-    return get_from_testbed_dict('vcenter', 'server', None)
+    return get_vcenter_item('server', None)
 
 def get_vcenter_port():
-    return get_from_testbed_dict('vcenter', 'port', None)
+    return get_vcenter_item('port', None)
 
 def get_vcenter_username():
-    return get_from_testbed_dict('vcenter', 'username', None)
+    return get_vcenter_item('username', None)
 
 def get_vcenter_password():
-    return get_from_testbed_dict('vcenter', 'password', None)
+    return get_vcenter_item('password', None)
 
 def get_vcenter_datacenter():
-    return get_from_testbed_dict('vcenter', 'datacenter', None)
+    return get_vcenter_item('datacenter', None)
 
 def get_vcenter_compute():
-    return get_from_testbed_dict('vcenter', 'vcenter_compute', None)
+    return get_vcenter_item('vcenter_compute', None)
 
 def get_authserver_ip(ignore_vip=False, openstack_node=None):
     orch = getattr(env, 'orchestrator', 'openstack')
     if orch == 'vcenter':
-       return get_from_testbed_dict('vcenter', 'server', None)
+       return get_vcenter_item('server', None)
     # openstack
     if openstack_node:
         openstack_host = get_control_host_string(openstack_node)
@@ -190,15 +201,17 @@ def get_keystone_admin_token():
 def get_authserver_admin_user():
     orch = getattr(env, 'orchestrator', 'openstack')
     if orch == 'vcenter':
-       return get_from_testbed_dict('vcenter', 'username', None)
+        # for vcenter orch case, only one vcenter is supported
+        return get_vcenter_item('username', None)
     # openstack
     ks_admin_user = getattr(testbed, 'keystone_admin_user','admin')
     return get_from_testbed_dict('keystone', 'admin_user', ks_admin_user) 
 
 def get_authserver_admin_password():
     orch = getattr(env, 'orchestrator', 'openstack')
     if orch == 'vcenter':
-       return get_from_testbed_dict('vcenter', 'password', None)
+        # for vcenter orch case, only one vcenter is supported
+        return get_vcenter_item('password', None)
     # openstack
     os_admin_password = getattr(env,'openstack_admin_password', 'contrail123')
     ks_admin_password = getattr(testbed,