From: Prasanna Huddar Date: Mon, 20 Jan 2014 03:31:52 +0000 (-0800) Subject: pyang fixes for statistics module X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~53 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=79fc532382872d160d2f22119d32d8d6c0796886 pyang fixes for statistics module Signed-off-by: Prasanna Huddar Change-Id: I7dd4c3c5bb5478abe02bf744a99163f9d76680f3 --- diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-statistics.yang similarity index 97% rename from opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang rename to opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-statistics.yang index 2b1d993026..94e2c0a428 100644 --- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang +++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-statistics.yang @@ -3,14 +3,12 @@ module opendaylight-flow-statistics { prefix flowstat; import yang-ext {prefix ext; revision-date "2013-07-09";} - import ietf-yang-types {prefix yang; revision-date "2010-09-24";} import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} import opendaylight-flow-types {prefix flow-types;revision-date "2013-10-26";} import opendaylight-statistics-types {prefix stat-types;revision-date "2013-09-25";} import opendaylight-table-types {prefix table-types;revision-date "2013-10-26";} import flow-node-inventory {prefix flow-node;revision-date "2013-08-19";} import flow-capable-transaction {prefix tr;} - import sal-flow {prefix flow;} import ietf-inet-types {prefix inet; revision-date "2010-09-24";} diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-table-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-table-statistics.yang similarity index 96% rename from opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-table-statistics.yang rename to opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-table-statistics.yang index b8233545c5..ab84f50f31 100644 --- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-table-statistics.yang +++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-table-statistics.yang @@ -4,7 +4,6 @@ module opendaylight-flow-table-statistics { import flow-capable-transaction {prefix tr;} import yang-ext {prefix ext; revision-date "2013-07-09";} - import ietf-yang-types {prefix yang; revision-date "2010-09-24";} import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} import flow-node-inventory {prefix flow-node;revision-date "2013-08-19";} import opendaylight-table-types {prefix table-types;revision-date "2013-10-26";} diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/group-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-group-statistics.yang similarity index 98% rename from opendaylight/md-sal/model/model-flow-statistics/src/main/yang/group-statistics.yang rename to opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-group-statistics.yang index 834e0a7835..2f5c5bbe0a 100644 --- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/group-statistics.yang +++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-group-statistics.yang @@ -35,7 +35,7 @@ module opendaylight-group-statistics { } } - augment "/inv:nodes/inv:node/group-types:group" { + augment "/inv:nodes/inv:node/fni:group" { ext:augment-identifier "node-group-desc-stats"; uses group-desc; } diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/meter-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang similarity index 100% rename from opendaylight/md-sal/model/model-flow-statistics/src/main/yang/meter-statistics.yang rename to opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/port-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-port-statistics.yang similarity index 96% rename from opendaylight/md-sal/model/model-flow-statistics/src/main/yang/port-statistics.yang rename to opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-port-statistics.yang index 787a4e6aa0..22f0aca5e7 100644 --- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/port-statistics.yang +++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-port-statistics.yang @@ -4,7 +4,6 @@ module opendaylight-port-statistics { import flow-capable-transaction {prefix tr;} import yang-ext {prefix ext; revision-date "2013-07-09";} - import ietf-yang-types {prefix yang; revision-date "2010-09-24";} import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} import opendaylight-statistics-types {prefix stat-types;revision-date "2013-09-25";} diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/queue-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-queue-statistics.yang similarity index 97% rename from opendaylight/md-sal/model/model-flow-statistics/src/main/yang/queue-statistics.yang rename to opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-queue-statistics.yang index 7665ef75c7..9c48cfdbe8 100644 --- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/queue-statistics.yang +++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-queue-statistics.yang @@ -4,7 +4,6 @@ module opendaylight-queue-statistics { import flow-capable-transaction {prefix tr;} import yang-ext {prefix ext; revision-date "2013-07-09";} - import ietf-yang-types {prefix yang; revision-date "2010-09-24";} import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} import flow-node-inventory {prefix flow-node;revision-date "2013-08-19";} import opendaylight-queue-types {prefix queue-types;revision-date "2013-09-25";} diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-statistics-types.yang similarity index 97% rename from opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang rename to opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-statistics-types.yang index 7bde486e91..c4cccc1102 100644 --- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang +++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-statistics-types.yang @@ -3,7 +3,6 @@ module opendaylight-statistics-types { prefix stat-types; import ietf-yang-types {prefix yang;} - import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} revision "2013-09-25" { description "Initial revision of flow service"; @@ -119,4 +118,4 @@ module opendaylight-statistics-types { uses duration; } -} \ No newline at end of file +}