Bug 5431 - Fixing bug & adding new tests for LB files

Fixing wrong parameter type in @GET function in
LB NN API and adding new tests for LB
files. Increased code coverage ~ 20% for these files

Change-Id: I4a5c373fc199c868655f6fef6be581cef761d24a
Signed-off-by: Ritu Sood <ritu.sood@intel.com>

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBHealthMonitorTests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBHealthMonitorTests.java
index 844bb70a077d1ea6135341a81697028a83a3059e..c2628c0baa0fc8e0c7d280ccf821ab21a786f0e8 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBHealthMonitorTests.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBHealthMonitorTests.java
@@ -29,7 +29,7 @@ public class NeutronLBHealthMonitorTests {
         ITNeutronE2E.test_fetch(url, "LB Health Monitor Collection GET failed");
     }
 
-    public void singleton_lb_healthMonitor_create_test() {
+    public String singleton_lb_healthMonitor_create_test() {
         String url = base + "/lbaas/healthmonitors";
         String content = " { \"healthmonitor\": { \"admin_state_up\": true," +
             "\"delay\": 1, \"expected_codes\": \"200,201,202\"," +
@@ -41,6 +41,12 @@ public class NeutronLBHealthMonitorTests {
             "\"timeout\": 1, \"type\": \"HTTP\"," +
             "\"url_path\": \"/index.html\" } }";
         ITNeutronE2E.test_create(url, content, "Singleton LB Health Monitor Post Failed NB");
+        return content;
+    }
+
+    public void singleton_lb_healthMonitor_with_one_query_item_test(String createJsonString) {
+        String url = base + "/lbaas/healthmonitors";
+        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "healthmonitors");
     }
 
     public void healthMonitor_update_test() {
@@ -82,7 +88,8 @@ public class NeutronLBHealthMonitorTests {
 
     public static void runTests(String base) {
         NeutronLBHealthMonitorTests healthMonitor_tester = new NeutronLBHealthMonitorTests(base);
-        healthMonitor_tester.singleton_lb_healthMonitor_create_test();
+        String createJsonString = healthMonitor_tester.singleton_lb_healthMonitor_create_test();
+        healthMonitor_tester.singleton_lb_healthMonitor_with_one_query_item_test(createJsonString);
         healthMonitor_tester.healthMonitor_update_test();
         healthMonitor_tester.healthMonitor_element_get_test();
         healthMonitor_tester.healthMonitor_element_get_with_query_test();

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBListenerTests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBListenerTests.java
index c07467e4118b6019d19c9f03353219103c8fafcf..052d67a62eb259d61c8550d1bdce99c634b9bf58 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBListenerTests.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBListenerTests.java
@@ -30,7 +30,7 @@ public class NeutronLBListenerTests {
     }
 
     //TODO handle SB check
-    public void singleton_lb_listener_create_test() {
+    public String singleton_lb_listener_create_test() {
         String url = base + "/lbaas/listeners";
         String content = "{ \"listener\": { " +
             "\"admin_state_up\": true, " +
@@ -45,6 +45,12 @@ public class NeutronLBListenerTests {
             "\"protocol_port\": 80, " +
             "\"tenant_id\": \"b7c1a69e88bf4b21a8148f787aef2081\" } }";
         ITNeutronE2E.test_create(url, content, "Singleton LB Listener Post Failed NB");
+        return content;
+    }
+
+    public void singleton_lb_listener_get_with_one_query_item_test(String createJsonString) {
+        String url = base + "/lbaas/listeners";
+        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "listeners");
     }
 
     public void listener_update_test() {
@@ -88,7 +94,8 @@ public class NeutronLBListenerTests {
 
     public static void runTests(String base) {
         NeutronLBListenerTests listener_tester = new NeutronLBListenerTests(base);
-        listener_tester.singleton_lb_listener_create_test();
+        String createJsonString = listener_tester.singleton_lb_listener_create_test();
+        listener_tester.singleton_lb_listener_get_with_one_query_item_test(createJsonString);
         listener_tester.listener_update_test();
         listener_tester.listener_element_get_test();
         listener_tester.listener_element_get_with_query_test();

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBPoolMembersTests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBPoolMembersTests.java
index e713d4f756e4fc8719f6a1fc1a672f370b807ef2..11aa77ca5b7ced9ce0731071e9d9f8620193168a 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBPoolMembersTests.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBPoolMembersTests.java
@@ -30,7 +30,7 @@ public class NeutronLBPoolMembersTests {
     }
 
     //TODO handle SB check
-    public void singleton_lb_pool_member_create_test() {
+    public String singleton_lb_pool_member_create_test() {
         String url = base + "/lbaas/pools/12ff63af-4127-4074-a251-bcb2ecc53ebe/members";
         String content = " { \"member\": { \"address\": \"10.0.0.8\"," +
             "\"admin_state_up\": true," +
@@ -40,6 +40,12 @@ public class NeutronLBPoolMembersTests {
             "\"tenant_id\": \"1a3e005cf9ce40308c900bcb08e5320c\"," +
             "\"weight\": 1 } }";
         ITNeutronE2E.test_create(url, content, "Singleton LB Pool Member Post Failed NB");
+        return content;
+    }
+
+    public void singleton_lb_pool_member_get_with_one_query_item_test(String createJsonString) {
+        String url = base + "/lbaas/pools/12ff63af-4127-4074-a251-bcb2ecc53ebe/members";
+        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "members");
     }
 
     public void pool_member_update_test() {
@@ -79,7 +85,8 @@ public class NeutronLBPoolMembersTests {
 
     public static void runTests(String base) {
         NeutronLBPoolMembersTests pool_member_tester = new NeutronLBPoolMembersTests(base);
-        pool_member_tester.singleton_lb_pool_member_create_test();
+        String createJsonString = pool_member_tester.singleton_lb_pool_member_create_test();
+        pool_member_tester.singleton_lb_pool_member_get_with_one_query_item_test(createJsonString);
         pool_member_tester.pool_member_update_test();
         pool_member_tester.pool_member_element_get_test();
         pool_member_tester.pool_member_element_get_with_query_test();

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBPoolTests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBPoolTests.java
index cff267f017643680c1efd46e99fbb14240b7721e..ca35b37ce412af5570f84015dcea41ad4bf6e5df 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBPoolTests.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBPoolTests.java
@@ -30,7 +30,7 @@ public class NeutronLBPoolTests {
     }
 
     //TODO handle SB check
-    public void singleton_lb_pool_create_test() {
+    public String singleton_lb_pool_create_test() {
         String url = base + "/lbaas/pools";
         String content = "{ \"pool\": { " +
             "\"admin_state_up\": true, " +
@@ -48,6 +48,12 @@ public class NeutronLBPoolTests {
                 "\"type\": \"APP_COOKIE\" }, " +
             "\"tenant_id\": \"b7c1a69e88bf4b21a8148f787aef2081\" } }";
         ITNeutronE2E.test_create(url, content, "Singleton LB Pool Post Failed NB");
+        return content;
+    }
+
+    public void singleton_lb_pool_get_with_one_query_item_test(String createJsonString) {
+        String url = base + "/lbaas/pools";
+        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "pools");
     }
 
     public void pool_update_test() {
@@ -94,7 +100,8 @@ public class NeutronLBPoolTests {
 
     public static void runTests(String base) {
         NeutronLBPoolTests pool_tester = new NeutronLBPoolTests(base);
-        pool_tester.singleton_lb_pool_create_test();
+        String createJsonString = pool_tester.singleton_lb_pool_create_test();
+        pool_tester.singleton_lb_pool_get_with_one_query_item_test(createJsonString);
         pool_tester.pool_update_test();
         pool_tester.pool_element_get_test();
         pool_tester.pool_element_get_with_query_test();

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLoadBalancerTests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLoadBalancerTests.java
index a5b9023bb15722ab1cd1ab60f9a668a831b989aa..ed87f4d423f6820a9801f6e9d359e9bffc52e6de 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLoadBalancerTests.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLoadBalancerTests.java
@@ -30,7 +30,7 @@ public class NeutronLoadBalancerTests {
     }
 
     //TODO handle SB check
-    public void singleton_loadbalancer_create_test() {
+    public String singleton_loadbalancer_create_test() {
         String url = base + "/lbaas/loadbalancers";
         String content = "{ \"loadbalancer\": { " +
             "\"admin_state_up\": true, " +
@@ -44,6 +44,12 @@ public class NeutronLoadBalancerTests {
             "\"vip_address\": \"10.0.0.4\", " +
             "\"vip_subnet_id\": \"013d3059-87a4-45a5-91e9-d721068ae0b2\" } }";
         ITNeutronE2E.test_create(url, content, "Singleton Load Balancer Post Failed NB");
+        return content;
+    }
+
+    public void singleton_loadbalancer_get_with_one_query_item_test(String createJsonString) {
+        String url = base + "/lbaas/loadbalancers";
+        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "loadbalancers");
     }
 
     public void loadBalancer_update_test() {
@@ -86,7 +92,8 @@ public class NeutronLoadBalancerTests {
 
     public static void runTests(String base) {
         NeutronLoadBalancerTests loadBalancer_tester = new NeutronLoadBalancerTests(base);
-        loadBalancer_tester.singleton_loadbalancer_create_test();
+        String createJsonString = loadBalancer_tester.singleton_loadbalancer_create_test();
+        loadBalancer_tester.singleton_loadbalancer_get_with_one_query_item_test(createJsonString);
         loadBalancer_tester.loadBalancer_update_test();
         loadBalancer_tester.loadBalancer_element_get_test();
         loadBalancer_tester.loadBalancer_element_get_with_query_test();

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
index b9ffe256fb392ed64a487086c17953dd3d12b713..bf32e2967e21bd8cce10ffdc8396169a47d3bc7a 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
@@ -142,7 +142,7 @@ public class NeutronLoadBalancerListenerNorthbound
             @QueryParam("description") String queryLoadBalancerListenerDescription,
             @QueryParam("protocol") String queryLoadBalancerListenerProtocol,
             @QueryParam("protocol_port") String queryLoadBalancerListenerProtocolPort,
-            @QueryParam("admin_state_up") String queryLoadBalancerListenerAdminIsUp,
+            @QueryParam("admin_state_up") Boolean queryLoadBalancerListenerAdminIsUp,
             // pagination
             @QueryParam("limit") String limit,
             @QueryParam("marker") String marker,

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
index 6ef9ef3306831d0448eef594bc8a788db164c262..98330783d2cdd339db01f06334d30c004a7ed678 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
@@ -156,7 +156,7 @@ public class NeutronLoadBalancerPoolNorthbound
             @QueryParam("protocol") String queryLoadBalancerProtocol,
             @QueryParam("lb_algorithm") String queryLoadBalancerPoolLbAlgorithm,
             @QueryParam("healthmonitor_id") String queryLoadBalancerPoolHealthMonitorID,
-            @QueryParam("admin_state_up") String queryLoadBalancerIsAdminStateUp,
+            @QueryParam("admin_state_up") Boolean queryLoadBalancerIsAdminStateUp,
             @QueryParam("members") List<NeutronLoadBalancerPoolMember> queryLoadBalancerPoolMembers,
             // pagination
             @QueryParam("limit") String limit,
@@ -283,8 +283,8 @@ public class NeutronLoadBalancerPoolNorthbound
             @QueryParam("tenant_id") String queryLoadBalancerPoolMemberTenantID,
             @QueryParam("address") String queryLoadBalancerPoolMemberAddress,
             @QueryParam("protocol_port") String queryLoadBalancerPoolMemberProtoPort,
-            @QueryParam("admin_state_up") String queryLoadBalancerPoolMemberAdminStateUp,
-            @QueryParam("weight") String queryLoadBalancerPoolMemberWeight,
+            @QueryParam("admin_state_up") Boolean queryLoadBalancerPoolMemberAdminStateUp,
+            @QueryParam("weight") Integer queryLoadBalancerPoolMemberWeight,
             @QueryParam("subnet_id") String queryLoadBalancerPoolMemberSubnetID,
 
             // pagination