Fix for config_drive issue

Change-Id: I7afe69cacc3e3897a296280bf74bcef41978819f

vmware_nsx_tempest_plugin/lib/appliance_manager.py

@@ -1,5 +1,5 @@
 # Copyright 2017 VMware Inc
-# All Rights Reserved.
+# All Rights Reserved..
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -45,7 +45,6 @@ class ApplianceManager(manager.NetworkScenarioTest):
         self.topology_servers = {}
         self.topology_servers_floating_ip = []
         self.topology_public_network_id = CONF.network.public_network_id
-        self.topology_config_drive = CONF.compute_feature_enabled.config_drive
         self.topology_keypairs = {}
         self.servers_details = {}
         self.topology_port_ids = {}
@@ -485,10 +484,6 @@ class ApplianceManager(manager.NetworkScenarioTest):
             _security_groups = [{'name': _sg['name']}]
             kwargs["security_groups"] = _security_groups
         # Define config drive for server.
-        if not config_drive:
-            kwargs["config_drive"] = self.topology_config_drive
-        else:
-            kwargs["config_drive"] = config_drive
         if not keypair:
             if clients:
                 client = clients.keypairs_client

vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_allowed_address_pair.py

@@ -152,7 +152,6 @@ class TestAllowedAddressPair(manager.NetworkScenarioTest):
         network = {'uuid': network['id']}
         server = self.create_server(name=name, networks=[network],
                                     key_name=keypair['name'],
-                                    config_drive=self.config_drive,
                                     security_groups=security_groups,
                                     image_id=image_id,
                                     wait_until='ACTIVE')
@@ -196,25 +195,6 @@ class TestAllowedAddressPair(manager.NetworkScenarioTest):
     def create_ipv6_network_topo(self):
         self.security_group = self._create_security_group()
         self.network = self._create_network()
-        rulesets = [
-            dict(
-                direction='ingress',
-                protocol='icmpv6',
-                ethertype='IPv6',
-            ),
-            dict(
-                direction='egress',
-                protocol='icmpv6',
-                ethertype='IPv6',
-            )
-        ]
-        rules = []
-        for ruleset in rulesets:
-            rules.append(
-                self._create_security_group_rule(
-                    tenant_id=self.network['tenant_id'],
-                    secgroup=self.security_group,
-                    **ruleset))
         self.subnet = self._create_subnet(self.network,
                                           cidr='14.168.1.0/24')
         self.subnet_v6 = self._create_subnet_v6(self.network,

vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_ipv6_provider_networks.py

@@ -174,27 +174,6 @@ class ProviderNetworks(feature_manager.FeatureManager):
                       security_group_rules_client=sec_rule_client,
                       security_groups_client=sec_client)
         self.sg = self.create_topology_security_group(**kwargs)
-        rulesets = [
-            dict(
-                direction='ingress',
-                protocol='icmpv6',
-                ethertype='IPv6',
-            ),
-            dict(
-                direction='egress',
-                protocol='icmpv6',
-                ethertype='IPv6',
-            )
-        ]
-        rules = []
-        for ruleset in rulesets:
-            rules.append(
-                self.create_topology_security_group_rule(
-                    tenant_id=network1['tenant_id'],
-                    sec_rule_client=sec_rule_client,
-                    sec_client=sec_client,
-                    sg=self.sg,
-                    **ruleset))
         routers_client = self.cmgr_adm.routers_client
         router_name = 'router'
         router = self.create_topology_router(router_name,

vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_multiple_networks_ops.py

@@ -143,7 +143,6 @@ class TestMultiNetworksOps(manager.NetworkScenarioTest):
             network['port'] = port_id
         server = self.create_server(name=name, networks=[network],
                                     key_name=keypair['name'],
-                                    config_drive=self.config_drive,
                                     security_groups=security_groups,
                                     image_id=image_id,
                                     wait_until='ACTIVE')
@@ -165,7 +164,8 @@ class TestMultiNetworksOps(manager.NetworkScenarioTest):
         network_ips = (p['fixed_ips'][0]['ip_address'] for p in
                        self._list_ports(tenant_id=server['tenant_id'],
                                         network_id=network['id'])
-            if (p['device_owner'].startswith('network:router_interface') or
+                       if (p['device_owner'].startswith(
+                           'network:router_interface') or
                        p['device_owner'].startswith('compute')))
         self._check_server_connectivity(floating_ip,
                                         network_ips,

vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_nsx_port_security.py

@@ -175,7 +175,6 @@ class TestNSXv3PortSecurityScenario(manager.NetworkScenarioTest):
             network['port'] = port_id
         server = self.create_server(name=name, networks=[network],
                                     key_name=keypair['name'],
-                                    config_drive=self.config_drive,
                                     security_groups=security_groups,
                                     image_id=image_id,
                                     wait_until='ACTIVE')

vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_provider_security_group.py

@@ -165,7 +165,6 @@ class TestProviderSecurityGroup(manager.NetworkScenarioTest):
         network = {'uuid': network['id']}
         server = self.create_server(name=name, networks=[network],
                                     key_name=keypair['name'],
-                                    config_drive=self.config_drive,
                                     security_groups=security_groups,
                                     image_id=image_id,
                                     wait_until='ACTIVE')
@@ -270,25 +269,6 @@ class TestProviderSecurityGroup(manager.NetworkScenarioTest):
     def create_multi_network_ipv6_topo(self):
         self.security_group = self._create_security_group()
         self.network = self._create_network(namestart="net-psg")
-        rulesets = [
-            dict(
-                direction='ingress',
-                protocol='icmpv6',
-                ethertype='IPv6',
-            ),
-            dict(
-                direction='egress',
-                protocol='icmpv6',
-                ethertype='IPv6',
-            )
-        ]
-        rules = []
-        for ruleset in rulesets:
-            rules.append(
-                self._create_security_group_rule(
-                    tenant_id=self.network['tenant_id'],
-                    secgroup=self.security_group,
-                    **ruleset))
         self.subnet = self._create_subnet(self.network,
                                           cidr='10.168.1.0/24')
         self.subnet_v6 = self._create_subnet_v6(self.network,

vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_router_nonat_ops.py

@@ -160,7 +160,6 @@ class TestRouterNoNATOps(manager.NetworkScenarioTest):
         network = {'uuid': network['id']}
         server = self.create_server(name=name, networks=[network],
                                     key_name=keypair['name'],
-                                    config_drive=self.config_drive,
                                     image_id=image_id,
                                     wait_until='ACTIVE', **kwargs)
         self.servers.append(server)