Merge "Bug 6641: Fix ip_address in allowed_address_pairs info"

[neutron.git] / neutron-spi / src / main / java / org / opendaylight / neutron / spi / NeutronLoadBalancerListener.java

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 6f8607a63ae651b9ee994ba347d79bbb7b0fb692..9f6b863810dd6df1c625b0aa3c9b4542354fd19c 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
@@ -8,13 +8,13 @@
 
 package org.opendaylight.neutron.spi;
 
+import java.io.Serializable;
+import java.util.Iterator;
+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;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * OpenStack Neutron v2.0 Load Balancer as a service
@@ -26,7 +26,6 @@ import java.util.List;
  * default_pool_id    String
  * tenant_id          uuid-str
  * name               String
- * description        String
  * shared             Bool
  * protocol           String
  * protocol_port      String
@@ -39,57 +38,31 @@ import java.util.List;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-
-public class NeutronLoadBalancerListener implements Serializable {
+public final class NeutronLoadBalancerListener extends NeutronObject<NeutronLoadBalancerListener>
+        implements Serializable, INeutronObject<NeutronLoadBalancerListener> {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(name = "id")
-    String loadBalancerListenerID;
-
-    @XmlElement (name = "default_pool_id")
+    @XmlElement(name = "default_pool_id")
     String neutronLoadBalancerListenerDefaultPoolID;
 
-    @XmlElement (name = "connection_limit")
+    @XmlElement(name = "connection_limit")
     Integer neutronLoadBalancerListenerConnectionLimit;
 
-    @XmlElement (name = "tenant_id")
-    String loadBalancerListenerTenantID;
-
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String loadBalancerListenerName;
 
-    @XmlElement (name = "description")
-    String loadBalancerListenerDescription;
-
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
+    @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean loadBalancerListenerAdminStateIsUp;
 
-    @XmlElement (name = "protocol")
+    @XmlElement(name = "protocol")
     String neutronLoadBalancerListenerProtocol;
 
-    @XmlElement (name = "protocol_port")
+    @XmlElement(name = "protocol_port")
     String neutronLoadBalancerListenerProtocolPort;
 
-    @XmlElement (name = "load_balancers")
+    @XmlElement(name = "load_balancers")
     List<Neutron_ID> neutronLoadBalancerListenerLoadBalancerIDs;
 
-
-    public String getLoadBalancerListenerID() {
-        return loadBalancerListenerID;
-    }
-
-    public void setLoadBalancerListenerID(String loadBalancerListenerID) {
-        this.loadBalancerListenerID = loadBalancerListenerID;
-    }
-
-    public String getLoadBalancerListenerTenantID() {
-        return loadBalancerListenerTenantID;
-    }
-
-    public void setLoadBalancerListenerTenantID(String loadBalancerListenerTenantID) {
-        this.loadBalancerListenerTenantID = loadBalancerListenerTenantID;
-    }
-
     public String getLoadBalancerListenerName() {
         return loadBalancerListenerName;
     }
@@ -98,14 +71,6 @@ public class NeutronLoadBalancerListener implements Serializable {
         this.loadBalancerListenerName = loadBalancerListenerName;
     }
 
-    public String getLoadBalancerListenerDescription() {
-        return loadBalancerListenerDescription;
-    }
-
-    public void setLoadBalancerListenerDescription(String loadBalancerListenerDescription) {
-        this.loadBalancerListenerDescription = loadBalancerListenerDescription;
-    }
-
     public Boolean getLoadBalancerListenerAdminStateIsUp() {
         return loadBalancerListenerAdminStateIsUp;
     }
@@ -150,7 +115,8 @@ public class NeutronLoadBalancerListener implements Serializable {
         return neutronLoadBalancerListenerLoadBalancerIDs;
     }
 
-    public void setNeutronLoadBalancerListenerLoadBalancerIDs(List<Neutron_ID> neutronLoadBalancerListenerLoadBalancerIDs) {
+    public void setNeutronLoadBalancerListenerLoadBalancerIDs(
+            List<Neutron_ID> neutronLoadBalancerListenerLoadBalancerIDs) {
         this.neutronLoadBalancerListenerLoadBalancerIDs = neutronLoadBalancerListenerLoadBalancerIDs;
     }
 
@@ -160,20 +126,17 @@ public class NeutronLoadBalancerListener implements Serializable {
         while (i.hasNext()) {
             String s = i.next();
             if (s.equals("id")) {
-                ans.setLoadBalancerListenerID(this.getLoadBalancerListenerID());
+                ans.setID(this.getID());
             }
-            if(s.equals("default_pool_id")) {
+            if (s.equals("default_pool_id")) {
                 ans.setNeutronLoadBalancerListenerDefaultPoolID(this.getNeutronLoadBalancerListenerDefaultPoolID());
             }
             if (s.equals("tenant_id")) {
-                ans.setLoadBalancerListenerTenantID(this.getLoadBalancerListenerTenantID());
+                ans.setTenantID(this.getTenantID());
             }
             if (s.equals("name")) {
                 ans.setLoadBalancerListenerName(this.getLoadBalancerListenerName());
             }
-            if(s.equals("description")) {
-                ans.setLoadBalancerListenerDescription(this.getLoadBalancerListenerDescription());
-            }
             if (s.equals("protocol")) {
                 ans.setNeutronLoadBalancerListenerProtocol(this.getNeutronLoadBalancerListenerProtocol());
             }
@@ -187,17 +150,15 @@ public class NeutronLoadBalancerListener implements Serializable {
         return ans;
     }
 
-    @Override public String toString() {
-        return "NeutronLoadBalancerListener{" +
-                "loadBalancerListenerID='" + loadBalancerListenerID + '\'' +
-                ", neutronLoadBalancerListenerDefaultPoolID='" + neutronLoadBalancerListenerDefaultPoolID + '\'' +
-                ", neutronLoadBalancerListenerConnectionLimit='" + neutronLoadBalancerListenerConnectionLimit + '\'' +
-                ", loadBalancerListenerTenantID='" + loadBalancerListenerTenantID + '\'' +
-                ", loadBalancerListenerName='" + loadBalancerListenerName + '\'' +
-                ", loadBalancerListenerDescription='" + loadBalancerListenerDescription + '\'' +
-                ", loadBalancerListenerAdminStateIsUp=" + loadBalancerListenerAdminStateIsUp +
-                ", neutronLoadBalancerListenerProtocol='" + neutronLoadBalancerListenerProtocol + '\'' +
-                ", neutronLoadBalancerListenerProtocolPort='" + neutronLoadBalancerListenerProtocolPort + '\'' +
-                '}';
+    @Override
+    public String toString() {
+        return "NeutronLoadBalancerListener{" + "loadBalancerListenerID='" + uuid + '\''
+                + ", neutronLoadBalancerListenerDefaultPoolID='" + neutronLoadBalancerListenerDefaultPoolID + '\''
+                + ", neutronLoadBalancerListenerConnectionLimit='" + neutronLoadBalancerListenerConnectionLimit + '\''
+                + ", loadBalancerListenerTenantID='" + tenantID + '\'' + ", loadBalancerListenerName='"
+                + loadBalancerListenerName + '\'' + ", loadBalancerListenerAdminStateIsUp="
+                + loadBalancerListenerAdminStateIsUp + ", neutronLoadBalancerListenerProtocol='"
+                + neutronLoadBalancerListenerProtocol + '\'' + ", neutronLoadBalancerListenerProtocolPort='"
+                + neutronLoadBalancerListenerProtocolPort + '\'' + '}';
     }
 }