Clean up yang model - Part I

Replace attrs with attributes on base and admin groups

Change-Id: I912510da4f9f5912e473be428b80aa98a1b82043
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>

diff --git a/model/src/main/yang/neutron-L3.yang b/model/src/main/yang/neutron-L3.yang
index e0f05cb09024b6dd24e9459bbb934fe506c7978e..bb7846b8fd22337d3ecf07539c730f0f543b8cf4 100644 (file)
--- a/model/src/main/yang/neutron-L3.yang
+++ b/model/src/main/yang/neutron-L3.yang
@@ -127,8 +127,8 @@ module neutron-L3 {
                     gateway.";
 
                 key "uuid";
-                uses attrs:base-attrs;
-                uses attrs:admin-attrs;
+                uses attrs:base-attributes;
+                uses attrs:admin-attributes;
                 uses L3-attrs;
                 container external_gateway_info {
                     leaf external-network-id {

diff --git a/model/src/main/yang/neutron-attrs.yang b/model/src/main/yang/neutron-attrs.yang
index 03f973ad8f72e2d7031dbeb838a2cfd949e51d0e..b7b0c686843f8c46d97e6c72394e373cef0830a5 100644 (file)
--- a/model/src/main/yang/neutron-attrs.yang
+++ b/model/src/main/yang/neutron-attrs.yang
@@ -28,7 +28,7 @@ module neutron-attrs {
                 models";
     }
 
-    grouping base-attrs {
+    grouping base-attributes {
 
         leaf uuid {
             type yang:uuid;
@@ -50,7 +50,7 @@ module neutron-attrs {
         }
     }
 
-    grouping admin-attrs {
+    grouping admin-attributes {
         leaf admin-state-up {
             type boolean;
             description "The administrative state of the network, which is up (true) or

diff --git a/model/src/main/yang/neutron-fwaas.yang b/model/src/main/yang/neutron-fwaas.yang
index 774eb00fd877c26d264cd1386cc5f00cd096d421..dffa4223debb6f8df5fbeae945160c0dfbd00596 100644 (file)
--- a/model/src/main/yang/neutron-fwaas.yang
+++ b/model/src/main/yang/neutron-fwaas.yang
@@ -122,22 +122,22 @@ module neutron-fwaas {
         container firewalls {
             list firewall {
                 key "uuid";
-                uses attrs:base-attrs;
-                uses attrs:admin-attrs;
+                uses attrs:base-attributes;
+                uses attrs:admin-attributes;
                 uses firewall-attrs;
             }
         }
         container firewall-policies {
             list firewall-policy {
                 key "uuid";
-                uses attrs:base-attrs;
+                uses attrs:base-attributes;
                 uses firewallpolicy-attrs;
             }
         }
         container firewall-rules {
             list firewall-rule {
                 key "uuid";
-                uses attrs:base-attrs;
+                uses attrs:base-attributes;
                 uses firewallrule-attrs;
             }
         }

diff --git a/model/src/main/yang/neutron-lbaasv2.yang b/model/src/main/yang/neutron-lbaasv2.yang
index 8d2d994621d2b4b53806e2724af51773d62579f1..bd3c5f855cd461f488aae2ca325bd6fbffc5c7dd 100644 (file)
--- a/model/src/main/yang/neutron-lbaasv2.yang
+++ b/model/src/main/yang/neutron-lbaasv2.yang
@@ -266,8 +266,8 @@ module neutron-lbaasv2 {
             description "Container for Loadbalancers.";
             list loadbalancers {
                 key "uuid";
-                uses attrs:base-attrs;
-                uses attrs:admin-attrs;
+                uses attrs:base-attributes;
+                uses attrs:admin-attributes;
                 uses loadbalancer-attrs;
                 description "List of Loadbalancers.";
             }
@@ -276,7 +276,7 @@ module neutron-lbaasv2 {
             description "Container for Listeners.";
             list listeners {
                 key "uuid";
-                uses attrs:base-attrs;
+                uses attrs:base-attributes;
                 uses listener-attrs;
                 description "List of Listeners";
             }
@@ -285,7 +285,7 @@ module neutron-lbaasv2 {
             description "Container for LBaaSV2.0 pools.";
             list pools {
                 key "uuid";
-                uses attrs:base-attrs;
+                uses attrs:base-attributes;
                 uses pool-attrs;
                 description "List of Pools";
                 container member {
@@ -307,4 +307,4 @@ module neutron-lbaasv2 {
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/model/src/main/yang/neutron-metering.yang b/model/src/main/yang/neutron-metering.yang
index 3ec9314adc0d15c5b2decc7cf8786d60b31314a1..bd94c9eb86ea80ccb62224d3d39feddaba2d7b93 100644 (file)
--- a/model/src/main/yang/neutron-metering.yang
+++ b/model/src/main/yang/neutron-metering.yang
@@ -79,7 +79,7 @@ module neutron-metering {
             description "Container for metering labels.";
             list metering-label {
                 key "uuid";
-                uses attrs:base-attrs;
+                uses attrs:base-attributes;
                 uses metering-label-attrs;
                 description "List of Metering Labels.";
             }

diff --git a/model/src/main/yang/neutron-networks.yang b/model/src/main/yang/neutron-networks.yang
index fd7ed4b4739f89ca5335f3ea46011748eac83047..550f05887d4ae1ae72ece06377b26223526a8588 100644 (file)
--- a/model/src/main/yang/neutron-networks.yang
+++ b/model/src/main/yang/neutron-networks.yang
@@ -59,22 +59,6 @@ module neutron-networks {
         description
                 "This type is used to refer to a Network Type.";
     }
-    grouping network-attrs {
-
-        leaf-list subnets {
-            description "The associated subnets.";
-            type yang:uuid;
-        }
-
-        leaf shared {
-            type boolean;
-            default "false";
-            description "Indicates whether this network or subnet is shared across all
-                        tenants. By default, only administrative users can change this
-                        value.";
-        }
-
-    }
 
     grouping networks-attributes {
         container networks {
@@ -89,9 +73,22 @@ module neutron-networks {
                             with a network.";
 
                 key "uuid";
-                uses attrs:base-attrs;
-                uses attrs:admin-attrs;
-                uses network-attrs;
+
+                leaf-list subnets {
+                    description "The associated subnets.";
+                    type yang:uuid;
+                }
+
+                leaf shared {
+                    type boolean;
+                    default "false";
+                    description "Indicates whether this network or subnet is shared across all
+                                tenants. By default, only administrative users can change this
+                                value.";
+                }
+
+                uses attrs:base-attributes;
+                uses attrs:admin-attributes;
             }
         }
     }

diff --git a/model/src/main/yang/neutron-ports.yang b/model/src/main/yang/neutron-ports.yang
index d400a1b4f42e9edcfd05cfb1b38af717156c68da..f30b03c4115e9057306a19e959c5282e18ea4224 100644 (file)
--- a/model/src/main/yang/neutron-ports.yang
+++ b/model/src/main/yang/neutron-ports.yang
@@ -101,8 +101,8 @@ module neutron-ports {
         container ports {
             list port {
                 key "uuid";
-                uses attrs:base-attrs;
-                uses attrs:admin-attrs;
+                uses attrs:base-attributes;
+                uses attrs:admin-attributes;
                 uses port-attrs;
             }
         }

diff --git a/model/src/main/yang/neutron-provider-ext.yang b/model/src/main/yang/neutron-provider-ext.yang
index 34ef6fb827de52919f2c9cb13d5b59ac5af499ed..554c9469283118bf8e4cd06bfb4ac91c83cbc57f 100644 (file)
--- a/model/src/main/yang/neutron-provider-ext.yang
+++ b/model/src/main/yang/neutron-provider-ext.yang
@@ -34,11 +34,11 @@ module neutron-provider-ext {
           This module augments the networks container in the neutron-networks
           module with provider information.
           ";
-        list providers {
+        list segments {
             description "List of provider network(s) associated with this network.";
             key segmentation-id;
-            uses provider:provider-attrs;
+            uses provider:provider-attributes;
         }
-        uses provider:provider-attrs;
+        uses provider:provider-attributes;
     }
 }

diff --git a/model/src/main/yang/neutron-provider.yang b/model/src/main/yang/neutron-provider.yang
index 2f4252e3197f0477a01567b542ce0a0a7c481a71..316eef94b73e4962a81f423e6a39c162a3fb3373 100644 (file)
--- a/model/src/main/yang/neutron-provider.yang
+++ b/model/src/main/yang/neutron-provider.yang
@@ -28,7 +28,7 @@ module neutron-provider {
                 models";
     }
 
-    grouping provider-attrs {
+    grouping provider-attributes {
         leaf physical-network {
             type string;
             description "The physical network where this network object is implemented.

diff --git a/model/src/main/yang/neutron-secgroups.yang b/model/src/main/yang/neutron-secgroups.yang
index 4fee0246bb1fbba2d3b7b976df04667f8e9ac36e..4d310bb809d140908cda458ea8e45aaf4f28c71d 100644 (file)
--- a/model/src/main/yang/neutron-secgroups.yang
+++ b/model/src/main/yang/neutron-secgroups.yang
@@ -130,7 +130,7 @@ module neutron-secgroups {
             description "Container for security groups.";
             list security-group {
                 key "uuid";
-                uses attrs:base-attrs;
+                uses attrs:base-attributes;
                 uses security-group-attrs;
                 description "List of Metering Labels.";
                 leaf-list security-rules {

diff --git a/model/src/main/yang/neutron-subnets.yang b/model/src/main/yang/neutron-subnets.yang
index b75c896475a5c2adcf3c593f55388aa7a9eed978..f2958c70824da7767bfb511c209830d8fe0501da 100644 (file)
--- a/model/src/main/yang/neutron-subnets.yang
+++ b/model/src/main/yang/neutron-subnets.yang
@@ -114,7 +114,7 @@ module neutron-subnets {
         container subnets {
             list subnet {
                 key "uuid";
-                uses attrs:base-attrs;
+                uses attrs:base-attributes;
                 uses subnet-attrs;
             }
         }

diff --git a/model/src/main/yang/neutron-vpnaas.yang b/model/src/main/yang/neutron-vpnaas.yang
index 6df085aaaae39cf80768a53881c088dbbb32883b..d9a479efe0ea8c2f27b2b54dbe7aa52745126556 100644 (file)
--- a/model/src/main/yang/neutron-vpnaas.yang
+++ b/model/src/main/yang/neutron-vpnaas.yang
@@ -188,30 +188,30 @@ module neutron-vpnaas {
         container vpn-services {
             list vpn-service {
                 key "uuid";
-                uses attrs:base-attrs;
-                uses attrs:admin-attrs;
+                uses attrs:base-attributes;
+                uses attrs:admin-attributes;
                 uses vpnservices-attrs;
             }
         }
         container ike-policies {
             list ike-policy {
                 key "uuid";
-                uses attrs:base-attrs;
+                uses attrs:base-attributes;
                 uses ikepolicy-attrs;
             }
         }
         container ipsec-policies {
             list ipsec-policy {
                 key "uuid";
-                uses attrs:base-attrs;
+                uses attrs:base-attributes;
                 uses ipsecpolicy-attrs;
             }
         }
         container ipsec-site-connections {
             list ipsec-site-connection {
                 key "uuid";
-                uses attrs:base-attrs;
-                uses attrs:admin-attrs;
+                uses attrs:base-attributes;
+                uses attrs:admin-attributes;
                 uses ipsecconnection-attrs;
             }
         }

diff --git a/model/src/main/yang/neutron.yang b/model/src/main/yang/neutron.yang
index 2c412d0018bbee216e7c91846c5ae08b6aadcf42..cb23ebf67b41291014065235814646911682d9aa 100644 (file)
--- a/model/src/main/yang/neutron.yang
+++ b/model/src/main/yang/neutron.yang
@@ -45,4 +45,4 @@ module neutron {
         uses subnets:subnets-attributes;
         uses lbaasv2:lbaas-attributes;
     }
-}
\ No newline at end of file
+}