UI Flow configuration fix

ISSUE: Flows configured through UI do not honor selected actions

Signed-off-by: Alessandro Boch <aboch@cisco.com>

diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/ActionType.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/ActionType.java
index d9dc0c7fee4714bcfd4470e8d664091e7983cacb..0e085473d5513d929a9c18a3cd5fad3b087e67fd 100644 (file)
--- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/ActionType.java
+++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/ActionType.java
@@ -17,20 +17,30 @@ package org.opendaylight.controller.sal.action;
  *
  */
 public enum ActionType {
-    DROP("drop", 0, 0), LOOPBACK("loopback", 0, 0), FLOOD("flood", 0, 0), // regular switching flood (obeys to stp port state)
+    DROP("drop", 0, 0),
+    LOOPBACK("loopback", 0, 0),
+    FLOOD("flood", 0, 0), // regular switching flood (obeys to stp port state)
     FLOOD_ALL("floodAll", 0, 0), // flood to all ports regardless of stp port state
-    CONTROLLER("controller", 0, 0), INTERFACE("interface", 0, 0), // Interface
+    CONTROLLER("controller", 0, 0),
+    INTERFACE("interface", 0, 0), // Interface
     SW_PATH("software path", 0, 0), // OF Local
-    HW_PATH("harware path", 0, 0), OUTPUT("output", 0, 0xffff), // physical port
-    ENQUEUE("enqueue", 0, 0xffff), SET_DL_SRC("setDlSrc", 0, 0), SET_DL_DST(
-            "setDlDst", 0, 0), SET_VLAN_ID("setVlan", 1, 0xfff), SET_VLAN_PCP(
-            "setVlanPcp", 0, 0x7), SET_VLAN_CFI("setVlanCif", 0, 0x1), POP_VLAN(
-            "stripVlan", 0, 0), // Pop
+    HW_PATH("harware path", 0, 0),
+    OUTPUT("output", 0, 0xffff), // physical port
+    ENQUEUE("enqueue", 0, 0xffff),
+    SET_DL_SRC("setDlSrc", 0, 0),
+    SET_DL_DST("setDlDst", 0, 0),
+    SET_VLAN_ID("setVlan", 1, 0xfff),
+    SET_VLAN_PCP("setVlanPcp", 0, 0x7),
+    SET_VLAN_CFI("setVlanCif", 0, 0x1),
+    POP_VLAN("stripVlan", 0, 0), // Pop
     PUSH_VLAN("pushVlan", 0, 0xffff), // Push (the max value only takes into account the TCI portion of the 802.1q header)
     SET_DL_TYPE("setDlType", 0, 0xffff), // Set ethertype/length field
-    SET_NW_SRC("setNwSrc", 0, 0), SET_NW_DST("setNwDst", 0, 0), SET_NW_TOS(
-            "setNwTos", 0, 0x3f), SET_TP_SRC("setTpSrc", 1, 0xffff), SET_TP_DST(
-            "setTpDst", 1, 0xffff), SET_NEXT_HOP("setNextHop", 0, 0);
+    SET_NW_SRC("setNwSrc", 0, 0),
+    SET_NW_DST("setNwDst", 0, 0),
+    SET_NW_TOS("setNwTos", 0, 0x3f),
+    SET_TP_SRC("setTpSrc", 1, 0xffff),
+    SET_TP_DST("setTpDst", 1, 0xffff),
+    SET_NEXT_HOP("setNextHop", 0, 0);
 
     private String id;
     private int minValue;

diff --git a/opendaylight/web/flows/src/main/resources/js/page.js b/opendaylight/web/flows/src/main/resources/js/page.js
index c24b9d1346e6f172beedf386e82008c073f3a58c..2d6b6bb4c5a205e7e50c1e3ca3ba4e64473f876a 100644 (file)
--- a/opendaylight/web/flows/src/main/resources/js/page.js
+++ b/opendaylight/web/flows/src/main/resources/js/page.js
@@ -528,10 +528,6 @@ one.f.flows = {
                                alert('Select node');
                                return;
                        }
-                       if (result['ingressPort'] == undefined) {
-                               alert('Select port');
-                               return;
-                       }
                        if (action.length == 0) {
                                alert('Please specify an action');
                                return;
@@ -601,7 +597,7 @@ one.f.flows = {
                        $fieldset.append($legend);
                        // name
                        var $label = one.lib.form.label("Name");
-                       var $input = one.lib.form.input("Match Name");
+                       var $input = one.lib.form.input("Flow Name");
                        $input.attr('id', one.f.flows.id.modal.form.name);
                        $fieldset.append($label).append($input);
                        // node
@@ -787,7 +783,7 @@ one.f.flows = {
                         var placeholder = "VLAN Identification Number";
                         var id = one.f.flows.id.modal.action.setVlanId;
                         var help = "Range: 0 - 4095";
-                        var action = 'setVlan';
+                        var action = 'SET_VLAN_ID';
                         var name = "VLAN ID";
                         var body = function() {
                             return one.f.flows.modal.action.body.set(h3, placeholder, id, help);
@@ -803,7 +799,7 @@ one.f.flows = {
                         var placeholder = "VLAN Priority";
                         var id = one.f.flows.id.modal.action.setVlanPriority;
                         var help = "Range: 0 - 7";
-                        var action = 'setVlanPcp';
+                        var action = 'SET_VLAN_PCP';
                         var name = "VLAN Priority";
                         var body = function() {
                             return one.f.flows.modal.action.body.set(h3, placeholder, id, help);
@@ -816,7 +812,7 @@ one.f.flows = {
                         break;
                     case "stripVlanHeader" :
                         var name = "Strip VLAN Header";
-                        var action = 'stripVlan';
+                        var action = 'POP_VLAN';
                         one.f.flows.modal.action.add.add(name, action);
                         break;
                     case "modifyDatalayerSourceAddress" :
@@ -824,7 +820,7 @@ one.f.flows = {
                         var placeholder = "Source MAC Address";
                         var id = one.f.flows.id.modal.action.modifyDatalayerSourceAddress;
                         var help = "Example: 00:11:22:aa:bb:cc";
-                        var action = 'setDlSrc';
+                        var action = 'SET_DL_SRC';
                         var name = "Source MAC";
                         var body = function() {
                             return one.f.flows.modal.action.body.set(h3, placeholder, id, help);
@@ -840,7 +836,7 @@ one.f.flows = {
                         var placeholder = "Destination MAC Address";
                         var id = one.f.flows.id.modal.action.modifyDatalayerDestinationAddress;
                         var help = "Example: 00:11:22:aa:bb:cc";
-                        var action = 'setDlDst';
+                        var action = 'SET_DL_DST';
                         var name = "Destination MAC";
                         var body = function() {
                             return one.f.flows.modal.action.body.set(h3, placeholder, id, help);
@@ -856,7 +852,7 @@ one.f.flows = {
                         var placeholder = "Source IP Address";
                         var id = one.f.flows.id.modal.action.modifyNetworkSourceAddress;
                         var help = "Example: 127.0.0.1";
-                        var action = 'setNwSrc';
+                        var action = 'SET_NW_SRC';
                         var name = "Source IP";
                         var body = function() {
                             return one.f.flows.modal.action.body.set(h3, placeholder, id, help);
@@ -872,7 +868,7 @@ one.f.flows = {
                         var placeholder = "Destination IP Address";
                         var id = one.f.flows.id.modal.action.modifyNetworkDestinationAddress;
                         var help = "Example: 127.0.0.1";
-                        var action = 'setNwDst';
+                        var action = 'SET_NW_DST';
                         var name = "Destination IP";
                         var body = function() {
                             return one.f.flows.modal.action.body.set(h3, placeholder, id, help);
@@ -888,7 +884,7 @@ one.f.flows = {
                         var placeholder = "IPv4 ToS";
                         var id = one.f.flows.id.modal.action.modifyTosBits;
                         var help = "Range: 0 - 63";
-                        var action = 'setNwTos';
+                        var action = 'SET_NW_TOS';
                         var name = "TOS Bits";
                         var body = function() {
                             return one.f.flows.modal.action.body.set(h3, placeholder, id, help);
@@ -904,7 +900,7 @@ one.f.flows = {
                         var placeholder = "Transport Source Port";
                         var id = one.f.flows.id.modal.action.modifyTransportSourcePort;
                         var help = "Range: 1 - 65535";
-                        var action = 'setTpSrc';
+                        var action = 'SET_TP_SRC';
                         var name = "Source Port";
                         var body = function() {
                             return one.f.flows.modal.action.body.set(h3, placeholder, id, help);
@@ -920,7 +916,7 @@ one.f.flows = {
                         var placeholder = "Transport Destination Port";
                         var id = one.f.flows.id.modal.action.modifyTransportDestinationPort;
                         var help = "Range: 1 - 65535";
-                        var action = 'setTpDst';
+                        var action = 'SET_TP_DST';
                         var name = "Destination Port";
                         var body = function() {
                             return one.f.flows.modal.action.body.set(h3, placeholder, id, help);
@@ -933,32 +929,32 @@ one.f.flows = {
                         break;
                     case "drop" :
                         var name = "Drop";
-                        var action = 'drop';
+                        var action = 'DROP';
                         one.f.flows.modal.action.add.add(name, action);
                         break;
                     case "loopback" :
                         var name = "Loopback";
-                        var action = 'loopback';
+                        var action = 'LOOPBACK';
                         one.f.flows.modal.action.add.add(name, action);
                         break;
                     case "flood" :
                         var name = "Flood";
-                        var action = 'flood';
+                        var action = 'FLOOD';
                         one.f.flows.modal.action.add.add(name, action);
                         break;
                     case "softwarePath" :
                         var name = "Software Path";
-                        var action = 'software path';
+                        var action = 'SW_PATH';
                         one.f.flows.modal.action.add.add(name, action);
                         break;
                     case "hardwarePath" :
                         var name = "Hardware Path";
-                        var action = 'hardware path';
+                        var action = 'HW_PATH';
                         one.f.flows.modal.action.add.add(name, action);
                         break;
                     case "controller" :
                         var name = "Controller";
-                        var action = 'controller';
+                        var action = 'CONTROLLER';
                         one.f.flows.modal.action.add.add(name, action);
                         break;
                 }

diff --git a/opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java b/opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java
index 903fa7b5d13499628f3683d3fe026374e3000d1c..dfa21075ea845eaf3140a701cf99d706553c41dc 100644 (file)
--- a/opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java
+++ b/opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java
@@ -229,7 +229,8 @@ public class Troubleshoot implements IDaylightWeb {
         row.put("nodeName", desc);
         if (match.isPresent(MatchType.IN_PORT)) {
             row.put(MatchType.IN_PORT.id(), ((NodeConnector) flow.getMatch()
-                    .getField(MatchType.IN_PORT).getValue()).getID().toString());
+                    .getField(MatchType.IN_PORT).getValue())
+                    .getNodeConnectorIdAsString());
         } else {
             row.put(MatchType.IN_PORT.id(), "*");
         }