Clean up yange model - Part V

replace attrs with attributes in securty group, subnets
and vpnaas groupings

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

diff --git a/model/src/main/yang/neutron-secgroups.yang b/model/src/main/yang/neutron-secgroups.yang
index 4d310bb809d140908cda458ea8e45aaf4f28c71d..8d09a0fcbc0d0da4753c2c4f7d7fab7979c1db1c 100644 (file)
--- a/model/src/main/yang/neutron-secgroups.yang
+++ b/model/src/main/yang/neutron-secgroups.yang
@@ -31,14 +31,14 @@ module neutron-secgroups {
                 models";
     }
 
-    grouping security-group-attrs {
+    grouping security-group-attributes {
         description "OpenStack Layer3 Security group information.";
         leaf description {
             type string;
             description "Description for the security group.";
         }
     }
-    grouping security-rule-attrs {
+    grouping security-rule-attributes {
         description "OpenStack Layer3 Security Group rules.";
         leaf id {
             type yang:uuid;
@@ -131,7 +131,7 @@ module neutron-secgroups {
             list security-group {
                 key "uuid";
                 uses attrs:base-attributes;
-                uses security-group-attrs;
+                uses security-group-attributes;
                 description "List of Metering Labels.";
                 leaf-list security-rules {
                     type yang:uuid;
@@ -145,7 +145,7 @@ module neutron-secgroups {
             description "Container for security group rules.";
             list security-rule {
                 key "id";
-                uses security-rule-attrs;
+                uses security-rule-attributes;
                 description "List of Security Group Rules.";
             }
         }

diff --git a/model/src/main/yang/neutron-subnets.yang b/model/src/main/yang/neutron-subnets.yang
index f2958c70824da7767bfb511c209830d8fe0501da..1356618ffac268a7e061d59c9ec6f351beb9bd91 100644 (file)
--- a/model/src/main/yang/neutron-subnets.yang
+++ b/model/src/main/yang/neutron-subnets.yang
@@ -29,7 +29,7 @@ module neutron-subnets {
                 "Initial version of Openstack Neutron Ice House Subnets model.";
     }
 
-    grouping subnet-attrs {
+    grouping subnet-attributes {
         leaf network-id {
             type yang:uuid;
             description "network this subnet is associated with.";
@@ -115,7 +115,7 @@ module neutron-subnets {
             list subnet {
                 key "uuid";
                 uses attrs:base-attributes;
-                uses subnet-attrs;
+                uses subnet-attributes;
             }
         }
     }

diff --git a/model/src/main/yang/neutron-vpnaas.yang b/model/src/main/yang/neutron-vpnaas.yang
index d9a479efe0ea8c2f27b2b54dbe7aa52745126556..0a8796c5813f3b74d8f2e8807b197a3d63b846b0 100644 (file)
--- a/model/src/main/yang/neutron-vpnaas.yang
+++ b/model/src/main/yang/neutron-vpnaas.yang
@@ -27,7 +27,7 @@ module neutron-vpnaas {
                 "Initial version";
     }
 
-    grouping vpnservices-attrs {
+    grouping vpnservices-attributes {
         leaf descr {
             type string;
             description "Detailed description of the vpn service.";
@@ -42,7 +42,7 @@ module neutron-vpnaas {
         }
     }
 
-    grouping ikepolicy-attrs {
+    grouping ikepolicy-attributes {
         leaf descr {
             type string;
             description "Detailed description of the ike policy.";
@@ -80,7 +80,7 @@ module neutron-vpnaas {
         }
     }
 
-    grouping ipsecpolicy-attrs {
+    grouping ipsecpolicy-attributes {
         leaf descr {
             type string;
             description "Detailed description of the ipsec policy.";
@@ -118,7 +118,7 @@ module neutron-vpnaas {
         }
     }
 
-    grouping ipsecconnection-attrs {
+    grouping ipsecconnection-attributes {
         leaf descr {
             type string;
             description "Detailed description of the ipsec policy.";
@@ -190,21 +190,21 @@ module neutron-vpnaas {
                 key "uuid";
                 uses attrs:base-attributes;
                 uses attrs:admin-attributes;
-                uses vpnservices-attrs;
+                uses vpnservices-attributes;
             }
         }
         container ike-policies {
             list ike-policy {
                 key "uuid";
                 uses attrs:base-attributes;
-                uses ikepolicy-attrs;
+                uses ikepolicy-attributes;
             }
         }
         container ipsec-policies {
             list ipsec-policy {
                 key "uuid";
                 uses attrs:base-attributes;
-                uses ipsecpolicy-attrs;
+                uses ipsecpolicy-attributes;
             }
         }
         container ipsec-site-connections {
@@ -212,7 +212,7 @@ module neutron-vpnaas {
                 key "uuid";
                 uses attrs:base-attributes;
                 uses attrs:admin-attributes;
-                uses ipsecconnection-attrs;
+                uses ipsecconnection-attributes;
             }
         }
     }

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
index 3d1f3081850d4478d841f96e16ef59b083b47c02..7f48c9f699706e0ad2bbee4a12186fbbf84b0035 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
@@ -25,7 +25,7 @@ import org.opendaylight.neutron.spi.NeutronSecurityGroup;
 import org.opendaylight.neutron.spi.NeutronSecurityRule;
 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.rev150325.Neutron;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.SecurityRuleAttrs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.SecurityRuleAttributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.security.rules.attributes.SecurityRules;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.security.rules.attributes.security.rules.SecurityRule;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.security.rules.attributes.security.rules.SecurityRuleBuilder;
@@ -156,7 +156,7 @@ public class NeutronSecurityRuleInterface extends AbstractNeutronInterface<Secur
         }
         if (securityRule.getSecurityRuleDirection() != null) {
             boolean foundMatch = false;
-            for (SecurityRuleAttrs.Direction direction : SecurityRuleAttrs.Direction.values()) {
+            for (SecurityRuleAttributes.Direction direction : SecurityRuleAttributes.Direction.values()) {
                 if (direction.toString().equalsIgnoreCase(securityRule.getSecurityRuleDirection())) {
                     securityRuleBuilder.setDirection(direction);
                     foundMatch = true;
@@ -179,9 +179,9 @@ public class NeutronSecurityRuleInterface extends AbstractNeutronInterface<Secur
         }
         if (securityRule.getSecurityRuleProtocol() != null) {
             boolean foundMatch = false;
-            for (SecurityRuleAttrs.Protocol.Enumeration protocol : SecurityRuleAttrs.Protocol.Enumeration.values()) {
+            for (SecurityRuleAttributes.Protocol.Enumeration protocol : SecurityRuleAttributes.Protocol.Enumeration.values()) {
                 if (protocol.toString().equalsIgnoreCase(securityRule.getSecurityRuleProtocol())) {
-                    securityRuleBuilder.setProtocol(new SecurityRuleAttrs.Protocol(protocol));
+                    securityRuleBuilder.setProtocol(new SecurityRuleAttributes.Protocol(protocol));
                     foundMatch = true;
                     break;
                 }
@@ -189,7 +189,7 @@ public class NeutronSecurityRuleInterface extends AbstractNeutronInterface<Secur
             if (!foundMatch) {
                 try {
                     java.lang.Short protocol = Short.valueOf(securityRule.getSecurityRuleProtocol());
-                    securityRuleBuilder.setProtocol(new SecurityRuleAttrs.Protocol(protocol));
+                    securityRuleBuilder.setProtocol(new SecurityRuleAttributes.Protocol(protocol));
                 } catch (NumberFormatException e) {
                     LOGGER.warn("Unable to find protocol value for {}", securityRule.getSecurityRuleProtocol());
                 }
@@ -197,7 +197,7 @@ public class NeutronSecurityRuleInterface extends AbstractNeutronInterface<Secur
         }
         if (securityRule.getSecurityRuleEthertype() != null) {
             boolean foundMatch = false;
-            for (SecurityRuleAttrs.Ethertype etherType : SecurityRuleAttrs.Ethertype.values()) {
+            for (SecurityRuleAttributes.Ethertype etherType : SecurityRuleAttributes.Ethertype.values()) {
                 if (etherType.toString().equalsIgnoreCase(securityRule.getSecurityRuleEthertype())) {
                     securityRuleBuilder.setEthertype(etherType);
                     foundMatch = true;

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
index d94b4ae64e3a122e8eb0961f61721c3408530717..4011e67df5ecbd7859a353b62917d40b2d4fdadc 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
@@ -25,9 +25,9 @@ import org.opendaylight.neutron.spi.NeutronSubnet;
 import org.opendaylight.neutron.spi.NeutronSubnetIPAllocationPool;
 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.rev150325.Neutron;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev141002.SubnetAttrs;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev141002.subnet.attrs.AllocationPools;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev141002.subnet.attrs.AllocationPoolsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev141002.SubnetAttributes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev141002.subnet.attributes.AllocationPools;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev141002.subnet.attributes.AllocationPoolsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev141002.subnets.attributes.Subnets;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev141002.subnets.attributes.subnets.Subnet;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev141002.subnets.attributes.subnets.SubnetBuilder;
@@ -143,7 +143,7 @@ public class NeutronSubnetInterface extends AbstractNeutronInterface<Subnet, Neu
                         subnetBuilder.setNetworkId(toUuid(subnet.getNetworkUUID()));
                 }
                 if (subnet.getIpVersion() != null) {
-                        subnetBuilder.setIpVersion(SubnetAttrs.IpVersion.forValue(subnet
+                        subnetBuilder.setIpVersion(SubnetAttributes.IpVersion.forValue(subnet
                                         .getIpVersion()));
                 }
                 if (subnet.getCidr() != null) {
@@ -156,7 +156,7 @@ public class NeutronSubnetInterface extends AbstractNeutronInterface<Subnet, Neu
                 }
                 if (subnet.getIpV6RaMode() != null) {
                     boolean foundMatch = false;
-                    for (SubnetAttrs.Ipv6RaMode ipv6RaMode : SubnetAttrs.Ipv6RaMode.values()) {
+                    for (SubnetAttributes.Ipv6RaMode ipv6RaMode : SubnetAttributes.Ipv6RaMode.values()) {
                         if (ipv6RaMode.toString().equalsIgnoreCase(subnet.getIpV6RaMode())) {
                             subnetBuilder.setIpv6RaMode(ipv6RaMode);
                             foundMatch = true;
@@ -169,7 +169,7 @@ public class NeutronSubnetInterface extends AbstractNeutronInterface<Subnet, Neu
                 }
                 if (subnet.getIpV6AddressMode() != null) {
                     boolean foundMatch = false;
-                    for (SubnetAttrs.Ipv6AddressMode ipv6AddressMode : SubnetAttrs.Ipv6AddressMode.values()) {
+                    for (SubnetAttributes.Ipv6AddressMode ipv6AddressMode : SubnetAttributes.Ipv6AddressMode.values()) {
                         if (ipv6AddressMode.toString().equalsIgnoreCase(subnet.getIpV6AddressMode())) {
                             subnetBuilder.setIpv6AddressMode(ipv6AddressMode);
                             foundMatch = true;

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIKEPolicyInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIKEPolicyInterface.java
index 4a350dfd5a91bef8ef1bb958f8d181b7f380bc37..058a917dbd4b4e78ec0efdff4a3ee96636c05bf5 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIKEPolicyInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIKEPolicyInterface.java
@@ -20,7 +20,7 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderCo
 import org.opendaylight.neutron.spi.INeutronVPNIKEPolicyCRUD;
 import org.opendaylight.neutron.spi.NeutronVPNIKEPolicy;
 import org.opendaylight.neutron.spi.NeutronVPNLifetime;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.ikepolicy.attrs.LifetimeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.ikepolicy.attributes.LifetimeBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnaas.attributes.IkePolicies;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnaas.attributes.ike.policies.IkePolicy;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnaas.attributes.ike.policies.IkePolicyBuilder;

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIPSECPolicyInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIPSECPolicyInterface.java
index fd7cd9fc492d5dbe3309b21b869d47798376ad91..1cd61b762e43776a169f1c585801b40a6855e114 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIPSECPolicyInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIPSECPolicyInterface.java
@@ -20,7 +20,7 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderCo
 import org.opendaylight.neutron.spi.INeutronVPNIPSECPolicyCRUD;
 import org.opendaylight.neutron.spi.NeutronVPNIPSECPolicy;
 import org.opendaylight.neutron.spi.NeutronVPNLifetime;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.ipsecpolicy.attrs.LifetimeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.ipsecpolicy.attributes.LifetimeBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnaas.attributes.IpsecPolicies;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnaas.attributes.ipsec.policies.IpsecPolicy;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnaas.attributes.ipsec.policies.IpsecPolicyBuilder;

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIPSECSiteConnectionsInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIPSECSiteConnectionsInterface.java
index 6166ed5965efee4b155b95e7fb1e098a9a34acf3..75b2d2647468c6166cb56e02e2169e4d7cb66ced 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIPSECSiteConnectionsInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIPSECSiteConnectionsInterface.java
@@ -19,7 +19,7 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderCo
 import org.opendaylight.neutron.spi.INeutronVPNIPSECSiteConnectionsCRUD;
 import org.opendaylight.neutron.spi.NeutronVPNDeadPeerDetection;
 import org.opendaylight.neutron.spi.NeutronVPNIPSECSiteConnection;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.ipsecconnection.attrs.DpdBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.ipsecconnection.attributes.DpdBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnaas.attributes.IpsecSiteConnections;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnaas.attributes.ipsec.site.connections.IpsecSiteConnection;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnaas.attributes.ipsec.site.connections.IpsecSiteConnectionBuilder;