Fix rest client script to support remove operation
Clean some debugging logs
Change-Id: I4ccbcac9c13486c60642cbd1c887a1b6890a8e4b
diff --git a/src/main/java/net/onrc/onos/datagrid/web/IntentResource.java b/src/main/java/net/onrc/onos/datagrid/web/IntentResource.java
index bd420e3..48e5e15 100755
--- a/src/main/java/net/onrc/onos/datagrid/web/IntentResource.java
+++ b/src/main/java/net/onrc/onos/datagrid/web/IntentResource.java
@@ -213,7 +213,7 @@
Long.decode((String) fields.get("dstSwitch")),
(long) fields.get("dstPort"),
MACAddress.valueOf((String) fields.get("dstMac")).toLong());
- operations.add(new IntentOperation(operation, spi));
+ operations.add(operation, spi);
intent = spi;
} else {
ConstrainedShortestPathIntent cspi = new ConstrainedShortestPathIntent(applnIntentId,
@@ -224,7 +224,7 @@
(long) fields.get("dstPort"),
MACAddress.valueOf((String) fields.get("dstMac")).toLong(),
(double) fields.get("bandwidth"));
- operations.add(new IntentOperation(operation, cspi));
+ operations.add(operation, cspi);
intent = cspi;
}
return intent;
diff --git a/src/main/java/net/onrc/onos/intent/persist/PersistIntent.java b/src/main/java/net/onrc/onos/intent/persist/PersistIntent.java
index 4f77883..deb6871 100755
--- a/src/main/java/net/onrc/onos/intent/persist/PersistIntent.java
+++ b/src/main/java/net/onrc/onos/intent/persist/PersistIntent.java
@@ -72,12 +72,12 @@
// TODO call controllerRegistry.isClusterLeader()
if (leader) {
try {
- System.out.println("persist operations to ramcloud size of operations: " + operations.size());
kryo.writeObject(output, operations);
output.close();
byte[] buffer = stream.toByteArray();
table.create(String.valueOf(key).getBytes(), buffer);
- System.out.println("key is " + key + " value length is " + buffer.length);
+ log.debug("persist operations to ramcloud size of operations: {}", operations.size());
+ log.debug("key is {} ", key, " value length is {}", buffer.length);
ret = true;
} catch (JRamCloud.ObjectExistsException ex) {
log.warn("Failed to store intent journal with key " + key);
diff --git a/web/rest-intent/add-get-intent.rb b/web/rest-intent/add-get-intent.rb
index 91554f5..c62a7b6 100644
--- a/web/rest-intent/add-get-intent.rb
+++ b/web/rest-intent/add-get-intent.rb
@@ -143,7 +143,7 @@
def post intents
json_data = intents.to_json
- response = RestClient.post "http://#{@server}:#{@port}/wm/onos/datagrid/#{intent_op}/intents/json", json_data, :content_type => :json, :accept => :json
+ response = RestClient.post "http://#{@server}:#{@port}/wm/onos/datagrid/add/intents/json", json_data, :content_type => :json, :accept => :json
puts response
end