Issue #290, re-enable and fix some LBaaS tests

Author: gondor

connectors/okhttp/pom.xml

@@ -11,7 +11,7 @@
 	<packaging>jar</packaging>
 
 	<properties>
-		<okhttp.version>2.2.0</okhttp.version>
+		<okhttp.version>2.3.0</okhttp.version>
 	</properties>
 
 	<dependencies>

connectors/okhttp/src/main/java/org/openstack4j/connectors/okhttp/HttpResponseImpl.java

@@ -89,7 +89,12 @@ public String getStatusMessage() {
      * @return the input stream
      */
     public InputStream getInputStream() {
-        return response.body().byteStream();
+        try {
+            return response.body().byteStream();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
     }
 
     /**

connectors/pom.xml

@@ -36,7 +36,7 @@
         <dependency>
             <groupId>com.squareup.okhttp</groupId>
             <artifactId>mockwebserver</artifactId>
-            <version>2.1.0</version>
+            <version>2.3.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

core-test/pom.xml

@@ -21,7 +21,7 @@
 				<dependency>
 						<groupId>com.squareup.okhttp</groupId>
 						<artifactId>mockwebserver</artifactId>
-						<version>2.2.0</version>
+						<version>2.3.0</version>
 						<scope>provided</scope>
 					</dependency>
 					<dependency>

core-test/src/main/java/org/openstack4j/api/AbstractTest.java

@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.google.common.io.ByteStreams;
 import com.squareup.okhttp.mockwebserver.MockResponse;
 import com.squareup.okhttp.mockwebserver.MockWebServer;
 
@@ -65,7 +66,7 @@ protected void startServer() throws UnknownHostException {
         Logger.getLogger(getClass().getName()).info("Tests using connector: " + HttpExecutor.create().getExecutorName() + " on " + getHost());
         try {
         	Logger.getLogger(getClass().getName()).info("Starting server on port "+service().port);
-            server.play(service().port);
+            server.start(service().port);
         }
         catch (IOException e) {
             e.printStackTrace();
@@ -84,7 +85,7 @@ protected void startServer() throws UnknownHostException {
     protected void respondWith(String resource) throws IOException {
         MockResponse r = new MockResponse();
         InputStream is = getClass().getResourceAsStream(resource);
-        r.setBody(is, is.available());
+        r.setBody(new String(ByteStreams.toByteArray(is)));
         r.setHeader("Content-Type", "application/json");
         server.enqueue(r);
     }
@@ -146,6 +147,7 @@ protected OSClient os() {
 
             try {
                 String json = new String(Streams.readAll(getClass().getResourceAsStream(JSON_ACCESS)));
+                Logger.getLogger(getClass().getName()).info(getClass().getName());
               //  Logger.getLogger(getClass().getName()).info(getClass().getName() + ", JSON Access = " + json);
                 json = json.replaceAll("127.0.0.1", getHost());
                // Logger.getLogger(getClass().getName()).info("JSON Access = " + json);

core-test/src/main/java/org/openstack4j/api/network/LbPoolTests.java

@@ -2,8 +2,10 @@
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,38 +19,42 @@
 import org.openstack4j.model.network.ext.LbPoolUpdate;
 import org.openstack4j.openstack.networking.domain.ext.LbMethod;
 import org.openstack4j.openstack.networking.domain.ext.Protocol;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * 
- * @author liujunpeng
- *
- */
-@Test(suiteName="Network/lbpool", enabled=false)
-public class LbPoolTests extends AbstractTest{
-	public void testListPool() {
+@Test(suiteName="Network/lbpool", enabled=true)
+public class LbPoolTests extends AbstractTest {
+
+    private static final String LBPOOLS_JSON = "/network/lbpools.json";
+    private static final String LBPOOL_JSON = "/network/lbpool.json";
+    private static final String LBPOOL_UPDATE_JSON = "/network/lbpool_update.json";
+    
+	public void testListPool() throws IOException {
+	    respondWith(LBPOOLS_JSON);
 		List<? extends LbPool> list = os().networking().loadbalancers().lbPool().list();
-		System.out.println("test lb pool List" + list);
 		assertEquals(1, list.size());
+		assertEquals(list.get(0).getSubnetId(), "8032909d-47a1-4715-90af-5153ffe39861");
 	}
 
-	public void testListPoolFilter() {
+	public void testListPoolFilter() throws IOException {
+	    respondWith(LBPOOLS_JSON);
 		Map<String, String> map = new HashMap<String, String>();
 		map.put("name", "pool");
 		List<? extends LbPool> list = os().networking().loadbalancers().lbPool().list(map);
-		System.out.println("test lb pool List filter" + list);
 		assertEquals(1, list.size());
 	}
 
-	public void testGetPool() {
-		String id = "f6f1a5bb-2c5d-4c41-941c-024eb39414a6";
+	public void testGetPool() throws IOException {
+	    respondWith(LBPOOL_JSON);
+		String id = "4c0a0a5f-cf8f-44b7-b912-957daa8ce5e5";
 		LbPool pool = os().networking().loadbalancers().lbPool().get(id);
-		System.out.println("test get a pool" + pool);
+		assertNotNull(pool);
 		assertEquals(id, pool.getId());
 	}
 
-	public void testCreatePool() {
-		String name = "create";
+	public void testCreatePool() throws IOException {
+	    respondWith(LBPOOL_JSON);
+		String name = "pool1";
 		String protocol = Protocol.HTTP.toString();
 		LbPool create = Builders.lbPool().adminStateUp(true)
 				.description("pool").lbMethod(LbMethod.ROUND_ROBIN.toString())
@@ -58,11 +64,11 @@ public void testCreatePool() {
 				.protocol(protocol).build();
 		LbPool result = os().networking().loadbalancers().lbPool().create(create);
 		assertEquals(name, result.getName());
-		assertEquals(LbMethod.ROUND_ROBIN.toString(), result.getLbMethod());
+		assertEquals(result.getLbMethod(), LbMethod.ROUND_ROBIN.toString());
 		assertEquals(protocol, result.getProtocol());
 	}
-
-	public void testUpdatePool() {
+	public void testUpdatePool() throws IOException {
+	    respondWith(LBPOOL_UPDATE_JSON);
 		String poolId = "db083bf7-c455-4758-b1ad-203cf441a73a";
 		String name = "update";
 		LbPoolUpdate update = Builders.lbPoolUpdate().adminStateUp(false)
@@ -76,28 +82,30 @@ public void testUpdatePool() {
 		assertFalse(result.isAdminStateUp());
 	}
 
+	@Test(enabled=false)
 	public void testAssociateHealthMonitor() {
 		String poolId = "db083bf7-c455-4758-b1ad-203cf441a73a";
 		String healthId = "8767284a-b542-4db6-8393-0a404a959c1d";
 		HealthMonitorAssociate associate = Builders.lbPoolAssociateHealthMonitor().id(healthId).build();
 		HealthMonitor result = os().networking().loadbalancers().lbPool().associateHealthMonitor(poolId, associate);
 		assertTrue(result != null);
 	}
-
+	
+    @Test(enabled=false)
 	public void testDisAssociateHealthMonitor() {
 		String poolId = "db083bf7-c455-4758-b1ad-203cf441a73a";
 		String healthId = "8767284a-b542-4db6-8393-0a404a959c1d";
 		ActionResponse result = os().networking().loadbalancers().lbPool()
 				.disAssociateHealthMonitor(poolId, healthId);
 		assertTrue(result.isSuccess());
 	}
-
+	
 	public void testDeletePool() {
-		String id = "02ae87ec-5502-469e-8c41-f2c57d185054";
-		ActionResponse result = os().networking().loadbalancers().lbPool().delete(id);
-		System.out.println("delete a pool" + result);
+	    respondWith(200);
+		ActionResponse result = os().networking().loadbalancers().lbPool().delete("02ae87ec-5502-469e-8c41-f2c57d185054");
 		assertTrue(result.isSuccess());
 	}
+	
 	@Override
 	protected Service service() {
 		return Service.NETWORK;

core-test/src/main/resources/network/lbpool.json

@@ -0,0 +1,19 @@
+{
+    "pool": {
+        "admin_state_up": true,
+        "description": "simple pool",
+        "healthmonitor_id": null,
+        "id": "4c0a0a5f-cf8f-44b7-b912-957daa8ce5e5",
+        "lb_method": "ROUND_ROBIN",
+        "listeners": [
+            {
+                "id": "35cb8516-1173-4035-8dae-0dae3453f37f"
+            }
+        ],
+        "members": [],
+        "name": "pool1",
+        "protocol": "HTTP",
+        "subnet_id":"7d1dab60-cf8a-4f75-af5c-44aab98b0c42",
+        "tenant_id":"d7fd03242ffa4933863bc528ed884fb6"
+    }
+}

core-test/src/main/resources/network/lbpool_update.json

@@ -0,0 +1,19 @@
+{
+    "pool": {
+        "admin_state_up": false,
+        "description": "update",
+        "healthmonitor_id": null,
+        "id": "4c0a0a5f-cf8f-44b7-b912-957daa8ce5e5",
+        "lb_method": "LEAST_CONNECTIONS",
+        "listeners": [
+            {
+                "id": "35cb8516-1173-4035-8dae-0dae3453f37f"
+            }
+        ],
+        "members": [],
+        "name": "update",
+        "protocol": "HTTP",
+        "subnet_id":"7d1dab60-cf8a-4f75-af5c-44aab98b0c42",
+        "tenant_id":"d7fd03242ffa4933863bc528ed884fb6"
+    }
+}

core-test/src/main/resources/network/lbpools.json

@@ -0,0 +1,24 @@
+{
+   "pools":[
+      {
+         "status":"ACTIVE",
+         "lb_method":"ROUND_ROBIN",
+         "protocol":"HTTP",
+         "description":"",
+         "health_monitors":[
+            "466c8345-28d8-4f84-a246-e04380b0461d",
+            "5d4b5228-33b0-4e60-b225-9b727c1a20e7"
+         ],
+         "subnet_id":"8032909d-47a1-4715-90af-5153ffe39861",
+         "tenant_id":"83657cfcdfe44cd5920adaf26c48ceea",
+         "admin_state_up":true,
+         "name":"app_pool",
+         "members":[
+            "701b531b-111a-4f21-ad85-4795b7b12af6",
+            "beb53b4d-230b-4abd-8118-575b8fa006ef"
+         ],
+         "id":"72741b06-df4d-4715-b142-276b6bce75ab",
+         "vip_id":"4ec89087-d057-4e2c-911f-60a3b47ee304"
+      }
+   ]
+}