From 7ff2e7fd626af68b5d782bb4f8772a9969cee92c Mon Sep 17 00:00:00 2001 From: Prasanna Huddar Date: Sun, 19 Jan 2014 19:38:47 -0800 Subject: [PATCH] pyang fixes for service models Signed-off-by: Prasanna Huddar Change-Id: I425794e060f352ccc3788c0123b1f50c832b89dc --- .../src/main/yang/{flow-error.yang => flow-errors.yang} | 0 .../src/main/yang/flow-node-inventory.yang | 6 ++++-- ...ology-notification.yang => flow-topology-discovery.yang} | 3 +-- .../src/main/yang/{flow-service.yang => sal-flow.yang} | 3 +-- .../src/main/yang/{group-service.yang => sal-group.yang} | 4 +--- .../src/main/yang/{meter-service.yang => sal-meter.yang} | 3 +-- .../src/main/yang/{port-service.yang => sal-port.yang} | 2 +- .../src/main/yang/{queue-service.yang => sal-queue.yang} | 3 +-- .../src/main/yang/{table-service.yang => sal-table.yang} | 3 +-- 9 files changed, 11 insertions(+), 16 deletions(-) rename opendaylight/md-sal/model/model-flow-service/src/main/yang/{flow-error.yang => flow-errors.yang} (100%) rename opendaylight/md-sal/model/model-flow-service/src/main/yang/{flow-topology-notification.yang => flow-topology-discovery.yang} (92%) rename opendaylight/md-sal/model/model-flow-service/src/main/yang/{flow-service.yang => sal-flow.yang} (97%) rename opendaylight/md-sal/model/model-flow-service/src/main/yang/{group-service.yang => sal-group.yang} (94%) rename opendaylight/md-sal/model/model-flow-service/src/main/yang/{meter-service.yang => sal-meter.yang} (97%) rename opendaylight/md-sal/model/model-flow-service/src/main/yang/{port-service.yang => sal-port.yang} (99%) rename opendaylight/md-sal/model/model-flow-service/src/main/yang/{queue-service.yang => sal-queue.yang} (91%) rename opendaylight/md-sal/model/model-flow-service/src/main/yang/{table-service.yang => sal-table.yang} (94%) 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-errors.yang similarity index 100% rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-error.yang rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-errors.yang diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang index 0f5cc71e8b..65362a1790 100644 --- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang +++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang @@ -4,7 +4,6 @@ module flow-node-inventory { import yang-ext {prefix ext; revision-date "2013-07-09";} import ietf-inet-types {prefix inet; revision-date "2010-09-24";} - import ietf-yang-types {prefix yang; revision-date "2010-09-24";} import opendaylight-port-types {prefix port;revision-date "2013-09-25";} import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} import opendaylight-table-types {prefix table;revision-date "2013-10-26";} @@ -150,6 +149,7 @@ module flow-node-inventory { container supported-match-types { list match-type { + key "match"; uses feature; leaf match { type string; // FIXME: Add identity @@ -160,6 +160,7 @@ module flow-node-inventory { container supported-instructions { list instruction-type { + key "instruction"; uses feature; leaf instruction { type string; // FIXME: Add identity @@ -169,6 +170,7 @@ module flow-node-inventory { container supported-actions { list action-type { + key "action"; uses feature; leaf action { @@ -227,4 +229,4 @@ module flow-node-inventory { uses flow-node-connector; } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-notification.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-discovery.yang similarity index 92% rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-notification.yang rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-discovery.yang index 6ad6b6dbc5..05c413d7bb 100644 --- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-notification.yang +++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-discovery.yang @@ -2,7 +2,6 @@ module flow-topology-discovery { namespace "urn:opendaylight:flow:topology:discovery"; prefix flow-node-topo; - import yang-ext {prefix ext; revision-date "2013-07-09";} import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} revision "2013-08-19" { @@ -40,4 +39,4 @@ module flow-topology-discovery { } -} \ No newline at end of file +} 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/sal-flow.yang similarity index 97% rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-flow.yang index 5c68a137c3..091bd43e19 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/sal-flow.yang @@ -4,7 +4,6 @@ module sal-flow { import yang-ext {prefix ext; revision-date "2013-07-09";} import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} - import ietf-inet-types {prefix inet; revision-date "2010-09-24";} import opendaylight-flow-types {prefix types;revision-date "2013-10-26";} import flow-capable-transaction {prefix tr;} import flow-errors {prefix error;} @@ -129,4 +128,4 @@ module sal-flow { 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/group-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-group.yang similarity index 94% rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-group.yang index 7eeb0ac0f3..7543bf412b 100644 --- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang +++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-group.yang @@ -2,9 +2,7 @@ module sal-group { namespace "urn:opendaylight:group:service"; prefix group; - import yang-ext {prefix ext; revision-date "2013-07-09";} import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} - import ietf-inet-types {prefix inet;revision-date 2010-09-24;} import opendaylight-group-types {prefix group-type;revision-date 2013-10-18;} import flow-capable-transaction {prefix tr;} @@ -94,4 +92,4 @@ module sal-group { uses node-group; uses tr:transaction-aware; } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-meter.yang similarity index 97% rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-meter.yang index ecdef41951..50f65df8e5 100644 --- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang +++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-meter.yang @@ -2,7 +2,6 @@ module sal-meter { namespace "urn:opendaylight:meter:service"; prefix meter; - import yang-ext {prefix ext; revision-date "2013-07-09";} import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} import opendaylight-meter-types {prefix meter-type;revision-date "2013-09-18";} import flow-capable-transaction {prefix tr;} @@ -96,4 +95,4 @@ module sal-meter { uses node-meter; 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/sal-port.yang similarity index 99% rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/port-service.yang rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-port.yang index 6795e6fd67..cf6d232db3 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/sal-port.yang @@ -53,4 +53,4 @@ module sal-port { notification port-removed { uses node-port; } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/queue-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-queue.yang similarity index 91% rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/queue-service.yang rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-queue.yang index bf79cbf635..4fa9fb0e57 100644 --- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/queue-service.yang +++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-queue.yang @@ -2,7 +2,6 @@ module sal-queue { namespace "urn:opendaylight:queue:service"; prefix queue; - import yang-ext {prefix ext; revision-date "2013-07-09";} import opendaylight-inventory {prefix inv; revision-date "2013-08-19";} import opendaylight-queue-types {prefix queue-type; revision-date "2013-09-25";} @@ -26,4 +25,4 @@ module sal-queue { notification queue-get-config-reply { uses node-queue; } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/table-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-table.yang similarity index 94% rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/table-service.yang rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-table.yang index 02a63cb2b2..66990d473f 100644 --- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/table-service.yang +++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-table.yang @@ -2,7 +2,6 @@ module sal-table { namespace "urn:opendaylight:table:service"; prefix table; - import yang-ext {prefix ext; revision-date "2013-07-09";} import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} import opendaylight-table-types {prefix table-type;revision-date "2013-10-26";} import flow-capable-transaction {prefix tr;} @@ -40,4 +39,4 @@ module sal-table { } uses table-type:table-features; } -} \ No newline at end of file +} -- 2.36.6