Tempest: Remove deprecated tenant_id

tenant_id has already been deprecated and removed from upstream
tempest in patch (I28f3f1084b91c809335494eb16219b3d9261b8bf).

Remove it from our vmware_nsx tempest plugin as well.

Change-Id: I967c7f09e7248629b08ee6e8101cd2e81bc7ed19
This commit is contained in:
Tong Liu 2016-11-11 12:13:56 +00:00
parent abe19309ba
commit 2a32e1f08f
2 changed files with 4 additions and 7 deletions

View File

@ -76,8 +76,7 @@ class TestMultiHVNetworkOps(manager.NetworkScenarioTest):
self.kvm_image = CONF.compute.image_ref_alt
def _setup_l2_topo(self, **kwargs):
self.security_group = self._create_security_group(
tenant_id=self.tenant_id)
self.security_group = self._create_security_group()
self.network, self.subnet, self.router = self.create_networks(**kwargs)
esx_server_name = data_utils.rand_name('server-esx')
kvm_server_name = data_utils.rand_name('server-kvm')

View File

@ -70,10 +70,8 @@ class TestMicroSegmentationOps(manager.NetworkScenarioTest):
self.keypairs = {}
def _create_security_groups(self):
web_sg = self._create_empty_security_group(tenant_id=self.tenant_id,
namestart="secgroup-web")
app_sg = self._create_empty_security_group(tenant_id=self.tenant_id,
namestart="secgroup-app")
web_sg = self._create_empty_security_group(namestart="secgroup-web")
app_sg = self._create_empty_security_group(namestart="secgroup-app")
# Common rules to allow the following traffic
# 1. Egress ICMP IPv4 any any
# 2. Egress ICMP IPv6 any any
@ -153,7 +151,7 @@ class TestMicroSegmentationOps(manager.NetworkScenarioTest):
def _create_network_topo(self, **kwargs):
self.web_net, self.web_subnet, self.router = self.create_networks(
**kwargs)
self.app_net = self._create_network(tenant_id=self.tenant_id)
self.app_net = self._create_network()
self.app_subnet = self._create_subnet(network=self.app_net)
router_id = self.router['id']
self.routers_client.add_router_interface(