From: Ed Warnicke <eaw@cisco.com>
Date: Fri, 1 Aug 2014 02:30:50 +0000 (+0000)
Subject: Merge "Fixed for bug 1168 : Issue while update subnet"
X-Git-Tag: release/helium~384
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=17d82f582a6bc13c78be3b19954ff8c021180e93;hp=-c

Merge "Fixed for bug 1168 : Issue while update subnet"
---

17d82f582a6bc13c78be3b19954ff8c021180e93
diff --combined opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java
index 840029006b,4b6f24b6b6..d032d2e8ac
--- a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java
+++ b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java
@@@ -25,7 -25,7 +25,7 @@@ import org.opendaylight.controller.conf
  @XmlRootElement
  @XmlAccessorType(XmlAccessType.NONE)
  
 -public class NeutronSubnet extends ConfigurationObject implements Serializable {
 +public class NeutronSubnet extends ConfigurationObject implements Serializable, INeutronObject {
      private static final long serialVersionUID = 1L;
  
      // See OpenStack Network API v2.0 Reference for description of
@@@ -75,7 -75,7 +75,7 @@@
       */
      List<NeutronPort> myPorts;
  
-     boolean gatewayIPAssigned;
+     Boolean gatewayIPAssigned;
  
      public NeutronSubnet() {
          myPorts = new ArrayList<NeutronPort>();
@@@ -83,8 -83,6 +83,8 @@@
  
      public String getID() { return subnetUUID; }
  
 +    public void setID(String id) { this.subnetUUID = id; }
 +
      public String getSubnetUUID() {
          return subnetUUID;
      }
@@@ -460,6 -458,10 +460,10 @@@
          gatewayIPAssigned = false;
      }
  
+     public Boolean getGatewayIPAllocated() {
+         return gatewayIPAssigned;
+     }
+ 
      @Override
      public String toString() {
          return "NeutronSubnet [subnetUUID=" + subnetUUID + ", networkUUID=" + networkUUID + ", name=" + name