From e437c43fb7bd575c740bf36e16f03c8b0c355bd6 Mon Sep 17 00:00:00 2001
From: Jeremy Mitchell <mitchell852@gmail.com>
Date: Mon, 8 Jun 2020 19:59:21 -0600
Subject: [PATCH 1/4] allows edge_loc cachegroups to parent other edge_locs

---
 .../form/topology/FormTopologyController.js   | 42 +++++++++++--------
 .../form/topology/form.topology.tpl.html      |  9 ++--
 ...ableSelectTopologyCacheGroupsController.js | 31 +++++++++-----
 traffic_portal/app/src/styles/main.scss       |  5 +++
 4 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/traffic_portal/app/src/common/modules/form/topology/FormTopologyController.js b/traffic_portal/app/src/common/modules/form/topology/FormTopologyController.js
index a260a50bee..aca835e962 100644
--- a/traffic_portal/app/src/common/modules/form/topology/FormTopologyController.js
+++ b/traffic_portal/app/src/common/modules/form/topology/FormTopologyController.js
@@ -74,10 +74,10 @@ var FormTopologyController = function(topology, cacheGroups, $anchorScroll, $sco
 				return false;
 			}
 
-			// EDGE_LOC cannot have children
-			if (parent.type === 'EDGE_LOC') {
+			// EDGE_LOC can only have EDGE_LOC children
+			if (parent.type === 'EDGE_LOC' && node.type !== 'EDGE_LOC') {
 				$anchorScroll(); // scrolls window to top
-				messageModel.setMessages([ { level: 'error', text: 'Cache groups of EDGE_LOC type must not have children.' } ], false);
+				messageModel.setMessages([ { level: 'error', text: 'EDGE_LOC cache groups can only have EDGE_LOC children.' } ], false);
 				return false;
 			}
 
@@ -124,14 +124,17 @@ var FormTopologyController = function(topology, cacheGroups, $anchorScroll, $sco
 		buildCacheGroupNamesInTopology($scope.topologyTree, true);
 
 		/*  Cache groups that can act as a second parent include:
-			1. cache groups of type ORG_LOC or MID_LOC (not EDGE_LOC)
-			2. cache groups that are not currently acting as the primary parent
-			3. cache groups that exist currently in the topology
+			1. cache groups that are not the current cache group (you can't parent/sec parent yourself)
+			2. cache groups that are not currently acting as the primary parent (primary parent != sec parent)
+			3. cache groups that exist currently in the topology only
+			4a. any cache group types (ORG_LOC, MID_LOC, EDGE_LOC) if child cache group is EDGE_LOC
+			4b. only MID_LOC or ORG_LOC cache group types if child cache group is not EDGE_LOC
 		 */
 		let eligibleSecParentCandidates = cacheGroups.filter(function(cg) {
-			return cg.typeName !== 'EDGE_LOC' &&
+			return (node.cachegroup && node.cachegroup !== cg.name) &&
 				(node.parent && node.parent !== cg.name) &&
-				cacheGroupNamesInTopology.includes(cg.name);
+				cacheGroupNamesInTopology.includes(cg.name) &&
+				((node.type === 'EDGE_LOC') || (cg.typeName === 'MID_LOC' || cg.typeName === 'ORG_LOC'));
 		});
 
 		let params = {
@@ -139,7 +142,8 @@ var FormTopologyController = function(topology, cacheGroups, $anchorScroll, $sco
 			message: 'Please select a secondary parent that is part of the ' + topology.name + ' topology',
 			key: 'name',
 			required: false,
-			selectedItemKeyValue: node.secParent
+			selectedItemKeyValue: node.secParent,
+			labelFunction: function(item) { return item['name'] + ' (' + item['typeName'] + ')' }
 		};
 		let modalInstance = $uibModal.open({
 			templateUrl: 'common/modules/dialog/select/dialog.select.tpl.html',
@@ -178,11 +182,20 @@ var FormTopologyController = function(topology, cacheGroups, $anchorScroll, $sco
 		scope.toggle();
 	};
 
-	$scope.hasNodeError = function(node) {
+	$scope.nodeError = function(node) {
+		// only EDGE_LOCs can serve as a leaf node on the topology
 		if (node.type !== 'EDGE_LOC' && node.children.length === 0) {
-			return true;
+			return node.type + ' requires 1+ child cache group';
+		}
+		return '';
+	};
+
+	$scope.nodeWarning = function(node) {
+		// only EDGE_LOCs with child EDGE_LOCs require special configuration
+		if (node.type === 'EDGE_LOC' && node.children.length > 0) {
+			return 'EDGE_LOC with EDGE_LOC children requires special config';
 		}
-		return false;
+		return '';
 	};
 
 	$scope.isOrigin = function(node) {
@@ -199,11 +212,6 @@ var FormTopologyController = function(topology, cacheGroups, $anchorScroll, $sco
 
 	$scope.addCacheGroups = function(parent, scope) {
 
-		if (parent.type === 'EDGE_LOC') {
-			// can't add children to EDGE_LOC. button should be hidden anyhow.
-			return;
-		}
-
 		// cache groups already in the topology cannot be selected again for addition
 		buildCacheGroupNamesInTopology($scope.topologyTree, true);
 
diff --git a/traffic_portal/app/src/common/modules/form/topology/form.topology.tpl.html b/traffic_portal/app/src/common/modules/form/topology/form.topology.tpl.html
index 13b24b7ac2..f4b8e281fd 100644
--- a/traffic_portal/app/src/common/modules/form/topology/form.topology.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/topology/form.topology.tpl.html
@@ -68,17 +68,18 @@
 
 <script type="text/ng-template" id="nodes_renderer.html">
     <!-- this hidden form field will make the form invalid (and disable the save btn) because it's a required field with no value -->
-    <input name="error" ng-if="hasNodeError(node)" ng-model="error" type="hidden" required>
+    <input name="error" ng-if="nodeError(node)" ng-model="error" type="hidden" required>
     <!-- this hidden form field will mark the form as dirty (and enable the save btn) when the topology tree is modified in any way -->
     <input name="dirty" ng-model="dirty" type="hidden">
     <div id="{{node.cachegroup}}" ui-tree-handle class="tree-node tree-node-content"
-         ng-class="{ 'error': hasNodeError(node), 'origin': isOrigin(node), 'mid': isMid(node) }">
+         ng-class="{ 'error': nodeError(node), 'warning': nodeWarning(node), 'origin': isOrigin(node), 'mid': isMid(node) }">
         <div class="tree-node-label pull-left">
             <a class="tree-toggle btn btn-primary btn-xs" ng-if="node.type !== 'ROOT' && hasChildren(node)" data-nodrag ng-click="toggle(this)">
                 <i class="fa" ng-class="collapsed ? 'fa-caret-right' : 'fa-caret-down'"></i>
             </a> {{::nodeLabel(node)}} <small>{{::node.type}}</small>
         </div>
-        <div ng-if="hasNodeError(node)" class="error-msg">1+ child required for {{::node.type}}</div>
+        <div ng-if="nodeError(node)" class="error-msg">{{nodeError(node)}}</div>
+        <div ng-if="nodeWarning(node)" class="error-msg">{{nodeWarning(node)}}</div>
         <div class="pull-right">
             <a ng-show="node.cachegroup && node.parent" title="Set Secondary Parent Cache Group for {{::node.cachegroup}}" class="btn btn-primary btn-xs" data-nodrag ng-click="editSecParent(node)" style="margin-right: 8px;">
                 2nd: {{(node.secParent) ? node.secParent : 'None'}}
@@ -86,7 +87,7 @@
             <a ng-if="node.cachegroup" title="View Servers Assigned to {{::node.cachegroup}}" class="btn btn-primary btn-xs" data-nodrag ng-click="viewCacheGroupServers(node)" style="margin-right: 8px;">
                 <i class="fa fa-server"></i>
             </a>
-            <a ng-disabled="node.type === 'EDGE_LOC'" title="{{(node.type !== 'EDGE_LOC') ? 'Add child cache groups to ' + nodeLabel(node) : 'Child cache groups cannot be added to EDGE_LOC cache groups'}}" class="btn btn-primary btn-xs" data-nodrag ng-click="addCacheGroups(node, this)" style="margin-right: 8px;">
+            <a title="Add child cache groups to {{nodeLabel(node)}}" class="btn btn-primary btn-xs" data-nodrag ng-click="addCacheGroups(node, this)" style="margin-right: 8px;">
                 <i class="fa fa-plus"></i>
             </a>
             <a ng-if="node.cachegroup" title="Remove {{::node.cachegroup}} Cache Group" class="btn btn-danger btn-xs" data-nodrag ng-click="deleteCacheGroup(node, this)">
diff --git a/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js b/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js
index acb387071d..4df2d794ff 100644
--- a/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js
+++ b/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js
@@ -59,10 +59,17 @@ var TableSelectTopologyCacheGroupsController = function(parent, topology, cacheG
 	$scope.parent = parent;
 
 	$scope.cacheGroups = cacheGroups.filter(function(cg) {
-		// all cg types (ORG_LOC, MID_LOC, EDGE_LOC) can be added to the root of a topology
-		// but only EDGE_LOC and MID_LOC can be added farther down the topology tree
-		if (parent.type === 'ROOT') return (cg.typeName === 'EDGE_LOC' || cg.typeName === 'MID_LOC' || cg.typeName === 'ORG_LOC');
-		return (cg.typeName === 'EDGE_LOC' || cg.typeName === 'MID_LOC');
+		// displayed cache groups are filtered based on parent cache group type
+		if (parent.type === 'ROOT') {
+			// the topology root can have children of any kind (EDGE_LOC, MID_LOC, ORG_LOC)
+			return true;
+		} else if (parent.type === 'EDGE_LOC') {
+			// EDGE_LOC can only have EDGE_LOC children
+			return cg.typeName === 'EDGE_LOC';
+		} else {
+			// only EDGE_LOC and MID_LOC can be added farther down the topology tree (not root)
+			return (cg.typeName === 'EDGE_LOC' || cg.typeName === 'MID_LOC');
+		}
 	});
 
 	$scope.selectAll = function($event) {
@@ -101,19 +108,22 @@ var TableSelectTopologyCacheGroupsController = function(parent, topology, cacheG
 	};
 
 	$scope.submit = function() {
-		// cache groups that are eligible to be a secondary parent include cache groups that are:
+		/*  Cache groups that can act as a second parent include:
+			1. cache groups that are not currently acting as the primary parent
+			2. cache groups that exist currently in the topology
+		 */
 		let eligibleSecParentCandidates = cacheGroups.filter(function(cg) {
-			return cg.typeName !== 'EDGE_LOC' && // not an edge_loc cache group
-				(parent.cachegroup && parent.cachegroup !== cg.name) && // not the primary parent cache group
-				usedCacheGroupNames.includes(cg.name); // a cache group that exists in the topology
+			return (parent.cachegroup && parent.cachegroup !== cg.name) &&
+				usedCacheGroupNames.includes(cg.name);
 		});
+
 		if (eligibleSecParentCandidates.length === 0) {
 			$uibModalInstance.close({ selectedCacheGroups: selectedCacheGroups, parent: parent.cachegroup, secParent: '' });
 			return;
 		}
 		let params = {
 			title: 'Assign secondary parent?',
-			message: 'Would you like to assign a secondary parent to the following cache groups?<br><br>primary parent = ' + parent.cachegroup + '<br><br>'
+			message: 'Primary parent = ' + parent.cachegroup + '<br>Secondary parent = null<br><br>Would you like to assign a secondary parent to the following cache groups? Note: secondary parent assignment is optional and can be done later.<br><br>'
 		};
 		params.message += selectedCacheGroups.map(function(cg) { return cg.name }).join('<br>') + '<br><br>';
 		let modalInstance = $uibModal.open({
@@ -131,7 +141,8 @@ var TableSelectTopologyCacheGroupsController = function(parent, topology, cacheG
 			let params = {
 				title: 'Select a secondary parent',
 				message: 'Please select a secondary parent that is part of the ' + topology.name + ' topology',
-				key: 'name'
+				key: 'name',
+				labelFunction: function(item) { return item['name'] + ' (' + item['typeName'] + ')' }
 			};
 			let modalInstance = $uibModal.open({
 				templateUrl: 'common/modules/dialog/select/dialog.select.tpl.html',
diff --git a/traffic_portal/app/src/styles/main.scss b/traffic_portal/app/src/styles/main.scss
index a984feadd6..c4d678be64 100644
--- a/traffic_portal/app/src/styles/main.scss
+++ b/traffic_portal/app/src/styles/main.scss
@@ -220,5 +220,10 @@ input[type="checkbox"].dirty {
     background-color: #f2dede;
     border-color: #f5c6cb;
   }
+  .tree-node.warning {
+    color: #856404;
+    background-color: #fff3cd;
+    border-color: #ffeeba;
+  }
 
 }

From 7c84ac559b4b4054e0c18b1d825151d4a3557162 Mon Sep 17 00:00:00 2001
From: Jeremy Mitchell <mitchell852@gmail.com>
Date: Tue, 9 Jun 2020 08:42:10 -0600
Subject: [PATCH 2/4] when adding child cachegroups, you must select a type

---
 .../form/topology/FormTopologyController.js   | 87 +++++++++++++------
 ...ableSelectTopologyCacheGroupsController.js | 16 +---
 2 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/traffic_portal/app/src/common/modules/form/topology/FormTopologyController.js b/traffic_portal/app/src/common/modules/form/topology/FormTopologyController.js
index aca835e962..53590c7a30 100644
--- a/traffic_portal/app/src/common/modules/form/topology/FormTopologyController.js
+++ b/traffic_portal/app/src/common/modules/form/topology/FormTopologyController.js
@@ -215,42 +215,75 @@ var FormTopologyController = function(topology, cacheGroups, $anchorScroll, $sco
 		// cache groups already in the topology cannot be selected again for addition
 		buildCacheGroupNamesInTopology($scope.topologyTree, true);
 
+		// the types of child cache groups you can add depends on the parent cache group's type
+		let eligibleChildrenTypes = [ { name: 'EDGE_LOC' } ];
+		if (parent.type === 'ROOT') {
+			eligibleChildrenTypes.push({ name: 'MID_LOC' });
+			eligibleChildrenTypes.push({ name: 'ORG_LOC' });
+		} else if (parent.type === 'MID_LOC' || parent.type === 'ORG_LOC') {
+			eligibleChildrenTypes.push({ name: 'MID_LOC' });
+		}
+
+		let parentName = (parent.cachegroup) ? parent.cachegroup : 'ROOT';
+		let params = {
+			title: 'Select a child cache group type',
+			message: 'Please select the type of child cache group(s) you would like to add to ' + parentName,
+			key: 'name',
+		};
 		let modalInstance = $uibModal.open({
-			templateUrl: 'common/modules/table/topologyCacheGroups/table.selectTopologyCacheGroups.tpl.html',
-			controller: 'TableSelectTopologyCacheGroupsController',
-			size: 'lg',
+			templateUrl: 'common/modules/dialog/select/dialog.select.tpl.html',
+			controller: 'DialogSelectController',
+			size: 'md',
 			resolve: {
-				parent: function() {
-					return parent;
-				},
-				topology: function() {
-					return topology;
-				},
-				cacheGroups: function(cacheGroupService) {
-					return cacheGroupService.getCacheGroups();
+				params: function () {
+					return params;
 				},
-				usedCacheGroupNames: function() {
-					return cacheGroupNamesInTopology;
+				collection: function() {
+					return eligibleChildrenTypes;
 				}
 			}
 		});
-		modalInstance.result.then(function(result) {
-			let nodeData = scope.$modelValue,
-				cacheGroupNodes = result.selectedCacheGroups.map(function(cg) {
-					return {
-						id: cg.id,
-						cachegroup: cg.name,
-						type: cg.typeName,
-						parent: (result.parent) ? result.parent : '',
-						secParent: result.secParent,
-						children: []
+		modalInstance.result.then(function(type) {
+			modalInstance = $uibModal.open({
+				templateUrl: 'common/modules/table/topologyCacheGroups/table.selectTopologyCacheGroups.tpl.html',
+				controller: 'TableSelectTopologyCacheGroupsController',
+				size: 'lg',
+				resolve: {
+					parent: function() {
+						return parent;
+					},
+					topology: function() {
+						return topology;
+					},
+					selectedType: function() {
+						return type.name;
+					},
+					cacheGroups: function(cacheGroupService) {
+						return cacheGroupService.getCacheGroups();
+					},
+					usedCacheGroupNames: function() {
+						return cacheGroupNamesInTopology;
 					}
+				}
+			});
+			modalInstance.result.then(function(result) {
+				let nodeData = scope.$modelValue,
+					cacheGroupNodes = result.selectedCacheGroups.map(function(cg) {
+						return {
+							id: cg.id,
+							cachegroup: cg.name,
+							type: cg.typeName,
+							parent: (result.parent) ? result.parent : '',
+							secParent: result.secParent,
+							children: []
+						}
+					});
+				cacheGroupNodes.forEach(function(node) {
+					nodeData.children.unshift(node);
 				});
-			cacheGroupNodes.forEach(function(node) {
-				nodeData.children.unshift(node);
+				// marks the form as dirty thus enabling the save btn
+				$scope.topologyForm.dirty.$setDirty();
 			});
-			// marks the form as dirty thus enabling the save btn
-			$scope.topologyForm.dirty.$setDirty();
 		});
 	};
 
diff --git a/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js b/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js
index 4df2d794ff..ed0d0696e7 100644
--- a/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js
+++ b/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-var TableSelectTopologyCacheGroupsController = function(parent, topology, cacheGroups, usedCacheGroupNames, $scope, $uibModal, $uibModalInstance, serverService) {
+var TableSelectTopologyCacheGroupsController = function(parent, topology, selectedType, cacheGroups, usedCacheGroupNames, $scope, $uibModal, $uibModalInstance, serverService) {
 
 	let selectedCacheGroups = [],
 		usedCacheGroupCount = 0;
@@ -59,17 +59,7 @@ var TableSelectTopologyCacheGroupsController = function(parent, topology, cacheG
 	$scope.parent = parent;
 
 	$scope.cacheGroups = cacheGroups.filter(function(cg) {
-		// displayed cache groups are filtered based on parent cache group type
-		if (parent.type === 'ROOT') {
-			// the topology root can have children of any kind (EDGE_LOC, MID_LOC, ORG_LOC)
-			return true;
-		} else if (parent.type === 'EDGE_LOC') {
-			// EDGE_LOC can only have EDGE_LOC children
-			return cg.typeName === 'EDGE_LOC';
-		} else {
-			// only EDGE_LOC and MID_LOC can be added farther down the topology tree (not root)
-			return (cg.typeName === 'EDGE_LOC' || cg.typeName === 'MID_LOC');
-		}
+		return cg.typeName === selectedType;
 	});
 
 	$scope.selectAll = function($event) {
@@ -201,5 +191,5 @@ var TableSelectTopologyCacheGroupsController = function(parent, topology, cacheG
 
 };
 
-TableSelectTopologyCacheGroupsController.$inject = ['parent', 'topology', 'cacheGroups', 'usedCacheGroupNames', '$scope', '$uibModal', '$uibModalInstance', 'serverService'];
+TableSelectTopologyCacheGroupsController.$inject = ['parent', 'topology', 'selectedType', 'cacheGroups', 'usedCacheGroupNames', '$scope', '$uibModal', '$uibModalInstance', 'serverService'];
 module.exports = TableSelectTopologyCacheGroupsController;

From 1ef12c205f66a400d819925dcfddc728d7e0c1fd Mon Sep 17 00:00:00 2001
From: Jeremy Mitchell <mitchell852@gmail.com>
Date: Tue, 9 Jun 2020 10:22:58 -0600
Subject: [PATCH 3/4] assigning sec parents in bulk must be limited to the type
 of cachegroups being added

---
 .../TableSelectTopologyCacheGroupsController.js              | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js b/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js
index ed0d0696e7..d4c238184a 100644
--- a/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js
+++ b/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js
@@ -101,10 +101,13 @@ var TableSelectTopologyCacheGroupsController = function(parent, topology, select
 		/*  Cache groups that can act as a second parent include:
 			1. cache groups that are not currently acting as the primary parent
 			2. cache groups that exist currently in the topology
+			3a. any cache group types (ORG_LOC, MID_LOC, EDGE_LOC) if child cache group(s) are EDGE_LOC
+			3b. only MID_LOC or ORG_LOC cache group types if child cache group(s) are MID_LOC or ORG_LOC
 		 */
 		let eligibleSecParentCandidates = cacheGroups.filter(function(cg) {
 			return (parent.cachegroup && parent.cachegroup !== cg.name) &&
-				usedCacheGroupNames.includes(cg.name);
+				usedCacheGroupNames.includes(cg.name) &&
+				((selectedType === 'EDGE_LOC') || (cg.typeName === 'MID_LOC' || cg.typeName === 'ORG_LOC'));
 		});
 
 		if (eligibleSecParentCandidates.length === 0) {

From d1bb9314f718fbec408922431eea5de9bf9cc207 Mon Sep 17 00:00:00 2001
From: Jeremy Mitchell <mitchell852@gmail.com>
Date: Wed, 10 Jun 2020 15:08:13 -0600
Subject: [PATCH 4/4] adds type to parent and sec parent to display a warning
 if either of a nodes parent are edge_loc

---
 .../form/topology/FormTopologyController.js   | 34 +++++++++++--------
 .../form/topology/form.topology.tpl.html      |  2 +-
 ...ableSelectTopologyCacheGroupsController.js |  8 ++---
 .../src/common/service/utils/TopologyUtils.js | 14 ++++----
 4 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/traffic_portal/app/src/common/modules/form/topology/FormTopologyController.js b/traffic_portal/app/src/common/modules/form/topology/FormTopologyController.js
index 53590c7a30..e0dab19817 100644
--- a/traffic_portal/app/src/common/modules/form/topology/FormTopologyController.js
+++ b/traffic_portal/app/src/common/modules/form/topology/FormTopologyController.js
@@ -32,8 +32,8 @@ var FormTopologyController = function(topology, cacheGroups, $anchorScroll, $sco
 	let removeSecParentReferences = function(topologyTree, secParentName) {
 		// when a cache group is removed, any references to the cache group as a secParent need to be removed
 		topologyTree.forEach(function(node) {
-			if (node.secParent && node.secParent === secParentName) {
-				node.secParent = '';
+			if (node.secParent && node.secParent.name === secParentName) {
+				node.secParent = { name: '', type: '' };
 			}
 			if (node.children && node.children.length > 0) {
 				removeSecParentReferences(node.children, secParentName);
@@ -83,15 +83,16 @@ var FormTopologyController = function(topology, cacheGroups, $anchorScroll, $sco
 
 			// update the parent and secParent fields of the node on successful drop
 			if (parent.cachegroup) {
-				node.parent = parent.cachegroup; // change the node parent based on where the node is dropped
-				if (node.parent === node.secParent) {
+				// change the node parent based on where the node is dropped
+				node.parent = { name: parent.cachegroup, type: parent.type };
+				if (node.parent.name === node.secParent.name) {
 					// node parent and secParent cannot be the same
-					node.secParent = "";
+					node.secParent = { name: '', type: '' };
 				}
 			} else {
 				// the node was dropped at the root of the topology. no parents.
-				node.parent = "";
-				node.secParent = "";
+				node.parent = { name: '', type: '' };
+				node.secParent = { name: '', type: '' };
 			}
 			// marks the form as dirty thus enabling the save btn
 			$scope.topologyForm.dirty.$setDirty();
@@ -132,7 +133,7 @@ var FormTopologyController = function(topology, cacheGroups, $anchorScroll, $sco
 		 */
 		let eligibleSecParentCandidates = cacheGroups.filter(function(cg) {
 			return (node.cachegroup && node.cachegroup !== cg.name) &&
-				(node.parent && node.parent !== cg.name) &&
+				(node.parent && node.parent.name !== cg.name) &&
 				cacheGroupNamesInTopology.includes(cg.name) &&
 				((node.type === 'EDGE_LOC') || (cg.typeName === 'MID_LOC' || cg.typeName === 'ORG_LOC'));
 		});
@@ -142,7 +143,7 @@ var FormTopologyController = function(topology, cacheGroups, $anchorScroll, $sco
 			message: 'Please select a secondary parent that is part of the ' + topology.name + ' topology',
 			key: 'name',
 			required: false,
-			selectedItemKeyValue: node.secParent,
+			selectedItemKeyValue: node.secParent.name,
 			labelFunction: function(item) { return item['name'] + ' (' + item['typeName'] + ')' }
 		};
 		let modalInstance = $uibModal.open({
@@ -160,9 +161,9 @@ var FormTopologyController = function(topology, cacheGroups, $anchorScroll, $sco
 		});
 		modalInstance.result.then(function(selectedSecParent) {
 			if (selectedSecParent) {
-				node.secParent = selectedSecParent.name;
+				node.secParent = { name: selectedSecParent.name, type: selectedSecParent.typeName };
 			} else {
-				node.secParent = '';
+				node.secParent = { name: '', type: '' };
 			}
 			// marks the form as dirty thus enabling the save btn
 			$scope.topologyForm.dirty.$setDirty();
@@ -191,9 +192,12 @@ var FormTopologyController = function(topology, cacheGroups, $anchorScroll, $sco
 	};
 
 	$scope.nodeWarning = function(node) {
-		// only EDGE_LOCs with child EDGE_LOCs require special configuration
-		if (node.type === 'EDGE_LOC' && node.children.length > 0) {
-			return 'EDGE_LOC with EDGE_LOC children requires special config';
+		// EDGE_LOCs with parent/secondary parent EDGE_LOCs require special configuration
+		if (node.parent) {
+			console.log(node.parent);
+		}
+		if ((node.parent && node.parent.type === 'EDGE_LOC') || (node.secParent && node.secParent.type === 'EDGE_LOC')) {
+			return 'Special Configuration Required';
 		}
 		return '';
 	};
@@ -273,7 +277,7 @@ var FormTopologyController = function(topology, cacheGroups, $anchorScroll, $sco
 							id: cg.id,
 							cachegroup: cg.name,
 							type: cg.typeName,
-							parent: (result.parent) ? result.parent : '',
+							parent: result.parent,
 							secParent: result.secParent,
 							children: []
 						}
diff --git a/traffic_portal/app/src/common/modules/form/topology/form.topology.tpl.html b/traffic_portal/app/src/common/modules/form/topology/form.topology.tpl.html
index f4b8e281fd..dca5efa564 100644
--- a/traffic_portal/app/src/common/modules/form/topology/form.topology.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/topology/form.topology.tpl.html
@@ -82,7 +82,7 @@
         <div ng-if="nodeWarning(node)" class="error-msg">{{nodeWarning(node)}}</div>
         <div class="pull-right">
             <a ng-show="node.cachegroup && node.parent" title="Set Secondary Parent Cache Group for {{::node.cachegroup}}" class="btn btn-primary btn-xs" data-nodrag ng-click="editSecParent(node)" style="margin-right: 8px;">
-                2nd: {{(node.secParent) ? node.secParent : 'None'}}
+                2nd Parent: {{(node.secParent.name) ? node.secParent.name : ''}} [{{node.secParent.type}}]
             </a>
             <a ng-if="node.cachegroup" title="View Servers Assigned to {{::node.cachegroup}}" class="btn btn-primary btn-xs" data-nodrag ng-click="viewCacheGroupServers(node)" style="margin-right: 8px;">
                 <i class="fa fa-server"></i>
diff --git a/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js b/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js
index d4c238184a..9b1f9e148a 100644
--- a/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js
+++ b/traffic_portal/app/src/common/modules/table/topologyCacheGroups/TableSelectTopologyCacheGroupsController.js
@@ -111,7 +111,7 @@ var TableSelectTopologyCacheGroupsController = function(parent, topology, select
 		});
 
 		if (eligibleSecParentCandidates.length === 0) {
-			$uibModalInstance.close({ selectedCacheGroups: selectedCacheGroups, parent: parent.cachegroup, secParent: '' });
+			$uibModalInstance.close({ selectedCacheGroups: selectedCacheGroups, parent: { name: parent.cachegroup, type: parent.type }, secParent: { name: '', type: ''} });
 			return;
 		}
 		let params = {
@@ -153,14 +153,14 @@ var TableSelectTopologyCacheGroupsController = function(parent, topology, select
 			});
 			modalInstance.result.then(function(cg) {
 				// user selected a secondary parent
-				$uibModalInstance.close({ selectedCacheGroups: selectedCacheGroups, parent: parent.cachegroup, secParent: cg.name });
+				$uibModalInstance.close({ selectedCacheGroups: selectedCacheGroups, parent: { name: parent.cachegroup, type: parent.type }, secParent: { name: cg.name, type: cg.typeName } });
 			}, function () {
 				// user apparently changed their mind and doesn't want to select a secondary parent
-				$uibModalInstance.close({ selectedCacheGroups: selectedCacheGroups, parent: parent.cachegroup, secParent: '' });
+				$uibModalInstance.close({ selectedCacheGroups: selectedCacheGroups, parent: { name: parent.cachegroup, type: parent.type }, secParent: { name: '', type: ''} });
 			});
 		}, function () {
 			// user doesn't want to select a secondary parent
-			$uibModalInstance.close({ selectedCacheGroups: selectedCacheGroups, parent: parent.cachegroup, secParent: '' });
+			$uibModalInstance.close({ selectedCacheGroups: selectedCacheGroups, parent: { name: parent.cachegroup, type: parent.type }, secParent: { name: '', type: ''} });
 		});
 	};
 
diff --git a/traffic_portal/app/src/common/service/utils/TopologyUtils.js b/traffic_portal/app/src/common/service/utils/TopologyUtils.js
index ec45c8a782..086bea22a2 100644
--- a/traffic_portal/app/src/common/service/utils/TopologyUtils.js
+++ b/traffic_portal/app/src/common/service/utils/TopologyUtils.js
@@ -40,8 +40,8 @@ var TopologyUtils = function() {
 
 	let addNodeIndexes = function() {
 		normalizedTopology.nodes.forEach(function(currentNode) {
-			let parentNodeIndex = _.findIndex(normalizedTopology.nodes, function(node) { return currentNode.parent === node.cachegroup });
-			let secParentNodeIndex = _.findIndex(normalizedTopology.nodes, function(node) { return currentNode.secParent === node.cachegroup });
+			let parentNodeIndex = _.findIndex(normalizedTopology.nodes, function(node) { return currentNode.parent.name === node.cachegroup });
+			let secParentNodeIndex = _.findIndex(normalizedTopology.nodes, function(node) { return currentNode.secParent.name === node.cachegroup });
 			if (parentNodeIndex > -1) {
 				currentNode.parents.push(parentNodeIndex);
 				if (secParentNodeIndex > -1) {
@@ -79,8 +79,8 @@ var TopologyUtils = function() {
 				item.children = []
 			}
 			if (item.parents.length === 0) {
-				item.parent = "";
-				item.secParent = "";
+				item.parent = { name: '', type: '' };
+				item.secParent = { name: '', type: '' };
 				roots.push(item)
 			} else if (item.parents[0] in all) {
 				let p = all[item.parents[0]]
@@ -89,10 +89,12 @@ var TopologyUtils = function() {
 				}
 				p.children.push(item);
 				// add parent to each node
-				item.parent = all[item.parents[0]].cachegroup;
+				item.parent = { name: all[item.parents[0]].cachegroup, type: all[item.parents[0]].type };
 				// add secParent to each node
 				if (item.parents.length === 2 && item.parents[1] in all) {
-					item.secParent = all[item.parents[1]].cachegroup;
+					item.secParent = { name: all[item.parents[1]].cachegroup, type: all[item.parents[1]].type };
+				} else {
+					item.secParent = { name: '', type: '' };
 				}
 			}
 		});