openstack/horizon
Code Issues Proposed changes

network topology: handle port AZ correctly

Browse Source 
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
This commit is contained in:
Akihiro Motoki 2019-03-21 16:41:37 +09:00
parent e649d6b409
commit ffbe0e2f2f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstack_dashboard/static/js/horizon.networktopology.js
View File

@ -743,7 +743,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) {
@ -773,7 +773,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) {