Merge "Fixed for bug : 1171 - issue while creating subnet"

[controller.git] / opendaylight / networkconfiguration / neutron / src / main / java / org / opendaylight / controller / networkconfig / neutron / NeutronSubnet.java

diff --git 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
index 4b6f24b6b651488f559e6489093e8213196e0774..1f10b395137c498b3e542e974545132332e84be4 100644 (file)
--- 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 @@ import org.opendaylight.controller.configuration.ConfigurationObject;
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 
 @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
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of


@@ -83,6 +83,8 @@ public class NeutronSubnet extends ConfigurationObject implements Serializable {
 
     public String getID() { return subnetUUID; }
 
 
     public String getID() { return subnetUUID; }
 

+    public void setID(String id) { this.subnetUUID = id; }
+

     public String getSubnetUUID() {
         return subnetUUID;
     }
     public String getSubnetUUID() {
         return subnetUUID;
     }


@@ -297,7 +299,7 @@ public class NeutronSubnet extends ConfigurationObject implements Serializable {
             try {
                 SubnetUtils util = new SubnetUtils(cidr);
                 SubnetInfo info = util.getInfo();
             try {
                 SubnetUtils util = new SubnetUtils(cidr);
                 SubnetInfo info = util.getInfo();

-                if (gatewayIP == null) {
+                if (gatewayIP == null || ("").equals(gatewayIP)) {

                     gatewayIP = info.getLowAddress();
                 }
                 if (allocationPools.size() < 1) {
                     gatewayIP = info.getLowAddress();
                 }
                 if (allocationPools.size() < 1) {