openstack/horizon
Code Issues Proposed changes

Merge "Added type checks for ha device owners"

Browse Source
This commit is contained in:
Zuul 2017-10-21 01:48:25 +00:00 committed by Gerrit Code Review
commit 54c5fdb92a
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_dashboard/static/js/horizon.flatnetworktopology.js
View File

@ -545,7 +545,12 @@ horizon.flat_network_topology = {
object.network_id = network_id; object.network_id = network_id;
object.ip_address = ip_address; object.ip_address = ip_address;
object.device_owner = device_owner; object.device_owner = device_owner;
object.is_interface = (device_owner === 'router_interface' || device_owner === 'router_gateway'); object.is_interface = (
device_owner === 'router_interface' ||
device_owner === 'router_gateway' ||
device_owner === 'ha_router_replicated_interface'
);
// (device_owner === 'router_interface' || device_owner === 'router_gateway');
ports.push(object); ports.push(object);
}); });
var html; var html;

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

@ -957,7 +957,11 @@ horizon.network_topology = {
object.ip_address = ipAddress; object.ip_address = ipAddress;
object.device_owner = deviceOwner; object.device_owner = deviceOwner;
object.network_id = networkId; object.network_id = networkId;
object.is_interface = (deviceOwner === 'router_interface' || deviceOwner === 'router_gateway'); object.is_interface = (
deviceOwner === 'router_interface' ||
deviceOwner === 'router_gateway' ||
deviceOwner === 'ha_router_replicated_interface'
);
ports.push(object); ports.push(object);
}); });
} else if (d.hasOwnProperty('subnets')) { } else if (d.hasOwnProperty('subnets')) {