From 1f28a4469833d17e9d29bcd3069af40d1d7f0bfe Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Wed, 5 Jun 2019 10:37:54 +0100 Subject: [PATCH] Fix _associate_floating_ip() conflict Both NeutronScenario and NovaScenario classes contains a method called _associate_floating_ip() with different signatures. The CreateNetworkNovaBootPing test class inherits from NeutronScenario and VMScenario (which inherits from NovaScenario). When running the test, I was getting the following error: TypeError: _associate_floating_ip() got an unexpected keyword argument 'fixed_address' And turns out the _associate_floating_ip() from the NeutronScenario class was taking precedence and it doesn't contains the "fixed_address" parameter. This patch is inverting the inheritance order in the CreateNetworkNovaBootPing test class so that the _associate_floating_ip() from NovaScenario is the one being invoked. Change-Id: I139664e2cc8ecc76e80a9eef286d733504734016 Signed-off-by: Lucas Alvares Gomes --- .../netcreate-boot/netcreate_nova_boot_fip_ping.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rally/rally-plugins/netcreate-boot/netcreate_nova_boot_fip_ping.py b/rally/rally-plugins/netcreate-boot/netcreate_nova_boot_fip_ping.py index 8a93f330e..58edfb73e 100644 --- a/rally/rally-plugins/netcreate-boot/netcreate_nova_boot_fip_ping.py +++ b/rally/rally-plugins/netcreate-boot/netcreate_nova_boot_fip_ping.py @@ -26,8 +26,8 @@ from rally.task import validation @scenario.configure(context={"cleanup@openstack": ["neutron", "nova"], "keypair@openstack": {}, "allow_ssh@openstack": None}, name="BrowbeatPlugin.create_network_nova_boot_ping", platform="openstack") -class CreateNetworkNovaBootPing(neutron_utils.NeutronScenario, - vm_utils.VMScenario): +class CreateNetworkNovaBootPing(vm_utils.VMScenario, + neutron_utils.NeutronScenario): def run(self, image, flavor, ext_net_id, router_create_args=None, network_create_args=None, subnet_create_args=None, **kwargs):