Bug 7848: Allow neutron port create with security disabled.

Add default parameters in test validation.

Change-Id: Id5fcf5701763d72274a96f1a0af29a7546bc24f8
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Signed-off-by: Achuth Maniyedath <achuth.m@altencalsoftlabs.com>
(cherry picked from commit 4e9ef800bfb39a9cef35fe9e97ae7aae43f76065)

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronNetworkTests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronNetworkTests.java
index db00c50da5089d8e7a701aeee40b9de118fd5e89..d649f067d1a8b5baa01915d6cfca05829c9acd8d 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronNetworkTests.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronNetworkTests.java
@@ -9,10 +9,8 @@
 package org.opendaylight.neutron.e2etest;
 
 import java.lang.Thread;
-
 import java.net.HttpURLConnection;
 import java.net.URL;
-
 import org.junit.Assert;
 
 public class NeutronNetworkTests {
@@ -74,6 +72,20 @@ public class NeutronNetworkTests {
         ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "networks");
     }
 
+    public String singleton_default_network_create_test() {
+        String url = base + "/networks";
+        String content = "{ \"network\": {" + "\"name\": \"netdefault\", \"subnets\": [], "
+                + " \"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
+                + " \"router:external\": false, \"segments\": [ " + " { \"provider:segmentation_id\": 2, "
+                + " \"provider:physical_network\": \"8bab8453-1bc9-45af-8c70-f83aa9b50453\", "
+                + " \"provider:network_type\": \"vlan\" }, { " + " \"provider:segmentation_id\": null, "
+                + " \"provider:physical_network\": \"8bab8453-1bc9-45af-8c70-f83aa9b50453\", "
+                + " \"provider:network_type\": \"stt\" } ], "
+                + " \"id\": \"de8e5957-d49f-d77b-de5b-d1f75b21c03c\" " + " } } ";
+        ITNeutronE2E.test_create(url, content, "Singleton Default Network Post Failed NB");
+        return content;
+    }
+
     //TODO handle SB check
     public void external_network_create_test() {
         String url = base + "/networks";
@@ -163,6 +175,7 @@ public class NeutronNetworkTests {
         network_tester.network_collection_get_test_with_wait();
         String createJsonString = network_tester.singleton_network_create_test();
         network_tester.singleton_network_get_with_one_query_item_test(createJsonString);
+        network_tester.singleton_default_network_create_test();
         network_tester.external_network_create_test(); //needed for router test
         network_tester.bulk_network_create_test();
         network_tester.network_update_test();

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronPortTests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronPortTests.java
index 6ef06abcfb294fb90ada171b63fc9e22ed7d701a..0773950893e8c466011ee96e855b5382497b890d 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronPortTests.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronPortTests.java
@@ -51,6 +51,22 @@ public class NeutronPortTests {
         ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "ports");
     }
 
+    public String singleton_default_port_create_test() {
+        String url = base + "/ports";
+        String content = "{ \"port\": { \"binding:host_id\": \"\","
+                + "\"name\": \"default-port\"," + "\"allowed_address_pairs\": [],"
+                + "\"network_id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\","
+                + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\"," + "\"binding:vif_details\": {},"
+                + "\"binding:vnic_type\": \"normal\"," + "\"binding:vif_type\": \"unbound\","
+                + "\"device_owner\": \"\"," + "\"mac_address\": \"fa:16:3e:c9:cb:f0\"," + "\"binding:profile\": {},"
+                + "\"fixed_ips\": [ {" + "\"subnet_id\": \"3b80198d-4f7b-4f77-9ef5-774d54e17126\","
+                + "\"ip_address\": \"10.0.0.2\" } ]," + "\"id\": \"d5c0ee9f-d634-d522-d954-d1021b570b0d\","
+                + "\"security_groups\": [] ," + "\"device_id\": \"\" } }";
+        ITNeutronE2E.test_create(url, content, "Singleton Default Port Post Failed NB");
+        return content;
+    }
+
+
     //TODO handle SB check
     public void router_interface_port_create_test() {
         String url = base + "/ports";
@@ -146,6 +162,7 @@ public class NeutronPortTests {
         NeutronPortTests port_tester = new NeutronPortTests(base);
         String createJsonString = port_tester.singleton_port_create_test();
         port_tester.singleton_port_get_with_one_query_item_test(createJsonString);
+        port_tester.singleton_default_port_create_test();
         port_tester.router_interface_port_create_test(); //needed for router test
         port_tester.bulk_port_create_test();
         port_tester.port_update_test();

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBgpvpn.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBgpvpn.java
index d759ed76e6243bfc488e5e160cc9fcd012168aab..eeb1a665d93be29dec79cdebff0032f5907fb82b 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBgpvpn.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBgpvpn.java
@@ -28,12 +28,6 @@ public class NeutronBgpvpn extends NeutronObject implements Serializable, INeutr
     @XmlElement (name = "name")
     String bgpvpnName;
 
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
-    Boolean adminStateUp;
-
-    @XmlElement (name = "status")
-    String status;
-
     @XmlElement (defaultValue = "l3", name = "type")
     String type;
 
@@ -72,15 +66,10 @@ public class NeutronBgpvpn extends NeutronObject implements Serializable, INeutr
     }
 
     public void initDefaults() {
+        super.initDefaults();
         if (type == null) {
             type = "l3";
         }
-        if (status == null) {
-            status = "ACTIVE";
-        }
-        if (adminStateUp == null) {
-            adminStateUp = true;
-        }
         if (autoAggregate == null) {
             autoAggregate = false;
         }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
index 589dc8c2847595d6c43e6a44ddc36a113e35215f..c98084f8380c7fbdd47aed6d344ad45768510625 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
@@ -277,8 +277,4 @@ public class NeutronFirewallRule extends NeutronObject implements Serializable,
             ", firewallRuleIsEnabled=" + firewallRuleIsEnabled +
             '}';
     }
-
-    @Override
-    public void initDefaults() {
-    }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
index 93b82f071c18ba5bc0777606cffccdfdb5fd153c..f87052983f60c82ce48e8e082988a3bf17c0cdd2 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
@@ -29,9 +29,6 @@ public class NeutronNetwork extends NeutronObject implements Serializable, INeut
     @XmlElement (name = "name")
     String networkName;
 
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
-    Boolean adminStateUp;
-
     @XmlElement (defaultValue = "false", name = "shared")
     Boolean shared;
 
@@ -51,9 +48,6 @@ public class NeutronNetwork extends NeutronObject implements Serializable, INeut
     @XmlElement (namespace="provider", name="segmentation_id")
     String providerSegmentationID;
 
-    @XmlElement (name = "status")
-    String status;
-
     @XmlElement (name="segments")
     List<NeutronNetwork_Segment> segments;
 
@@ -75,12 +69,7 @@ public class NeutronNetwork extends NeutronObject implements Serializable, INeut
 
     @Override
     public void initDefaults() {
-        if (status == null) {
-            status = "ACTIVE";
-        }
-        if (adminStateUp == null) {
-            adminStateUp = true;
-        }
+        super.initDefaults();
         if (shared == null) {
             shared = false;
         }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java
index dd32f8b17a51fd2f7c5b331788330f1a0aa1fcfd..1bbfa5b00656a04d38466304e9503158f3842851 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java
@@ -24,6 +24,12 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.
 public class NeutronObject extends Neutron_ID implements Serializable, INeutronObject {
     private static final long serialVersionUID = 1L;
 
+    @XmlElement(defaultValue = "true", name = "admin_state_up")
+    Boolean adminStateUp;
+
+    @XmlElement(name = "status")
+    String status;
+
     @XmlElement (name = "tenant_id")
     String tenantID;
 
@@ -59,5 +65,11 @@ public class NeutronObject extends Neutron_ID implements Serializable, INeutronO
 
     @Override
     public void initDefaults() {
+        if (status == null) {
+            status = "ACTIVE";
+        }
+        if (adminStateUp == null) {
+            adminStateUp = true;
+        }
     }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java
index dc000577764cbf0781c0561a0fe40db9157b7d79..bea8c9f54f98cad71da0aac8da9cf48d5e3d986e 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java
@@ -36,12 +36,6 @@ public class NeutronPort extends NeutronObject implements Serializable, INeutron
     @XmlElement (name = "name")
     String name;
 
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
-    Boolean adminStateUp;
-
-    @XmlElement (name = "status")
-    String status;
-
     @XmlElement (name = "mac_address")
     String macAddress;
 
@@ -310,10 +304,9 @@ public class NeutronPort extends NeutronObject implements Serializable, INeutron
 
     @Override
     public void initDefaults() {
-        adminStateUp = true;
-        portSecurityEnabled = true;
-        if (status == null) {
-            status = "ACTIVE";
+        super.initDefaults();
+        if (portSecurityEnabled == null) {
+            portSecurityEnabled = true;
         }
         if (fixedIPs == null) {
             fixedIPs = new ArrayList<Neutron_IPs>();

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
index 74dc54230f1bcc7255555208c0591e0f40b7b605..9491fc1db81e68bfbb69506f7cc4d9ed98ceba01 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
@@ -154,11 +154,6 @@ public class NeutronRouter extends NeutronObject implements Serializable, INeutr
         return ans;
     }
 
-    @Override
-    public void initDefaults() {
-        adminStateUp = true;
-    }
-
     @Override
     public String toString() {
         return "NeutronRouter [" +

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
index 81ddb0a7e9cdbd5bb19dd21793ac742b8a8b1ea8..71673f0c2cb7a3a491f19cc11779800df52cd7e4 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
@@ -73,9 +73,4 @@ public class NeutronSecurityGroup extends NeutronObject implements Serializable,
                 ", securityGroupTenantID='" + tenantID + '\'' +
                 "]";
     }
-
-    @Override
-    public void initDefaults() {
-        //TODO verify no defaults values are nessecary required.
-    }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java
index 9b0bfa90265ff30411667cdd170614847a39216b..6f3b498bd19dda77922464c0f48a81e6022ec40e 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java
@@ -183,9 +183,4 @@ public class NeutronSecurityRule extends NeutronObject implements Serializable,
             ", securityRuleTenantID='" + tenantID + '\'' +
             '}';
     }
-
-    @Override
-    public void initDefaults() {
-        //TODO verify no defaults values are nessecary required.
-    }
 }