openstack
/
horizon
Code Issues Proposed changes

Merge "network topology: handle port AZ correctly"

This commit is contained in:
Zuul 2019-03-21 19:45:49 +00:00 committed by Gerrit Code Review
parent 18efb06cdd ffbe0e2f2f
commit 21aaf46885
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) {