x/vmware-nsx
Code Issues Proposed changes

Merge "Tempest: Fix tenant_id for nsxv scenario test"

Browse Source
This commit is contained in:
Jenkins 2016-11-19 21:02:58 +00:00 committed by Gerrit Code Review
commit 54efa785bb
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vmware_nsx_tempest/tests/nsxv/scenario/test_dvr_basic_ops.py
View File

@ -105,8 +105,7 @@ class TestDvrBasicOps(manager.NetworkScenarioTest):
def _setup_network_and_servers(self, **kwargs):
boot_with_port = kwargs.pop('boot_with_port', False)
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)
self.check_networks()
@ -131,8 +130,7 @@ class TestDvrBasicOps(manager.NetworkScenarioTest):
network = self._create_network(
networks_client=networks_client,
routers_client=routers_client,
namestart=namestart,
tenant_id=self.tenant_id)
namestart=namestart)
router_kwargs = dict(client=routers_client, namestart=namestart)
for k in kwargs.keys():
@ -242,7 +240,7 @@ class TestDvrBasicOps(manager.NetworkScenarioTest):
floating_ip, server)
def _create_new_network(self, create_gateway=False):
self.new_net = self._create_network(tenant_id=self.tenant_id)
self.new_net = self._create_network()
if create_gateway:
self.new_subnet = self._create_subnet(
network=self.new_net)

4
vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_round_robin_ops.py
View File

@ -195,8 +195,7 @@ class LBaasRoundRobinBaseTest(dmgr.TopoDeployScenarioManager):
serv['id'], 'ACTIVE')
def _create_security_group_for_test(self):
self.security_group = self._create_security_group(
tenant_id=self.tenant_id)
self.security_group = self._create_security_group()
self._create_security_group_rules_for_port(self.protocol_port)
def _create_security_group_rules_for_port(self, port):
@ -208,7 +207,6 @@ class LBaasRoundRobinBaseTest(dmgr.TopoDeployScenarioManager):
}
self._create_security_group_rule(
secgroup=self.security_group,
tenant_id=self.tenant_id,
**rule)
def start_web_servers(self, server_list=None):

7
vmware_nsx_tempest/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py
View File

@ -127,8 +127,7 @@ class TestLBaaSBasicOps(manager.NetworkScenarioTest):
network = self._create_network(
routers_client=routers_client,
networks_client=networks_client,
namestart=namestart,
tenant_id=self.tenant_id)
namestart=namestart)
subnet_kwargs = dict(network=network,
namestart=namestart,
@ -154,8 +153,7 @@ class TestLBaaSBasicOps(manager.NetworkScenarioTest):
HELO.check_networks(self, self.network, self.subnet, self.router)
def _create_security_group_for_test(self):
self.security_group = self._create_security_group(
tenant_id=self.tenant_id)
self.security_group = self._create_security_group()
self._create_security_group_rules_for_port(self.port1)
self._create_security_group_rules_for_port(self.port2)
@ -168,7 +166,6 @@ class TestLBaaSBasicOps(manager.NetworkScenarioTest):
}
self._create_security_group_rule(
secgroup=self.security_group,
tenant_id=self.tenant_id,
**rule)
def _create_server(self, name):