From: Prasanna Huddar Date: Tue, 19 Nov 2013 09:07:23 +0000 (+0530) Subject: ID's are made in sync with openflow specification. Flow/Group/Table/Port/Queue/Meter... X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~381 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=b0018881dbb148637989e84271b99bef918e966f ID's are made in sync with openflow specification. Flow/Group/Table/Port/Queue/Meter all Id's where string. The Spec points to uint32. So all ID have been moved to uint32 type. Signed-off-by: Prasanna Huddar Change-Id: I75382f32ba715879db25cff1513283035c0d2dfd --- diff --git a/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FRMRuntimeDataProvider.xtend b/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FRMRuntimeDataProvider.xtend index d462251a9f..bbad85b35f 100644 --- a/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FRMRuntimeDataProvider.xtend +++ b/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FRMRuntimeDataProvider.xtend @@ -108,7 +108,7 @@ class ConfigurationReader implements FlowManagementReader { } override readFlow(FlowKey key) { - val flowCfg = manager.getStaticFlow(key.id,key.node.toADNode()); + val flowCfg = manager.getStaticFlow(String.valueOf(key.id), key.node.toADNode()); return flowCfg.toConfigurationFlow; } } diff --git a/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FlowConfigMapping.xtend b/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FlowConfigMapping.xtend index e4d9173378..ef806f33ef 100644 --- a/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FlowConfigMapping.xtend +++ b/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FlowConfigMapping.xtend @@ -24,14 +24,14 @@ class FlowConfigMapping { idleTimeout = source.idleTimeout match = source.match node = source.node - key = new FlowKey(sourceCfg.name,node); + key = new FlowKey(Long.parseLong(sourceCfg.name),node); return it.build(); } static def toFlowConfig(Flow sourceCfg) { val flow = toFlow(sourceCfg); val it = new FlowConfig; - name = sourceCfg.key.id + name = String.valueOf(sourceCfg.id); node = sourceCfg.node.toADNode(); return it @@ -40,7 +40,7 @@ class FlowConfigMapping { static def toFlowConfig(InstanceIdentifier identifier) { val it = new FlowConfig() val FlowKey key = ((identifier.path.get(2) as IdentifiableItem).key) - name = key.id; + name = String.valueOf(key.id); node = key.node.toADNode(); return it; diff --git a/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/SampleConsumer.java b/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/SampleConsumer.java index a82eedc3f9..2fbe0a0202 100644 --- a/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/SampleConsumer.java +++ b/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/SampleConsumer.java @@ -31,7 +31,7 @@ public class SampleConsumer { Flow createSampleFlow(String name, NodeRef node) { FlowBuilder ret = new FlowBuilder(); - FlowKey key = new FlowKey(name, node); + FlowKey key = new FlowKey(Long.parseLong(name), node); ret.setKey(key); return ret.build(); } diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang index 8338d185cc..f0b7e97a15 100644 --- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang +++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang @@ -8,7 +8,14 @@ module opendaylight-port-types { revision "2013-09-25" { description "Initial revision of Port Inventory model"; } - + + typedef port-reason { + type enumeration { + enum add; + enum delete; + enum update; + } + } typedef port-config { type bits { @@ -26,7 +33,6 @@ module opendaylight-port-types { enum live; } } - typedef port-features { type bits { @@ -72,6 +78,14 @@ module opendaylight-port-types { } } + grouping flow-port-status { + leaf reason { + type port-reason; + } + + uses flow-capable-port; + } + grouping flow-capable-port { uses common-port; @@ -114,7 +128,7 @@ module opendaylight-port-types { } } - grouping ofp-port-mod { + grouping port-mod { container port { list port { key "port-mod-order"; diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-config.yang index 7361358aff..1c57142997 100644 --- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-config.yang +++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-config.yang @@ -23,7 +23,7 @@ module flow-management { key "node id"; leaf id { - type string; + type uint32; } uses flow:flow-entry; } diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-config.yang index 48dda2edcd..2fc051087d 100644 --- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-config.yang +++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-config.yang @@ -22,7 +22,7 @@ module group-management { key "id node"; leaf id { - type string; + type uint32; } uses group-entry; diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-config.yang index 111d3d60fa..35d4550ebf 100644 --- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-config.yang +++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-config.yang @@ -22,7 +22,7 @@ module meter-management { key "id node"; leaf id { - type string; + type uint32; } uses meter-entry; diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-config.yang index 945cc32ab5..50762b87ce 100644 --- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-config.yang +++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-config.yang @@ -14,7 +14,7 @@ module port-management { leaf node { type inv:node-ref; } - uses port:ofp-port-mod; + uses port:port-mod; } container ports { @@ -22,7 +22,7 @@ module port-management { key "id node"; leaf id { - type string; + type uint32; } uses port-entry; diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-config.yang index 88dcfce91c..512fb6528b 100644 --- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-config.yang +++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-config.yang @@ -23,7 +23,7 @@ module table-management { key "id node"; leaf id { - type string; + type uint32; } uses table-entry; diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-error.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-error.yang index 171f9563ee..369b279b95 100644 --- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-error.yang +++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-error.yang @@ -16,13 +16,15 @@ module flow-errors { enum flow-mod-failed; enum group-mod-failed; enum port-mod-failed; - enum table-mod-failed; - enum meter-mod-failed; + enum table-mod-failed; enum queue-op-failed; enum switch-config-failed; enum role-request-failed; + enum meter-mod-failed; enum table-features-failed; - enum experimenter; + enum experimenter { + value "65535"; + } } } diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang index df0b2527b8..a32a45f2fd 100644 --- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang +++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang @@ -97,9 +97,11 @@ module sal-flow { notification node-error-notification { uses error:error-message; + uses tr:transaction-aware; } notification node-experimenter-error-notification { uses error:experimenter-error-message; + uses tr:transaction-aware; } } \ No newline at end of file diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/port-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/port-service.yang index df527ef267..9588652a1c 100644 --- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/port-service.yang +++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/port-service.yang @@ -13,7 +13,7 @@ module sal-port { grouping node-port { uses "inv:node-context-ref"; - uses port-type:ofp-port-mod; + uses port-type:flow-port-status; } /** Base configuration structure **/ @@ -21,10 +21,10 @@ module sal-port { uses "inv:node-context-ref"; container original-port { - uses port-type:ofp-port-mod; + uses port-type:port-mod; } container updated-port { - uses port-type:ofp-port-mod; + uses port-type:port-mod; } } diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug01Test.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug01Test.java index 70be175598..08eb409b3d 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug01Test.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug01Test.java @@ -46,7 +46,7 @@ public class DOMCodecBug01Test extends AbstractDataServiceTest { private static final QName FLOW_ID_QNAME = QName.create(Flow.QNAME, "id"); private static final QName FLOW_NODE_QNAME = QName.create(Flow.QNAME, "node"); - private static final String FLOW_ID = "foo"; + private static final long FLOW_ID = 1234; private static final String NODE_ID = "node:1"; private static final NodeKey NODE_KEY = new NodeKey(new NodeId(NODE_ID));