spi: consolidate common member 32/46432/4
authorIsaku Yamahata <isaku.yamahata@intel.com>
Fri, 30 Sep 2016 06:10:59 +0000 (23:10 -0700)
committerIsaku Yamahata <isaku.yamahata@intel.com>
Tue, 4 Oct 2016 06:14:41 +0000 (23:14 -0700)
Since some fields are common to neutron resource, name, status, admin_state_up,
introduce common parent interfaces/classes to consolidate them.

Change-Id: Ie8b654010f0cf780eaa958b49d38b1ed72847961
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
60 files changed:
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronAdminAttributes.java [new file with mode: 0644]
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronBaseAttributes.java [new file with mode: 0644]
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronAdminAttributes.java [new file with mode: 0644]
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBaseAttributes.java [new file with mode: 0644]
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBgpvpn.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gateway.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabel.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifier.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortChain.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPair.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroup.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIKEPolicy.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIPSECPolicy.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIPSECSiteConnection.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNService.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFirewallJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkQosJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronQosJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityGroupJAXBTest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronBgpvpnsNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelsNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronQosPolicyNorthbound.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronBgpvpnInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronL2gatewayInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronQosPolicyInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronAdminAttributes.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronAdminAttributes.java
new file mode 100644 (file)
index 0000000..589dfc1
--- /dev/null
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2016 Intel Coporporation  All rights reserved.
+ * Copyright (c) 2016 Isaku Yamahata  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.neutron.spi;
+
+/**
+ * This class contains behaviour common to Neutron configuration objects
+ */
+public interface INeutronAdminAttributes<T extends INeutronAdminAttributes> extends INeutronBaseAttributes<T> {
+    Boolean getAdminStateUp();
+
+    void setAdminStateUp(Boolean adminStateUp);
+
+    String getStatus();
+
+    void setStatus(String status);
+}
diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronBaseAttributes.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronBaseAttributes.java
new file mode 100644 (file)
index 0000000..40a3718
--- /dev/null
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2016 Intel Corporation  All rights reserved.
+ * Copyright (c) 2016 Isaku Yamahata  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.neutron.spi;
+
+/**
+ * This class contains behaviour common to Neutron configuration objects
+ */
+public interface INeutronBaseAttributes<T extends INeutronBaseAttributes> extends INeutronObject<T> {
+    String getName();
+
+    void setName(String name);
+}
diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronAdminAttributes.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronAdminAttributes.java
new file mode 100644 (file)
index 0000000..0b1f701
--- /dev/null
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016 Intel Corporation  All rights reserved.
+ * Copyright (c) 2016 Isaku Yamahata  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.neutron.spi;
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.NONE)
+public abstract class NeutronAdminAttributes<T extends NeutronAdminAttributes> extends NeutronBaseAttributes<T>
+        implements Serializable, INeutronAdminAttributes<T> {
+    private static final long serialVersionUID = 1L;
+
+    @XmlElement(defaultValue = "true", name = "admin_state_up")
+    Boolean adminStateUp;
+
+    @XmlElement(name = "status")
+    String status;
+
+    public NeutronAdminAttributes() {
+        super();
+    }
+
+    public Boolean getAdminStateUp() {
+        return adminStateUp;
+    }
+
+    public void setAdminStateUp(Boolean adminStateUp) {
+        this.adminStateUp = adminStateUp;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    @Override
+    protected void extractField(String field, T ans) {
+        super.extractField(field, ans);
+        if (field.equals("admin_state_up")) {
+            ans.setAdminStateUp(this.getAdminStateUp());
+        }
+        if (field.equals("status")) {
+            ans.setStatus(this.getStatus());
+        }
+    }
+}
diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBaseAttributes.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBaseAttributes.java
new file mode 100644 (file)
index 0000000..9dd115f
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2016 Intel Corporation  All rights reserved.
+ * Copyright (c) 2016 Isaku Yamahata  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.neutron.spi;
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.NONE)
+public abstract class NeutronBaseAttributes<T extends NeutronBaseAttributes> extends NeutronObject<T>
+        implements Serializable, INeutronBaseAttributes<T> {
+    private static final long serialVersionUID = 1L;
+
+    @XmlElement(name = "name")
+    String name;
+
+    public NeutronBaseAttributes() {
+        super();
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    protected void extractField(String field, T ans) {
+        super.extractField(field, ans);
+        if (field.equals("name")) {
+            ans.setName(this.getName());
+        }
+    }
+}
index 1a0db7d793206a4f76e41c364991d166a3ef7ae1..3ca50f0ba53235ef986544674cff03500e16548a 100644 (file)
@@ -17,22 +17,12 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "bgpvpn")
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronBgpvpn extends NeutronObject<NeutronBgpvpn>
-        implements Serializable, INeutronObject<NeutronBgpvpn> {
+public final class NeutronBgpvpn extends NeutronAdminAttributes<NeutronBgpvpn> implements Serializable {
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(name = "name")
-    String bgpvpnName;
-
-    @XmlElement(defaultValue = "true", name = "admin_state_up")
-    Boolean adminStateUp;
-
-    @XmlElement(name = "status")
-    String status;
-
     @XmlElement(defaultValue = "l3", name = "type")
     String type;
 
@@ -85,34 +75,10 @@ public final class NeutronBgpvpn extends NeutronObject<NeutronBgpvpn>
         }
     }
 
-    public String getBgpvpnName() {
-        return bgpvpnName;
-    }
-
-    public void setBgpvpnName(String bgpvpnName) {
-        this.bgpvpnName = bgpvpnName;
-    }
-
     public boolean isAdminStateUp() {
         return adminStateUp;
     }
 
-    public Boolean getAdminStateUp() {
-        return adminStateUp;
-    }
-
-    public void setAdminStateUp(boolean newValue) {
-        adminStateUp = newValue;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
     public boolean isAutoAggregate() {
         return autoAggregate;
     }
@@ -259,15 +225,6 @@ public final class NeutronBgpvpn extends NeutronObject<NeutronBgpvpn>
         NeutronBgpvpn ans = new NeutronBgpvpn();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setBgpvpnName(this.getBgpvpnName());
-            }
-            if (s.equals("admin_state_up")) {
-                ans.setAdminStateUp(adminStateUp);
-            }
-            if (s.equals("status")) {
-                ans.setStatus(this.getStatus());
-            }
             if (s.equals("type")) {
                 ans.setType(this.getType());
             }
@@ -304,7 +261,7 @@ public final class NeutronBgpvpn extends NeutronObject<NeutronBgpvpn>
 
     @Override
     public String toString() {
-        return "NeutronBgpvpn [bgpvpnUUID=" + uuid + ", bgpvpnName=" + bgpvpnName + ", adminStateUp=" + adminStateUp
+        return "NeutronBgpvpn [bgpvpnUUID=" + uuid + ", bgpvpnName=" + name + ", adminStateUp=" + adminStateUp
                 + ", status=" + status + ", tenantID=" + tenantID + ", type=" + type + ", technique=" + technique
                 + ", routeTargets=" + routeTargets + ", importTargets=" + importTargets + ", exportTargets="
                 + exportTargets + ", routeDistinguishers=" + routeDistinguishers + ", vnid = " + vnid
index ea3f156c6c3bb3d809617795e66d45639bf0f36a..565a23f5f177626db491b12beded62f8d826da1c 100644 (file)
@@ -33,13 +33,9 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronFirewall extends NeutronObject<NeutronFirewall>
-        implements Serializable, INeutronObject<NeutronFirewall> {
+public final class NeutronFirewall extends NeutronBaseAttributes<NeutronFirewall> implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(name = "name")
-    String firewallName;
-
     @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean firewallAdminStateIsUp;
 
@@ -49,14 +45,6 @@ public final class NeutronFirewall extends NeutronObject<NeutronFirewall>
     @XmlElement(name = "firewall_policy_id")
     String neutronFirewallPolicyID;
 
-    public String getFirewallName() {
-        return firewallName;
-    }
-
-    public void setFirewallName(String firewallName) {
-        this.firewallName = firewallName;
-    }
-
     public Boolean getFirewallAdminStateIsUp() {
         return firewallAdminStateIsUp;
     }
@@ -85,9 +73,6 @@ public final class NeutronFirewall extends NeutronObject<NeutronFirewall>
         NeutronFirewall ans = new NeutronFirewall();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setFirewallName(this.getFirewallName());
-            }
             if (s.equals("admin_state_up")) {
                 ans.setFirewallAdminStateIsUp(firewallAdminStateIsUp);
             }
@@ -104,7 +89,7 @@ public final class NeutronFirewall extends NeutronObject<NeutronFirewall>
     @Override
     public String toString() {
         return "NeutronFirewall{" + "firewallUUID='" + uuid + '\'' + ", firewallTenantID='" + tenantID + '\''
-                + ", firewallName='" + firewallName + '\'' + ", firewallAdminStateIsUp=" + firewallAdminStateIsUp
+                + ", firewallName='" + name + '\'' + ", firewallAdminStateIsUp=" + firewallAdminStateIsUp
                 + ", firewallIsShared=" + firewallIsShared + ", firewallRulePolicyID=" + neutronFirewallPolicyID + '}';
     }
 }
index 51fb06aafffb25644cbb473090e3c5f81be1daec..872fef78de33312ab3d3c6c50199c8ff25f00063 100644 (file)
@@ -32,13 +32,9 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronFirewallPolicy extends NeutronObject<NeutronFirewallPolicy>
-        implements Serializable, INeutronObject<NeutronFirewallPolicy> {
+public final class NeutronFirewallPolicy extends NeutronBaseAttributes<NeutronFirewallPolicy> implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(name = "name")
-    String firewallPolicyName;
-
     @XmlElement(defaultValue = "false", name = "shared")
     Boolean firewallPolicyIsShared;
 
@@ -61,21 +57,10 @@ public final class NeutronFirewallPolicy extends NeutronObject<NeutronFirewallPo
         this.firewallPolicyIsShared = firewallPolicyIsShared;
     }
 
-    public String getFirewallPolicyName() {
-        return firewallPolicyName;
-    }
-
-    public void setFirewallPolicyName(String firewallPolicyName) {
-        this.firewallPolicyName = firewallPolicyName;
-    }
-
     public NeutronFirewallPolicy extractFields(List<String> fields) {
         NeutronFirewallPolicy ans = new NeutronFirewallPolicy();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setFirewallPolicyName(this.getFirewallPolicyName());
-            }
             if (s.equals("shared")) {
                 ans.setFirewallPolicyIsShared(firewallPolicyIsShared);
             }
