openstack
/
rally
Code Issues Proposed changes

Add missing device_owner for L3 HA's case 

Patch Ieab53624dc34dc687a0e8eebd8477 added a new possible value for the
device_owner field of a port, that signifies a router's interface for a
subnet. The rally code was not changed accordingly, which causes rally
to try to delete the port using the wrong API ('neutron port-delete'
instead of 'neutron router-interface-delete'), causing cleanup errors
and leftover resources.

Closes-Bug: #1562878
Change-Id: I65933650d613e1800541dfdb33714a50f5c13db7
This commit is contained in:
John Schwarz 2016-11-07 12:36:51 +02:00
parent 454ba1d4a2
commit 41010685c4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rally/plugins/openstack/cleanup/resources.py
View File

@ -376,9 +376,10 @@ class NeutronV1Pool(NeutronLbaasV1Mixin):
class NeutronPort(NeutronMixin):
def delete(self):
if (self.raw_resource["device_owner"] == "network:router_interface" or
self.raw_resource["device_owner"] ==
"network:router_interface_distributed"):
if (self.raw_resource["device_owner"] in
("network:router_interface",
"network:router_interface_distributed",
"network:ha_router_replicated_interface")):
self._manager().remove_interface_router(
self.raw_resource["device_id"],
{"port_id": self.raw_resource["id"]})