fix for highline tempest + imapctor ufo for mac learning & sg cases

Change-Id: Ia5c1b00050ed6a3cfd4ceb93a3ecd425dc123cc8
This commit is contained in:
dkumbhar 2021-08-19 10:02:04 +00:00
parent d4f77d9979
commit 98ac480a21
2 changed files with 3 additions and 8 deletions

View File

@ -100,7 +100,7 @@ class NSXv3MacLearningTest(base.BaseNetworkTest):
mac_learn_set_bool = True
else:
mac_learn_set_bool = False
return mac_learn_set_bool
return mac_learn_set_bool
def _create_mac_learn_enabled_port(self, network):
# Create Port with required port security/sec groups config
@ -206,7 +206,6 @@ class NSXv3MacLearningTest(base.BaseNetworkTest):
nsx_network)
ml_port_nsx = self.nsxp.get_logical_port(mac_lrn_port['name'],
nsx_network)
self.assertIsNotNone(ml_port_nsx['realization_id'])
nill_nsx = self.nsx.get_logical_port(vanilla_port['name'])
ml_port_nsx = self.nsx.get_logical_port(mac_lrn_port['name'])
test_ports_in_body = []
@ -234,7 +233,6 @@ class NSXv3MacLearningTest(base.BaseNetworkTest):
nsx_network = self.nsxp.get_logical_switch(self.network['name'],
self.network['id'])
nsx_port = self.nsxp.get_logical_port(port['name'], nsx_network)
self.assertIsNotNone(nsx_port['realization_id'])
nsx_port = self.nsx.get_logical_port(port['name'])
nsxport_mac_learning = self._get_nsx_mac_learning_enabled(port)
body = self.ports_client.show_port(port['id'])
@ -274,7 +272,6 @@ class NSXv3MacLearningTest(base.BaseNetworkTest):
self.network['id'])
updated_nsx_port = self.nsxp.get_logical_port(
updated_os_port['name'], nsx_network)
self.assertIsNotNone(updated_nsx_port['realization_id'])
updated_nsx_port = self.nsx.get_logical_port(
updated_os_port['name'])
# Assert if NSXT and OS names do not match
@ -305,7 +302,6 @@ class NSXv3MacLearningTest(base.BaseNetworkTest):
self.network['id'])
nsx_port = self.nsxp.get_logical_port(test_port['name'],
nsx_network)
self.assertIsNotNone(nsx_port['realization_id'])
nsx_port = self.nsx.get_logical_port(test_port['name'])
# Check created port name matches name on NSXT and NSXT id exists
self.assertIsNotNone(nsx_port['id'],
@ -413,7 +409,6 @@ class NSXv3MacLearningTest(base.BaseNetworkTest):
self.network['id'])
updated_nsx_port = self.nsxp.get_logical_port(
updated_port['name'], nsx_network)
self.assertIsNotNone(updated_nsx_port['realization_id'])
updated_nsx_port = self.nsx.get_logical_port(updated_port['name'])
self.assertEqual(updated_nsx_port['display_name'],
updated_port['name'],

View File

@ -254,10 +254,10 @@ class NSXv3SecGroupTest(base.BaseSecGroupTest):
secgroup['name'], secgroup['id'],
os_tenant_id='default')
self.assertIsNone(nsx_dfw_section_policy, dfw_error_msg)
nsx_nsgroup = self.nsxp.get_ns_group(
nsx_nsgroup = self.nsx.get_ns_group(
secgroup['name'], secgroup['id'], nsxp=True,
os_tenant_id='default')
nsx_dfw_section = self.nsxp.get_firewall_section(
nsx_dfw_section = self.nsx.get_firewall_section(
secgroup['name'], secgroup['id'], nsxp=True)
else:
nsx_nsgroup = self.nsx.get_ns_group(secgroup['name'],