From 8b7df31b57271de1f2fc05c65d60f1c549a7701e Mon Sep 17 00:00:00 2001 From: Prasanna Huddar Date: Sat, 30 Nov 2013 20:05:55 +0530 Subject: [PATCH] modified meter and group enum from leaf to typedef. Signed-off-by: Prasanna Huddar Change-Id: I5cb3d27519818979d9c5559bd834480b831d8049 --- .../consumer/impl/FlowConsumerImpl.java | 1 + .../consumer/impl/GroupConsumerImpl.java | 8 ++-- .../src/main/yang/group-types.yang | 34 +++++++-------- .../src/main/yang/meter-types.yang | 41 +++++++++++-------- 4 files changed, 44 insertions(+), 40 deletions(-) diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/FlowConsumerImpl.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/FlowConsumerImpl.java index 9d2a6a0b11..6aa0d5fc90 100644 --- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/FlowConsumerImpl.java +++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/FlowConsumerImpl.java @@ -185,6 +185,7 @@ public class FlowConsumerImpl implements IForwardingRulesManager { private void addFlow(InstanceIdentifier path, Flow dataObject) { AddFlowInputBuilder input = new AddFlowInputBuilder(); + List inst = (dataObject).getInstructions().getInstruction(); input.setNode((dataObject).getNode()); input.setPriority((dataObject).getPriority()); diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/GroupConsumerImpl.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/GroupConsumerImpl.java index b8dac19bf3..381faa41b0 100644 --- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/GroupConsumerImpl.java +++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/GroupConsumerImpl.java @@ -35,15 +35,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.Gro import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.GroupRemoved; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.GroupUpdated; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.RemoveGroupInputBuilder; - import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.SalGroupListener; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.SalGroupService; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.group.update.UpdatedGroupBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes.GroupType; +import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.Buckets; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.Bucket; -import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.config.rev131024.meters.Meter; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -239,8 +237,8 @@ public class GroupConsumerImpl implements IForwardingRulesManager { return new Status(StatusCode.BADREQUEST, "Group record does not exist"); }*/ - if (!(group.getGroupType().getIntValue() >= GroupType.GroupAll.getIntValue() && group.getGroupType() - .getIntValue() <= GroupType.GroupFf.getIntValue())) { + if (!(group.getGroupType().getIntValue() >= GroupTypes.GroupAll.getIntValue() && group.getGroupType() + .getIntValue() <= GroupTypes.GroupFf.getIntValue())) { logger.error("Invalid Group type %d" + group.getGroupType().getIntValue()); return new Status(StatusCode.BADREQUEST, "Invalid Group type"); } diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang index 25e8e7aa57..244fedb3e7 100644 --- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang +++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang @@ -14,30 +14,30 @@ module opendaylight-group-types { type uint32; } - grouping group-types { - leaf group-type { - type enumeration { - enum group-all; - enum group-select; - enum group-indirect; - enum group-ff; - } - } + typedef group-types { + type enumeration { + enum group-all; + enum group-select; + enum group-indirect; + enum group-ff; + } } typedef group-capabilities { - type enumeration { - enum select-weight; - enum select-liveness; - enum chaining; - enum chaining-checks; - } - } + type enumeration { + enum select-weight; + enum select-liveness; + enum chaining; + enum chaining-checks; + } + } grouping group { - uses group-types; + leaf group-type { + type group-types; + } leaf group-id { type group-id; diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang index d26ca66799..fc9be63ec8 100644 --- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang +++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang @@ -14,24 +14,25 @@ module opendaylight-meter-types { type uint32; } - grouping meter-flags { - leaf flags { - type bits { - bit meter-kbps; - bit meter-pktps; - bit meter-burst; - bit meter-stats; - } - } + // field types + identity meter-flags { + description "Base identity for match Fields"; } - grouping meter-band-type { - leaf flags { - type bits { - bit ofpmbt-drop; - bit ofpmbt-dscp-remark; - bit ofpmbt-experimenter; - } + typedef meter-flags { + type bits { + bit meter-kbps; + bit meter-pktps; + bit meter-burst; + bit meter-stats; + } + } + + typedef meter-band-type { + type bits { + bit ofpmbt-drop; + bit ofpmbt-dscp-remark; + bit ofpmbt-experimenter; } } @@ -79,7 +80,9 @@ module opendaylight-meter-types { grouping meter { - uses meter-flags; + leaf flags { + type meter-flags; + } leaf meter-id { type meter-id; @@ -104,7 +107,9 @@ module opendaylight-meter-types { } container meter-band-types { - uses meter-band-type; + leaf flags { + type meter-band-type; + } } leaf rate { -- 2.36.6