[vCenter] Minor fixes for vCenter suite

* Increase timeout for creation instances
* Fix DVS parameters for scale tests
* CERT_BYBASS value should be boolean
* PROGRESS_TO_STOP value should be integer

Change-Id: I56e955bd1925f9280e2c54957b4c8a6b50e1bcc5
(cherry picked from commit aaca57a4d6)

fuelweb_test/settings.py

@@ -372,14 +372,15 @@ DEBUG_MODE = get_var_as_bool('DEBUG_MODE', True)
 VCENTER_IP = os.environ.get('VCENTER_IP')
 VCENTER_USERNAME = os.environ.get('VCENTER_USERNAME')
 VCENTER_PASSWORD = os.environ.get('VCENTER_PASSWORD')
-VCENTER_CERT_BYPASS = os.environ.get('VCENTER_CERT_BYPASS', True)
+VCENTER_CERT_BYPASS = get_var_as_bool('VCENTER_CERT_BYPASS', True)
 VCENTER_CERT_URL = os.environ.get('VCENTER_CERT_URL')
 VCENTER_DATACENTER = os.environ.get('VC_DATACENTER')
 VCENTER_DATASTORE = os.environ.get('VC_DATASTORE')
 VCENTER_GLANCE_IP = os.environ.get('VCENTER_GLANCE_IP')
 VCENTER_GLANCE_USERNAME = os.environ.get('VCENTER_GLANCE_USERNAME')
 VCENTER_GLANCE_PASSWORD = os.environ.get('VCENTER_GLANCE_PASSWORD')
-VCENTER_GLANCE_CERT_BYPASS = os.environ.get('VCENTER_GLANCE_CERT_BYPASS', True)
+VCENTER_GLANCE_CERT_BYPASS = get_var_as_bool('VCENTER_GLANCE_CERT_BYPASS',
+                                             True)
 VCENTER_GLANCE_CERT_URL = os.environ.get('VCENTER_GLANCE_CERT_URL')
 VMWARE_IMG_URL = os.environ.get('VMWARE_IMG_URL')
 VMWARE_IMG_NAME = os.environ.get('VMWARE_IMG_NAME')
@@ -715,8 +716,8 @@ REPEAT_COUNT = int(os.environ.get("REPEAT_COUNT", 2))
 # in the 'repetitive_restart' test group
 RESTART_COUNT = int(os.environ.get("RESTART_COUNT", 10))
 
-# is using in stop on deploy test
+# Is used for stop_on_deploy test
-PROGRESS_TO_STOP = os.environ.get("PROGRESS_TO_STOP", 60)
+PROGRESS_TO_STOP = int(os.environ.get("PROGRESS_TO_STOP", 60))
 
 # RH-related variables
 # Need to update these variables, when image with RH for

system_test/actions/vcenter_actions.py

