Implement REST API of policy
Change-Id: I46f5a3cd6d66cf7a3a90a5d153b3878fdf5cbd31
diff --git a/impl/src/main/java/org/onosproject/segmentrouting/policy/api/DropPolicyCodec.java b/impl/src/main/java/org/onosproject/segmentrouting/policy/api/DropPolicyCodec.java
new file mode 100644
index 0000000..407bd08
--- /dev/null
+++ b/impl/src/main/java/org/onosproject/segmentrouting/policy/api/DropPolicyCodec.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2021-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.segmentrouting.policy.api;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+
+/**
+ * Codec of DropPolicy class.
+ */
+public final class DropPolicyCodec extends JsonCodec<DropPolicy> {
+
+ // JSON field names
+ public static final String POLICY_ID = "policy_id";
+ public static final String POLICY_TYPE = "policy_type";
+
+ @Override
+ public ObjectNode encode(DropPolicy policy, CodecContext context) {
+ final ObjectNode result = context.mapper().createObjectNode()
+ .put(POLICY_ID, policy.policyId().toString())
+ .put(POLICY_TYPE, policy.policyType().toString());
+
+ return result;
+ }
+
+ @Override
+ public DropPolicy decode(ObjectNode json, CodecContext context) {
+ return new DropPolicy();
+ }
+}
diff --git a/impl/src/main/java/org/onosproject/segmentrouting/policy/api/RedirectPolicyCodec.java b/impl/src/main/java/org/onosproject/segmentrouting/policy/api/RedirectPolicyCodec.java
new file mode 100644
index 0000000..efb2828
--- /dev/null
+++ b/impl/src/main/java/org/onosproject/segmentrouting/policy/api/RedirectPolicyCodec.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2021-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.segmentrouting.policy.api;
+
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.net.DeviceId;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import static org.onlab.util.Tools.nullIsIllegal;
+
+/**
+ * Codec of RedirectPolicy class.
+ */
+public final class RedirectPolicyCodec extends JsonCodec<RedirectPolicy> {
+
+ // JSON field names
+ public static final String POLICY_ID = "policy_id";
+ public static final String POLICY_TYPE = "policy_type";
+ public static final String SPINES_TO_ENFORCES = "spinesToEnforce";
+ public static final String DEVICE_ID = "deviceId";
+ public static final String MISSING_MEMBER_MESSAGE =
+ " member is required in Redirect Policy";
+
+ @Override
+ public ObjectNode encode(RedirectPolicy policy, CodecContext context) {
+ final ObjectNode result = context.mapper().createObjectNode()
+ .put(POLICY_ID, policy.policyId().toString())
+ .put(POLICY_TYPE, policy.policyType().toString());
+
+ ArrayNode deviceIdArr = result.putObject(SPINES_TO_ENFORCES).putArray(DEVICE_ID);
+ for (DeviceId deviceId : policy.spinesToEnforce()) {
+ deviceIdArr.add(deviceId.toString());
+ }
+
+ return result;
+ }
+
+ @Override
+ public RedirectPolicy decode(ObjectNode json, CodecContext context) {
+ List<DeviceId> spinesToEnforce = new LinkedList<>();
+
+ ObjectNode spinesNode = nullIsIllegal(get(json, SPINES_TO_ENFORCES),
+ SPINES_TO_ENFORCES + MISSING_MEMBER_MESSAGE);
+ ArrayNode deviceIdArr = nullIsIllegal((ArrayNode) spinesNode.get(DEVICE_ID),
+ DEVICE_ID + MISSING_MEMBER_MESSAGE);
+ deviceIdArr.forEach(deviceId -> spinesToEnforce.add(DeviceId.deviceId(deviceId.textValue())));
+
+ return new RedirectPolicy(Set.copyOf(spinesToEnforce));
+ }
+}
diff --git a/impl/src/main/java/org/onosproject/segmentrouting/policy/api/TrafficMatchCodec.java b/impl/src/main/java/org/onosproject/segmentrouting/policy/api/TrafficMatchCodec.java
new file mode 100644
index 0000000..1f4f8be
--- /dev/null
+++ b/impl/src/main/java/org/onosproject/segmentrouting/policy/api/TrafficMatchCodec.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2021-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.segmentrouting.policy.api;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.net.flow.TrafficSelector;
+
+import static org.onlab.util.Tools.nullIsIllegal;
+
+/**
+ * Codec of TrafficMatch class.
+ */
+public final class TrafficMatchCodec extends JsonCodec<TrafficMatch> {
+
+ // JSON field names
+ public static final String TRAFFIC_MATCH_ID = "traffic_match_id";
+ public static final String TRAFFIC_SELECTOR = "selector";
+ public static final String POLICY_ID = "policy_id";
+ public static final String MISSING_MEMBER_MESSAGE =
+ " member is required in Traffic Match";
+
+ @Override
+ public ObjectNode encode(TrafficMatch trafficMatch, CodecContext context) {
+ final JsonCodec<TrafficSelector> selectorCodec =
+ context.codec(TrafficSelector.class);
+
+ final ObjectNode selector = selectorCodec.encode(trafficMatch.trafficSelector(), context);
+ final ObjectNode result = context.mapper().createObjectNode()
+ .put(TRAFFIC_MATCH_ID, trafficMatch.trafficMatchId().toString())
+ .put(POLICY_ID, trafficMatch.policyId().toString())
+ .set(TRAFFIC_SELECTOR, selector);
+
+ return result;
+ }
+
+ @Override
+ public TrafficMatch decode(ObjectNode json, CodecContext context) {
+ final JsonCodec<TrafficSelector> selectorCodec =
+ context.codec(TrafficSelector.class);
+
+ ObjectNode selectorJson = nullIsIllegal(get(json, TRAFFIC_SELECTOR),
+ TRAFFIC_SELECTOR + MISSING_MEMBER_MESSAGE);
+ TrafficSelector trafficSelector = selectorCodec.decode(selectorJson, context);
+
+ PolicyId policyId = PolicyId.of(nullIsIllegal(json.get(POLICY_ID),
+ POLICY_ID + MISSING_MEMBER_MESSAGE).asText());
+
+ return new TrafficMatch(trafficSelector, policyId);
+ }
+}
diff --git a/impl/src/main/java/org/onosproject/segmentrouting/policy/impl/PolicyManager.java b/impl/src/main/java/org/onosproject/segmentrouting/policy/impl/PolicyManager.java
index 8f7c69c..87fa61a 100644
--- a/impl/src/main/java/org/onosproject/segmentrouting/policy/impl/PolicyManager.java
+++ b/impl/src/main/java/org/onosproject/segmentrouting/policy/impl/PolicyManager.java
@@ -26,6 +26,7 @@
import org.onlab.util.PredictableExecutor;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.NodeId;
+import org.onosproject.codec.CodecService;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.net.ConnectPoint;
@@ -48,6 +49,7 @@
import org.onosproject.segmentrouting.SegmentRoutingService;
import org.onosproject.segmentrouting.config.DeviceConfigNotFoundException;
import org.onosproject.segmentrouting.policy.api.DropPolicy;
+import org.onosproject.segmentrouting.policy.api.DropPolicyCodec;
import org.onosproject.segmentrouting.policy.api.Policy;
import org.onosproject.segmentrouting.policy.api.Policy.PolicyType;
import org.onosproject.segmentrouting.policy.api.PolicyData;
@@ -55,7 +57,9 @@
import org.onosproject.segmentrouting.policy.api.PolicyService;
import org.onosproject.segmentrouting.policy.api.PolicyState;
import org.onosproject.segmentrouting.policy.api.RedirectPolicy;
+import org.onosproject.segmentrouting.policy.api.RedirectPolicyCodec;
import org.onosproject.segmentrouting.policy.api.TrafficMatch;
+import org.onosproject.segmentrouting.policy.api.TrafficMatchCodec;
import org.onosproject.segmentrouting.policy.api.TrafficMatchData;
import org.onosproject.segmentrouting.policy.api.TrafficMatchId;
import org.onosproject.segmentrouting.policy.api.TrafficMatchState;
@@ -153,6 +157,9 @@
private CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY)
+ private CodecService codecService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
private StorageService storageService;
@Reference(cardinality = ReferenceCardinality.MANDATORY)
@@ -161,7 +168,7 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY)
private WorkPartitionService workPartitionService;
- @Reference(cardinality = ReferenceCardinality.OPTIONAL)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
private SegmentRoutingService srService;
@Reference(cardinality = ReferenceCardinality.MANDATORY)
@@ -174,6 +181,10 @@
public void activate() {
appId = coreService.registerApplication(APP_NAME);
+ codecService.registerCodec(DropPolicy.class, new DropPolicyCodec());
+ codecService.registerCodec(RedirectPolicy.class, new RedirectPolicyCodec());
+ codecService.registerCodec(TrafficMatch.class, new TrafficMatchCodec());
+
policies = storageService.<PolicyId, PolicyRequest>consistentMapBuilder()
.withName(POLICY_STORE)
.withSerializer(serializer).build();
@@ -203,6 +214,9 @@
@Deactivate
public void deactivate() {
// Teardown everything
+ codecService.unregisterCodec(DropPolicy.class);
+ codecService.unregisterCodec(RedirectPolicy.class);
+ codecService.unregisterCodec(TrafficMatch.class);
policies.removeListener(mapPolListener);
policies.destroy();
policiesMap.clear();