x/browbeat
Code Issues Proposed changes

Trunk dynamic workloads : close ssh connections

Browse Source 
This patch closes ssh connections when they are
no longer required in trunk dynamic workloads.

Change-Id: I318ba53d682564eaa868e00f59fecbcc047fb233
This commit is contained in:
Sanjay Chari 2022-01-11 13:55:34 +05:30
parent 0d14c6b2f8
commit 560c062baf
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rally/rally-plugins/dynamic-workloads/dynamic_utils.py
View File

@ -115,6 +115,7 @@ class NovaUtils(vm_utils.VMScenario):
self._run_command_until_failure(jumphost_ssh, cmd) self._run_command_until_failure(jumphost_ssh, cmd)
else: else:
self._run_command_with_attempts(jumphost_ssh, cmd) self._run_command_with_attempts(jumphost_ssh, cmd)
jumphost_ssh.close()
@atomic.action_timer("vm.wait_for_ping_failure") @atomic.action_timer("vm.wait_for_ping_failure")
def _wait_for_ping_failure(self, server_ip): def _wait_for_ping_failure(self, server_ip):

7
rally/rally-plugins/dynamic-workloads/trunk.py
View File

@ -53,6 +53,7 @@ class TrunkDynamicScenario(
script = f"sudo ip r a {dest_vm} via {gateway} dev eth0.{subport_number}" script = f"sudo ip r a {dest_vm} via {gateway} dev eth0.{subport_number}"
source_ssh = self.get_ssh(local_vm_user, local_vm) source_ssh = self.get_ssh(local_vm_user, local_vm)
self._run_command_with_attempts(source_ssh, script) self._run_command_with_attempts(source_ssh, script)
source_ssh.close()
def delete_route_from_vm_to_jumphost(self, local_vm, dest_vm, local_vm_user, def delete_route_from_vm_to_jumphost(self, local_vm, dest_vm, local_vm_user,
subport_number, gateway): subport_number, gateway):
@ -66,6 +67,7 @@ class TrunkDynamicScenario(
script = f"sudo ip r d {dest_vm} via {gateway} dev eth0.{subport_number}" script = f"sudo ip r d {dest_vm} via {gateway} dev eth0.{subport_number}"
source_ssh = self.get_ssh(local_vm_user, local_vm) source_ssh = self.get_ssh(local_vm_user, local_vm)
self._run_command_with_attempts(source_ssh, script) self._run_command_with_attempts(source_ssh, script)
source_ssh.close()
def simulate_subport_connection(self, trunk_id, vm_fip, jump_fip): def simulate_subport_connection(self, trunk_id, vm_fip, jump_fip):
"""Simulate connection from jumphost to random subport of trunk VM """Simulate connection from jumphost to random subport of trunk VM
@ -265,6 +267,8 @@ class TrunkDynamicScenario(
self.release_lock(trunk["trunk"]["id"]) self.release_lock(trunk["trunk"]["id"])
vm_ssh.close()
def add_subports_to_random_trunks(self, num_trunks, subport_count): def add_subports_to_random_trunks(self, num_trunks, subport_count):
"""Add <<subport_count>> subports to <<num_trunks>> randomly chosen trunks """Add <<subport_count>> subports to <<num_trunks>> randomly chosen trunks
:param num_trunks: int, number of trunks to be randomly chosen :param num_trunks: int, number of trunks to be randomly chosen
@ -306,6 +310,8 @@ class TrunkDynamicScenario(
self.release_lock(trunk["id"]) self.release_lock(trunk["id"])
num_operations_completed += 1 num_operations_completed += 1
vm_ssh.close()
if num_operations_completed == 0: if num_operations_completed == 0:
self.log_info("""No trunks which are not under lock, so self.log_info("""No trunks which are not under lock, so
cannot add subports to any trunks.""") cannot add subports to any trunks.""")
@ -372,6 +378,7 @@ class TrunkDynamicScenario(
self.clients("neutron").trunk_remove_subports(trunk["id"], self.clients("neutron").trunk_remove_subports(trunk["id"],
{"sub_ports": subport_payload}) {"sub_ports": subport_payload})
self.clients("neutron").delete_port(subport_to_delete["port"]["id"]) self.clients("neutron").delete_port(subport_to_delete["port"]["id"])
vm_ssh.close()
# Check the number of subports present in trunk after deletion, # Check the number of subports present in trunk after deletion,
# and simulate subport connection if it is > 0. We use the # and simulate subport connection if it is > 0. We use the