[ONOS-4159] PCE Web GUI implementation:ClientsideChanges

Change-Id: Ib8397ecc9ebe5a28550263ebe6e4eaf05712c05e

@@ -278,20 +278,18 @@ public class PceWebTopovMessageHandler extends UiMessageHandler {
                     .valueOf(dstDevice.annotations().value("lsrId")));
                     .valueOf(dstDevice.annotations().value("lsrId")));
 
 
             Collection<Tunnel> tunnelSet = tunnelService.queryTunnel(tunSrc, tunDst);
             Collection<Tunnel> tunnelSet = tunnelService.queryTunnel(tunSrc, tunDst);
-            if (tunnelSet != null) {
             ObjectNode result = objectNode();
             ObjectNode result = objectNode();
             ArrayNode arrayNode = arrayNode();
             ArrayNode arrayNode = arrayNode();
-
             for (Tunnel tunnel : tunnelSet) {
             for (Tunnel tunnel : tunnelSet) {
                 if (tunnel.type() == MPLS) {
                 if (tunnel.type() == MPLS) {
                     arrayNode.add(tunnel.tunnelId().toString());
                     arrayNode.add(tunnel.tunnelId().toString());
                 }
                 }
             }
             }
+
             result.putArray(BUFFER_ARRAY).addAll(arrayNode);
             result.putArray(BUFFER_ARRAY).addAll(arrayNode);
             sendMessage(PCEWEB_SHOW_TUNNEL, sid, result);
             sendMessage(PCEWEB_SHOW_TUNNEL, sid, result);
         }
         }
     }
     }
-    }
 
 
     /**
     /**
      * Handles the 'update path' event received from the client.
      * Handles the 'update path' event received from the client.
@@ -342,7 +340,6 @@ public class PceWebTopovMessageHandler extends UiMessageHandler {
                     .valueOf(dstDevice.annotations().value("lsrId")));
                     .valueOf(dstDevice.annotations().value("lsrId")));
 
 
             Collection<Tunnel> tunnelSet = tunnelService.queryTunnel(tunSrc, tunDst);
             Collection<Tunnel> tunnelSet = tunnelService.queryTunnel(tunSrc, tunDst);
-              if (tunnelSet != null) {
             ObjectNode result = objectNode();
             ObjectNode result = objectNode();
             ArrayNode arrayNode = arrayNode();
             ArrayNode arrayNode = arrayNode();
 
 
@@ -351,11 +348,11 @@ public class PceWebTopovMessageHandler extends UiMessageHandler {
                     arrayNode.add(tunnel.tunnelId().toString());
                     arrayNode.add(tunnel.tunnelId().toString());
                 }
                 }
             }
             }
+
             result.putArray(BUFFER_ARRAY).addAll(arrayNode);
             result.putArray(BUFFER_ARRAY).addAll(arrayNode);
             sendMessage(PCEWEB_SHOW_TUNNEL_REMOVE, sid, result);
             sendMessage(PCEWEB_SHOW_TUNNEL_REMOVE, sid, result);
         }
         }
     }
     }
-    }
 
 
     /**
     /**
      * Handles the 'remove path' event received from the client.
      * Handles the 'remove path' event received from the client.

@@ -34,7 +34,6 @@
         glyphId: 'topo',
         glyphId: 'topo',
         tooltip: 'PCE web Topo Overlay',
         tooltip: 'PCE web Topo Overlay',
 
 
-
         activate: function () {
         activate: function () {
             $log.debug("PCE web topology overlay ACTIVATED");
             $log.debug("PCE web topology overlay ACTIVATED");
         },
         },
@@ -112,11 +111,32 @@
             },
             },
             1: {
             1: {
                 cb: function () {
                 cb: function () {
-                    pps.setMode("shortest");
+                    pps.setMode();
+                },
+                tt: 'Setup path',
+                gid: 'plus'
+            },
+            2: {
+                cb: function () {
+                    pps.updatePath(selection);
                 },
                 },
-                tt: 'Select constraints for LSP',
+                tt: 'Update path',
                 gid: '*jp'
                 gid: '*jp'
             },
             },
+            3: {
+                cb: function () {
+                    pps.remPath(selection);
+                },
+                tt: 'Remove path',
+                gid: 'minus'
+            },
+            4: {
+                cb: function () {
+                    pps.queryTunnelDisplay();
+                },
+                tt: 'Show Tunnels',
+                gid: 'checkMark'
+            },
             0: {
             0: {
                 cb: function () {
                 cb: function () {
                     pps.clear();
                     pps.clear();
@@ -126,7 +146,7 @@
             },
             },
 
 
             _keyOrder: [
             _keyOrder: [
-                'openBracket', 'closeBracket', '1', '0'
+                'openBracket', 'closeBracket', '1', '2', '3', '4', '0'
             ]
             ]
         },
         },
         hooks: {
         hooks: {
@@ -145,6 +165,9 @@
             },
             },
             single: function (data) {
             single: function (data) {
                 selectionCallback(data);
                 selectionCallback(data);
+            },
+            multi: function (selectOrder) {
+                selectionCallback(selectOrder);
             }
             }
         }
         }
     };
     };