Clean up yang model - Part IV

Use attributes instead of attrs in grouping names for
metering and port objects.

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

diff --git a/model/src/main/yang/neutron-metering.yang b/model/src/main/yang/neutron-metering.yang
index bd94c9eb86ea80ccb62224d3d39feddaba2d7b93..d2ca28e6eba104d97d8b7fe46388713cd245bc24 100644 (file)
--- a/model/src/main/yang/neutron-metering.yang
+++ b/model/src/main/yang/neutron-metering.yang
@@ -31,14 +31,14 @@ module neutron-metering {
                 models";
     }
 
-    grouping metering-label-attrs {
+    grouping metering-label-attributes {
         description "OpenStack Layer3 Metering label information.";
         leaf description {
             type string;
             description "Description for the metering label.";
         }
     }
-    grouping metering-rule-attrs {
+    grouping metering-rule-attributes {
         description "OpenStack Layer3 Metering label rules.";
         leaf id {
             type yang:uuid;
@@ -80,7 +80,7 @@ module neutron-metering {
             list metering-label {
                 key "uuid";
                 uses attrs:base-attributes;
-                uses metering-label-attrs;
+                uses metering-label-attributes;
                 description "List of Metering Labels.";
             }
         }
@@ -90,7 +90,7 @@ module neutron-metering {
             description " Container for metering rules.";
             list metering-rule {
                 key "id";
-                uses metering-rule-attrs;
+                uses metering-rule-attributes;
                 description "List of Metering Rules.";
             }
         }

diff --git a/model/src/main/yang/neutron-ports.yang b/model/src/main/yang/neutron-ports.yang
index cc83a5f6196de8d3b61562f1ce6ab2ab95440e6e..8fb37c4ec94e05f7750f2d12062f1badad598a63 100644 (file)
--- a/model/src/main/yang/neutron-ports.yang
+++ b/model/src/main/yang/neutron-ports.yang
@@ -29,7 +29,7 @@ module neutron-ports {
                 "Initial version of Openstack Neutron Ice House Ports model.";
     }
 
-    grouping port-attrs {
+    grouping port-attributes {
         list allowed-address-pairs {
             description "Allowed address pairs for this port. For example: neutron port-create
                         net1 --allowed-address-pairs type=dict list=true mac_address=<mac_address>,ip_address=<ip_cidr>
@@ -103,7 +103,7 @@ module neutron-ports {
                 key "uuid";
                 uses attrs:base-attributes;
                 uses attrs:admin-attributes;
-                uses port-attrs;
+                uses port-attributes;
             }
         }
     }

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelRuleInterface.java
index 00d278fd9fdc4454aeb4cf9ee1e130da8cd970c2..9348ac45c202730b10116a25613cc780b3ef4625 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelRuleInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelRuleInterface.java
@@ -20,7 +20,7 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderCo
 import org.opendaylight.neutron.spi.INeutronMeteringLabelRuleCRUD;
 import org.opendaylight.neutron.spi.NeutronMeteringLabelRule;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.metering.rev141002.MeteringRuleAttrs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.metering.rev141002.MeteringRuleAttributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.metering.rev141002.metering.rules.attributes.MeteringRules;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.metering.rev141002.metering.rules.attributes.metering.rules.MeteringRule;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.metering.rev141002.metering.rules.attributes.metering.rules.MeteringRuleBuilder;
@@ -124,7 +124,7 @@ public class NeutronMeteringLabelRuleInterface extends AbstractNeutronInterface<
             meteringRuleBuilder.setMeteringLabelId(toUuid(meteringLableRule.getMeteringLabelRuleUUID()));
         }
         if (meteringLableRule.getMeteringLabelRuleDirection() != null) {
-            meteringRuleBuilder.setDirection((MeteringRuleAttrs.Direction.valueOf(meteringLableRule
+            meteringRuleBuilder.setDirection((MeteringRuleAttributes.Direction.valueOf(meteringLableRule
                     .getMeteringLabelRuleDirection())));
         }
         if (meteringLableRule.getMeteringLabelRuleRemoteIPPrefix() != null) {

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
index bf9e913582d52bf226d93d8a7cb6207227a32cd1..709e70988c72bebcc006e09f2ba978d70332f435 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
@@ -31,12 +31,12 @@ import org.opendaylight.neutron.spi.NeutronSubnet;
 import org.opendaylight.neutron.spi.Neutron_IPs;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
 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.ports.rev141002.port.attrs.AllowedAddressPairs;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev141002.port.attrs.AllowedAddressPairsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev141002.port.attrs.ExtraDhcpOpts;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev141002.port.attrs.ExtraDhcpOptsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev141002.port.attrs.FixedIps;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev141002.port.attrs.FixedIpsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev141002.port.attributes.AllowedAddressPairs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev141002.port.attributes.AllowedAddressPairsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev141002.port.attributes.ExtraDhcpOpts;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev141002.port.attributes.ExtraDhcpOptsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev141002.port.attributes.FixedIps;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev141002.port.attributes.FixedIpsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev141002.ports.attributes.Ports;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev141002.ports.attributes.ports.Port;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev141002.ports.attributes.ports.PortBuilder;