commit e95f4eaca83c44555ca310da3943f9d324e12edc
author Matteo Gerola <mgerola@create-net.org> Wed Aug 06 16:15:01 2014 +0200
committer Gerrit Code Review <gerrit2@localhost> Tue Aug 12 10:08:31 2014 -0700
tree 2f35459bde204bf091ef93b8348daaeb955aa564
parent 51bb27ccdeb98962ed9f1f52df9c94731f32f7da

Replace LOXI 0.3.4 with LOXI 0.3.8

(rebased on top of master)

Change-Id: I026c425e565a5c2e5a9776d42a90b1e138264de3

pom.xml

diff --git a/pom.xml b/pom.xml
index 83fad6b..0725340 100644
--- a/pom.xml
+++ b/pom.xml
@@ -702,7 +702,7 @@
     <dependency>
       <groupId>org.projectfloodlight</groupId>
       <artifactId>openflowj</artifactId>
-      <version>0.3.4-SNAPSHOT</version>
+      <version>0.3.8-SNAPSHOT</version>
     </dependency>
     <!-- Floodlight's dependencies -->
     <dependency>

src/main/java/net/onrc/onos/core/intent/Match.java

diff --git a/src/main/java/net/onrc/onos/core/intent/Match.java b/src/main/java/net/onrc/onos/core/intent/Match.java
index a3c397b..14d8b92 100644
--- a/src/main/java/net/onrc/onos/core/intent/Match.java
+++ b/src/main/java/net/onrc/onos/core/intent/Match.java
@@ -13,7 +13,7 @@
 import org.projectfloodlight.openflow.protocol.match.Match.Builder;
 import org.projectfloodlight.openflow.protocol.match.MatchField;
 import org.projectfloodlight.openflow.types.EthType;
-import org.projectfloodlight.openflow.types.IPv4AddressWithMask;
+import org.projectfloodlight.openflow.types.IPv4Address;
 import org.projectfloodlight.openflow.types.MacAddress;
 import org.projectfloodlight.openflow.types.OFPort;
 
@@ -150,13 +150,13 @@
         }
         if (srcIp != ShortestPathIntent.EMPTYIPADDRESS) {
             matchBuilder.setExact(MatchField.ETH_TYPE, EthType.IPv4)
-                    .setMasked(MatchField.IPV4_SRC,
-                            IPv4AddressWithMask.of(srcIp, IPV4_PREFIX_LEN));
+            .setMasked(MatchField.IPV4_SRC,
+                    IPv4Address.of(srcIp).withMaskOfLength(IPV4_PREFIX_LEN));
         }
         if (dstIp != ShortestPathIntent.EMPTYIPADDRESS) {
             matchBuilder.setExact(MatchField.ETH_TYPE, EthType.IPv4)
-                    .setMasked(MatchField.IPV4_DST,
-                            IPv4AddressWithMask.of(dstIp, IPV4_PREFIX_LEN));
+            .setMasked(MatchField.IPV4_DST,
+                    IPv4Address.of(dstIp).withMaskOfLength(IPV4_PREFIX_LEN));
         }
         matchBuilder.setExact(MatchField.IN_PORT, OFPort.of((int) srcPort));