commit 3e6d0f04c36b42cc15c295652627077ef21e2385
author Georgios Katsikas <katsikas.gp@gmail.com> Wed Jul 25 17:04:04 2018 +0200
committer Andrea Campanella <andrea@opennetworking.org> Thu Jul 26 17:19:07 2018 +0000
tree 624c398e211ad840c7f8ebd6e8e420ad52833ce0
parent 351d456aca776804ba30bfbe5911468853433d67

Fixed address translation and rule removal bugs

This patch fixes two bugs in the flow rule programmable
module of the server device driver. The first bug was related
to the translation of IP addresses and masks into NIC flow
rule commands. The second bug was related to the command used
to explicitly remove a flow rule.
The first bug was detected after testing the server device driver
with large ACL configurations from Internet Service Providers.

Code review fixes applied.

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

drivers/server/src/main/java/org/onosproject/drivers/server/devices/nic/DefaultDpdkNicFlowRule.java

diff --git a/drivers/server/src/main/java/org/onosproject/drivers/server/devices/nic/DefaultDpdkNicFlowRule.java b/drivers/server/src/main/java/org/onosproject/drivers/server/devices/nic/DefaultDpdkNicFlowRule.java
index 5831b79..223f5c3 100644
--- a/drivers/server/src/main/java/org/onosproject/drivers/server/devices/nic/DefaultDpdkNicFlowRule.java
+++ b/drivers/server/src/main/java/org/onosproject/drivers/server/devices/nic/DefaultDpdkNicFlowRule.java
@@ -18,6 +18,7 @@
 
 import org.onosproject.net.flow.FlowRule;
 
+import org.onlab.packet.Ip4Address;
 import org.onlab.packet.MacAddress;
 
 /**
@@ -32,20 +33,17 @@
             long             interfaceNumber,
             long             cpuCoreIndex,
             NicRuleScope     scope) {
-        super(flowRule, trafficClassId, interfaceName, interfaceNumber,
-            cpuCoreIndex, scope);
+        super(flowRule, trafficClassId, interfaceName, interfaceNumber, cpuCoreIndex, scope);
     }
 
     @Override
     public String createRule() {
-        String rule = "flow create " + Long.toString(this.interfaceNumber) + " ";
-        return rule + ruleBody();
+        return "flow create " + Long.toString(this.interfaceNumber) + " " + ruleBody();
     }
 
     @Override
     public String removeRule() {
-        String rule = "flow remove " + Long.toString(this.interfaceNumber) + " ";
-        return rule + ruleBody();
+        return "flow destroy " + Long.toString(this.interfaceNumber) + " rule " + id().toString();
     }
 
     @Override
@@ -87,7 +85,8 @@
             }
 
             if (this.ipv4SrcMask() != null) {
-                rule += "src mask " + this.ipv4SrcMask().toString() + " ";
+                rule += "src spec " + this.ipv4SrcMask().address().getIp4Address().toString() + " ";
+                rule += "src mask " + Ip4Address.makeMaskPrefix(this.ipv4SrcMask().prefixLength()).toString() + " ";
             }
 
             if (this.ipv4DstAddress() != null) {
@@ -95,7 +94,8 @@
             }
 
             if (this.ipv4DstMask() != null) {
-                rule += "dst mask " + this.ipv4DstMask().toString() + " ";
+                rule += "dst spec " + this.ipv4DstMask().address().getIp4Address().toString() + " ";
+                rule += "dst mask " + Ip4Address.makeMaskPrefix(this.ipv4DstMask().prefixLength()).toString() + " ";
             }
 
             rule += "/ ";