@@ -89,7 +74,7 @@ public final class NeutronFirewallPolicy extends NeutronObject<NeutronFirewallPo
     @Override
     public String toString() {
         return "NeutronFirewallPolicy{" + "firewallPolicyUUID='" + uuid + '\'' + ", firewallPolicyTenantID='" + tenantID
-                + '\'' + ", firewallPolicyName='" + firewallPolicyName + '\'' + ", firewallPolicyIsShared="
+                + '\'' + ", firewallPolicyName='" + name + '\'' + ", firewallPolicyIsShared="
                 + firewallPolicyIsShared + ", firewallPolicyIsAudited='" + firewallPolicyIsAudited + '\'' + '}';
     }
 }
index a7d357781e875f77565f3a4fe9843a5446c43d91..360f9cb7c4abe8000bc4edd4f1105c5927d16133 100644 (file)
@@ -44,13 +44,9 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronFirewallRule extends NeutronObject<NeutronFirewallRule>
-        implements Serializable, INeutronObject<NeutronFirewallRule> {
+public final class NeutronFirewallRule extends NeutronBaseAttributes<NeutronFirewallRule> implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(name = "name")
-    String firewallRuleName;
-
     @XmlElement(defaultValue = "false", name = "shared")
     Boolean firewallRuleIsShared;
 
@@ -194,21 +190,10 @@ public final class NeutronFirewallRule extends NeutronObject<NeutronFirewallRule
         this.firewallRuleIsShared = firewallRuleIsShared;
     }
 
-    public String getFirewallRuleName() {
-        return firewallRuleName;
-    }
-
-    public void setFirewallRuleName(String firewallRuleName) {
-        this.firewallRuleName = firewallRuleName;
-    }
-
     public NeutronFirewallRule extractFields(List<String> fields) {
         NeutronFirewallRule ans = new NeutronFirewallRule();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setFirewallRuleName(this.getFirewallRuleName());
-            }
             if (s.equals("shared")) {
                 ans.setFirewallRuleIsShared(firewallRuleIsShared);
             }
@@ -253,7 +238,7 @@ public final class NeutronFirewallRule extends NeutronObject<NeutronFirewallRule
     @Override
     public String toString() {
         return "firewallPolicyRules{" + "firewallRuleUUID='" + uuid + '\'' + ", firewallRuleTenantID='" + tenantID
-                + '\'' + ", firewallRuleName='" + firewallRuleName + '\'' + ", firewallRuleIsShared="
+                + '\'' + ", firewallRuleName='" + name + '\'' + ", firewallRuleIsShared="
                 + firewallRuleIsShared + ", firewallRulePolicyID=" + firewallRulePolicyID + ", firewallRuleProtocol='"
                 + firewallRuleProtocol + '\'' + ", firewallRuleIpVer=" + firewallRuleIpVer + ", firewallRuleSrcIpAddr='"
                 + firewallRuleSrcIpAddr + '\'' + ", firewallRuleDstIpAddr='" + firewallRuleDstIpAddr + '\''
index 703b6f2aa02bfaceb6c2cce9c9cd1c0a617dedcf..cb9dcae9383a09d48fe5afff56a277522563f528 100644 (file)
@@ -15,24 +15,13 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "l2gateway")
-public final class NeutronL2gateway extends NeutronObject<NeutronL2gateway>
-        implements Serializable, INeutronObject<NeutronL2gateway> {
+public final class NeutronL2gateway extends NeutronBaseAttributes<NeutronL2gateway>
+        implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(name = "name")
-    String l2gatewayName;
-
     @XmlElement(name = "devices")
     List<NeutronL2gatewayDevice> neutronL2gatewayDevices;
 
-    public String getL2gatewayName() {
-        return l2gatewayName;
-    }
-
-    public void setL2gatewayName(String l2gatewayName) {
-        this.l2gatewayName = l2gatewayName;
-    }
-
     public List<NeutronL2gatewayDevice> getNeutronL2gatewayDevices() {
         return neutronL2gatewayDevices;
     }
@@ -45,9 +34,6 @@ public final class NeutronL2gateway extends NeutronObject<NeutronL2gateway>
         NeutronL2gateway ans = new NeutronL2gateway();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setL2gatewayName(this.getL2gatewayName());
-            }
             if (s.equals("devices")) {
                 List<NeutronL2gatewayDevice> devices = new ArrayList<NeutronL2gatewayDevice>();
                 devices.addAll(this.getNeutronL2gatewayDevices());
@@ -59,7 +45,7 @@ public final class NeutronL2gateway extends NeutronObject<NeutronL2gateway>
 
     @Override
     public String toString() {
-        return "NeutronL2Gateway [" + "id = " + uuid + ", name = " + l2gatewayName + ", tenant_id = " + tenantID
+        return "NeutronL2Gateway [" + "id = " + uuid + ", name = " + name + ", tenant_id = " + tenantID
                 + ", devices = " + neutronL2gatewayDevices + "]";
     }
 
index 9da189c52a8b96ca2ac3636fd67a80b660c33e33..4f25036774ae672c372e0a59123cf9c9fe85cb1d 100644 (file)
@@ -32,49 +32,15 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronLoadBalancer extends NeutronObject<NeutronLoadBalancer>
-        implements Serializable, INeutronObject<NeutronLoadBalancer> {
+public final class NeutronLoadBalancer extends NeutronAdminAttributes<NeutronLoadBalancer> implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(name = "name")
-    String loadBalancerName;
-
-    @XmlElement(name = "status")
-    String loadBalancerStatus;
-
-    @XmlElement(name = "admin_state_up")
-    Boolean loadBalancerAdminStateUp;
-
     @XmlElement(name = "vip_address")
     String loadBalancerVipAddress;
 
     @XmlElement(name = "vip_subnet_id")
     String loadBalancerVipSubnetID;
 
-    public String getLoadBalancerName() {
-        return loadBalancerName;
-    }
-
-    public void setLoadBalancerName(String loadBalancerName) {
-        this.loadBalancerName = loadBalancerName;
-    }
-
-    public String getLoadBalancerStatus() {
-        return loadBalancerStatus;
-    }
-
-    public void setLoadBalancerStatus(String loadBalancerStatus) {
-        this.loadBalancerStatus = loadBalancerStatus;
-    }
-
-    public Boolean getLoadBalancerAdminStateUp() {
-        return loadBalancerAdminStateUp;
-    }
-
-    public void setLoadBalancerAdminStateUp(Boolean loadBalancerAdminStateUp) {
-        this.loadBalancerAdminStateUp = loadBalancerAdminStateUp;
-    }
-
     public String getLoadBalancerVipAddress() {
         return loadBalancerVipAddress;
     }
@@ -95,21 +61,12 @@ public final class NeutronLoadBalancer extends NeutronObject<NeutronLoadBalancer
         NeutronLoadBalancer ans = new NeutronLoadBalancer();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setLoadBalancerName(this.getLoadBalancerName());
-            }
             if (s.equals("vip_address")) {
                 ans.setLoadBalancerVipAddress(this.getLoadBalancerVipAddress());
             }
             if (s.equals("vip_subnet_id")) {
                 ans.setLoadBalancerVipSubnetID(this.getLoadBalancerVipSubnetID());
             }
-            if (s.equals("status")) {
-                ans.setLoadBalancerStatus(this.getLoadBalancerStatus());
-            }
-            if (s.equals("admin_state_up")) {
-                ans.setLoadBalancerAdminStateUp(this.getLoadBalancerAdminStateUp());
-            }
         }
         return ans;
     }
@@ -117,8 +74,8 @@ public final class NeutronLoadBalancer extends NeutronObject<NeutronLoadBalancer
     @Override
     public String toString() {
         return "NeutronLoadBalancer{" + "loadBalancerID='" + uuid + '\'' + ", loadBalancerTenantID='" + tenantID + '\''
-                + ", loadBalancerName='" + loadBalancerName + '\'' + ", loadBalancerStatus='" + loadBalancerStatus
-                + '\'' + ", loadBalancerAdminStateUp='" + loadBalancerAdminStateUp + '\'' + ", loadBalancerVipAddress='"
+                + ", loadBalancerName='" + name + '\'' + ", loadBalancerStatus='" + status
+                + '\'' + ", loadBalancerAdminStateUp='" + adminStateUp + '\'' + ", loadBalancerVipAddress='"
                 + loadBalancerVipAddress + '\'' + ", loadBalancerVipSubnetID='" + loadBalancerVipSubnetID + '\'' + '}';
     }
 }
index 6079e7f490d6543edc359517a41d23e34cd14f75..f70df61214018c9df0ede47dc43eb2beee77d5fa 100644 (file)
@@ -37,8 +37,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronLoadBalancerListener extends NeutronObject<NeutronLoadBalancerListener>
-        implements Serializable, INeutronObject<NeutronLoadBalancerListener> {
+public final class NeutronLoadBalancerListener extends NeutronBaseAttributes<NeutronLoadBalancerListener>
+        implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "default_pool_id")
@@ -47,9 +47,6 @@ public final class NeutronLoadBalancerListener extends NeutronObject<NeutronLoad
     @XmlElement(name = "connection_limit")
     Integer neutronLoadBalancerListenerConnectionLimit;
 
-    @XmlElement(name = "name")
-    String loadBalancerListenerName;
-
     @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean loadBalancerListenerAdminStateIsUp;
 
@@ -62,14 +59,6 @@ public final class NeutronLoadBalancerListener extends NeutronObject<NeutronLoad
     @XmlElement(name = "load_balancers")
     List<Neutron_ID> neutronLoadBalancerListenerLoadBalancerIDs;
 
-    public String getLoadBalancerListenerName() {
-        return loadBalancerListenerName;
-    }
-
-    public void setLoadBalancerListenerName(String loadBalancerListenerName) {
-        this.loadBalancerListenerName = loadBalancerListenerName;
-    }
-
     public Boolean getLoadBalancerListenerAdminStateIsUp() {
         return loadBalancerListenerAdminStateIsUp;
     }
@@ -126,9 +115,6 @@ public final class NeutronLoadBalancerListener extends NeutronObject<NeutronLoad
             if (s.equals("default_pool_id")) {
                 ans.setNeutronLoadBalancerListenerDefaultPoolID(this.getNeutronLoadBalancerListenerDefaultPoolID());
             }
-            if (s.equals("name")) {
-                ans.setLoadBalancerListenerName(this.getLoadBalancerListenerName());
-            }
             if (s.equals("protocol")) {
                 ans.setNeutronLoadBalancerListenerProtocol(this.getNeutronLoadBalancerListenerProtocol());
             }
