Fixing reconciling hosts to regions
Change-Id: Ib4b2ff52a7530a60c7933194bd35f2f2d2d4f552
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Link.js b/web/gui/src/main/webapp/app/view/topo2/topo2Link.js
index 66e3bb5..f8f331c 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Link.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Link.js
@@ -95,11 +95,11 @@
function linkEndPoints(srcId, dstId) {
var allNodes = this.region.nodes();
- var sourceNode = this.region.findNodeById(srcId);
- var targetNode = this.region.findNodeById(dstId);
+ var sourceNode = this.region.findNodeById(this, srcId);
+ var targetNode = this.region.findNodeById(this, dstId);
if (!sourceNode || !targetNode) {
- $log.error('Node(s) not on map for link:' + srcId + ':' + dstId);
+ $log.error('Node(s) not on map for link:' + srcId + '~' + dstId);
// logicError('Node(s) not on map for link:\n' + sMiss + dMiss);
return null;
}
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Region.js b/web/gui/src/main/webapp/app/view/topo2/topo2Region.js
index 29a7e68..bd24bbb 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Region.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Region.js
@@ -84,11 +84,14 @@
$log.debug('Region: ', region);
}
- function findNodeById(id) {
+ function findNodeById(link, id) {
- // Remove /{port} from id if needed
- var regex = new RegExp('^[^/]*');
- id = regex.exec(id)[0];
+
+ if (link.get('type') !== 'UiEdgeLink') {
+ // Remove /{port} from id if needed
+ var regex = new RegExp('^[^/]*');
+ id = regex.exec(id)[0];
+ }
return region.get('devices').get(id) ||
region.get('hosts').get(id) ||