commit 2fa80f49d393e32609614c60381ee930e64df3d6
author Pavlin Radoslavov <pavlin@onlab.us> Fri Apr 18 13:10:38 2014 -0700
committer Pavlin Radoslavov <pavlin@onlab.us> Fri Apr 18 13:10:38 2014 -0700
tree e114e073f302657254cb037eb30743148fea3e53
parent 13d1dbf6f264a502da0e30f90f57f31634919589

Use DPID format like "00:00:00:00:00:00:00:00" to set the switch DPID
instead of an integer when pusing an intent via the REST api.

Change-Id: Ie58a774762f201e64f85ec811ca0aa0b2c51d6b1

scripts/intent-installer.rb

diff --git a/scripts/intent-installer.rb b/scripts/intent-installer.rb
index 41361be..3112a98 100755
--- a/scripts/intent-installer.rb
+++ b/scripts/intent-installer.rb
@@ -187,11 +187,11 @@
         :intent_id => "#{@freeze}#{@intent_id}",
         :intent_type => @intent_type,
         :intent_op => @intent_op,
-        :srcSwitch => "258".to_s,
-        :srcPort => 65534,
+        :srcSwitch => "00:00:00:00:00:00:02:02".to_s,
+        :srcPort => 1,
         :srcMac => "00:00:c0:#{mac_format(idx)}",
-        :dstSwitch => "514".to_s,
-        :dstPort => 65534,
+        :dstSwitch => "00:00:00:00:00:00:04:02".to_s,
+        :dstPort => 1,
         :dstMac => "00:00:c1:#{mac_format(idx)}"
       }
 puts intent.inspect

src/main/java/net/onrc/onos/core/datagrid/web/IntentResource.java

diff --git a/src/main/java/net/onrc/onos/core/datagrid/web/IntentResource.java b/src/main/java/net/onrc/onos/core/datagrid/web/IntentResource.java
index 909ec82..1445e4b 100755
--- a/src/main/java/net/onrc/onos/core/datagrid/web/IntentResource.java
+++ b/src/main/java/net/onrc/onos/core/datagrid/web/IntentResource.java
@@ -19,6 +19,7 @@
 import net.onrc.onos.core.intent.IntentOperationList;
 import net.onrc.onos.core.intent.ShortestPathIntent;
 import net.onrc.onos.core.intent.runtime.IPathCalcRuntimeService;
+import net.onrc.onos.core.util.Dpid;
 
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.JsonNode;
@@ -188,12 +189,15 @@
         if ((intentOp.equals("remove"))) {
             operation = IntentOperation.Operator.REMOVE;
         }
+        Dpid srcSwitchDpid = new Dpid((String) fields.get("srcSwitch"));
+        Dpid dstSwitchDpid = new Dpid((String) fields.get("dstSwitch"));
+
         if (intentType.equals("shortest_intent_type")) {
             ShortestPathIntent spi = new ShortestPathIntent(applnIntentId,
-                    Long.decode((String) fields.get("srcSwitch")),
+                    srcSwitchDpid.value(),
                     (long) fields.get("srcPort"),
                     MACAddress.valueOf((String) fields.get("srcMac")).toLong(),
-                    Long.decode((String) fields.get("dstSwitch")),
+                    dstSwitchDpid.value(),
                     (long) fields.get("dstPort"),
                     MACAddress.valueOf((String) fields.get("dstMac")).toLong());
             spi.setPathFrozen(pathFrozen);