commit 80e0b9fed490a6f7967a73a6e7988c4472ec030b
author Georgios Katsikas <katsikas.gp@gmail.com> Sat Jul 21 20:29:18 2018 +0200
committer Andrea Campanella <andrea@opennetworking.org> Wed Jul 25 16:55:37 2018 +0000
tree 23ddab929d524bed3e30e1f20be7976bd6fef71b
parent 3c933ec287e907b6294cd74664d6a5710ca56d4f

Fixed NIC name to port number inconsistencies in server driver

This patch fixes some weak assumptions regarding the way the
server device driver maps NIC names and port numbers.
Also, some necessary refactoring and stdout message fixes are
committed.

Addressed comments from ONOS developers

Change-Id: I6730d971ddf8d4fe97c2d3bef75f1432e7a4592e
Signed-off-by: Georgios Katsikas <katsikas.gp@gmail.com>

drivers/server/src/main/java/org/onosproject/drivers/server/FlowRuleProgrammableServerImpl.java

diff --git a/drivers/server/src/main/java/org/onosproject/drivers/server/FlowRuleProgrammableServerImpl.java b/drivers/server/src/main/java/org/onosproject/drivers/server/FlowRuleProgrammableServerImpl.java
index 7177dc0..efc7bd6 100644
--- a/drivers/server/src/main/java/org/onosproject/drivers/server/FlowRuleProgrammableServerImpl.java
+++ b/drivers/server/src/main/java/org/onosproject/drivers/server/FlowRuleProgrammableServerImpl.java
@@ -43,6 +43,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import javax.ws.rs.ProcessingException;
 
+import com.google.common.base.Strings;
+
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.slf4j.LoggerFactory.getLogger;
@@ -66,7 +68,6 @@
      * Parameters to be exchanged with the server's agent.
      */
     private static final String PARAM_RULES        = "rules";
-    private static final String PARAM_NIC_ID       = "nicId";
     private static final String PARAM_CPU_ID       = "cpuId";
     private static final String PARAM_CPU_RULES    = "cpuRules";
     private static final String PARAM_RULE_ID      = "ruleId";
@@ -127,7 +128,6 @@
 
             // Each device might have multiple NICs
             for (JsonNode nicNode : scNode.path(PARAM_NICS)) {
-                String nicId = get(nicNode, PARAM_NIC_ID);
                 JsonNode cpusNode = nicNode.path(PARAM_CPUS);
 
                 // Each NIC can dispatch to multiple CPU cores
@@ -281,20 +281,18 @@
         Map<Long, ArrayNode> cpuObjSet =
             new ConcurrentHashMap<Long, ArrayNode>();
 
-        String nicId = null;
+        String nic = null;
 
         for (FlowRule rule : rules) {
             NicFlowRule nicRule = (NicFlowRule) rule;
             long coreIndex = nicRule.cpuCoreIndex();
 
             // Keep the ID of the target NIC
-            if (nicId == null) {
-                long nicIfaceNb = nicRule.interfaceNumber();
-                checkArgument(nicIfaceNb > 0,
-                    "Attempted to install NIC rules on an invalid NIC ID: "
-                    + nicIfaceNb);
-                // NIC IDs in the dataplane start from 0
-                nicId = Long.toString(nicIfaceNb - 1);
+            if (nic == null) {
+                nic = findNicInterfaceWithPort(deviceId, nicRule.interfaceNumber());
+                checkArgument(
+                    !Strings.isNullOrEmpty(nic),
+                    "Attempted to install rules on an invalid NIC");
             }
 
             // Create a JSON array for this CPU core
@@ -314,8 +312,7 @@
         }
 
         ObjectNode nicObjNode = mapper.createObjectNode();
-        // TODO: Fix this as it might cause issues
-        nicObjNode.put("nicId", "fd" + nicId);
+        nicObjNode.put("nicName", nic);
 
         ArrayNode cpusArrayNode = nicObjNode.putArray(PARAM_CPUS);