AT&T 1712 and 1802 release code

[so.git] / adapters / mso-adapters-rest-interface / src / main / java / org / openecomp / mso / openstack / beans / Subnet.java

diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/Subnet.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/openstack/beans/Subnet.java
similarity index 85%
rename from adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/Subnet.java
rename to adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/openstack/beans/Subnet.java
index eea4741..086395c 100644 (file)
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/Subnet.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/openstack/beans/Subnet.java
@@ -41,8 +41,10 @@ public class Subnet {
     private String ipVersion="4";
 
     private Boolean enableDHCP=false;
+    
+    private Boolean addrFromStart=true;
 
-    private List<String> hostRoutes;
+    private List<HostRoute> hostRoutes;
 
     private List<Pool> allocationPools;
 
@@ -58,7 +60,7 @@ public class Subnet {
        public void setSubnetName(String subnetName) {
                this.subnetName = subnetName;
        }
-
+       
        public List<Pool> getAllocationPools() {
                return allocationPools;
        }
@@ -82,7 +84,15 @@ public class Subnet {
         return enableDHCP;
     }
 
-    /**
+       public Boolean getAddrFromStart() {
+               return addrFromStart;
+       }
+
+       public void setAddrFromStart(Boolean addrFromStart) {
+               this.addrFromStart = addrFromStart;
+       }
+
+       /**
      * @return the gw
      */
     public String getGatewayIp() {
@@ -92,7 +102,7 @@ public class Subnet {
     /**
      * @return the hostRoutes
      */
-    public List<String> getHostRoutes() {
+    public List<HostRoute> getHostRoutes() {
         return hostRoutes;
     }
 
@@ -158,7 +168,7 @@ public class Subnet {
      * @param hostRoutes
      *            the hostRoutes to set
      */
-    public void setHostRoutes(List<String> hostRoutes) {
+    public void setHostRoutes(List<HostRoute> hostRoutes) {
         this.hostRoutes = hostRoutes;
     }
 
@@ -186,15 +196,12 @@ public class Subnet {
         this.subnetId = subnetId;
     }
 
- 
        @Override
        public String toString() {
-               return "Subnet [subnetName=" + subnetName + ", neutronId=" + neutronId
-                               + ", subnetId=" + subnetId + ", cidr=" + cidr + ", gatewayIp="
-                               + gatewayIp + ", ipVersion=" + ipVersion + ", enableDHCP="
-                               + enableDHCP + ", hostRoutes=" + hostRoutes
-                               + ", allocationPools=" + allocationPools + ", dnsNameServers="
-                               + dnsNameServers + "]";
+               return "Subnet [subnetName=" + subnetName + ", neutronId=" + neutronId + ", subnetId=" + subnetId + ", cidr="
+                               + cidr + ", gatewayIp=" + gatewayIp + ", ipVersion=" + ipVersion + ", enableDHCP=" + enableDHCP
+                               + ", addrFromStart=" + addrFromStart + ", hostRoutes=" + hostRoutes + ", allocationPools="
+                               + allocationPools + ", dnsNameServers=" + dnsNameServers + "]";
        }
 
 }