@@ -148,7 +134,7 @@ public final class NeutronLoadBalancerListener extends NeutronObject<NeutronLoad
                 + ", neutronLoadBalancerListenerDefaultPoolID='" + neutronLoadBalancerListenerDefaultPoolID + '\''
                 + ", neutronLoadBalancerListenerConnectionLimit='" + neutronLoadBalancerListenerConnectionLimit + '\''
                 + ", loadBalancerListenerTenantID='" + tenantID + '\'' + ", loadBalancerListenerName='"
-                + loadBalancerListenerName + '\'' + ", loadBalancerListenerAdminStateIsUp="
+                + name + '\'' + ", loadBalancerListenerAdminStateIsUp="
                 + loadBalancerListenerAdminStateIsUp + ", neutronLoadBalancerListenerProtocol='"
                 + neutronLoadBalancerListenerProtocol + '\'' + ", neutronLoadBalancerListenerProtocolPort='"
                 + neutronLoadBalancerListenerProtocolPort + '\'' + '}';
index b394dfbe2cc7d5b74f5d08a1fc7ac139b10b3c19..adba5d3f61a4912be8a5ef499207a148f4e0d3d8 100644 (file)
@@ -36,13 +36,10 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronLoadBalancerPool extends NeutronObject<NeutronLoadBalancerPool>
-        implements Serializable, INeutronObject<NeutronLoadBalancerPool> {
+public final class NeutronLoadBalancerPool extends NeutronBaseAttributes<NeutronLoadBalancerPool>
+        implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(name = "name")
-    String loadBalancerPoolName;
-
     @XmlElement(name = "protocol")
     String loadBalancerPoolProtocol;
 
@@ -68,14 +65,6 @@ public final class NeutronLoadBalancerPool extends NeutronObject<NeutronLoadBala
         loadBalancerPoolMembers = new ArrayList<>();
     }
 
-    public String getLoadBalancerPoolName() {
-        return loadBalancerPoolName;
-    }
-
-    public void setLoadBalancerPoolName(String loadBalancerPoolName) {
-        this.loadBalancerPoolName = loadBalancerPoolName;
-    }
-
     public String getLoadBalancerPoolProtocol() {
         return loadBalancerPoolProtocol;
     }
@@ -164,9 +153,6 @@ public final class NeutronLoadBalancerPool extends NeutronObject<NeutronLoadBala
         NeutronLoadBalancerPool ans = new NeutronLoadBalancerPool();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setLoadBalancerPoolName(this.getLoadBalancerPoolName());
-            }
             if (s.equals("protocol")) {
                 ans.setLoadBalancerPoolProtocol(this.getLoadBalancerPoolProtocol());
             }
@@ -189,7 +175,7 @@ public final class NeutronLoadBalancerPool extends NeutronObject<NeutronLoadBala
     @Override
     public String toString() {
         return "NeutronLoadBalancerPool{" + "id='" + uuid + '\'' + ", tenantID='" + tenantID + '\'' + ", name='"
-                + loadBalancerPoolName + '\'' + ", protocol=" + loadBalancerPoolProtocol + '\'' + ", lbAlgorithm='"
+                + name + '\'' + ", protocol=" + loadBalancerPoolProtocol + '\'' + ", lbAlgorithm='"
                 + loadBalancerPoolLbAlgorithm + '\'' + ", healthmonitorID=" + neutronLoadBalancerPoolHealthMonitorID
                 + ", adminStateUp=" + loadBalancerPoolAdminStateIsUp + '}';
      // todo: add loadBalancerPoolMembers as joined string
index fa23b5b041ff829aeccc853aa6df9ae3b9b6b88d..8316f13a5663aea42cb967ec0cc42cbae1e51f20 100644 (file)
@@ -17,13 +17,9 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronMeteringLabel extends NeutronObject<NeutronMeteringLabel>
-        implements Serializable, INeutronObject<NeutronMeteringLabel> {
+public final class NeutronMeteringLabel extends NeutronBaseAttributes<NeutronMeteringLabel> implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(name = "name")
-    String meteringLabelName;
-
     @XmlElement(defaultValue = "false", name = "shared")
     Boolean shared;
 
@@ -31,14 +27,6 @@ public final class NeutronMeteringLabel extends NeutronObject<NeutronMeteringLab
      * getters and setters
      */
 
-    public String getMeteringLabelName() {
-        return meteringLabelName;
-    }
-
-    public void setMeteringLabelName(String name) {
-        this.meteringLabelName = name;
-    }
-
     public Boolean getMeteringLabelShared() {
         return shared;
     }
@@ -55,7 +43,7 @@ public final class NeutronMeteringLabel extends NeutronObject<NeutronMeteringLab
 
     @Override
     public String toString() {
-        return "NeutronMeteringLabel [id=" + uuid + ", name=" + meteringLabelName + ", tenant_id=" + tenantID
+        return "NeutronMeteringLabel [id=" + uuid + ", name=" + name + ", tenant_id=" + tenantID
                 + ", shared=" + shared + "]";
     }
 
@@ -72,9 +60,6 @@ public final class NeutronMeteringLabel extends NeutronObject<NeutronMeteringLab
         NeutronMeteringLabel ans = new NeutronMeteringLabel();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setMeteringLabelName(this.getMeteringLabelName());
-            }
             if (s.equals("shared")) {
                 ans.setMeteringLabelShared(this.getMeteringLabelShared());
             }
index 417a13c3ad0dc89128cce95310283489a6d68458..484be7d12f013e3fbfa5803b0ff8ef73c9aceb5c 100644 (file)
@@ -17,19 +17,12 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "network")
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronNetwork extends NeutronObject<NeutronNetwork>
-        implements Serializable, INeutronObject<NeutronNetwork> {
+public final class NeutronNetwork extends NeutronAdminAttributes<NeutronNetwork> implements Serializable {
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(name = "name")
-    String networkName;
-
-    @XmlElement(defaultValue = "true", name = "admin_state_up")
-    Boolean adminStateUp;
-
     @XmlElement(defaultValue = "false", name = "shared")
     Boolean shared;
 
@@ -49,9 +42,6 @@ public final class NeutronNetwork extends NeutronObject<NeutronNetwork>
     @XmlElement(namespace = "provider", name = "segmentation_id")
     String providerSegmentationID;
 
-    @XmlElement(name = "status")
-    String status;
-
     @XmlElement(name = "segments")
     List<NeutronNetwork_Segment> segments;
 
@@ -90,26 +80,10 @@ public final class NeutronNetwork extends NeutronObject<NeutronNetwork>
         }
     }
 
-    public String getNetworkName() {
-        return networkName;
-    }
-
-    public void setNetworkName(String networkName) {
-        this.networkName = networkName;
-    }
-
     public boolean isAdminStateUp() {
         return adminStateUp;
     }
 
-    public Boolean getAdminStateUp() {
-        return adminStateUp;
-    }
-
-    public void setAdminStateUp(boolean newValue) {
-        adminStateUp = newValue;
-    }
-
     public boolean isShared() {
         return shared;
     }
@@ -158,14 +132,6 @@ public final class NeutronNetwork extends NeutronObject<NeutronNetwork>
         this.providerSegmentationID = providerSegmentationID;
     }
 
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
     public void setSegments(List<NeutronNetwork_Segment> segments) {
         this.segments = segments;
     }
@@ -212,15 +178,6 @@ public final class NeutronNetwork extends NeutronObject<NeutronNetwork>
         NeutronNetwork ans = new NeutronNetwork();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setNetworkName(this.getNetworkName());
-            }
-            if (s.equals("admin_state_up")) {
-                ans.setAdminStateUp(adminStateUp);
-            }
-            if (s.equals("status")) {
-                ans.setStatus(this.getStatus());
-            }
             if (s.equals("shared")) {
                 ans.setShared(shared);
             }
