neutorn-spi: remove neutron prefix of field

field name of neutron spi doesn't prefix neutron.
The following three classes have the fields with neutorn prefix.
NeutronL2gateway, NeutronL2gatewayDevice, NeutronLoadBalancerListener
remove prefix of the fields of those classes For consistency.

Change-Id: I81984a294b4601bfb18b24140d03d615dba1424a
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gateway.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gateway.java
index cb9dcae9383a09d48fe5afff56a277522563f528..8da9e9d2241c82d7cbf83a14e24603710a13deb1 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gateway.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gateway.java
@@ -20,14 +20,14 @@ public final class NeutronL2gateway extends NeutronBaseAttributes<NeutronL2gatew
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "devices")
-    List<NeutronL2gatewayDevice> neutronL2gatewayDevices;
+    List<NeutronL2gatewayDevice> l2gatewayDevices;
 
     public List<NeutronL2gatewayDevice> getNeutronL2gatewayDevices() {
-        return neutronL2gatewayDevices;
+        return l2gatewayDevices;
     }
 
-    public void setNeutronL2gatewayDevices(List<NeutronL2gatewayDevice> neutronL2gatewayDevices) {
-        this.neutronL2gatewayDevices = neutronL2gatewayDevices;
+    public void setNeutronL2gatewayDevices(List<NeutronL2gatewayDevice> l2gatewayDevices) {
+        this.l2gatewayDevices = l2gatewayDevices;
     }
 
     public NeutronL2gateway extractFields(List<String> fields) {
@@ -46,7 +46,7 @@ public final class NeutronL2gateway extends NeutronBaseAttributes<NeutronL2gatew
     @Override
     public String toString() {
         return "NeutronL2Gateway [" + "id = " + uuid + ", name = " + name + ", tenant_id = " + tenantID
-                + ", devices = " + neutronL2gatewayDevices + "]";
+                + ", devices = " + l2gatewayDevices + "]";
     }
 
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java
index 397a442f8745527560e6ab7adeccf1e5aee1a0df..ff4392d508ea47586288fbb9dc96179898891506 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java
@@ -17,7 +17,7 @@ public final class NeutronL2gatewayDevice extends NeutronID implements Serializa
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "interfaces")
-    List<NeutronL2gatewayDeviceInterface> neutronL2gatewayDeviceInterfaces;
+    List<NeutronL2gatewayDeviceInterface> l2gatewayDeviceInterfaces;
 
     @XmlElement(name = "device_name")
     String deviceName;
@@ -31,17 +31,17 @@ public final class NeutronL2gatewayDevice extends NeutronID implements Serializa
     }
 
     public List<NeutronL2gatewayDeviceInterface> getNeutronL2gatewayDeviceInterfaces() {
-        return neutronL2gatewayDeviceInterfaces;
+        return l2gatewayDeviceInterfaces;
     }
 
     public void setNeutronL2gatewayDeviceInterfaces(
-            List<NeutronL2gatewayDeviceInterface> neutronL2gatewayDeviceInterfaces) {
-        this.neutronL2gatewayDeviceInterfaces = neutronL2gatewayDeviceInterfaces;
+            List<NeutronL2gatewayDeviceInterface> l2gatewayDeviceInterfaces) {
+        this.l2gatewayDeviceInterfaces = l2gatewayDeviceInterfaces;
     }
 
     @Override
     public String toString() {
         return "NeutronL2gatewayDevice [" + "id=" + uuid + ", neutronL2gwDeviceInterfaces="
-                + neutronL2gatewayDeviceInterfaces + ", deviceName=" + deviceName + "]";
+                + l2gatewayDeviceInterfaces + ", deviceName=" + deviceName + "]";
     }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
index 5f2bc3bd3aede31040aa9303c19a599494198ab0..6c2c7453f40ddf2394fb3957e3525881704a143f 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
@@ -44,22 +44,22 @@ public final class NeutronLoadBalancerListener extends NeutronBaseAttributes<Neu
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "default_pool_id")
-    String neutronLoadBalancerListenerDefaultPoolID;
+    String loadBalancerListenerDefaultPoolID;
 
     @XmlElement(name = "connection_limit")
-    Integer neutronLoadBalancerListenerConnectionLimit;
+    Integer loadBalancerListenerConnectionLimit;
 
     @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean loadBalancerListenerAdminStateIsUp;
 
     @XmlElement(name = "protocol")
-    String neutronLoadBalancerListenerProtocol;
+    String loadBalancerListenerProtocol;
 
     @XmlElement(name = "protocol_port")
-    String neutronLoadBalancerListenerProtocolPort;
+    String loadBalancerListenerProtocolPort;
 
     @XmlElement(name = "loadbalancers")
-    List<NeutronID> neutronLoadBalancerListenerLoadBalancerIDs;
+    List<NeutronID> loadBalancerListenerLoadBalancerIDs;
 
     public Boolean getLoadBalancerListenerAdminStateIsUp() {
         return loadBalancerListenerAdminStateIsUp;
@@ -70,44 +70,44 @@ public final class NeutronLoadBalancerListener extends NeutronBaseAttributes<Neu
     }
 
     public String getNeutronLoadBalancerListenerProtocol() {
-        return neutronLoadBalancerListenerProtocol;
+        return loadBalancerListenerProtocol;
     }
 
