CLI support for adjacency labels and policy type
diff --git a/cli/cli/c_actions.py b/cli/cli/c_actions.py
index 93c00c0..71622a2 100755
--- a/cli/cli/c_actions.py
+++ b/cli/cli/c_actions.py
@@ -102,7 +102,7 @@
url_str = "http://%s/rest/v1/tunnel/" % (sdnsh.controller)
obj_data = {}
obj_data['tunnel_id']=tunnel_id
- obj_data['tunnel_path']=entries
+ obj_data['label_path']=entries
data = sdnsh.store.rest_post_request(url_str,obj_data)
# LOOK! successful stuff should be returned in json too.
if data != "success":
diff --git a/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterPolicyRESTParams.java b/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterPolicyRESTParams.java
index d0a34b0..8fc9256 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterPolicyRESTParams.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterPolicyRESTParams.java
@@ -3,6 +3,7 @@
public class SegmentRouterPolicyRESTParams {
private String policy_id;
+ private String policy_type;
private int priority;
private String tunnel_id;
private String proto_type;
@@ -15,6 +16,7 @@
public SegmentRouterPolicyRESTParams() {
this.policy_id = null;
+ this.policy_type = null;
this.priority = 0;
this.tunnel_id = null;
this.proto_type = null;
@@ -34,6 +36,14 @@
return this.policy_id;
}
+ public void setPolicy_type(String policy_type) {
+ this.policy_type = policy_type;
+ }
+
+ public String getPolicy_type() {
+ return this.policy_type;
+ }
+
public void setPriority(int priority) {
this.priority = priority;
}
diff --git a/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterPolicyResource.java b/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterPolicyResource.java
index 0931dd3..6c24901 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterPolicyResource.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterPolicyResource.java
@@ -45,8 +45,9 @@
return "fail";
}
- log.debug("createPolicy with params id {} src_ip {} dst_ip {}"
+ log.debug("createPolicy of type {} with params id {} src_ip {} dst_ip {}"
+ "proto {} src_port {} dst_port {} priority {} tunnel_id {}",
+ createParams.getPolicy_type(),
createParams.getPolicy_id(), createParams.getSrc_ip(),
createParams.getDst_ip(), createParams.getProto_type(),
createParams.getSrc_tp_port(), createParams.getDst_tp_port(),