Clean up yang model... Part III

Replace attrs with attributes in L3 and LBaaS model groupings.
This causes some of transcriber project to be rewritten :-(

Change-Id: I5bcba88aedfb3b0a626e104bcd48d9c469b06381
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 bb7846b8fd22337d3ecf07539c730f0f543b8cf4..e1d8d9b0fefd75917f12546888073a38f436fdf1 100644 (file)
--- a/model/src/main/yang/neutron-L3.yang
+++ b/model/src/main/yang/neutron-L3.yang
@@ -31,7 +31,7 @@ module neutron-L3 {
                 models";
     }
 
-    grouping L3-attrs {
+    grouping L3-attributes {
         leaf distribted {
             description "whether this router is distributed or not.";
             type boolean;
@@ -51,7 +51,7 @@ module neutron-L3 {
         }
     }
 
-    grouping L3-floatingip-attrs {
+    grouping L3-floatingip-attributes {
         leaf uuid {
             type yang:uuid;
             description "UUID to index this object.";
@@ -99,7 +99,7 @@ module neutron-L3 {
         }
     }
 
-    grouping interface-attrs {
+    grouping interface-attributes {
         leaf uuid {
             type yang:uuid;
             description "UUID to index this object.";
@@ -129,7 +129,7 @@ module neutron-L3 {
                 key "uuid";
                 uses attrs:base-attributes;
                 uses attrs:admin-attributes;
-                uses L3-attrs;
+                uses L3-attributes;
                 container external_gateway_info {
                     leaf external-network-id {
                         description "The network_id, for the external gateways. If this is empty, then this
@@ -155,7 +155,7 @@ module neutron-L3 {
                 list interfaces {
                     description "List of interfaces associated with this router object.";
                     key "uuid";
-                    uses interface-attrs;
+                    uses interface-attributes;
                 }
             }
         }
@@ -168,7 +168,7 @@ module neutron-L3 {
                     attached to an internal network.";
 
                 key "uuid";
-                uses L3-floatingip-attrs;
+                uses L3-floatingip-attributes;
             }
         }
     }

diff --git a/model/src/main/yang/neutron-lbaasv2.yang b/model/src/main/yang/neutron-lbaasv2.yang
index bd3c5f855cd461f488aae2ca325bd6fbffc5c7dd..d7cf5f656b849608b9750f838df7725e71eebb1d 100644 (file)
--- a/model/src/main/yang/neutron-lbaasv2.yang
+++ b/model/src/main/yang/neutron-lbaasv2.yang
@@ -31,7 +31,7 @@ module neutron-lbaasv2 {
                 models";
     }
 
-    grouping loadbalancer-attrs {
+    grouping loadbalancer-attributes {
         description "LBaaSV2.0 load balancer attributes.";
         leaf descr {
             type string;
@@ -47,7 +47,7 @@ module neutron-lbaasv2 {
             description "The ID of the subnet on which to allocate the VIP address.";
         }
     }
-    grouping listener-attrs {
+    grouping listener-attributes {
         description "LBaaSV2.0 listener attributes.";
         leaf default-pool-d {
             type yang:uuid;
@@ -95,7 +95,7 @@ module neutron-lbaasv2 {
             default "-1";
         }
     }
-    grouping pool-attrs {
+    grouping pool-attributes {
         leaf admin-state-up {
             type boolean;
             description "The administrative state of the pool, which is up (true) or
@@ -151,7 +151,7 @@ module neutron-lbaasv2 {
             }
         }
     }
-    grouping member-attrs {
+    grouping member-attributes {
         leaf uuid {
             type yang:uuid;
             description "The unique ID for the member.";
@@ -189,7 +189,7 @@ module neutron-lbaasv2 {
             default "true";
         }
     }
-    grouping healthmonitor-attrs {
+    grouping healthmonitor-attributes {
         leaf uuid {
             type yang:uuid;
             description "The unique ID for the healthmonitor.";
@@ -268,7 +268,7 @@ module neutron-lbaasv2 {
                 key "uuid";
                 uses attrs:base-attributes;
                 uses attrs:admin-attributes;
-                uses loadbalancer-attrs;
+                uses loadbalancer-attributes;
                 description "List of Loadbalancers.";
             }
         }
@@ -277,7 +277,7 @@ module neutron-lbaasv2 {
             list listeners {
                 key "uuid";
                 uses attrs:base-attributes;
-                uses listener-attrs;
+                uses listener-attributes;
                 description "List of Listeners";
             }
         }
@@ -286,13 +286,13 @@ module neutron-lbaasv2 {
             list pools {
                 key "uuid";
                 uses attrs:base-attributes;
-                uses pool-attrs;
+                uses pool-attributes;
                 description "List of Pools";
                 container member {
                     description "Container for pool members.";
                     list members {
                         key "uuid";
-                        uses member-attrs;
+                        uses member-attributes;
                         description "List of members.";
                     }
                 }
@@ -302,7 +302,7 @@ module neutron-lbaasv2 {
             description "Container for LBaaSV2.0 healthmonitors.";
             list healthmonitors {
                 key "uuid";
-                uses healthmonitor-attrs;
+                uses healthmonitor-attributes;
                 description "List of healthmonitors.";
             }
         }

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java
index 531ad8be40d8adb8162bf25cdf73ebe6127a61ac..b410f9244f3df92f4a12288c642c127835a20454 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java
@@ -29,8 +29,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev141002.floatingips.attributes.Floatingips;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev141002.floatingips.attributes.floatingips.Floatingip;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev141002.floatingips.attributes.floatingips.FloatingipBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev141002.l3.floatingip.attrs.FixedIpAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev141002.l3.floatingip.attrs.FixedIpAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev141002.l3.floatingip.attributes.FixedIpAddress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev141002.l3.floatingip.attributes.FixedIpAddressBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150325.Neutron;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.osgi.framework.BundleContext;

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
index 7fb136e444642501e23ba32a84c39edcb6a9db34..7d915db232cb8b9e801edfc2472703cbaf33db72 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
@@ -21,7 +21,7 @@ import org.opendaylight.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD;
 import org.opendaylight.neutron.spi.NeutronLoadBalancerHealthMonitor;
 import org.opendaylight.neutron.spi.Neutron_ID;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.HealthmonitorAttrs.Type;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.HealthmonitorAttributes.Type;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.lbaas.attributes.Healthmonitor;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.lbaas.attributes.healthmonitor.Healthmonitors;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.lbaas.attributes.healthmonitor.HealthmonitorsBuilder;

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java
index 469486c6705fd7664ed6f17d49e4a8421aba732e..3acc0d9d40e966a9258a4c4a0764df149d0d4743 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java
@@ -21,7 +21,7 @@ import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerCRUD;
 import org.opendaylight.neutron.spi.NeutronLoadBalancerListener;
 import org.opendaylight.neutron.spi.Neutron_ID;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.ListenerAttrs.Protocol;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.ListenerAttributes.Protocol;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.lbaas.attributes.Listener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.lbaas.attributes.listener.Listeners;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.lbaas.attributes.listener.ListenersBuilder;

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
index b5b1623d108f715572a2afc5ee1a57b5a30b4658..eb61c79514e9edfed6a0224faced037d51e82135 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
@@ -23,11 +23,11 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember;
 import org.opendaylight.neutron.spi.NeutronLoadBalancer_SessionPersistence;
 import org.opendaylight.neutron.spi.Neutron_ID;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.PoolAttrs.Protocol;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.PoolAttributes.Protocol;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.lbaas.attributes.Pool;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.lbaas.attributes.pool.Pools;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.lbaas.attributes.pool.PoolsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.pool.attrs.SessionPersistenceBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev141002.pool.attributes.SessionPersistenceBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150325.Neutron;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.osgi.framework.BundleContext;