-    public void setNeutronLoadBalancerListenerProtocol(String neutronLoadBalancerListenerProtocol) {
-        this.neutronLoadBalancerListenerProtocol = neutronLoadBalancerListenerProtocol;
+    public void setNeutronLoadBalancerListenerProtocol(String loadBalancerListenerProtocol) {
+        this.loadBalancerListenerProtocol = loadBalancerListenerProtocol;
     }
 
     public String getNeutronLoadBalancerListenerProtocolPort() {
-        return neutronLoadBalancerListenerProtocolPort;
+        return loadBalancerListenerProtocolPort;
     }
 
-    public void setNeutronLoadBalancerListenerProtocolPort(String neutronLoadBalancerListenerProtocolPort) {
-        this.neutronLoadBalancerListenerProtocolPort = neutronLoadBalancerListenerProtocolPort;
+    public void setNeutronLoadBalancerListenerProtocolPort(String loadBalancerListenerProtocolPort) {
+        this.loadBalancerListenerProtocolPort = loadBalancerListenerProtocolPort;
     }
 
     public String getNeutronLoadBalancerListenerDefaultPoolID() {
-        return neutronLoadBalancerListenerDefaultPoolID;
+        return loadBalancerListenerDefaultPoolID;
     }
 
-    public void setNeutronLoadBalancerListenerDefaultPoolID(String neutronLoadBalancerListenerDefaultPoolID) {
-        this.neutronLoadBalancerListenerDefaultPoolID = neutronLoadBalancerListenerDefaultPoolID;
+    public void setNeutronLoadBalancerListenerDefaultPoolID(String loadBalancerListenerDefaultPoolID) {
+        this.loadBalancerListenerDefaultPoolID = loadBalancerListenerDefaultPoolID;
     }
 
     public Integer getNeutronLoadBalancerListenerConnectionLimit() {
-        return neutronLoadBalancerListenerConnectionLimit;
+        return loadBalancerListenerConnectionLimit;
     }
 
-    public void setNeutronLoadBalancerListenerConnectionLimit(Integer neutronLoadBalancerListenerConnectionLimit) {
-        this.neutronLoadBalancerListenerConnectionLimit = neutronLoadBalancerListenerConnectionLimit;
+    public void setNeutronLoadBalancerListenerConnectionLimit(Integer loadBalancerListenerConnectionLimit) {
+        this.loadBalancerListenerConnectionLimit = loadBalancerListenerConnectionLimit;
     }
 
     public List<NeutronID> getNeutronLoadBalancerListenerLoadBalancerIDs() {
-        return neutronLoadBalancerListenerLoadBalancerIDs;
+        return loadBalancerListenerLoadBalancerIDs;
     }
 
     public void setNeutronLoadBalancerListenerLoadBalancerIDs(
-            List<NeutronID> neutronLoadBalancerListenerLoadBalancerIDs) {
-        this.neutronLoadBalancerListenerLoadBalancerIDs = neutronLoadBalancerListenerLoadBalancerIDs;
+            List<NeutronID> loadBalancerListenerLoadBalancerIDs) {
+        this.loadBalancerListenerLoadBalancerIDs = loadBalancerListenerLoadBalancerIDs;
     }
 
     public NeutronLoadBalancerListener extractFields(List<String> fields) {
@@ -133,14 +133,14 @@ public final class NeutronLoadBalancerListener extends NeutronBaseAttributes<Neu
     @Override
     public String toString() {
         return "NeutronLoadBalancerListener{" + "loadBalancerListenerID='" + uuid + '\''
-                + ", neutronLoadBalancerListenerDefaultPoolID='" + neutronLoadBalancerListenerDefaultPoolID + '\''
-                + ", neutronLoadBalancerListenerConnectionLimit='" + neutronLoadBalancerListenerConnectionLimit + '\''
+                + ", loadBalancerListenerDefaultPoolID='" + loadBalancerListenerDefaultPoolID + '\''
+                + ", loadBalancerListenerConnectionLimit='" + loadBalancerListenerConnectionLimit + '\''
                 + ", loadBalancerListenerTenantID='" + tenantID + '\''
                 + ", loadBalancerListenerName='" + name + '\''
                 + ", loadBalancerListenerAdminStateIsUp=" + loadBalancerListenerAdminStateIsUp + '\''
-                + ", neutronLoadBalancerListenerProtocol='" + neutronLoadBalancerListenerProtocol + '\''
-                + ", neutronLoadBalancerListenerProtocolPort='" + neutronLoadBalancerListenerProtocolPort + '\''
-                + ", neutronLoadBalancerListenerLoadBalancerIDs='" + neutronLoadBalancerListenerLoadBalancerIDs + '\''
+                + ", loadBalancerListenerProtocol='" + loadBalancerListenerProtocol + '\''
+                + ", loadBalancerListenerProtocolPort='" + loadBalancerListenerProtocolPort + '\''
+                + ", loadBalancerListenerLoadBalancerIDs='" + loadBalancerListenerLoadBalancerIDs + '\''
                 + '}';
     }
 }