Merge "Use ${project.version} for internal dependencies"

[ovsdb.git] / openstack / net-virt / src / main / java / org / opendaylight / ovsdb / openstack / netvirt / translator / NeutronNetwork.java

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/NeutronNetwork.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/NeutronNetwork.java
index b6396dc6e42c782c948201bd0199e572aabca9c6..1e008ec76aa33111361dbc59a8e95011e832a1d8 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/NeutronNetwork.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/NeutronNetwork.java
@@ -10,7 +10,6 @@ package org.opendaylight.ovsdb.openstack.netvirt.translator;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -61,9 +60,6 @@ public class NeutronNetwork implements Serializable, INeutronObject {
     @XmlElement (name = "status")
     String status;
 
-    @XmlElement (name = "subnets")
-    List<String> subnets;
-
     @XmlElement (name="segments")
     List<NeutronNetwork_Segment> segments;
 
@@ -81,7 +77,6 @@ public class NeutronNetwork implements Serializable, INeutronObject {
     }
 
     public void initDefaults() {
-        subnets = new ArrayList<String>();
         if (status == null) {
             status = "ACTIVE";
         }
@@ -185,22 +180,6 @@ public class NeutronNetwork implements Serializable, INeutronObject {
         this.status = status;
     }
 
-    public List<String> getSubnets() {
-        return subnets;
-    }
-
-    public void setSubnets(List<String> subnets) {
-        this.subnets = subnets;
-    }
-
-    public void addSubnet(String uuid) {
-        subnets.add(uuid);
-    }
-
-    public void removeSubnet(String uuid) {
-        subnets.remove(uuid);
-    }
-
     public void setSegments(List<NeutronNetwork_Segment> segments) {
         this.segments = segments;
     }
@@ -237,43 +216,38 @@ public class NeutronNetwork implements Serializable, INeutronObject {
 
     public NeutronNetwork extractFields(List<String> fields) {
         NeutronNetwork ans = new NeutronNetwork();
-        Iterator<String> i = fields.iterator();
-        while (i.hasNext()) {
-            String s = i.next();
-            if (s.equals("id")) {
-                ans.setNetworkUUID(this.getNetworkUUID());
-            }
-            if (s.equals("name")) {
-                ans.setNetworkName(this.getNetworkName());
-            }
-            if (s.equals("admin_state_up")) {
-                ans.setAdminStateUp(adminStateUp);
-            }
-            if (s.equals("status")) {
-                ans.setStatus(this.getStatus());
-            }
-            if (s.equals("subnets")) {
-                List<String> subnetList = new ArrayList<String>();
-                subnetList.addAll(this.getSubnets());
-                ans.setSubnets(subnetList);
-            }
-            if (s.equals("shared")) {
-                ans.setShared(shared);
-            }
-            if (s.equals("tenant_id")) {
-                ans.setTenantID(this.getTenantID());
-            }
-            if (s.equals("external")) {
-                ans.setRouterExternal(this.getRouterExternal());
-            }
-            if (s.equals("segmentation_id")) {
-                ans.setProviderSegmentationID(this.getProviderSegmentationID());
-            }
-            if (s.equals("physical_network")) {
-                ans.setProviderPhysicalNetwork(this.getProviderPhysicalNetwork());
-            }
-            if (s.equals("network_type")) {
-                ans.setProviderNetworkType(this.getProviderNetworkType());
+        for (String s : fields) {
+            switch (s) {
+                case "id":
+                    ans.setNetworkUUID(this.getNetworkUUID());
+                    break;
+                case "name":
+                    ans.setNetworkName(this.getNetworkName());
+                    break;
+                case "admin_state_up":
+                    ans.setAdminStateUp(adminStateUp);
+                    break;
+                case "status":
+                    ans.setStatus(this.getStatus());
+                    break;
+                case "shared":
+                    ans.setShared(shared);
+                    break;
+                case "tenant_id":
+                    ans.setTenantID(this.getTenantID());
+                    break;
+                case "external":
+                    ans.setRouterExternal(this.getRouterExternal());
+                    break;
+                case "segmentation_id":
+                    ans.setProviderSegmentationID(this.getProviderSegmentationID());
+                    break;
+                case "physical_network":
+                    ans.setProviderPhysicalNetwork(this.getProviderPhysicalNetwork());
+                    break;
+                case "network_type":
+                    ans.setProviderNetworkType(this.getProviderNetworkType());
+                    break;
             }
         }
         return ans;
@@ -285,7 +259,7 @@ public class NeutronNetwork implements Serializable, INeutronObject {
                 + adminStateUp + ", shared=" + shared + ", tenantID=" + tenantID + ", routerExternal=" + routerExternal
                 + ", providerNetworkType=" + providerNetworkType + ", providerPhysicalNetwork="
                 + providerPhysicalNetwork + ", providerSegmentationID=" + providerSegmentationID + ", status=" + status
-                + ", subnets=" + subnets + ", segments = " + segments + "]";
+                + ", segments = " + segments + "]";
     }
 }