Adding first set of changes for bug onos-5071

Addressed review comments
Addressed review comments for patch-2
Addressed review comments for patch-3
Fixed broken "show intent" on topo view.

Change-Id: Ie76deca917d6cd6c98d121135e53b9093b5ed8ee

@@ -88,6 +88,7 @@ import static org.onosproject.net.device.DeviceEvent.Type.PORT_STATS_UPDATED;
 import static org.onosproject.net.host.HostEvent.Type.HOST_ADDED;
 import static org.onosproject.net.host.HostEvent.Type.HOST_ADDED;
 import static org.onosproject.net.link.LinkEvent.Type.LINK_ADDED;
 import static org.onosproject.net.link.LinkEvent.Type.LINK_ADDED;
 import static org.onosproject.ui.JsonUtils.envelope;
 import static org.onosproject.ui.JsonUtils.envelope;
+import static org.onosproject.ui.JsonUtils.string;
 import static org.onosproject.ui.topo.TopoJson.highlightsMessage;
 import static org.onosproject.ui.topo.TopoJson.highlightsMessage;
 import static org.onosproject.ui.topo.TopoJson.json;
 import static org.onosproject.ui.topo.TopoJson.json;
 
 
@@ -100,6 +101,7 @@ public class TopologyViewMessageHandler extends TopologyViewMessageHandlerBase {
     private static final String REQ_DETAILS = "requestDetails";
     private static final String REQ_DETAILS = "requestDetails";
     private static final String UPDATE_META = "updateMeta";
     private static final String UPDATE_META = "updateMeta";
     private static final String ADD_HOST_INTENT = "addHostIntent";
     private static final String ADD_HOST_INTENT = "addHostIntent";
+    private static final String REMOVE_INTENT = "removeIntent";
     private static final String ADD_MULTI_SRC_INTENT = "addMultiSourceIntent";
     private static final String ADD_MULTI_SRC_INTENT = "addMultiSourceIntent";
     private static final String REQ_RELATED_INTENTS = "requestRelatedIntents";
     private static final String REQ_RELATED_INTENTS = "requestRelatedIntents";
     private static final String REQ_NEXT_INTENT = "requestNextRelatedIntent";
     private static final String REQ_NEXT_INTENT = "requestNextRelatedIntent";
@@ -220,6 +222,7 @@ public class TopologyViewMessageHandler extends TopologyViewMessageHandlerBase {
                 // TODO: migrate traffic related to separate app
                 // TODO: migrate traffic related to separate app
                 new AddHostIntent(),
                 new AddHostIntent(),
                 new AddMultiSourceIntent(),
                 new AddMultiSourceIntent(),
+                new RemoveIntent(),
 
 
                 new ReqAllFlowTraffic(),
                 new ReqAllFlowTraffic(),
                 new ReqAllPortTraffic(),
                 new ReqAllPortTraffic(),
@@ -426,6 +429,37 @@ public class TopologyViewMessageHandler extends TopologyViewMessageHandlerBase {
         }
         }
     }
     }
 
 
