Fix tests according to change in fuel-qa
Change-Id: I2c08e4cefd2eb8e3ada3e914a47c474dca82e138 Closes-bug: #1573481
This commit is contained in:
parent
a7193c4fcd
commit
852c5bc45f
|
@ -403,7 +403,7 @@ class TestDVSDestructive(TestBasic):
|
|||
floating_ip = []
|
||||
for srv in srv_list:
|
||||
floating_ip.append(os_conn.get_nova_instance_ip(
|
||||
srv, net_name=self.inter_net_name, type='floating'))
|
||||
srv, net_name=self.inter_net_name, addrtype='floating'))
|
||||
controller = self.fuel_web.get_nailgun_primary_node(
|
||||
self.env.d_env.nodes().slaves[0]
|
||||
)
|
||||
|
@ -463,7 +463,7 @@ class TestDVSDestructive(TestBasic):
|
|||
floating_ip = []
|
||||
for srv in srv_list:
|
||||
floating_ip.append(os_conn.get_nova_instance_ip(
|
||||
srv, net_name=self.inter_net_name, type='floating'))
|
||||
srv, net_name=self.inter_net_name, addrtype='floating'))
|
||||
controllers = self.fuel_web.get_devops_nodes_by_nailgun_nodes(
|
||||
self.fuel_web.get_nailgun_cluster_nodes_by_roles(
|
||||
cluster_id=cluster_id,
|
||||
|
|
|
@ -398,11 +398,8 @@ class TestDVSSystem(TestBasic):
|
|||
for srv in srv_list:
|
||||
os_conn.nova.servers.delete(srv)
|
||||
|
||||
logger.info("Check that all instances were deleted.")
|
||||
for srv in srv_list:
|
||||
assert_true(
|
||||
os_conn.verify_srv_deleted(srv),
|
||||
"Verify server was deleted")
|
||||
logger.info("Check that instance was deleted.")
|
||||
os_conn.verify_srv_deleted(srv)
|
||||
|
||||
@test(depends_on=[dvs_vcenter_systest_setup],
|
||||
groups=["dvs_vcenter_security", 'dvs_vcenter_system'])
|
||||
|
|
Loading…
Reference in New Issue