@@ -481,7 +481,8 @@ class VMwareActions(object):
         vm = os_conn.create_server(image=image,
                                    availability_zone=self.vcenter_az,
                                    security_groups=[sg],
-                                   net_id=net['id'])
+                                   net_id=net['id'],
+                                   timeout=210)
         floating_ip = os_conn.assign_floating_ip(vm)
         helpers.wait(lambda: helpers.tcp_ping(floating_ip.ip, 22), timeout=180,
                      timeout_msg="Node {ip} is not accessible by SSH.".format(
@@ -536,7 +537,8 @@ class VMwareActions(object):
         vm = os_conn.create_server(availability_zone=self.vcenter_az,
                                    image=False,
                                    net_id=net['id'],
-                                   block_device_mapping=block_device_mapping)
+                                   block_device_mapping=block_device_mapping,
+                                   timeout=210)
         floating_ip = os_conn.assign_floating_ip(vm)
         helpers.wait(lambda: helpers.tcp_ping(floating_ip.ip, 22), timeout=180,
                      timeout_msg="Node {ip} is not accessible by SSH.".format(
@@ -568,7 +570,7 @@ class VMwareActions(object):
         for service in vmware_services:
             logger.info("Check {}".format(service.host))
             os_conn.enable_nova_service(service)
-            vm = os_conn.create_server(image=image, timeout=180,
+            vm = os_conn.create_server(image=image, timeout=210,
                                        availability_zone=self.vcenter_az,
                                        net_id=net['id'], security_groups=[sg])
             vm_host = getattr(vm, 'OS-EXT-SRV-ATTR:host')
@@ -617,9 +619,9 @@ class VMwareActions(object):
         vm = os_conn.create_server(image=image,
                                    availability_zone=self.vcenter_az,
                                    net_id=net['id'], security_groups=[sg],
-                                   flavor_id=flavor.id, timeout=666)
+                                   flavor_id=flavor.id, timeout=900)
         floating_ip = os_conn.assign_floating_ip(vm)
-        helpers.wait(lambda: helpers.tcp_ping(floating_ip.ip, 22), timeout=180,
+        helpers.wait(lambda: helpers.tcp_ping(floating_ip.ip, 22), timeout=210,
                      timeout_msg="Node {ip} is not accessible by SSH.".format(
                          ip=floating_ip.ip))
 
@@ -641,9 +643,9 @@ class VMwareActions(object):
         vm = os_conn.create_server(image=image,
                                    availability_zone=self.vcenter_az,
                                    net_id=net['id'], security_groups=[sg],
-                                   flavor_id=flavor.id, timeout=666)
+                                   flavor_id=flavor.id, timeout=900)
         floating_ip = os_conn.assign_floating_ip(vm)
-        helpers.wait(lambda: helpers.tcp_ping(floating_ip.ip, 22), timeout=180,
+        helpers.wait(lambda: helpers.tcp_ping(floating_ip.ip, 22), timeout=210,
                      timeout_msg="Node {ip} is not accessible by SSH.".format(
                          ip=floating_ip.ip))
 
@@ -677,7 +679,7 @@ class VMwareActions(object):
         os_conn.create_server(name=vm_name, image=image,
                               availability_zone=self.vcenter_az,
                               net_id=net['id'], security_groups=[sg],
-                              min_count=count)
+                              min_count=count, timeout=210)
 
         for i in range(1, count + 1):
             vm = os_conn.get_server_by_name('{name}-{index}'.format(
@@ -707,7 +709,7 @@ class VMwareActions(object):
                              properties={"vmware_disktype": "sparse"})
         vm = os_conn.create_server(image=image,
                                    availability_zone=self.vcenter_az,
-                                   net_id=net['id'])
+                                   net_id=net['id'], timeout=210)
         os_conn.delete_instance(vm)
         os_conn.verify_srv_deleted(vm)
 
@@ -715,7 +717,7 @@ class VMwareActions(object):
                              properties={"vmware_disktype": "preallocated "})
         vm = os_conn.create_server(image=image,
                                    availability_zone=self.vcenter_az,
-                                   net_id=net['id'])
+                                   net_id=net['id'], timeout=210)
         os_conn.delete_instance(vm)
         os_conn.verify_srv_deleted(vm)
 
@@ -723,7 +725,7 @@ class VMwareActions(object):
                              properties={"vmware_disktype": "thin "})
         vm = os_conn.create_server(image=image,
                                    availability_zone=self.vcenter_az,
-                                   net_id=net['id'])
+                                   net_id=net['id'], timeout=210)
         os_conn.delete_instance(vm)
         os_conn.verify_srv_deleted(vm)
 
@@ -838,7 +840,7 @@ class VMwareActions(object):
             net_id=net['id'],
             availability_zone=vcenter_az,
             image=vc_image,
-            timeout=200,
+            timeout=210,
             security_groups=[sec_group],
             min_count=inst_count
         )

system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_computevmware.yaml

@@ -48,5 +48,5 @@ template:
             datastore: .*
             target_node: compute-vmware
       vmware_dvs:
-        dvswitch_name: !os_env DVS_NAME, Cluster1:Cluster1;Cluster2:Cluster2
+        dvswitch_name: !os_env DVS_NAME, "Cluster1:Cluster1:dvUplink1;dvUplink2:dvUplink3\nCluster2:Cluster2:dvUplink1;dvUplink2:dvUplink3"
         dvs_fw_driver: false

system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_delete_computevmware.yaml

@@ -47,5 +47,5 @@ template:
       action: delete
     - action: reconfigure
       vmware_dvs:
-        dvswitch_name: !os_env DVS_NAME, Cluster1:Cluster1
+        dvswitch_name: !os_env DVS_NAME, "Cluster1:Cluster1:dvUplink1;dvUplink2:dvUplink3"
         dvs_fw_driver: false