From 94bf61662c43e484d878267962019c076a6a8b7b Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Thu, 21 Mar 2019 16:41:37 +0900 Subject: [PATCH] network topology: handle port AZ correctly Previously d3 version of the network topology view handles ports with device_owner 'compute:nova' and 'compute:None' specially. This leads to the situtaion that neutron ports with non-default AZ are not shown properly. There is no reason to handle neutron ports with the default AZ differently. What we would like to do is just to classify neutron ports attached to nova servers. This commit changes the logic to check device_owner of ports have a prefix 'compute:'. Note that we also need to check if device_owner is a string before checking the prefix. Change-Id: I472bae9af3d14d8a31efcae8a7610b84c4f09c3d Closes-Bug: #1820260 (cherry picked from commit ffbe0e2f2f96556f4476ea3873af1bc628c879ca) --- openstack_dashboard/static/js/horizon.networktopology.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openstack_dashboard/static/js/horizon.networktopology.js b/openstack_dashboard/static/js/horizon.networktopology.js index f8d97ff749..c718ab92e6 100644 --- a/openstack_dashboard/static/js/horizon.networktopology.js +++ b/openstack_dashboard/static/js/horizon.networktopology.js @@ -713,7 +713,7 @@ horizon.network_topology = { var device = self.find_by_id(port.device_id); var _network = self.find_by_id(port.network_id); if (angular.isDefined(device) && angular.isDefined(_network)) { - if (port.device_owner == 'compute:nova' || port.device_owner == 'compute:None') { + if (port.device_owner && port.device_owner.startsWith('compute:')) { _network.data.instances++; device.data.networks.push(_network.data); if (port.fixed_ips) { @@ -743,7 +743,8 @@ horizon.network_topology = { } self.new_link(self.find_by_id(port.device_id), self.find_by_id(port.network_id)); change = true; - } else if (angular.isDefined(_network) && port.device_owner == 'compute:nova') { + } else if (angular.isDefined(_network) && + port.device_owner && port.device_owner.startsWith('compute:')) { // Need to add a previously hidden node to the graph because it is // connected to more than 1 network if (_network.data.collapsed) {