Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions common/servicechain/mirror/verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ def verify_svc_mirroring(self, si_count=1, svc_mode='transparent', ci=False):
compute_2 = host_list[0]
if len(host_list) > 1:
compute_1 = host_list[0]
compute_2 = host_list[1]
if self.inputs.vcenter_compute is not None:
compute_2 = self.inputs.host_data[self.inputs.vcenter_compute]['name']
else:
compute_2 = host_list[1]
self.vm1_fixture = self.config_vm(
self.vn1_fixture, self.vm1_name, node_name=compute_1, image_name=image_name)
self.vm2_fixture = self.config_vm(
Expand Down Expand Up @@ -260,7 +263,10 @@ def verify_svc_mirroring_with_floating_ip(self, si_count=1):
compute_2 = host_list[0]
if len(host_list) > 1:
compute_1 = host_list[0]
compute_2 = host_list[1]
if self.inputs.vcenter_compute is not None:
compute_2 = self.inputs.host_data[self.inputs.vcenter_compute]['name']
else:
compute_2 = host_list[1]
self.vm1_fixture = self.config_vm(
self.vn1_fixture, self.vm1_name, node_name=compute_1)
self.vm2_fixture = self.config_vm(
Expand Down Expand Up @@ -400,7 +406,10 @@ def verify_svc_mirror_with_deny(self, si_count=1):
compute_2 = host_list[0]
if len(host_list) > 1:
compute_1 = host_list[0]
compute_2 = host_list[1]
if self.inputs.vcenter_compute is not None:
compute_2 = self.inputs.host_data[self.inputs.vcenter_compute]['name']
else:
compute_2 = host_list[1]
self.vm1_fixture = self.config_vm(
self.vn1_fixture, self.vm1_name, node_name=compute_1)
self.vm2_fixture = self.config_vm(
Expand Down Expand Up @@ -847,7 +856,10 @@ def verify_svc_mirroring_unidirection(self, si_count=1, svc_mode='transparent'):
compute_2 = host_list[0]
if len(host_list) > 1:
compute_1 = host_list[0]
compute_2 = host_list[1]
if self.inputs.vcenter_compute is not None:
compute_2 = self.inputs.host_data[self.inputs.vcenter_compute]['name']
else:
compute_2 = host_list[1]
self.vm1_fixture = self.config_vm(
self.vn1_fixture, self.vm1_name, node_name=compute_1)
self.vm2_fixture = self.config_vm(
Expand Down Expand Up @@ -980,7 +992,10 @@ def verify_attach_detach_policy_with_svc_mirroring(self, si_count=1):
compute_2 = host_list[0]
if len(host_list) > 1:
compute_1 = host_list[0]
compute_2 = host_list[1]
if self.inputs.vcenter_compute is not None:
compute_2 = self.inputs.host_data[self.inputs.vcenter_compute]['name']
else:
compute_2 = host_list[1]
self.vm1_fixture = self.config_vm(
self.vn1_fixture, self.vm1_name, node_name=compute_1)
self.vm2_fixture = self.config_vm(
Expand Down