Merge "Fix for Ipv6 tempest testcases"

vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_ipv6_router.py

@@ -287,13 +287,21 @@ class IPv6RoutersTest(feature_manager.FeatureManager):
         subnet_ipv4 = self.create_topology_subnet(
             subnet_name, network, subnets_client=subnet_client,
             cidr='20.21.0.0/16')
-        subnet = self._create_ipv6_subnet(network, cidr="4200::/64")
+        subnet = self._create_ipv6_subnet(
+            network, cidr="4200::/64",
+            ipv6_ra_mode="dhcpv6-stateful",
+            ipv6_address_mode="dhcpv6-stateful",
+            slaac=False)
         network_1 = self.create_topology_network(
             name, networks_client=networks_client)
         subnet_ipv4_1 = self.create_topology_subnet(
             subnet_name, network_1, subnets_client=subnet_client,
             cidr='20.22.0.0/16')
-        subnet_1 = self._create_ipv6_subnet(network_1, cidr="4201::/64")
+        subnet_1 = self._create_ipv6_subnet(
+            network_1, cidr="4201::/64",
+            ipv6_ra_mode="dhcpv6-stateful",
+            ipv6_address_mode="dhcpv6-stateful",
+            slaac=False)
         rtr_name = data_utils.rand_name("ipv6-rtr")
         router = self.create_topology_router(
             rtr_name, routers_client=self.cmgr_adm.routers_client)
@@ -474,11 +482,10 @@ class IPv6RoutersTest(feature_manager.FeatureManager):
         can be deleted while port is attached to the subnet
         """
         kwargs = {"admin_state_up": "True"}
-        topology_dict = self.create_topo_single_network("rtr_update",
-                                                        create_instance=True,
-                                                        slaac=False,
-                                                        set_gateway=True,
-                                                        **kwargs)
+        topology_dict = self.create_topo_single_dhcpv6_network(
+            "rtr_update", create_instance=True, slaac=False,
+            set_gateway=True, ipv6_ra_mode="dhcpv6-stateful",
+            ipv6_address_mode="dhcpv6-stateful", **kwargs)
         router = topology_dict['router_state']
         subnet_v6 = topology_dict['subnet_v6']
         self.cmgr_adm.routers_client.remove_router_interface(
@@ -509,11 +516,10 @@ class IPv6RoutersTest(feature_manager.FeatureManager):
         can not be deleted while port is attached to the subnet
         """
         kwargs = {"admin_state_up": "True"}
-        topology_dict = self.create_topo_single_network("rtr_update",
-                                                        create_instance=True,
-                                                        slaac=False,
-                                                        set_gateway=True,
-                                                        **kwargs)
+        topology_dict = self.create_topo_single_dhcpv6_network(
+            "rtr_update", create_instance=True, slaac=False,
+            set_gateway=True, ipv6_ra_mode="dhcpv6-stateful",
+            ipv6_address_mode="dhcpv6-stateful", **kwargs)
         router = topology_dict['router_state']
         self.assertRaises(exceptions.Conflict,
                           self.cmgr_adm.routers_client.delete_router,

vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_nsx_port_security.py

@@ -528,7 +528,7 @@ class TestNSXv3PortSecurityScenario(manager.NetworkScenarioTest):
                 "port_security_enabled": "false", "security_groups": []}
         port_client = self.ports_client
         port_id = port_client.create_port(**body)
-        time.sleep(constants.NSX_NETWORK_REALISE_TIMEOUT)
+        time.sleep(60)
         self.addCleanup(test_utils.call_and_ignore_notfound_exc,
                         port_client.delete_port,
                         port_id['port']['id'])
@@ -559,7 +559,7 @@ class TestNSXv3PortSecurityScenario(manager.NetworkScenarioTest):
         body = {"port_security_enabled": "true",
                 "security_groups": [sec_group]}
         port_client.update_port(port_id_server_2, **body)
-        time.sleep(constants.NSX_BACKEND_TIME_INTERVAL)
+        time.sleep(60)
         self._check_server_connectivity(public_ip_address_server_1,
                                         private_ip_address_server_2,
                                         private_key_server_1)
@@ -571,7 +571,7 @@ class TestNSXv3PortSecurityScenario(manager.NetworkScenarioTest):
         private_key_server_2 = \
             self._get_server_key(server_default_2)
         port_client.update_port(port_id_server_2, **body)
-        time.sleep(constants.NSX_BACKEND_TIME_INTERVAL)
+        time.sleep(60)
         for rule in self.rules:
             if rule.get('remote_group_id'):
                 self.compute_security_group_rules_client.\
@@ -583,7 +583,7 @@ class TestNSXv3PortSecurityScenario(manager.NetworkScenarioTest):
         body = {"port_security_enabled": "true",
                 "security_groups": [sec_group]}
         port_client.update_port(port_id_server_2, **body)
-        time.sleep(constants.NSX_BACKEND_TIME_INTERVAL)
+        time.sleep(60)
         ruleset = dict(
                        direction='ingress',
                        protocol='icmpv6',

vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_octavia_loadbalancers.py

@@ -1272,6 +1272,7 @@ class OctaviaRoundRobin(feature_manager.FeatureManager):
                                     timeout=self.hm_timeout,
                                     max_retries=self.hm_max_retries,
                                     delay=self.hm_delay)
+        time.sleep(60)
         lb_id = self.loadbalancer['id']
         noerr, status_dict = self.get_status_lb_resources(lb_id)
         self.assertTrue(noerr, status_dict)