From 999b7d2a063eba80bed96d292d8a4140a6ffce3b Mon Sep 17 00:00:00 2001 From: Sanjay Chari Date: Mon, 13 Sep 2021 17:01:28 +0530 Subject: [PATCH] Fix in trunk dynamic workloads This patch introduces the following changes. 1. self.keypair assignment has been shifted from trunk.py to dynamic_workload.py. This is because errors will occur if other trunk dynamic workloads are run before pod_fip_simulation in an iteration if self.keypair assignment is left in trunk.py. 2. self.ext_net_name assignment has been shifted from trunk.py to dynamic_workload.py for the same reason as above. Change-Id: If0a67276eb973b6c0abaef5781a3c0bba3bee434 --- rally/rally-plugins/dynamic-workloads/dynamic_workload.py | 5 +++++ rally/rally-plugins/dynamic-workloads/trunk.py | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/rally/rally-plugins/dynamic-workloads/dynamic_workload.py b/rally/rally-plugins/dynamic-workloads/dynamic_workload.py index 32b88f5c6..5efd8dab0 100644 --- a/rally/rally-plugins/dynamic-workloads/dynamic_workload.py +++ b/rally/rally-plugins/dynamic-workloads/dynamic_workload.py @@ -75,6 +75,11 @@ class DynamicWorkload(vm.VMDynamicScenario, trunk.TrunkDynamicScenario, self.router = self._create_router(router_create_args) self.log_info("router {} created for this iteration".format(self.router)) + self.keypair = self.context["user"]["keypair"] + + self.ext_net_name = self.clients("neutron").show_network(ext_net_id)["network"][ + "name"] + if workloads == "all" or "create_delete_servers" in workloads_list: self.boot_servers(smallest_image, smallest_flavor, num_create_vms, subnet_create_args=subnet_create_args) diff --git a/rally/rally-plugins/dynamic-workloads/trunk.py b/rally/rally-plugins/dynamic-workloads/trunk.py index 071805d70..750477678 100644 --- a/rally/rally-plugins/dynamic-workloads/trunk.py +++ b/rally/rally-plugins/dynamic-workloads/trunk.py @@ -197,19 +197,12 @@ class TrunkDynamicScenario( :param subport_count: int, number of subports to create per trunk :param num_vms: int, number of servers to create """ - self.ext_net_name = None - if ext_net_id: - self.ext_net_name = self.clients("neutron").show_network(ext_net_id)["network"][ - "name" - ] - network = self._create_network({}) subnet = self._create_subnet(network, {}) self._add_interface_router(subnet["subnet"], self.router["router"]) kwargs = {} kwargs["nics"] = [{"net-id": network["network"]["id"]}] - self.keypair = self.context["user"]["keypair"] jump_host = self._boot_server_with_fip_and_tag(jumphost_image, jumphost_flavor, "jumphost_trunk", True, self.ext_net_name,