commit 399a292b237bd9bc9c740e7e4410eb950354b27b
author Komal Shah <komal@onlab.us> Wed May 28 01:57:40 2014 -0700
committer Komal Shah <komal@onlab.us> Wed May 28 06:12:22 2014 -0700
tree 0d0606c2666b8533e62aca8f77e1356a173f9466
parent f66cf21e1f372e4d765c70cbad0b2fae8d595603

IPAddress into IntentFramework Fixed & SDN-IP SetupBGPPaths

Change-Id: Ie25571ad9c9c834e476a5010e29175c9fb6cd3fb

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

diff --git a/src/main/java/net/onrc/onos/core/intent/ShortestPathIntent.java b/src/main/java/net/onrc/onos/core/intent/ShortestPathIntent.java
index 3c8d345..1d5606f 100644
--- a/src/main/java/net/onrc/onos/core/intent/ShortestPathIntent.java
+++ b/src/main/java/net/onrc/onos/core/intent/ShortestPathIntent.java
@@ -7,12 +7,16 @@
  * @author Toshio Koide (t-koide@onlab.us)
  */
 public class ShortestPathIntent extends Intent {
+    public static final long EMPTYMACADDRESS = 0;
+    public static final int EMPTYIPADDRESS = 0;
     protected long srcSwitchDpid;
     protected long srcPortNumber;
     protected long srcMacAddress;
     protected long dstSwitchDpid;
     protected long dstPortNumber;
     protected long dstMacAddress;
+    protected int srcIpAddress;
+    protected int dstIpAddress;
     protected String pathIntentId = null;
     protected int idleTimeout;
     protected int hardTimeout;
@@ -39,13 +43,24 @@
     public ShortestPathIntent(String id,
                               long srcSwitch, long srcPort, long srcMac,
                               long dstSwitch, long dstPort, long dstMac) {
+        //super(id);
+        this(id, srcSwitch, srcPort, srcMac, EMPTYIPADDRESS, dstSwitch, dstPort, dstMac, EMPTYIPADDRESS);
+    }
+
+    // CHECKSTYLE:OFF suppress the warning about too many parameters
+    public ShortestPathIntent(String id,
+                              long srcSwitch, long srcPort, long srcMac, int srcIp,
+                              long dstSwitch, long dstPort, long dstMac, int dstIp ) {
+    // CHECKSTYLE:ON
         super(id);
-        srcSwitchDpid = srcSwitch;
-        srcPortNumber = srcPort;
-        srcMacAddress = srcMac;
-        dstSwitchDpid = dstSwitch;
-        dstPortNumber = dstPort;
-        dstMacAddress = dstMac;
+        this.srcSwitchDpid = srcSwitch;
+        this.srcPortNumber = srcPort;
+        this.srcMacAddress = srcMac;
+        this.dstSwitchDpid = dstSwitch;
+        this.dstPortNumber = dstPort;
+        this.dstMacAddress = dstMac;
+        this.srcIpAddress = srcIp;
+        this.dstIpAddress = dstIp;
     }
 
     /**
@@ -164,9 +179,17 @@
 
     @Override
     public String toString() {
-        return String.format("id:%s, state:%s, srcDpid:%s, srcPort:%d, srcMac:%s, dstDpid:%s, dstPort:%d, dstMac:%s",
+        return String.format("id:%s, state:%s, srcDpid:%s, srcPort:%d, srcMac:%s, srcIP:%s, dstDpid:%s, dstPort:%d, dstMac:%s, dstIP:%s",
                 getId(), getState(),
-                new Dpid(srcSwitchDpid), srcPortNumber, MACAddress.valueOf(srcMacAddress),
-                new Dpid(dstSwitchDpid), dstPortNumber, MACAddress.valueOf(dstMacAddress));
+                new Dpid(srcSwitchDpid), srcPortNumber, MACAddress.valueOf(srcMacAddress), Integer.toString(srcIpAddress),
+                new Dpid(dstSwitchDpid), dstPortNumber, MACAddress.valueOf(dstMacAddress), Integer.toString(dstIpAddress));
+    }
+
+    public int getSrcIp() {
+        return srcIpAddress;
+    }
+
+    public int getDstIp() {
+        return dstIpAddress;
     }
 }