+    private Intent findIntentByPayload(ObjectNode payload) {
+        int appId = Integer.parseInt(string(payload, APP_ID));
+        String appName = string(payload, APP_NAME);
+        ApplicationId applicId = new DefaultApplicationId(appId, appName);
+        long intentKey = Long.decode(string(payload, KEY));
+
+        Key key = Key.of(intentKey, applicId);
+        log.debug("Attempting to select intent by key={}", key);
+
+        Intent intent = intentService.getIntent(key);
+
+        return intent;
+    }
+
+    private final class RemoveIntent extends RequestHandler {
+        private RemoveIntent() {
+            super(REMOVE_INTENT);
+        }
+
+        @Override
+        public void process(long sid, ObjectNode payload) {
+            Intent intent = findIntentByPayload(payload);
+            if (intent == null) {
+                log.warn("Unable to find intent from payload {}", payload);
+            } else {
+                log.debug("Removing intent {}", intent.key());
+                intentService.withdraw(intent);
+            }
+        }
+    }
+
     private final class AddMultiSourceIntent extends RequestHandler {
     private final class AddMultiSourceIntent extends RequestHandler {
         private AddMultiSourceIntent() {
         private AddMultiSourceIntent() {
             super(ADD_MULTI_SRC_INTENT);
             super(ADD_MULTI_SRC_INTENT);
@@ -551,19 +585,11 @@ public class TopologyViewMessageHandler extends TopologyViewMessageHandlerBase {
 
 
         @Override
         @Override
         public void process(long sid, ObjectNode payload) {
         public void process(long sid, ObjectNode payload) {
-            int appId = Integer.parseInt(string(payload, APP_ID));
-            String appName = string(payload, APP_NAME);
-            ApplicationId applicId = new DefaultApplicationId(appId, appName);
-            long intentKey = Long.decode(string(payload, KEY));
-
-            Key key = Key.of(intentKey, applicId);
-            log.debug("Attempting to select intent key={}", key);
-
-            Intent intent = intentService.getIntent(key);
+            Intent intent = findIntentByPayload(payload);
             if (intent == null) {
             if (intent == null) {
-                log.debug("no such intent found!");
+                log.warn("Unable to find intent from payload {}", payload);
             } else {
             } else {
-                log.debug("starting to monitor intent {}", key);
+                log.debug("starting to monitor intent {}", intent.key());
                 traffic.monitor(intent);
                 traffic.monitor(intent);
             }
             }
         }
         }

@@ -23,7 +23,7 @@
 }
 }
 
 
 #ov-intent div.ctrl-btns {
 #ov-intent div.ctrl-btns {
-    width: 110px;
+    width: 150px;
 }
 }
 
 
 
 

@@ -14,6 +14,13 @@
                  icon icon-id="topo" icon-size="42"
                  icon icon-id="topo" icon-size="42"
                  tooltip tt-msg="topoTip"
                  tooltip tt-msg="topoTip"
                  ng-click="showIntent()"></div>
                  ng-click="showIntent()"></div>
+
+            <div ng-class="{'active': !!selId}"
+                 icon icon-id="stop" icon-size="42"
+                 tooltip tt-msg="deactivateTip"
+                 ng-click="deactivateIntent()"></div>
+
+
         </div>
         </div>
     </div>
     </div>
 
 

@@ -21,11 +21,17 @@
 (function () {
 (function () {
     'use strict';
     'use strict';
 
 
+    var dialogId = 'remove-intent-dialog',
+        dialogOpts = {
+            edge: 'right'
+        };
+
     angular.module('ovIntent', [])
     angular.module('ovIntent', [])
         .controller('OvIntentCtrl',
         .controller('OvIntentCtrl',
         ['$log', '$scope', 'TableBuilderService', 'NavService',
         ['$log', '$scope', 'TableBuilderService', 'NavService',
+            'TopoTrafficService', 'DialogService',
 
 
-        function ($log, $scope, tbs, ns) {
+        function ($log, $scope, tbs, ns, tts, ds) {
 
 
             function selCb($event, row) {
             function selCb($event, row) {
                 $log.debug('Got a click on:', row);
                 $log.debug('Got a click on:', row);
@@ -34,9 +40,9 @@
                     name = m ? m[2] : null;
                     name = m ? m[2] : null;
 
 
                 $scope.intentData = ($scope.selId && m) ? {
                 $scope.intentData = ($scope.selId && m) ? {
-                    intentAppId: id,
-                    intentAppName: name,
-                    intentKey: row.key
+                    appId: id,
+                    appName: name,
+                    key: row.key
                 } : null;
                 } : null;
             }
             }
 
 
@@ -48,12 +54,42 @@
             });
             });
 
 
             $scope.topoTip = 'Show selected intent on topology view';
             $scope.topoTip = 'Show selected intent on topology view';
+            $scope.deactivateTip = 'Remove selected intent';
 
 
             $scope.showIntent = function () {
             $scope.showIntent = function () {
                 var d = $scope.intentData;
                 var d = $scope.intentData;
                 d && ns.navTo('topo', d);
                 d && ns.navTo('topo', d);
             };
             };
 
 
-            $log.log('OvIntentCtrl has been created');
+            $scope.deactivateIntent = function () {
+                var content = ds.createDiv();
+
+                content.append('p')
+                    .text('Are you sure you want to remove the selected intent?');
+
+                function dOk() {
+                    var d = $scope.intentData;
+                    d && tts.removeIntent(d);
+                }
+
+                function dCancel() {
+                    ds.closeDialog();
+                    $log.debug('Canceling remove-intent action');
+                }
+
+                ds.openDialog(dialogId, dialogOpts)
+                    .setTitle('Confirm Action')
+                    .addContent(content)
+                    .addOk(dOk)
+                    .addCancel(dCancel)
+                    .bindKeys();
+            };
+
+            $scope.$on('$destroy', function () {
+                ds.closeDialog();
+                $log.debug('OvIntentCtrl has been destroyed');
+            });
+
+            $log.debug('OvIntentCtrl has been created');
         }]);
         }]);
 }());
 }());

@@ -585,11 +585,11 @@
                 setMap: setMap
                 setMap: setMap
             });
             });
 
 
-            if (params.intentKey && params.intentAppId && params.intentAppName) {
+            if (params.key && params.appId && params.appName) {
                 $scope.intentData = {
                 $scope.intentData = {
-                    key: params.intentKey,
-                    appId: params.intentAppId,
-                    appName: params.intentAppName
+                    key: params.key,
+                    appId: params.appId,
+                    appName: params.appName
                 };
                 };
             }
             }
 
 

@@ -176,6 +176,18 @@
         flash.flash('Host-to-Host flow added');
         flash.flash('Host-to-Host flow added');
     }
     }
 
 
+    function removeIntent (d) {
+        $log.debug('Entering removeIntent');
+        wss.sendEvent('removeIntent', {
+            appId: d.appId,
+            appName: d.appName,
+            key: d.key
+        });
+        trafficMode = 'intents';
+        hoverMode = null;
+        flash.flash('Intent removed');
+    }
+
     function addMultiSourceIntent () {
     function addMultiSourceIntent () {
         var so = api.selectOrder();
         var so = api.selectOrder();
         wss.sendEvent('addMultiSourceIntent', {
         wss.sendEvent('addMultiSourceIntent', {
@@ -223,7 +235,8 @@
                 // TODO: these should move to new UI demo app
                 // TODO: these should move to new UI demo app
                 // invoked from buttons on detail (multi-select) panel
                 // invoked from buttons on detail (multi-select) panel
                 addHostIntent: addHostIntent,
                 addHostIntent: addHostIntent,
-                addMultiSourceIntent: addMultiSourceIntent
+                addMultiSourceIntent: addMultiSourceIntent,
+                removeIntent: removeIntent
             };
             };
         }]);
         }]);
 }());
 }());

@@ -49,6 +49,7 @@ describe('factory: view/topo/topoTraffic.js', function() {
             'requestTrafficForMode',
             'requestTrafficForMode',
             'addHostIntent',
             'addHostIntent',
             'addMultiSourceIntent',
             'addMultiSourceIntent',
+            'removeIntent',
         ])).toBeTruthy();
         ])).toBeTruthy();
     });
     });