GUI -- TopoView - Fixed problem of labels on hostlinks not being positioned correctly.

- updated traffic scenario.

Change-Id: I452e0e81327a9006c20e00a843c6096432a1efac

@@ -846,13 +846,6 @@
             })
             })
             .style('opacity', 0.0)
             .style('opacity', 0.0)
             .remove();
             .remove();
-
-        // NOTE: invoke a single tick to force the labels to position
-        //        onto their links.
-        tick();
-        // TODO: this causes undesirable behavior when in oblique view
-        // It causes the nodes to jump into "overhead" view positions, even
-        //  though the oblique planes are still showing...
     }
     }
 
 
     // ==========================
     // ==========================
@@ -921,10 +914,10 @@
                 rect,
                 rect,
                 text,
                 text,
                 parms = {
                 parms = {
-                    x1: d.ldata.x1,
-                    y1: d.ldata.y1,
-                    x2: d.ldata.x2,
-                    y2: d.ldata.y2
+                    x1: d.ldata.source.x,
+                    y1: d.ldata.source.y,
+                    x2: d.ldata.target.x,
+                    y2: d.ldata.target.y
                 };
                 };
 
 
             if (d.ldata.type() === 'hostLink') {
             if (d.ldata.type() === 'hostLink') {

+{
+  "event": "addDevice",
+  "payload": {
+    "id": "of:0000ffffffffff04",
+    "type": "roadm",
+    "online": true,
+    "master": "myInstB",
+    "labels": [
+      "",
+      "opt-4",
+      "0000ffffffffff04"
+    ],
+    "metaUi": {
+      "x": 1100,
+      "y": 600
+    }
+  }
+}

+{
+  "event": "addLink",
+  "payload": {
+    "id": "of:0000ffffffffff08/4-of:0000ffffffffff04/1",
+    "type": "optical",
+    "online": true,
+    "linkWidth": 2,
+    "src": "of:0000ffffffffff08",
+    "srcPort": "4",
+    "dst": "of:0000ffffffffff04",
+    "dstPort": "1",
+    "props" : {
+      "BW": "90 Gb"
+    }
+  }
+}

@@ -7,24 +7,26 @@
         "class": "primary",
         "class": "primary",
         "links": [
         "links": [
           "0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
           "0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
-          "0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101"
+          "0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101",
+          "of:0000ffffffff0003/4-of:0000ffffffffff03/1",
+          "of:0000ffffffff0008/4-of:0000ffffffffff08/1"
         ],
         ],
         "labels": [
         "labels": [
           "20 bytes",
           "20 bytes",
-          "20 bytes"
+          "20 bytes",
+          "24 bytes",
+          "some bits"
         ]
         ]
       },
       },
       {
       {
         "class": "primary optical",
         "class": "primary optical",
         "links": [
         "links": [
-          "of:0000ffffffff0003/4-of:0000ffffffffff03/1",
-          "of:0000ffffffff0008/4-of:0000ffffffffff08/1",
-          "of:0000ffffffffff08/4-of:0000ffffffffff03/1"
+          "of:0000ffffffffff08/4-of:0000ffffffffff03/1",
+          "of:0000ffffffffff08/4-of:0000ffffffffff04/1"
         ],
         ],
         "labels": [
         "labels": [
-          "24 bytes",
-          "some bits",
-          "foo bars"
+          "foo bars",
+          "boo fars"
         ]
         ]
       }
       }
     ]
     ]

@@ -7,24 +7,27 @@
         "class": "secondary",
         "class": "secondary",
         "links": [
         "links": [
           "0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
           "0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
-          "0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101"
+          "0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101",
+          "of:0000ffffffff0003/4-of:0000ffffffffff03/1",
+          "of:0000ffffffff0008/4-of:0000ffffffffff08/1"
         ],
         ],
         "labels": [
         "labels": [
           "35 bytes",
           "35 bytes",
-          "35 bytes"
+          "35 bytes",
+          "24 bytes",
+          "some bits"
         ]
         ]
       },
       },
       {
       {
         "class": "secondary optical",
         "class": "secondary optical",
         "links": [
         "links": [
-          "of:0000ffffffff0003/4-of:0000ffffffffff03/1",
-          "of:0000ffffffff0008/4-of:0000ffffffffff08/1",
-          "of:0000ffffffffff08/4-of:0000ffffffffff03/1"
+          "of:0000ffffffffff08/4-of:0000ffffffffff03/1",
+          "of:0000ffffffffff08/4-of:0000ffffffffff04/1"
+
         ],
         ],
         "labels": [
         "labels": [
-          "24 bytes",
-          "some bits",
-          "foo bars"
+          "foo bars",
+          "bar foos"
         ]
         ]
       }
       }
     ]
     ]

@@ -14,17 +14,18 @@
         "class": "secondary",
         "class": "secondary",
         "links": [
         "links": [
           "of:0000ffffffff0003/9-of:0000ffffffff0007/2",
           "of:0000ffffffff0003/9-of:0000ffffffff0007/2",
-          "of:0000ffffffff0008/4-of:0000ffffffff0007/1"
+          "of:0000ffffffff0008/4-of:0000ffffffff0007/1",
+          "of:0000ffffffff0003/4-of:0000ffffffffff03/1",
+          "of:0000ffffffff0008/4-of:0000ffffffffff08/1"
         ],
         ],
-        "labels": ["secondary", "secondo"]
+        "labels": ["secondary", "secondo", "deux", "zwei"]
       },
       },
       {
       {
         "class": "secondary optical",
         "class": "secondary optical",
         "links": [
         "links": [
-          "of:0000ffffffff0003/4-of:0000ffffffffff03/1",
-          "of:0000ffffffff0008/4-of:0000ffffffffff08/1"
+          "of:0000ffffffffff08/4-of:0000ffffffffff04/1"
         ],
         ],
-        "labels": ["secondary optical", "secondo optical"]
+        "labels": ["secondary optical"]
       },
       },
       {
       {
         "class": "primary optical",
         "class": "primary optical",