[SDC-29] rebase continue work to align source

Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 14 insertions, 13 deletions

diff --git a/catalog-ui/src/app/models/graph/graph-links/links-factory.ts b/catalog-ui/src/app/models/graph/graph-links/links-factory.ts
index 7fdc0838ed..1744aa0ff3 100644
--- a/catalog-ui/src/app/models/graph/graph-links/links-factory.ts
+++ b/catalog-ui/src/app/models/graph/graph-links/links-factory.ts
@@ -33,19 +33,20 @@ export class LinksFactory {
 
     let newRelation:CompositionCiLinkBase;
 
-    let fromNode:CompositionCiNodeBase = cy.getElementById(relation.fromNode).data();
-    let toNode:CompositionCiNodeBase = cy.getElementById(relation.toNode).data();
-
-    if ((relation.fromNode && fromNode.isUcpePart) || (relation.toNode && toNode.isUcpePart )) { //Link from or to node inside ucpe
-
-      if (singleRelation && singleRelation.relationship.type && singleRelation.relationship.type == 'tosca.relationships.HostedOn') {
-        newRelation = new LinkUcpeHost(relation, singleRelation);
-      } else if (singleRelation.relationship.type && _.includes(singleRelation.relationship.type.toLowerCase(), 'link')) {
-        newRelation = new CompositionCiVlUcpeLink(relation, fromNode.isUcpePart, singleRelation);
-      } else {
-        newRelation = new CompositionCiUcpeLink(relation, fromNode.isUcpePart, singleRelation);
-      }
-    } else if (singleRelation.relationship.type && _.includes(singleRelation.relationship.type.toLowerCase(), 'link')) {
+    // let fromNode:CompositionCiNodeBase = cy.getElementById(relation.fromNode).data();
+    // let toNode:CompositionCiNodeBase = cy.getElementById(relation.toNode).data();
+    //
+    // if ((relation.fromNode && fromNode.isUcpePart) || (relation.toNode && toNode.isUcpePart )) { //Link from or to node inside ucpe
+    //
+    //   if (singleRelation && singleRelation.relationship.type && singleRelation.relationship.type == 'tosca.relationships.HostedOn') {
+    //     newRelation = new LinkUcpeHost(relation, singleRelation);
+    //   } else if (singleRelation.relationship.type && _.includes(singleRelation.relationship.type.toLowerCase(), 'link')) {
+    //     newRelation = new CompositionCiVlUcpeLink(relation, fromNode.isUcpePart, singleRelation);
+    //   } else {
+    //     newRelation = new CompositionCiUcpeLink(relation, fromNode.isUcpePart, singleRelation);
+    //   }
+    // } else
+     if (singleRelation.relationship.type && _.includes(singleRelation.relationship.type.toLowerCase(), 'link')) {
       newRelation = new CompositionCiVLink(relation, singleRelation);
     } else {
       newRelation = new CompositionCiSimpleLink(relation, singleRelation);