You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2014/10/30 22:04:21 UTC
git commit: Fixes the versioning issue in live tests as well as other
stability issues
Repository: jclouds-labs-openstack
Updated Branches:
refs/heads/master 56c586bdf -> 551b21a08
Fixes the versioning issue in live tests as well as other stability issues
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/551b21a0
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/551b21a0
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/551b21a0
Branch: refs/heads/master
Commit: 551b21a08655c5e7824e56f2cdf8dbbe43e7f0d4
Parents: 56c586b
Author: Zack Shoylev <za...@rackspace.com>
Authored: Tue Oct 28 19:52:40 2014 -0500
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Thu Oct 30 16:03:37 2014 -0500
----------------------------------------------------------------------
openstack-neutron/pom.xml | 2 +-
.../neutron/v2/extensions/RouterApiLiveTest.java | 4 ++--
.../neutron/v2/extensions/RouterApiMockTest.java | 6 +++++-
.../v2/extensions/lbaas/v1/LBaaSApiLiveTest.java | 6 +++++-
.../v2_0/features/NetworkApiLiveTest.java | 2 +-
.../neutron/v2_0/features/PortApiLiveTest.java | 2 +-
.../v2_0/features/SubnetApiExpectTest.java | 19 ++++++++++---------
.../neutron/v2_0/features/SubnetApiLiveTest.java | 2 +-
.../test/resources/router_create_request.json | 3 ++-
.../test/resources/router_create_response.json | 3 ++-
10 files changed, 30 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/551b21a0/openstack-neutron/pom.xml
----------------------------------------------------------------------
diff --git a/openstack-neutron/pom.xml b/openstack-neutron/pom.xml
index 0a661ef..17e5623 100644
--- a/openstack-neutron/pom.xml
+++ b/openstack-neutron/pom.xml
@@ -38,7 +38,7 @@
<!-- keystone endpoint -->
<test.openstack-neutron.endpoint>http://localhost:5000/v2.0/</test.openstack-neutron.endpoint>
<!-- keystone version -->
- <test.openstack-neutron.api-version>2.0</test.openstack-neutron.api-version>
+ <test.openstack-neutron.api-version>v2.0</test.openstack-neutron.api-version>
<test.openstack-neutron.build-version />
<test.openstack-neutron.identity>FIXME_IDENTITY</test.openstack-neutron.identity>
<test.openstack-neutron.credential>FIXME_CREDENTIALS</test.openstack-neutron.credential>
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/551b21a0/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiLiveTest.java
index 2a006e8..046aec7 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiLiveTest.java
@@ -56,7 +56,7 @@ public class RouterApiLiveTest extends BaseNeutronApiLiveTest {
assertNotNull(subnet);
Router router = routerApi.create(Router.createBuilder().name("jclouds-router-test")
- .externalGatewayInfo(ExternalGatewayInfo.builder().networkId(network.getId()).build()).build());
+ .externalGatewayInfo(ExternalGatewayInfo.builder().networkId(network.getId()).enableSnat(true).build()).build());
assertNotNull(router);
/* List and Get test */
@@ -72,7 +72,7 @@ public class RouterApiLiveTest extends BaseNeutronApiLiveTest {
assertEquals(routerGet.getName(), router.getName());
assertEquals(routerGet.getId(), router.getId());
- assertEquals(routerGet.getExternalGatewayInfo(), router.getExternalGatewayInfo());
+ assertEquals(routerGet.getExternalGatewayInfo().getNetworkId(), router.getExternalGatewayInfo().getNetworkId());
Router routerUpdate = routerApi.update(router.getId(), Router.updateBuilder().name("jclouds-router-test-rename").build());
assertNotNull(routerUpdate);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/551b21a0/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java
index b829799..dab3b78 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java
@@ -60,7 +60,10 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
RouterApi api = neutronApi.getRouterApi("RegionOne").get();
Router.CreateRouter createRouter = Router.createBuilder().name("another_router").adminStateUp(Boolean.TRUE)
- .externalGatewayInfo(ExternalGatewayInfo.builder().networkId("8ca37218-28ff-41cb-9b10-039601ea7e6b").build())
+ .externalGatewayInfo(ExternalGatewayInfo.builder()
+ .networkId("8ca37218-28ff-41cb-9b10-039601ea7e6b")
+ .enableSnat(true)
+ .build())
.build();
Router router = api.create(createRouter);
@@ -79,6 +82,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
assertNotNull(router);
assertEquals(router.getName(), "another_router");
assertEquals(router.getExternalGatewayInfo().getNetworkId(), "8ca37218-28ff-41cb-9b10-039601ea7e6b");
+ assertEquals(router.getExternalGatewayInfo().getEnableSnat().booleanValue(), true);
assertEquals(router.getStatus(), NetworkStatus.ACTIVE);
assertEquals(router.getAdminStateUp(), Boolean.TRUE);
assertEquals(router.getId(), "8604a0de-7f6b-409a-a47c-a1cc7bc77b2e");
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/551b21a0/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java
index 5d83d25..90564b9 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java
@@ -25,6 +25,7 @@ import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
import org.jclouds.logging.Logger;
import org.jclouds.openstack.neutron.v2.domain.Network;
@@ -54,6 +55,7 @@ import org.testng.annotations.Test;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.Uninterruptibles;
@Test(groups = "live", testName = "LBaaSApiLiveTest")
public class LBaaSApiLiveTest extends BaseNeutronApiLiveTest {
@@ -213,7 +215,7 @@ public class LBaaSApiLiveTest extends BaseNeutronApiLiveTest {
}
}
- public void testCreateUpdateAndDeleteMember() {
+ public void testCreateUpdateAndDeleteMember() throws InterruptedException {
for (String region : api.getConfiguredRegions()) {
Optional<LBaaSApi> lbaasApiExtension = api.getLBaaSApi(region);
if (!lbaasApiExtension.isPresent()) {
@@ -252,6 +254,8 @@ public class LBaaSApiLiveTest extends BaseNeutronApiLiveTest {
assertNull(member.getStatusDescription());
// List and Get
+ Thread.sleep(5000);
+ Uninterruptibles.sleepUninterruptibly(5, TimeUnit.SECONDS);
Members members = lbaasApi.listMembers(PaginationOptions.Builder.queryParameters(ImmutableMap.of("tenant_id", subnet.getTenantId()).asMultimap()));
assertNotNull(members);
assertFalse(members.isEmpty());
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/551b21a0/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java
index cc72b1c..938e353 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java
@@ -41,7 +41,7 @@ import com.google.common.collect.Sets;
* Tests parsing and Guice wiring of NetworkApi
*
*/
-@Test(groups = "live", testName = "NetworkApiLiveTest")
+@Test(groups = "live", testName = "NetworkApiLiveTest", singleThreaded = true)
public class NetworkApiLiveTest extends BaseNeutronApiLiveTest {
public void testGetAndListNetworks() {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/551b21a0/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java
index 76f3734..3b6f93a 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java
@@ -45,7 +45,7 @@ import com.google.common.collect.Sets;
* Tests PortApi in combination with the Network & SubnetApi
*
*/
-@Test(groups = "live", testName = "PortApiLiveTest")
+@Test(groups = "live", testName = "PortApiLiveTest", singleThreaded = true)
public class PortApiLiveTest extends BaseNeutronApiLiveTest {
public void testGetAndListPorts() {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/551b21a0/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java
index 0cab1dd..bb40fc3 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java
@@ -16,8 +16,14 @@
*/
package org.jclouds.openstack.neutron.v2_0.features;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
+import java.util.Set;
+
import org.jclouds.http.HttpResponse;
import org.jclouds.openstack.neutron.v2_0.domain.BulkSubnet;
import org.jclouds.openstack.neutron.v2_0.domain.ReferenceWithName;
@@ -30,13 +36,8 @@ import org.jclouds.openstack.neutron.v2_0.parse.ParseSubnetTest;
import org.jclouds.rest.AuthorizationException;
import org.testng.annotations.Test;
-import java.util.Set;
-
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
/**
* Tests parsing and Guice wiring of SubnetApi
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/551b21a0/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java
index b463339..a2bf3ec 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java
@@ -45,7 +45,7 @@ import com.google.common.collect.Sets;
* Tests subnet api in combination with the network api
*
*/
-@Test(groups = "live", testName = "SubnetApiLiveTest")
+@Test(groups = "live", testName = "SubnetApiLiveTest", singleThreaded = true)
public class SubnetApiLiveTest extends BaseNeutronApiLiveTest {
public void testGetAndListSubnets() {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/551b21a0/openstack-neutron/src/test/resources/router_create_request.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/router_create_request.json b/openstack-neutron/src/test/resources/router_create_request.json
index 106e5d4..9992028 100644
--- a/openstack-neutron/src/test/resources/router_create_request.json
+++ b/openstack-neutron/src/test/resources/router_create_request.json
@@ -2,7 +2,8 @@
"router": {
"name": "another_router",
"external_gateway_info": {
- "network_id": "8ca37218-28ff-41cb-9b10-039601ea7e6b"
+ "network_id": "8ca37218-28ff-41cb-9b10-039601ea7e6b",
+ "enable_snat":true
},
"admin_state_up": true
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/551b21a0/openstack-neutron/src/test/resources/router_create_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/router_create_response.json b/openstack-neutron/src/test/resources/router_create_response.json
index d851d76..a9c1286 100644
--- a/openstack-neutron/src/test/resources/router_create_response.json
+++ b/openstack-neutron/src/test/resources/router_create_response.json
@@ -2,7 +2,8 @@
"router": {
"status": "ACTIVE",
"external_gateway_info": {
- "network_id": "8ca37218-28ff-41cb-9b10-039601ea7e6b"
+ "network_id": "8ca37218-28ff-41cb-9b10-039601ea7e6b",
+ "enable_snat":true
},
"name": "another_router",
"admin_state_up": true,