pyang fixes for service models

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Change-Id: I425794e060f352ccc3788c0123b1f50c832b89dc

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 0f5cc71e8bc7052b1743d7e13d85ea3914e08bfd..65362a179094b98104c8345a0ec7dd28fced2296 100644 (file)
--- 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 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";}
     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 {
         
         container supported-match-types {
             list match-type {

+               key "match";

                 uses feature;
                 leaf match {
                     type string; // FIXME: Add identity
                 uses feature;
                 leaf match {
                     type string; // FIXME: Add identity


@@ -160,6 +160,7 @@ module flow-node-inventory {
         
         container supported-instructions {
             list instruction-type {
         
         container supported-instructions {
             list instruction-type {

+               key "instruction";

                 uses feature;
                 leaf instruction {
                     type string; // FIXME: Add identity
                 uses feature;
                 leaf instruction {
                     type string; // FIXME: Add identity


@@ -169,6 +170,7 @@ module flow-node-inventory {
 
         container supported-actions {
             list action-type {
 
         container supported-actions {
             list action-type {

+               key "action";

                 uses feature;
 
                 leaf action {
                 uses feature;
 
                 leaf action {


@@ -227,4 +229,4 @@ module flow-node-inventory {
         uses flow-node-connector;
     }
 
         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 6ad6b6dbc5532239ba9eba2d2a61f2fd6e3761fe..05c413d7bb14d1f9b823e44d41e01a8fff5da441 100644 (file)
--- 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;
 
     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" {
     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 5c68a137c3d71f8c23da9cd8da3f64d6552e2b56..091bd43e1973ac8f2ec6aaea93717fe386e25af4 100644 (file)
--- 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 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;}
     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;
     }
         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 7eeb0ac0f3767eb0d40e211d0b9c88d188cb8517..7543bf412b8c72295d5c1aaa8bcf2814c1aaa79c 100644 (file)
--- 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;
 
     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 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;}
 
     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;
     }    
         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 ecdef41951aa63482b11c122c51f08d602cb8f26..50f65df8e5a2be77c88147b80962c16717ee3ca2 100644 (file)
--- 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;
 
     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;}
     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;
     }
         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 6795e6fd67a8090e525546deb18658f6dc5930d3..cf6d232db330aca58f33cc81661f042dcc690266 100644 (file)
--- 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;       
     }
     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 bf79cbf6354e9ee413e6c3173adac0a5b27207ed..4fa9fb0e579881c19173f1f3b3779b08c6389e23 100644 (file)
--- 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;
 
     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";}
 
     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;
     }
     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 02a63cb2b214e98c2c603d71173a2ba35a3f3bd8..66990d473f84e21af3fcb1af3c46993bd1e1eb9b 100644 (file)
--- 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;
 
     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;}
     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;
     }
         }
         uses table-type:table-features;
     }

-}
\ No newline at end of file
+}