@@ -246,7 +203,7 @@ public final class NeutronNetwork extends NeutronObject<NeutronNetwork>
 
     @Override
     public String toString() {
-        return "NeutronNetwork [networkUUID=" + uuid + ", networkName=" + networkName + ", adminStateUp=" + adminStateUp
+        return "NeutronNetwork [networkUUID=" + uuid + ", networkName=" + name + ", adminStateUp=" + adminStateUp
                 + ", shared=" + shared + ", tenantID=" + tenantID + ", routerExternal=" + routerExternal
                 + ", providerNetworkType=" + providerNetworkType + ", providerPhysicalNetwork="
                 + providerPhysicalNetwork + ", providerSegmentationID=" + providerSegmentationID + ", status=" + status
index ff08f3109324cb8191f7c2c0480301d027b75e4a..dfb8aff0d9405585ed72e719d9f73b05bda97d21 100644 (file)
@@ -21,7 +21,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronPort extends NeutronObject<NeutronPort> implements Serializable, INeutronObject<NeutronPort> {
+public final class NeutronPort extends NeutronAdminAttributes<NeutronPort> implements Serializable {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of
@@ -30,15 +30,6 @@ public final class NeutronPort extends NeutronObject<NeutronPort> implements Ser
     @XmlElement(name = "network_id")
     String networkUUID;
 
-    @XmlElement(name = "name")
-    String name;
-
-    @XmlElement(defaultValue = "true", name = "admin_state_up")
-    Boolean adminStateUp;
-
-    @XmlElement(name = "status")
-    String status;
-
     @XmlElement(name = "mac_address")
     String macAddress;
 
@@ -95,14 +86,6 @@ public final class NeutronPort extends NeutronObject<NeutronPort> implements Ser
         this.networkUUID = networkUUID;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public boolean isAdminStateUp() {
         if (adminStateUp == null) {
             return true;
@@ -110,22 +93,6 @@ public final class NeutronPort extends NeutronObject<NeutronPort> implements Ser
         return adminStateUp;
     }
 
-    public Boolean getAdminStateUp() {
-        return adminStateUp;
-    }
-
-    public void setAdminStateUp(Boolean newValue) {
-        adminStateUp = newValue;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
     public String getMacAddress() {
         return macAddress;
     }
@@ -250,15 +217,6 @@ public final class NeutronPort extends NeutronObject<NeutronPort> implements Ser
             if ("network_id".equals(field)) {
                 ans.setNetworkUUID(this.getNetworkUUID());
             }
-            if ("name".equals(field)) {
-                ans.setName(this.getName());
-            }
-            if ("admin_state_up".equals(field)) {
-                ans.setAdminStateUp(this.getAdminStateUp());
-            }
-            if ("status".equals(field)) {
-                ans.setStatus(this.getStatus());
-            }
             if ("mac_address".equals(field)) {
                 ans.setMacAddress(this.getMacAddress());
             }
index 1878452e6e0ca0faa7bcc9c95efd22454a5a9602..51c96ce069f4361e8b90d6a481edf8ccf8951c9e 100644 (file)
@@ -18,13 +18,9 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronQosPolicy extends NeutronObject<NeutronQosPolicy>
-        implements Serializable, INeutronObject<NeutronQosPolicy> {
+public final class NeutronQosPolicy extends NeutronBaseAttributes<NeutronQosPolicy> implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(name = "name")
-    String name;
-
     @XmlElement(defaultValue = "false", name = "shared")
     Boolean shared;
 
@@ -34,14 +30,6 @@ public final class NeutronQosPolicy extends NeutronObject<NeutronQosPolicy>
     @XmlElement(name = "dscp_marking_rules")
     List<NeutronQosDscpMarkingRule> dscpRules;
 
-    public String getQosPolicyName() {
-        return name;
-    }
-
-    public void setQosPolicyName(String qosPolicyName) {
-        this.name = qosPolicyName;
-    }
-
     public Boolean getPolicyIsShared() {
         return shared;
     }
@@ -70,9 +58,6 @@ public final class NeutronQosPolicy extends NeutronObject<NeutronQosPolicy>
         NeutronQosPolicy ans = new NeutronQosPolicy();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setQosPolicyName(this.getQosPolicyName());
-            }
             if (s.equals("shared")) {
                 ans.setPolicyIsShared(this.getPolicyIsShared());
             }
index a20530431c464f6b0531547f3eba565e22a57823..a6172415fdd82cbf0fcf81aea1567071d23b101d 100644 (file)
@@ -17,21 +17,12 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronRouter extends NeutronObject<NeutronRouter>
-        implements Serializable, INeutronObject<NeutronRouter> {
+public final class NeutronRouter extends NeutronAdminAttributes<NeutronRouter>
+        implements Serializable {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
-    @XmlElement(name = "name")
-    String name;
-
-    @XmlElement(defaultValue = "true", name = "admin_state_up")
-    Boolean adminStateUp;
-
-    @XmlElement(name = "status")
-    String status;
-
     @XmlElement(name = "external_gateway_info", nillable = true)
     NeutronRouter_NetworkReference externalGatewayInfo;
 
@@ -47,14 +38,6 @@ public final class NeutronRouter extends NeutronObject<NeutronRouter>
     public NeutronRouter() {
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public boolean isAdminStateUp() {
         if (adminStateUp == null) {
             return true;
@@ -62,22 +45,6 @@ public final class NeutronRouter extends NeutronObject<NeutronRouter>
         return adminStateUp;
     }
 
-    public Boolean getAdminStateUp() {
-        return adminStateUp;
-    }
-
-    public void setAdminStateUp(Boolean newValue) {
-        adminStateUp = newValue;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
     public NeutronRouter_NetworkReference getExternalGatewayInfo() {
         return externalGatewayInfo;
     }
@@ -123,15 +90,6 @@ public final class NeutronRouter extends NeutronObject<NeutronRouter>
         NeutronRouter ans = new NeutronRouter();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setName(this.getName());
-            }
-            if (s.equals("admin_state_up")) {
-                ans.setAdminStateUp(this.getAdminStateUp());
-            }
-            if (s.equals("status")) {
-                ans.setStatus(this.getStatus());
-            }
             if (s.equals("external_gateway_info")) {
                 ans.setExternalGatewayInfo(this.getExternalGatewayInfo());
             }
index b42c9a90b2e686d0b9ca1d6cd9df19f5bc6fcbcf..9cd071de2d6d294e532c81dc3949edfc43dcab0c 100644 (file)
@@ -19,15 +19,12 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronSFCFlowClassifier extends NeutronObject<NeutronSFCFlowClassifier>
-        implements Serializable, INeutronObject<NeutronSFCFlowClassifier> {
+public final class NeutronSFCFlowClassifier extends NeutronBaseAttributes<NeutronSFCFlowClassifier>
+        implements Serializable {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Networking SFC (networking-sfc) API v1.0 Reference for description of
     // annotated attributes
-    @XmlElement(name = "name")
-    String name;
-
     @XmlElement(defaultValue = "IPv4", name = "ethertype")
     String ethertype;
 
@@ -65,14 +62,6 @@ public final class NeutronSFCFlowClassifier extends NeutronObject<NeutronSFCFlow
     public NeutronSFCFlowClassifier() {
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getEthertype() {
         return ethertype;
     }
@@ -174,9 +163,6 @@ public final class NeutronSFCFlowClassifier extends NeutronObject<NeutronSFCFlow
         NeutronSFCFlowClassifier ans = new NeutronSFCFlowClassifier();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setName(this.getName());
-            }
             if (s.equals("ethertype")) {
                 ans.setEthertype(this.getEthertype());
             }
index 09465b04325d2355d9b626beb7cdb7953fc1c0d4..b25ae3c1a2faec88c771137234389e02dd1fa936 100644 (file)
@@ -18,15 +18,12 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronSFCPortChain extends NeutronObject<NeutronSFCPortChain>
-        implements Serializable, INeutronObject<NeutronSFCPortChain> {
+public final class NeutronSFCPortChain extends NeutronBaseAttributes<NeutronSFCPortChain> implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Networking SFC (networking-sfc) Port Chain API v1.0 Reference
     // for description of annotated attributes
-    @XmlElement(name = "name")
-    String name;
 
     @XmlElement(name = "port_pair_groups")
     List<String> portPairGroupsUUID;
@@ -41,14 +38,6 @@ public final class NeutronSFCPortChain extends NeutronObject<NeutronSFCPortChain
     public NeutronSFCPortChain() {
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public List<String> getPortPairGroupsUUID() {
         return portPairGroupsUUID;
     }
@@ -86,9 +75,6 @@ public final class NeutronSFCPortChain extends NeutronObject<NeutronSFCPortChain
         NeutronSFCPortChain ans = new NeutronSFCPortChain();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setName(this.getName());
-            }
             if (s.equals("port_pair_groups")) {
                 ans.setPortPairGroupsUUID(this.getPortPairGroupsUUID());
             }
index 28b9914d9383ed0f428f4fbfbd0ceadd709ad23c..fc4c2ceaa9f7a29068c067ba1194123d2ce69b1d 100644 (file)
@@ -19,16 +19,12 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronSFCPortPair extends NeutronObject<NeutronSFCPortPair>
-        implements Serializable, INeutronObject<NeutronSFCPortPair> {
+public final class NeutronSFCPortPair extends NeutronBaseAttributes<NeutronSFCPortPair> implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Networking SFC (networking-sfc) Port Pair API v1.0 Reference
     // for description of annotated attributes
-    @XmlElement(name = "name")
-    String name;
-
     @XmlElement(name = "ingress")
     String ingressPortUUID;
 
@@ -42,14 +38,6 @@ public final class NeutronSFCPortPair extends NeutronObject<NeutronSFCPortPair>
     public NeutronSFCPortPair() {
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getIngressPortUUID() {
         return ingressPortUUID;
     }
@@ -87,9 +75,6 @@ public final class NeutronSFCPortPair extends NeutronObject<NeutronSFCPortPair>
         NeutronSFCPortPair ans = new NeutronSFCPortPair();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setName(this.getName());
-            }
             if (s.equals("ingress")) {
                 ans.setIngressPortUUID(this.getIngressPortUUID());
             }
index 37102d958c07a63d042a8478fed67eb4a83b0db3..3be05c1c67f45cc66eb6d853e0afc7c4e715f835 100644 (file)
@@ -16,30 +16,19 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronSFCPortPairGroup extends NeutronObject<NeutronSFCPortPairGroup>
-        implements Serializable, INeutronObject<NeutronSFCPortPairGroup> {
+public final class NeutronSFCPortPairGroup extends NeutronBaseAttributes<NeutronSFCPortPairGroup>
+        implements Serializable {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Networking SFC (networking-sfc) Port Pair Group API v1.0
     // Reference for description of annotated attributes
 
-    @XmlElement(name = "name")
-    String name;
-
     @XmlElement(name = "port_pairs")
     List<String> portPairs;
 
     public NeutronSFCPortPairGroup() {
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public List<String> getPortPairs() {
         return portPairs;
     }
@@ -61,9 +50,6 @@ public final class NeutronSFCPortPairGroup extends NeutronObject<NeutronSFCPortP
         NeutronSFCPortPairGroup ans = new NeutronSFCPortPairGroup();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setName(this.getName());
-            }
             if (s.equals("port_pairs")) {
                 ans.setPortPairs(this.getPortPairs());
             }
index 00b82ea30383fc17413fef56246e1360005728b7..62c16df58cdfe9123183f46e6dbca1248bf60847 100644 (file)
@@ -12,7 +12,6 @@ import java.io.Serializable;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
@@ -27,31 +26,16 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronSecurityGroup extends NeutronObject<NeutronSecurityGroup>
-        implements Serializable, INeutronObject<NeutronSecurityGroup> {
+public final class NeutronSecurityGroup extends NeutronBaseAttributes<NeutronSecurityGroup> implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(name = "name")
-    String securityGroupName;
-
     public NeutronSecurityGroup() {
     }
 
-    public String getSecurityGroupName() {
-        return securityGroupName;
-    }
-
-    public void setSecurityGroupName(String securityGroupName) {
-        this.securityGroupName = securityGroupName;
-    }
-
     public NeutronSecurityGroup extractFields(List<String> fields) {
         NeutronSecurityGroup ans = new NeutronSecurityGroup();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setSecurityGroupName(this.getSecurityGroupName());
-            }
         }
         return ans;
     }
@@ -59,7 +43,7 @@ public final class NeutronSecurityGroup extends NeutronObject<NeutronSecurityGro
     @Override
     public String toString() {
         return "NeutronSecurityGroup{" + "securityGroupUUID='" + uuid + '\'' + ", securityGroupName='"
-                + securityGroupName + '\'' + ", securityGroupTenantID='" + tenantID + '\'' + "]";
+                + name + '\'' + ", securityGroupTenantID='" + tenantID + '\'' + "]";
     }
 
     @Override
index 8615577b232008fe87651acc6f809c4d13e084f5..46a4fe9a291e328eaa98e7e20b234476270e0df2 100644 (file)
@@ -27,8 +27,7 @@ import org.slf4j.LoggerFactory;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronSubnet extends NeutronObject<NeutronSubnet>
-        implements Serializable, INeutronObject<NeutronSubnet> {
+public final class NeutronSubnet extends NeutronBaseAttributes<NeutronSubnet> implements Serializable {
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronCRUDInterfaces.class);
 
     private static final long serialVersionUID = 1L;
@@ -45,9 +44,6 @@ public final class NeutronSubnet extends NeutronObject<NeutronSubnet>
     @XmlElement(name = "network_id")
     String networkUUID;
 
-    @XmlElement(name = "name")
-    String name;
-
     @XmlElement(defaultValue = "4", name = "ip_version")
     Integer ipVersion;
 
@@ -83,14 +79,6 @@ public final class NeutronSubnet extends NeutronObject<NeutronSubnet>
         this.networkUUID = networkUUID;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public Integer getIpVersion() {
         return ipVersion;
     }
@@ -187,9 +175,6 @@ public final class NeutronSubnet extends NeutronObject<NeutronSubnet>
             if (s.equals("network_id")) {
                 ans.setNetworkUUID(this.getNetworkUUID());
             }
-            if (s.equals("name")) {
-                ans.setName(this.getName());
-            }
             if (s.equals("ip_version")) {
                 ans.setIpVersion(this.getIpVersion());
             }
index 14e8278396268bfe4b7b46ec789b63b477811f35..6c0f2dc99cdd9be343f30b8e096f11cc01d2cb79 100644 (file)
@@ -17,16 +17,12 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronVPNIKEPolicy extends NeutronObject<NeutronVPNIKEPolicy>
-        implements Serializable, INeutronObject<NeutronVPNIKEPolicy> {
+public final class NeutronVPNIKEPolicy extends NeutronBaseAttributes<NeutronVPNIKEPolicy> implements Serializable {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
-    @XmlElement(name = "name")
-    String name;
-
     @XmlElement(name = "auth_algorithm")
     String authAlgorithm;
 
@@ -48,14 +44,6 @@ public final class NeutronVPNIKEPolicy extends NeutronObject<NeutronVPNIKEPolicy
     public NeutronVPNIKEPolicy() {
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getAuthAlgorithm() {
         return authAlgorithm;
     }
@@ -117,9 +105,6 @@ public final class NeutronVPNIKEPolicy extends NeutronObject<NeutronVPNIKEPolicy
         NeutronVPNIKEPolicy ans = new NeutronVPNIKEPolicy();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setName(this.getName());
-            }
             if (s.equals("auth_algorithm")) {
                 ans.setAuthAlgorithm(this.getAuthAlgorithm());
             }
index 99ad974bd29119ae8d3ecbfb9a4172d98ea8ea59..0589f7ff3d366553fb9efc647dbcbf6be2fa5aae 100644 (file)
@@ -17,16 +17,12 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronVPNIPSECPolicy extends NeutronObject<NeutronVPNIPSECPolicy>
-        implements Serializable, INeutronObject<NeutronVPNIPSECPolicy> {
+public final class NeutronVPNIPSECPolicy extends NeutronBaseAttributes<NeutronVPNIPSECPolicy> implements Serializable {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
-    @XmlElement(name = "name")
-    String name;
-
     @XmlElement(name = "transform_protocol")
     String transformProtocol;
 
@@ -48,14 +44,6 @@ public final class NeutronVPNIPSECPolicy extends NeutronObject<NeutronVPNIPSECPo
     public NeutronVPNIPSECPolicy() {
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getTransformProtocol() {
         return transformProtocol;
     }
@@ -117,9 +105,6 @@ public final class NeutronVPNIPSECPolicy extends NeutronObject<NeutronVPNIPSECPo
         NeutronVPNIPSECPolicy ans = new NeutronVPNIPSECPolicy();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setName(this.getName());
-            }
             if (s.equals("transform_protocol")) {
                 ans.setTransformProtocol(this.getTransformProtocol());
             }
index 84fd96026f842c82c4efaf1709093b5a2aaee037..cada350249bc936de89263e05484e1bdcd4be4ee 100644 (file)
@@ -17,16 +17,13 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronVPNIPSECSiteConnection extends NeutronObject<NeutronVPNIPSECSiteConnection>
-        implements Serializable, INeutronObject<NeutronVPNIPSECSiteConnection> {
+public final class NeutronVPNIPSECSiteConnection extends NeutronAdminAttributes<NeutronVPNIPSECSiteConnection>
+        implements Serializable {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
-    @XmlElement(name = "name")
-    String name;
-
     @XmlElement(name = "peer_address")
     String peerAddress;
 
@@ -51,12 +48,6 @@ public final class NeutronVPNIPSECSiteConnection extends NeutronObject<NeutronVP
     @XmlElement(name = "initiator")
     String initiator;
 
-    @XmlElement(defaultValue = "true", name = "admin_state_up")
-    Boolean adminStateUp;
-
-    @XmlElement(name = "status")
-    String status;
-
     @XmlElement(name = "ikepolicy_id")
     String ikePolicyID;
 
@@ -72,14 +63,6 @@ public final class NeutronVPNIPSECSiteConnection extends NeutronObject<NeutronVP
     public NeutronVPNIPSECSiteConnection() {
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getPeerAddress() {
         return peerAddress;
     }
@@ -144,22 +127,6 @@ public final class NeutronVPNIPSECSiteConnection extends NeutronObject<NeutronVP
         this.initiator = initiator;
     }
 
-    public Boolean getAdminStateUp() {
-        return adminStateUp;
-    }
-
-    public void setAdminStateUp(boolean newValue) {
-        adminStateUp = newValue;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
     public String getIkePolicyID() {
         return ikePolicyID;
     }
@@ -206,9 +173,6 @@ public final class NeutronVPNIPSECSiteConnection extends NeutronObject<NeutronVP
         NeutronVPNIPSECSiteConnection ans = new NeutronVPNIPSECSiteConnection();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("name")) {
-                ans.setName(this.getName());
-            }
             if (s.equals("peer_address")) {
                 ans.setPeerAddress(this.getPeerAddress());
             }
@@ -230,12 +194,6 @@ public final class NeutronVPNIPSECSiteConnection extends NeutronObject<NeutronVP
             if (s.equals("initiator")) {
                 ans.setInitiator(this.getInitiator());
             }
-            if (s.equals("admin_state_up")) {
-                ans.setAdminStateUp(this.getAdminStateUp());
-            }
-            if (s.equals("status")) {
-                ans.setStatus(this.getStatus());
-            }
             if (s.equals("ikepolicy_id")) {
                 ans.setIkePolicyID(this.getIkePolicyID());
             }
index 37963b74cf9723add2ac8fc0ab794977a90a7f6a..6ccdd500a4d18c3bf51dcd4ebfc6ae112bc02aeb 100644 (file)
@@ -17,8 +17,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronVPNService extends NeutronObject<NeutronVPNService>
-        implements Serializable, INeutronObject<NeutronVPNService> {
+public final class NeutronVPNService extends NeutronAdminAttributes<NeutronVPNService> implements Serializable {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of
@@ -27,15 +26,6 @@ public final class NeutronVPNService extends NeutronObject<NeutronVPNService>
     @XmlElement(name = "router_id")
     String routerUUID;
 
-    @XmlElement(name = "status")
-    String status;
-
-    @XmlElement(name = "name")
-    String name;
-
-    @XmlElement(defaultValue = "true", name = "admin_state_up")
-    Boolean adminStateUp;
-
     @XmlElement(name = "subnet_id")
     String subnetUUID;
 
@@ -50,30 +40,6 @@ public final class NeutronVPNService extends NeutronObject<NeutronVPNService>
         this.routerUUID = routerUUID;
     }
 
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Boolean getAdminStateUp() {
-        return adminStateUp;
-    }
-
-    public void setAdminStateUp(boolean newValue) {
-        adminStateUp = newValue;
-    }
-
     public String getSubnetUUID() {
         return subnetUUID;
     }
@@ -86,18 +52,9 @@ public final class NeutronVPNService extends NeutronObject<NeutronVPNService>
         NeutronVPNService ans = new NeutronVPNService();
         for (String s : fields) {
             extractField(s, ans);
-            if (s.equals("admin_state_up")) {
-                ans.setAdminStateUp(this.getAdminStateUp());
-            }
-            if (s.equals("name")) {
-                ans.setName(this.getName());
-            }
             if (s.equals("router_id")) {
                 ans.setRouterUUID(this.getRouterUUID());
             }
-            if (s.equals("status")) {
-                ans.setStatus(this.getStatus());
-            }
             if (s.equals("subnet_id")) {
                 ans.setSubnetUUID(this.getSubnetUUID());
             }
index adb82a1a260cafac55a0fe32a1bd83e1df1a2895..e156a050bb4e4a90c59fb94e35dd074b8871fc45 100644 (file)
@@ -32,7 +32,7 @@ public class NeutronFirewallJAXBTest {
                 "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
 
         Assert.assertEquals("NeutronFirewall JAXB Test 3: Testing name failed", "jaxb-test",
-                testObject.getFirewallName());
+                testObject.getName());
 
         Assert.assertFalse("NeutronFirewall JAXB Test 5: Testing admin_state_up failed",
                 testObject.getFirewallAdminStateIsUp());
@@ -62,7 +62,7 @@ public class NeutronFirewallJAXBTest {
                 "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
 
         Assert.assertEquals("NeutronFirewallPolicy JAXB Test 3: Testing name failed", "jaxb-test",
-                testObject.getFirewallPolicyName());
+                testObject.getName());
 
         Assert.assertTrue("NeutronFirewallPolicy JAXB Test 5: Testing shared failed",
                 testObject.getFirewallPolicyIsShared());
@@ -92,7 +92,7 @@ public class NeutronFirewallJAXBTest {
                 "45977fa2dbd7482098dd68d0d8970117", testObject.getTenantID());
 
         Assert.assertEquals("NeutronFirewallRule JAXB Test 3: Testing name failed", "ALLOW_HTTP",
-                testObject.getFirewallRuleName());
+                testObject.getName());
 
         Assert.assertEquals("NeutronFirewallRule JAXB Test 5: Testing firewaulPolicyRuleID failed",
                 "83ca694a-eeff-48e5-b2d8-fe5198cf2e86", testObject.getFirewallRulePolicyID());
index d76374b4dbbc370839b1eb0b13b597f20d4e7bd2..eb34ec72573e9af15e91612055699bc9c08f2751 100644 (file)
@@ -31,13 +31,13 @@ public class NeutronLoadBalancerJAXBTest {
                 "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.uuid);
 
         Assert.assertEquals("NeutronLoadBalancer JAXB Test 2: Testing LoadBalancer Name failed",
-                "NeutronLoadBalancer", testObject.getLoadBalancerName());
+                "NeutronLoadBalancer", testObject.getName());
 
         Assert.assertEquals("NeutronLoadBalancer JAXB Test 4: Testing status failed", "ACTIVE",
-                testObject.getLoadBalancerStatus());
+                testObject.getStatus());
 
         Assert.assertFalse("NeutronLoadBalancer JAXB Test 5: Testing Admin state up failed",
-                testObject.getLoadBalancerAdminStateUp());
+                testObject.getAdminStateUp());
 
         Assert.assertEquals("NeutronLoadBalancer JAXB Test 6: Testing LoadBalancer VipAddress failed", "10.0.0.3",
                 testObject.getLoadBalancerVipAddress());
index 7f2b4456cd5bd9531d195bfb9afb8f536dc1f7dd..6611e3a2b914be26109d2a6cafec0a5adc460f9c 100644 (file)
@@ -40,7 +40,7 @@ public class NeutronLoadBalancerListenerJAXBTest {
                 (long) testObject.getNeutronLoadBalancerListenerConnectionLimit());
 
         Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 4: Testing LoadBalancer listener name failed",
-                "LoadBalancerListener", testObject.getLoadBalancerListenerName());
+                "LoadBalancerListener", testObject.getName());
 
         Assert.assertFalse(
                 "NeutronLoadBalancerListener JAXB Test 6: Testing LoadBalancer listener admin_state_up failed",
index e82dc7e150b71281a77d45cd4d238faf4a311b64..1a6031fd7dd84344cbe08474bd63916f11be1419 100644 (file)
@@ -33,7 +33,7 @@ public class NeutronLoadBalancerPoolJAXBTest {
                 "12ff63af-4127-4074-a251-bcb2ecc53ebe", testObject.getID());
 
         Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 2: Testing name failed", "pool1",
-                testObject.getLoadBalancerPoolName());
+                testObject.getName());
 
         Assert.assertTrue("NeutronLoadBalancerPool JAXB Test 3: Testing admin_state_up failed",
                 testObject.getLoadBalancerPoolAdminIsStateIsUp());
index 4576753d9cc2b630f1c6c39d0597994d1b265ad3..125e20062d4f87523dea6458572ce3e6a2ca8e60 100644 (file)
@@ -29,7 +29,7 @@ public class NeutronMeteringLabelJAXBTest {
                 "4e8e5957-649f-477b-9e5b-f1f75b21c03c", testObject.getID());
 
         Assert.assertEquals("NeutronMeteringLabel JAXB Test 2: Testing name failed", "net1",
-                testObject.getMeteringLabelName());
+                testObject.getName());
 
         Assert.assertEquals("NeutronMeteringLabel JAXB Test 4: Testing tenant_id failed",
                 "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID());
index 72a07cc3b54402470881bbaa9bb92173928bb0a4..a7f697d13f42a6e7bbbeb879e0ddf0568221e779 100644 (file)
@@ -40,7 +40,7 @@ public class NeutronNetworkJAXBTest {
 
         Assert.assertEquals("NeutronNetwork JAXB Test 4: Testing status failed", "ACTIVE", testObject.getStatus());
 
-        Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing name failed", "net1", testObject.getNetworkName());
+        Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing name failed", "net1", testObject.getName());
 
         Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing admin state up failed", true,
                 testObject.getAdminStateUp());
@@ -81,7 +81,7 @@ public class NeutronNetworkJAXBTest {
 
         Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing status failed", "ACTIVE", testObject.getStatus());
 
-        Assert.assertEquals("NeutronNetwork JAXB Test 5: Testing name failed", "net1", testObject.getNetworkName());
+        Assert.assertEquals("NeutronNetwork JAXB Test 5: Testing name failed", "net1", testObject.getName());
 
         Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing admin state up failed", true,
                 testObject.getAdminStateUp());
@@ -134,7 +134,7 @@ public class NeutronNetworkJAXBTest {
         Assert.assertNull("NeutronNetwork JAXB Test 2: Testing tenant_id failed", testObject.getTenantID());
 
         Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing name failed",
-                "HA network tenant c15340eb65804b20af2dd0fd3beddc8c", testObject.getNetworkName());
+                "HA network tenant c15340eb65804b20af2dd0fd3beddc8c", testObject.getName());
 
         Assert.assertEquals("NeutronNetwork JAXB Test 4: Testing admin state up failed", true,
                 testObject.getAdminStateUp());
index 9482a025e2ed9ad24f4d9a0f3c6314df625245c3..6cb208e0ef2ac82df06d1b6cbf7c7beee88e91a4 100644 (file)
@@ -38,7 +38,7 @@ public class NeutronNetworkQosJAXBTest {
 
         Assert.assertEquals("NeutronNetwork JAXB Test 4: Testing status failed", "ACTIVE", testObject.getStatus());
 
-        Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing name failed", "net1", testObject.getNetworkName());
+        Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing name failed", "net1", testObject.getName());
 
         Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing admin state up failed", true,
                 testObject.getAdminStateUp());
index 015abb69f27d56ac16d7cfdac519ddacdc7d9bd0..858e8417d92aef023a71c0ebeadc4f6fa8ec3052 100644 (file)
@@ -37,7 +37,7 @@ public class NeutronQosJAXBTest {
                 "aa902936679e4ea29bfe1158e3450a13", neutronObject.getTenantID());
 
         Assert.assertEquals("NeutronQosPolicy JAXB Test 3 : Testing Name failed", "jaxb-test",
-                neutronObject.getQosPolicyName());
+                neutronObject.getName());
 
         Assert.assertFalse("NeutronQosPolicy JaxB Test 4 : Testing Shared failed", neutronObject.getPolicyIsShared());
 
index 4aead6f394b827ff02a68b4a75aef4dfc7705fa7..e21b96c8f3818883381eec1647edee90e179280b 100644 (file)
@@ -34,7 +34,7 @@ public class NeutronSecurityGroupJAXBTest {
                 "2076db17-a522-4506-91de-c6dd8e837028", testObject.getID());
 
         Assert.assertEquals("NeutronSecurityGroup JAXB Test 2: Testing direction failed", "new-webservers",
-                testObject.getSecurityGroupName());
+                testObject.getName());
 
         Assert.assertEquals("NeutronSecurityGroup JAXB Test 4: Testing port range min failed",
                 "b4f50856753b4dc6afee5fa6b9b6c550", testObject.getTenantID());
index 1469fb491654bd7814827b5c7faf6c0dfe3ace0d..d4fb65c18c2b3015892c1ebce57029f213436bb8 100644 (file)
@@ -107,7 +107,7 @@ public final class NeutronBgpvpnsNorthbound
                 bAutoAggregate = Boolean.valueOf(queryAutoAggregate);
             }
             if ((queryID == null || queryID.equals(oSN.getID()))
-                    && (queryName == null || queryName.equals(oSN.getBgpvpnName()))
+                    && (queryName == null || queryName.equals(oSN.getName()))
                     && (bAdminStateUp == null || bAdminStateUp.booleanValue() == oSN.isAdminStateUp())
                     && (queryStatus == null || queryStatus.equals(oSN.getStatus()))
                     && (bAutoAggregate == null || bAutoAggregate.booleanValue() == oSN.isAutoAggregate())
index 29c6875918d31e0ea4801bd25c1bca92ae823eae..e0388b86e2db5941122b4ba35ccb20effa351b6a 100644 (file)
@@ -85,7 +85,7 @@ public final class NeutronFirewallNorthbound
         for (NeutronFirewall nsg : firewallInterface.getAll()) {
             if ((queryFirewallUUID == null || queryFirewallUUID.equals(nsg.getID()))
                     && (queryFirewallTenantID == null || queryFirewallTenantID.equals(nsg.getTenantID()))
-                    && (queryFirewallName == null || queryFirewallName.equals(nsg.getFirewallName()))
+                    && (queryFirewallName == null || queryFirewallName.equals(nsg.getName()))
                     && (queryFirewallAdminStateIsUp == null
                             || queryFirewallAdminStateIsUp.equals(nsg.getFirewallAdminStateIsUp()))
                     && (queryFirewallIsShared == null || queryFirewallIsShared.equals(nsg.getFirewallIsShared()))
index 0b3e134466c86fabd0e5e54361891789a90ef04d..39231346b74ed61953448ca77829a8845b5b1158 100644 (file)
@@ -84,7 +84,7 @@ public final class NeutronFirewallPolicyNorthbound extends
         for (NeutronFirewallPolicy nsg : firewallPolicyInterface.getAll()) {
             if ((queryFirewallPolicyUUID == null || queryFirewallPolicyUUID.equals(nsg.getID()))
                     && (queryFirewallPolicyTenantID == null || queryFirewallPolicyTenantID.equals(nsg.getTenantID()))
-                    && (queryFirewallPolicyName == null || queryFirewallPolicyName.equals(nsg.getFirewallPolicyName()))
+                    && (queryFirewallPolicyName == null || queryFirewallPolicyName.equals(nsg.getName()))
                     && (querySecurityPolicyIsShared == null
                             || querySecurityPolicyIsShared.equals(nsg.getFirewallPolicyIsShared()))
                     && (querySecurityPolicyIsAudited == null
index 724fe12743886283551da7c881d77ace2bae37a1..6991b6c5836fb7a2926a6cb652dab73a977644bc 100644 (file)
@@ -94,7 +94,7 @@ public final class NeutronFirewallRulesNorthbound
         for (NeutronFirewallRule nsr : firewallRuleInterface.getAll()) {
             if ((queryFirewallRuleUUID == null || queryFirewallRuleUUID.equals(nsr.getID()))
                     && (queryFirewallRuleTenantID == null || queryFirewallRuleTenantID.equals(nsr.getTenantID()))
-                    && (queryFirewallRuleName == null || queryFirewallRuleName.equals(nsr.getFirewallRuleName()))
+                    && (queryFirewallRuleName == null || queryFirewallRuleName.equals(nsr.getName()))
                     && (queryFirewallRuleIsShared == null
                             || queryFirewallRuleIsShared.equals(nsr.getFirewallRuleIsShared()))
                     && (queryFirewallRulePolicyID == null
index 4b9fc1d0a88b0bf826ea03d1c54fc3dcf328b663..8655c236a652c915ec3af97a8df6609e3cc8873e 100644 (file)
@@ -110,7 +110,7 @@ public final class NeutronL2gatewayNorthbound
         while (i.hasNext()) {
             NeutronL2gateway l2gateway = i.next();
             if ((queryID == null || queryID.equals(l2gateway.getID()))
-                    && (queryName == null || queryName.equals(l2gateway.getL2gatewayName()))
+                    && (queryName == null || queryName.equals(l2gateway.getName()))
                     && (queryTenantID == null || queryTenantID.equals(l2gateway.getTenantID()))
                     && (queryNeutronL2gatewayDevice == null
                             || queryNeutronL2gatewayDevice.equals(l2gateway.getNeutronL2gatewayDevices()))) {
index 70bcde6b793ea060247633bc1ec76517b111f7b0..34288681fcfdf39ad6316b68ed5b4015cdf44e3f 100644 (file)
@@ -94,7 +94,7 @@ public final class NeutronLoadBalancerListenerNorthbound extends AbstractNeutron
                     && (queryLoadBalancerListenerTenantID == null
                             || queryLoadBalancerListenerTenantID.equals(nsg.getTenantID()))
                     && (queryLoadBalancerListenerName == null
-                            || queryLoadBalancerListenerName.equals(nsg.getLoadBalancerListenerName()))
+                            || queryLoadBalancerListenerName.equals(nsg.getName()))
                     && (queryLoadBalancerListenerProtocol == null
                             || queryLoadBalancerListenerProtocol.equals(nsg.getNeutronLoadBalancerListenerProtocol()))
                     && (queryLoadBalancerListenerProtocolPort == null || queryLoadBalancerListenerProtocolPort
index 7c1b3427bc7a31503b457969c40891cc5b03f89a..d516a2b6198b6c995c32058cc9a6ab2bacd54bfe 100644 (file)
@@ -89,7 +89,7 @@ public final class NeutronLoadBalancerNorthbound
             NeutronLoadBalancer nsg = i.next();
             if ((queryLoadBalancerID == null || queryLoadBalancerID.equals(nsg.getID()))
                     && (queryLoadBalancerTenantID == null || queryLoadBalancerTenantID.equals(nsg.getTenantID()))
-                    && (queryLoadBalancerName == null || queryLoadBalancerName.equals(nsg.getLoadBalancerName()))
+                    && (queryLoadBalancerName == null || queryLoadBalancerName.equals(nsg.getName()))
                     && (queryLoadBalancerVipAddress == null
                             || queryLoadBalancerVipAddress.equals(nsg.getLoadBalancerVipAddress()))
                     && (queryLoadBalancerVipSubnet == null
index b960b57f5d5091942a9b4b9b8dae5947faf79543..d509f51f0643b7d789892d062f3c2c3bf4d7de54 100644 (file)
@@ -101,7 +101,7 @@ public final class NeutronLoadBalancerPoolNorthbound extends AbstractNeutronNort
                     && (queryLoadBalancerPoolTenantID == null
                             || queryLoadBalancerPoolTenantID.equals(nsg.getTenantID()))
                     && (queryLoadBalancerPoolName == null
-                            || queryLoadBalancerPoolName.equals(nsg.getLoadBalancerPoolName()))
+                            || queryLoadBalancerPoolName.equals(nsg.getName()))
                     && (queryLoadBalancerPoolLbAlgorithm == null
                             || queryLoadBalancerPoolLbAlgorithm.equals(nsg.getLoadBalancerPoolLbAlgorithm()))
                     && (queryLoadBalancerPoolHealthMonitorID == null || queryLoadBalancerPoolHealthMonitorID
index a5809cc145b7dadfdca9271fb5d92a5328829a20..3be0def67cf3f94409ed6bd1ff790fe771db846d 100644 (file)
@@ -81,7 +81,7 @@ public final class NeutronMeteringLabelsNorthbound extends
         while (i.hasNext()) {
             NeutronMeteringLabel oSS = i.next();
             if ((queryID == null || queryID.equals(oSS.getID()))
-                    && (queryName == null || queryName.equals(oSS.getMeteringLabelName()))
+                    && (queryName == null || queryName.equals(oSS.getName()))
                     && (queryTenantID == null || queryTenantID.equals(oSS.getTenantID()))) {
                 if (fields.size() > 0) {
                     ans.add(oSS.extractFields(fields));
index ed8f296b0a65af2711621cb0d67483c0a21f7c6e..aa50504d21f72ce3aa264af23b5b8ac1f247447a 100644 (file)
@@ -115,7 +115,7 @@ public final class NeutronNetworksNorthbound
             }
             NeutronNetwork oSN = i.next();
             if ((queryID == null || queryID.equals(oSN.getID()))
-                    && (queryName == null || queryName.equals(oSN.getNetworkName()))
+                    && (queryName == null || queryName.equals(oSN.getName()))
                     && (bAdminStateUp == null || bAdminStateUp.booleanValue() == oSN.isAdminStateUp())
                     && (queryStatus == null || queryStatus.equals(oSN.getStatus()))
                     && (bShared == null || bShared.booleanValue() == oSN.isShared())
index 39f3151d9653c1633cf24938a7df543694eed730..a7e28ad8d3dd82593912f218dc3e43ac91367365 100644 (file)
@@ -64,7 +64,7 @@ public final class NeutronQosPolicyNorthbound
         for (NeutronQosPolicy nsg : qosPolicyInterface.getAll()) {
             if ((queryQosPolicyUUID == null || queryQosPolicyUUID.equals(nsg.getID()))
                     && (queryQosPolicyTenantID == null || queryQosPolicyTenantID.equals(nsg.getTenantID()))
-                    && (queryQosPolicyName == null || queryQosPolicyName.equals(nsg.getQosPolicyName()))
+                    && (queryQosPolicyName == null || queryQosPolicyName.equals(nsg.getName()))
                     && (queryQosPolicyIsShared == null || queryQosPolicyIsShared.equals(nsg.getPolicyIsShared()))) {
                 if (fields.size() > 0) {
                     ans.add(nsg.extractFields(fields));
index 399a2097a0edae7485bb47fd94b08df132cb50f6..adaf13a9b403ce218db3696b43ce0a18da4875cb 100644 (file)
@@ -81,7 +81,7 @@ public final class NeutronSecurityGroupsNorthbound extends
         while (i.hasNext()) {
             NeutronSecurityGroup nsg = i.next();
             if ((querySecurityGroupUUID == null || querySecurityGroupUUID.equals(nsg.getID()))
-                    && (querySecurityGroupName == null || querySecurityGroupName.equals(nsg.getSecurityGroupName()))
+                    && (querySecurityGroupName == null || querySecurityGroupName.equals(nsg.getName()))
                     && (querySecurityTenantID == null || querySecurityTenantID.equals(nsg.getTenantID()))) {
                 if (fields.size() > 0) {
                     ans.add(nsg.extractFields(fields));
index 4d679977ae290b460d95f2f6cfe08c5f6c2f7b52..a340318004f30eb6085087c7beacb2d609cb50cb 100644 (file)
@@ -52,7 +52,7 @@ public final class NeutronBgpvpnInterface extends AbstractNeutronInterface<Bgpvp
     protected NeutronBgpvpn fromMd(Bgpvpn bgpvpn) {
         final NeutronBgpvpn result = new NeutronBgpvpn();
         result.setAdminStateUp(bgpvpn.isAdminStateUp());
-        result.setBgpvpnName(bgpvpn.getName());
+        result.setName(bgpvpn.getName());
         result.setAutoAggregate(bgpvpn.isAutoAggregate());
         result.setStatus(bgpvpn.getStatus());
         result.setTenantID(bgpvpn.getTenantId());
@@ -116,8 +116,8 @@ public final class NeutronBgpvpnInterface extends AbstractNeutronInterface<Bgpvp
         final BgpvpnBuilder bgpvpnBuilder = new BgpvpnBuilder();
 
         bgpvpnBuilder.setAdminStateUp(bgpvpn.getAdminStateUp());
-        if (bgpvpn.getBgpvpnName() != null) {
-            bgpvpnBuilder.setName(bgpvpn.getBgpvpnName());
+        if (bgpvpn.getName() != null) {
+            bgpvpnBuilder.setName(bgpvpn.getName());
         }
         if (bgpvpn.getAutoAggregate() != null) {
             bgpvpnBuilder.setAutoAggregate(bgpvpn.getAutoAggregate());
index 7b9b8c89ca9c293c0378596021bb2ab35f904b76..8f704e73605505fb053fd1d551f856afe4056bde 100644 (file)
@@ -50,7 +50,7 @@ public final class NeutronFirewallInterface extends AbstractNeutronInterface<Fir
             answer.setID(firewall.getUuid().getValue());
         }
         if (firewall.getName() != null) {
-            answer.setFirewallName(firewall.getName());
+            answer.setName(firewall.getName());
         }
         if (firewall.getTenantId() != null) {
             answer.setTenantID(firewall.getTenantId());
@@ -71,8 +71,8 @@ public final class NeutronFirewallInterface extends AbstractNeutronInterface<Fir
         if (firewall.getID() != null) {
             firewallBuilder.setUuid(toUuid(firewall.getID()));
         }
-        if (firewall.getFirewallName() != null) {
-            firewallBuilder.setName(firewall.getFirewallName());
+        if (firewall.getName() != null) {
+            firewallBuilder.setName(firewall.getName());
         }
         if (firewall.getTenantID() != null) {
             firewallBuilder.setTenantId(toUuid(firewall.getTenantID()));
index eb8772dbc612372925e7af8877774f02390ea16d..725d69084c568a4d6bbe966a7abf0912b6a6a2f6 100644 (file)
@@ -54,7 +54,7 @@ public final class NeutronFirewallPolicyInterface
             answer.setID(policy.getUuid().getValue());
         }
         if (policy.getName() != null) {
-            answer.setFirewallPolicyName(policy.getName());
+            answer.setName(policy.getName());
         }
         if (policy.getTenantId() != null) {
             answer.setTenantID(policy.getTenantId());
@@ -74,8 +74,8 @@ public final class NeutronFirewallPolicyInterface
         if (policy.getID() != null) {
             policyBuilder.setUuid(toUuid(policy.getID()));
         }
-        if (policy.getFirewallPolicyName() != null) {
-            policyBuilder.setName(policy.getFirewallPolicyName());
+        if (policy.getName() != null) {
+            policyBuilder.setName(policy.getName());
         }
         if (policy.getTenantID() != null) {
             policyBuilder.setTenantId(toUuid(policy.getTenantID()));
index 240a8b78e0a8fac7293029acc0b09e4a41ac1673..47dfd487ee63a3398add5aeaffe05ed29948b24c 100644 (file)
@@ -68,7 +68,7 @@ public final class NeutronFirewallRuleInterface extends
             answer.setID(rule.getUuid().getValue());
         }
         if (rule.getName() != null) {
-            answer.setFirewallRuleName(rule.getName());
+            answer.setName(rule.getName());
         }
         if (rule.getTenantId() != null) {
             answer.setTenantID(rule.getTenantId());
@@ -128,8 +128,8 @@ public final class NeutronFirewallRuleInterface extends
         if (rule.getID() != null) {
             ruleBuilder.setUuid(toUuid(rule.getID()));
         }
-        if (rule.getFirewallRuleName() != null) {
-            ruleBuilder.setName(rule.getFirewallRuleName());
+        if (rule.getName() != null) {
+            ruleBuilder.setName(rule.getName());
         }
         if (rule.getTenantID() != null) {
             ruleBuilder.setTenantId(toUuid(rule.getTenantID()));
index 766c0318e37a41cca3968e763998e77d6319ec31..d1949ff7ec41e24a7d2b99cd4ed1253adc1c85b8 100644 (file)
@@ -68,7 +68,7 @@ public final class NeutronL2gatewayInterface extends AbstractNeutronInterface<L2
             result.setID(l2gateway.getUuid().getValue());
         }
         if (l2gateway.getL2gatewayName() != null) {
-            result.setL2gatewayName(String.valueOf(l2gateway.getL2gatewayName()));
+            result.setName(String.valueOf(l2gateway.getL2gatewayName()));
         }
         if (l2gateway.getTenantId() != null) {
             result.setTenantID(l2gateway.getTenantId());
@@ -114,8 +114,8 @@ public final class NeutronL2gatewayInterface extends AbstractNeutronInterface<L2
     @Override
     protected L2gateway toMd(NeutronL2gateway neutronObject) {
         final L2gatewayBuilder l2gatewayBuilder = new L2gatewayBuilder();
-        if (neutronObject.getL2gatewayName() != null) {
-            l2gatewayBuilder.setL2gatewayName(neutronObject.getL2gatewayName());
+        if (neutronObject.getName() != null) {
+            l2gatewayBuilder.setL2gatewayName(neutronObject.getName());
         }
         if (neutronObject.getID() != null) {
             l2gatewayBuilder.setUuid(toUuid(neutronObject.getID()));
index fe094ff47f8102ef3e3940d2527c0d28159a9381..5c86a3b5a9cdc179c8f18bb9530f9275971d6b24 100644 (file)
@@ -48,13 +48,13 @@ public final class NeutronLoadBalancerInterface extends
     protected NeutronLoadBalancer fromMd(Loadbalancer loadBalancer) {
         final NeutronLoadBalancer answer = new NeutronLoadBalancer();
         if (loadBalancer.isAdminStateUp() != null) {
-            answer.setLoadBalancerAdminStateUp(loadBalancer.isAdminStateUp());
+            answer.setAdminStateUp(loadBalancer.isAdminStateUp());
         }
         if (loadBalancer.getName() != null) {
-            answer.setLoadBalancerName(loadBalancer.getName());
+            answer.setName(loadBalancer.getName());
         }
         if (loadBalancer.getStatus() != null) {
-            answer.setLoadBalancerStatus(loadBalancer.getStatus());
+            answer.setStatus(loadBalancer.getStatus());
         }
         if (loadBalancer.getTenantId() != null) {
             answer.setTenantID(loadBalancer.getTenantId());
@@ -74,12 +74,12 @@ public final class NeutronLoadBalancerInterface extends
     @Override
     protected Loadbalancer toMd(NeutronLoadBalancer loadBalancer) {
         final LoadbalancerBuilder loadBalancerBuilder = new LoadbalancerBuilder();
-        loadBalancerBuilder.setAdminStateUp(loadBalancer.getLoadBalancerAdminStateUp());
-        if (loadBalancer.getLoadBalancerName() != null) {
-            loadBalancerBuilder.setName(loadBalancer.getLoadBalancerName());
+        loadBalancerBuilder.setAdminStateUp(loadBalancer.getAdminStateUp());
+        if (loadBalancer.getName() != null) {
+            loadBalancerBuilder.setName(loadBalancer.getName());
         }
-        if (loadBalancer.getLoadBalancerStatus() != null) {
-            loadBalancerBuilder.setStatus(loadBalancer.getLoadBalancerStatus());
+        if (loadBalancer.getStatus() != null) {
+            loadBalancerBuilder.setStatus(loadBalancer.getStatus());
         }
         if (loadBalancer.getTenantID() != null) {
             loadBalancerBuilder.setTenantId(toUuid(loadBalancer.getTenantID()));
index 648bd3e9a5a3257da28a21adf71041b0e4e3691f..33301d53a75de342330611922621f12653bd7a55 100644 (file)
@@ -75,8 +75,8 @@ public final class NeutronLoadBalancerListenerInterface
             }
             listenerBuilder.setLoadbalancers(listLoadBalancers);
         }
-        if (listener.getLoadBalancerListenerName() != null) {
-            listenerBuilder.setName(listener.getLoadBalancerListenerName());
+        if (listener.getName() != null) {
+            listenerBuilder.setName(listener.getName());
         }
         if (listener.getNeutronLoadBalancerListenerProtocol() != null) {
             final ImmutableBiMap<String, Class<? extends ProtocolBase>> mapper = PROTOCOL_MAP.inverse();
@@ -123,7 +123,7 @@ public final class NeutronLoadBalancerListenerInterface
             answer.setNeutronLoadBalancerListenerLoadBalancerIDs(list);
         }
         if (listener.getName() != null) {
-            answer.setLoadBalancerListenerName(listener.getName());
+            answer.setName(listener.getName());
         }
         if (listener.getProtocol() != null) {
             answer.setNeutronLoadBalancerListenerProtocol(PROTOCOL_MAP.get(listener.getProtocol()));
index 5255e80c3eceddc16da2540f26070b7adfe8d219..f764d885ef6ec1012dd98663db149e7bec44558f 100644 (file)
@@ -94,8 +94,8 @@ public final class NeutronLoadBalancerPoolInterface
         }
         // because members are another container, we don't want to copy
         // it over, so just skip it here
-        if (pool.getLoadBalancerPoolName() != null) {
-            poolBuilder.setName(pool.getLoadBalancerPoolName());
+        if (pool.getName() != null) {
+            poolBuilder.setName(pool.getName());
         }
         if (pool.getLoadBalancerPoolProtocol() != null) {
             final ImmutableBiMap<String, Class<? extends ProtocolBase>> mapper = PROTOCOL_MAP.inverse();
@@ -153,7 +153,7 @@ public final class NeutronLoadBalancerPoolInterface
             answer.setLoadBalancerPoolMembers(members);
         }
         if (pool.getName() != null) {
-            answer.setLoadBalancerPoolName(pool.getName());
+            answer.setName(pool.getName());
         }
         if (pool.getProtocol() != null) {
             answer.setLoadBalancerPoolProtocol(PROTOCOL_MAP.get(pool.getProtocol()));
index caef2663334aea477be2bb00c8a5871bff8d392b..ed00548591c4ab70fb18b9d568e0ccbe151c65dd 100644 (file)
@@ -49,8 +49,8 @@ public final class NeutronMeteringLabelInterface
     @Override
     protected MeteringLabel toMd(NeutronMeteringLabel meteringLabel) {
         final MeteringLabelBuilder meteringLabelBuilder = new MeteringLabelBuilder();
-        if (meteringLabel.getMeteringLabelName() != null) {
-            meteringLabelBuilder.setName(meteringLabel.getMeteringLabelName());
+        if (meteringLabel.getName() != null) {
+            meteringLabelBuilder.setName(meteringLabel.getName());
         }
         if (meteringLabel.getMeteringLabelShared() != null) {
             meteringLabelBuilder.setShared(meteringLabel.getMeteringLabelShared());
@@ -74,7 +74,7 @@ public final class NeutronMeteringLabelInterface
     protected NeutronMeteringLabel fromMd(MeteringLabel label) {
         final NeutronMeteringLabel answer = new NeutronMeteringLabel();
         if (label.getName() != null) {
-            answer.setMeteringLabelName(label.getName());
+            answer.setName(label.getName());
         }
         if (label.isShared() != null) {
             answer.setMeteringLabelShared(label.isShared());
index f531f3c1a4026d32fae1a029fc36ebbcdde6857d..ebc7bb545b62f79c4977ce3dab50aa806eba3bf0 100644 (file)
@@ -59,7 +59,7 @@ public final class NeutronNetworkInterface extends AbstractNeutronInterface<Netw
         final NeutronNetwork result = new NeutronNetwork();
         result.initDefaults();
         result.setAdminStateUp(network.isAdminStateUp());
-        result.setNetworkName(network.getName());
+        result.setName(network.getName());
         result.setShared(network.isShared());
         result.setStatus(network.getStatus());
         result.setTenantID(network.getTenantId());
@@ -147,8 +147,8 @@ public final class NeutronNetworkInterface extends AbstractNeutronInterface<Netw
         fillExtensions(networkBuilder, network);
 
         networkBuilder.setAdminStateUp(network.getAdminStateUp());
-        if (network.getNetworkName() != null) {
-            networkBuilder.setName(network.getNetworkName());
+        if (network.getName() != null) {
+            networkBuilder.setName(network.getName());
         }
         if (network.getShared() != null) {
             networkBuilder.setShared(network.getShared());
index 6f4199b53ef8a0c446b9c09177761282420c4f21..8a2438215f9e10572c8a3eb319ba38128b31531c 100644 (file)
@@ -62,8 +62,8 @@ public final class NeutronQosPolicyInterface extends AbstractNeutronInterface<Qo
         if (qosPolicy.getTenantID() != null) {
             qosPolicyBuilder.setTenantId(toUuid(qosPolicy.getTenantID()));
         }
-        if (qosPolicy.getQosPolicyName() != null) {
-            qosPolicyBuilder.setName(qosPolicy.getQosPolicyName());
+        if (qosPolicy.getName() != null) {
+            qosPolicyBuilder.setName(qosPolicy.getName());
         }
         if (qosPolicy.getPolicyIsShared() != null) {
             qosPolicyBuilder.setShared(qosPolicy.getPolicyIsShared());
@@ -111,7 +111,7 @@ public final class NeutronQosPolicyInterface extends AbstractNeutronInterface<Qo
             result.setTenantID(qosPolicy.getTenantId());
         }
         if (qosPolicy.getName() != null) {
-            result.setQosPolicyName(qosPolicy.getName());
+            result.setName(qosPolicy.getName());
         }
         if (qosPolicy.isShared() != null) {
             result.setPolicyIsShared(qosPolicy.isShared());
index 05987cb53825638e9a63360d3acce27137dd23d7..3e17b1e22c169e00cddbd9ac71ec4f18cc275b97 100644 (file)
@@ -37,7 +37,7 @@ public final class NeutronSecurityGroupInterface
     protected NeutronSecurityGroup fromMd(SecurityGroup group) {
         final NeutronSecurityGroup answer = new NeutronSecurityGroup();
         if (group.getName() != null) {
-            answer.setSecurityGroupName(group.getName());
+            answer.setName(group.getName());
         }
         if (group.getTenantId() != null) {
             answer.setTenantID(group.getTenantId());
@@ -51,8 +51,8 @@ public final class NeutronSecurityGroupInterface
     @Override
     protected SecurityGroup toMd(NeutronSecurityGroup securityGroup) {
         final SecurityGroupBuilder securityGroupBuilder = new SecurityGroupBuilder();
-        if (securityGroup.getSecurityGroupName() != null) {
-            securityGroupBuilder.setName(securityGroup.getSecurityGroupName());
+        if (securityGroup.getName() != null) {
+            securityGroupBuilder.setName(securityGroup.getName());
         }
         if (securityGroup.getTenantID() != null) {
             securityGroupBuilder.setTenantId(toUuid(securityGroup.getTenantID()));