Merge "Bug 6641: Fix ip_address in allowed_address_pairs info"

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

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
index 25e2a547d035f19b786e8f59f330762e6753040d..295180c202be8cf05e6a2fc9e91421c4e80b4ecd 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.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 Firewall as a service
@@ -25,60 +25,31 @@ import java.util.List;
  * id                 uuid-str
  * tenant_id          uuid-str
  * name               String
- * description        String
  * admin_state_up     Bool
- * status             String
  * shared             Bool
  * firewall_policy_id uuid-str
  * http://docs.openstack.org/api/openstack-network/2.0/openstack-network.pdf
+ *
  */
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-
-public class NeutronFirewall implements Serializable {
+public final class NeutronFirewall extends NeutronObject<NeutronFirewall>
+        implements Serializable, INeutronObject<NeutronFirewall> {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(name = "id")
-    String firewallUUID;
-
-    @XmlElement (name = "tenant_id")
-    String firewallTenantID;
-
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String firewallName;
 
-    @XmlElement (name = "description")
-    String firewallDescription;
-
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
+    @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean firewallAdminStateIsUp;
 
-    @XmlElement (name = "status")
-    String firewallStatus;
-
-    @XmlElement (defaultValue = "false", name = "shared")
+    @XmlElement(defaultValue = "false", name = "shared")
     Boolean firewallIsShared;
 
-    @XmlElement (name = "firewall_policy_id")
+    @XmlElement(name = "firewall_policy_id")
     String neutronFirewallPolicyID;
 
-    public String getFirewallUUID() {
-        return firewallUUID;
-    }
-
-    public void setFirewallUUID(String firewallUUID) {
-        this.firewallUUID = firewallUUID;
-    }
-
-    public String getFirewallTenantID() {
-        return firewallTenantID;
-    }
-
-    public void setFirewallTenantID(String firewallTenantID) {
-        this.firewallTenantID = firewallTenantID;
-    }
-
     public String getFirewallName() {
         return firewallName;
     }
@@ -87,14 +58,6 @@ public class NeutronFirewall implements Serializable {
         this.firewallName = firewallName;
     }
 
-    public String getFirewallDescription() {
-        return firewallDescription;
-    }
-
-    public void setFirewallDescription(String firewallDescription) {
-        this.firewallDescription = firewallDescription;
-    }
-
     public Boolean getFirewallAdminStateIsUp() {
         return firewallAdminStateIsUp;
     }
@@ -103,14 +66,6 @@ public class NeutronFirewall implements Serializable {
         this.firewallAdminStateIsUp = firewallAdminStateIsUp;
     }
 
-    public String getFirewallStatus() {
-        return firewallStatus;
-    }
-
-    public void setFirewallStatus(String firewallStatus) {
-        this.firewallStatus = firewallStatus;
-    }
-
     public Boolean getFirewallIsShared() {
         return firewallIsShared;
     }
@@ -123,7 +78,7 @@ public class NeutronFirewall implements Serializable {
         return neutronFirewallPolicyID;
     }
 
-    public void setNeutronFirewallPolicyID(String firewallPolicy) {
+    public void setFirewallPolicyID(String firewallPolicy) {
         this.neutronFirewallPolicyID = firewallPolicy;
     }
 
@@ -133,28 +88,22 @@ public class NeutronFirewall implements Serializable {
         while (i.hasNext()) {
             String s = i.next();
             if (s.equals("id")) {
-                ans.setFirewallUUID(this.getFirewallUUID());
+                ans.setID(this.getID());
             }
             if (s.equals("tenant_id")) {
-                ans.setFirewallTenantID(this.getFirewallTenantID());
+                ans.setTenantID(this.getTenantID());
             }
             if (s.equals("name")) {
                 ans.setFirewallName(this.getFirewallName());
             }
-            if(s.equals("description")) {
-                ans.setFirewallDescription(this.getFirewallDescription());
-            }
             if (s.equals("admin_state_up")) {
                 ans.setFirewallAdminStateIsUp(firewallAdminStateIsUp);
             }
-            if (s.equals("status")) {
-                ans.setFirewallStatus(this.getFirewallStatus());
-            }
             if (s.equals("shared")) {
                 ans.setFirewallIsShared(firewallIsShared);
             }
             if (s.equals("firewall_policy_id")) {
-                ans.setNeutronFirewallPolicyID(this.getFirewallPolicyID());
+                ans.setFirewallPolicyID(this.getFirewallPolicyID());
             }
         }
         return ans;
@@ -162,15 +111,8 @@ public class NeutronFirewall implements Serializable {
 
     @Override
     public String toString() {
-        return "NeutronFirewall{" +
-            "firewallUUID='" + firewallUUID + '\'' +
-            ", firewallTenantID='" + firewallTenantID + '\'' +
-            ", firewallName='" + firewallName + '\'' +
-            ", firewallDescription='" + firewallDescription + '\'' +
-            ", firewallAdminStateIsUp=" + firewallAdminStateIsUp +
-            ", firewallStatus='" + firewallStatus + '\'' +
-            ", firewallIsShared=" + firewallIsShared +
-            ", firewallRulePolicyID=" + neutronFirewallPolicyID +
-            '}';
+        return "NeutronFirewall{" + "firewallUUID='" + uuid + '\'' + ", firewallTenantID='" + tenantID + '\''
+                + ", firewallName='" + firewallName + '\'' + ", firewallAdminStateIsUp=" + firewallAdminStateIsUp
+                + ", firewallIsShared=" + firewallIsShared + ", firewallRulePolicyID=" + neutronFirewallPolicyID + '}';
     }
 }