mirror of https://github.com/apache/jclouds.git
Prefer Regions to Zones in Neutron v2
This commit is contained in:
Jeremy Daggett
parent
de8c33c2d9
commit
775b63ba41
|
|
@ -18,11 +18,12 @@
|
|||
*/
|
||||
package org.jclouds.openstack.neutron.v2;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.inject.Provides;
|
||||
import java.io.Closeable;
|
||||
import java.util.Set;
|
||||
|
||||
import org.jclouds.javax.annotation.Nullable;
|
||||
import org.jclouds.location.Zone;
|
||||
import org.jclouds.location.functions.ZoneToEndpoint;
|
||||
import org.jclouds.location.Region;
|
||||
import org.jclouds.location.functions.RegionToEndpoint;
|
||||
import org.jclouds.openstack.neutron.v2.extensions.RouterApi;
|
||||
import org.jclouds.openstack.neutron.v2.features.NetworkApi;
|
||||
import org.jclouds.openstack.neutron.v2.features.PortApi;
|
||||
|
|
@ -31,51 +32,47 @@ import org.jclouds.openstack.v2_0.features.ExtensionApi;
|
|||
import org.jclouds.rest.annotations.Delegate;
|
||||
import org.jclouds.rest.annotations.EndpointParam;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.util.Set;
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.inject.Provides;
|
||||
|
||||
/**
|
||||
* Provides synchronous access to Neutron.
|
||||
* <p/>
|
||||
*
|
||||
* @see <a href="http://docs.openstack.org/api/openstack-network/2.0/content/">api doc</a>
|
||||
* Provides synchronous access to the OpenStack Networking (Neutron) v2 API
|
||||
*/
|
||||
public interface NeutronApi extends Closeable {
|
||||
/**
|
||||
* @return the Zone codes configured
|
||||
* @return the Region codes configured
|
||||
*/
|
||||
@Provides
|
||||
@Zone
|
||||
@Region
|
||||
Set<String> getConfiguredRegions();
|
||||
|
||||
/**
|
||||
* Provides synchronous access to Extension features.
|
||||
*/
|
||||
@Delegate
|
||||
ExtensionApi getExtensionApiForZone(
|
||||
@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
|
||||
ExtensionApi getExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
|
||||
|
||||
/**
|
||||
* Provides synchronous access to Network features.
|
||||
*/
|
||||
@Delegate
|
||||
NetworkApi getNetworkApiForZone(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
|
||||
NetworkApi getNetworkApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
|
||||
|
||||
/**
|
||||
* Provides synchronous access to Subnet features
|
||||
*/
|
||||
@Delegate
|
||||
SubnetApi getSubnetApiForZone(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
|
||||
SubnetApi getSubnetApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
|
||||
|
||||
/**
|
||||
* Provides synchronous access to Port features.
|
||||
*/
|
||||
@Delegate
|
||||
PortApi getPortApiForZone(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
|
||||
PortApi getPortApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
|
||||
|
||||
/**
|
||||
* Provides synchronous access to Router features.
|
||||
*/
|
||||
@Delegate
|
||||
Optional<? extends RouterApi> getRouterExtensionForZone(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
|
||||
Optional<? extends RouterApi> getRouterExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,22 +18,23 @@
|
|||
*/
|
||||
package org.jclouds.openstack.neutron.v2;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.inject.Module;
|
||||
import org.jclouds.apis.ApiMetadata;
|
||||
import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule;
|
||||
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
|
||||
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule;
|
||||
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule;
|
||||
import org.jclouds.openstack.neutron.v2.config.NeutronHttpApiModule;
|
||||
import org.jclouds.openstack.v2_0.ServiceType;
|
||||
import org.jclouds.rest.internal.BaseHttpApiMetadata;
|
||||
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
|
||||
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
|
||||
|
||||
import java.net.URI;
|
||||
import java.util.Properties;
|
||||
|
||||
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
|
||||
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
|
||||
import org.jclouds.apis.ApiMetadata;
|
||||
import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule;
|
||||
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
|
||||
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule;
|
||||
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
|
||||
import org.jclouds.openstack.neutron.v2.config.NeutronHttpApiModule;
|
||||
import org.jclouds.openstack.v2_0.ServiceType;
|
||||
import org.jclouds.rest.internal.BaseHttpApiMetadata;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.inject.Module;
|
||||
|
||||
/**
|
||||
* Implementation of {@link org.jclouds.apis.ApiMetadata} for Neutron 2.0 API
|
||||
|
|
@ -77,7 +78,7 @@ public class NeutronApiMetadata extends BaseHttpApiMetadata<NeutronApi> {
|
|||
.defaultModules(ImmutableSet.<Class<? extends Module>>builder()
|
||||
.add(AuthenticationApiModule.class)
|
||||
.add(KeystoneAuthenticationModule.class)
|
||||
.add(ZoneModule.class)
|
||||
.add(RegionModule.class)
|
||||
.add(NeutronHttpApiModule.class).build());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -65,12 +65,12 @@ public class NeutronHttpApiModule extends HttpApiModule<NeutronApi> {
|
|||
|
||||
@Provides
|
||||
@Singleton
|
||||
public LoadingCache<String, Set<? extends Extension>> provideExtensionsByZone(final Provider<NeutronApi> quantumApi) {
|
||||
public LoadingCache<String, Set<? extends Extension>> provideExtensionsByRegion(final Provider<NeutronApi> neutronApi) {
|
||||
return CacheBuilder.newBuilder().expireAfterWrite(23, TimeUnit.HOURS)
|
||||
.build(new CacheLoader<String, Set<? extends Extension>>() {
|
||||
@Override
|
||||
public Set<? extends Extension> load(String key) throws Exception {
|
||||
return quantumApi.get().getExtensionApiForZone(key).list();
|
||||
return neutronApi.get().getExtensionApi(key).list();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ public class NetworksToPagedIterable extends Arg0ToPagedIterable.FromCaller<Netw
|
|||
|
||||
@Override
|
||||
protected Function<Object, IterableWithMarker<Network>> markerToNextForArg0(Optional<Object> arg0) {
|
||||
String zone = arg0.isPresent() ? arg0.get().toString() : null;
|
||||
final NetworkApi networkApi = api.getNetworkApiForZone(zone);
|
||||
String region = arg0.isPresent() ? arg0.get().toString() : null;
|
||||
final NetworkApi networkApi = api.getNetworkApi(region);
|
||||
return new Function<Object, IterableWithMarker<Network>>() {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ public class PortsToPagedIterable extends Arg0ToPagedIterable.FromCaller<Port, P
|
|||
|
||||
@Override
|
||||
protected Function<Object, IterableWithMarker<Port>> markerToNextForArg0(Optional<Object> arg0) {
|
||||
String zone = arg0.isPresent() ? arg0.get().toString() : null;
|
||||
final PortApi portApi = api.getPortApiForZone(zone);
|
||||
String region = arg0.isPresent() ? arg0.get().toString() : null;
|
||||
final PortApi portApi = api.getPortApi(region);
|
||||
return new Function<Object, IterableWithMarker<Port>>() {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ public class RouterToPagedIterable extends Arg0ToPagedIterable.FromCaller<Router
|
|||
|
||||
@Override
|
||||
protected Function<Object, IterableWithMarker<Router>> markerToNextForArg0(Optional<Object> arg0) {
|
||||
String zone = arg0.isPresent() ? arg0.get().toString() : null;
|
||||
final RouterApi routerApi = api.getRouterExtensionForZone(zone).get();
|
||||
String region = arg0.isPresent() ? arg0.get().toString() : null;
|
||||
final RouterApi routerApi = api.getRouterExtensionApi(region).get();
|
||||
return new Function<Object, IterableWithMarker<Router>>() {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ public class SubnetsToPagedIterable extends Arg0ToPagedIterable.FromCaller<Subne
|
|||
|
||||
@Override
|
||||
protected Function<Object, IterableWithMarker<Subnet>> markerToNextForArg0(Optional<Object> arg0) {
|
||||
String zone = arg0.isPresent() ? arg0.get().toString() : null;
|
||||
final SubnetApi subnetApi = api.getSubnetApiForZone(zone);
|
||||
String region = arg0.isPresent() ? arg0.get().toString() : null;
|
||||
final SubnetApi subnetApi = api.getSubnetApi(region);
|
||||
return new Function<Object, IterableWithMarker<Subnet>>() {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
|
|
|
|||
|
|
@ -38,16 +38,16 @@ import static org.testng.Assert.assertTrue;
|
|||
public class NetworkApiLiveTest extends BaseNeutronApiLiveTest {
|
||||
|
||||
public void testCreateUpdateAndDeleteNetwork() {
|
||||
for (String zone : api.getConfiguredRegions()) {
|
||||
NetworkApi networkApi = api.getNetworkApiForZone(zone);
|
||||
for (String region : api.getConfiguredRegions()) {
|
||||
NetworkApi networkApi = api.getNetworkApi(region);
|
||||
Network net = networkApi.create(Network.createOptions("jclouds-test").networkType(NetworkType.LOCAL).build());
|
||||
Network test = networkApi.create(Network.createOptions("jclouds-test").build());
|
||||
assertNotNull(net);
|
||||
|
||||
/* List and get tests */
|
||||
Network networkList = api.getNetworkApiForZone(zone).list().concat().toSet().iterator().next();
|
||||
Network networkList = api.getNetworkApi(region).list().concat().toSet().iterator().next();
|
||||
assertNotNull(networkList);
|
||||
Network networkGet = api.getNetworkApiForZone(zone).get(networkList.getId());
|
||||
Network networkGet = api.getNetworkApi(region).get(networkList.getId());
|
||||
assertEquals(networkList, networkGet);
|
||||
/****/
|
||||
|
||||
|
|
@ -75,8 +75,8 @@ public class NetworkApiLiveTest extends BaseNeutronApiLiveTest {
|
|||
}
|
||||
|
||||
public void testBulkCreateNetwork() {
|
||||
for (String zone : api.getConfiguredRegions()) {
|
||||
NetworkApi networkApi = api.getNetworkApiForZone(zone);
|
||||
for (String region : api.getConfiguredRegions()) {
|
||||
NetworkApi networkApi = api.getNetworkApi(region);
|
||||
Set<Network> nets = networkApi.createBulk(
|
||||
ImmutableList.of(
|
||||
Network.createOptions("jclouds-live-test-1").networkType(NetworkType.LOCAL).adminStateUp(true).build(),
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
NetworkApi api = neutronApi.getNetworkApiForZone("RegionOne");
|
||||
NetworkApi api = neutronApi.getNetworkApi("RegionOne");
|
||||
|
||||
Network.CreateOptions createNetwork = Network.createOptions("jclouds-wibble")
|
||||
.networkType(NetworkType.LOCAL)
|
||||
|
|
@ -72,7 +72,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
* Check response
|
||||
*/
|
||||
assertNotNull(network);
|
||||
assertEquals(network.getName(),"jclouds-wibble");
|
||||
assertEquals(network.getName(), "jclouds-wibble");
|
||||
assertEquals(network.getNetworkType(), NetworkType.LOCAL);
|
||||
assertEquals(network.getTenantId(), "1234567890");
|
||||
assertEquals(network.getStatus(), NetworkStatus.ACTIVE);
|
||||
|
|
@ -90,7 +90,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
NetworkApi api = neutronApi.getNetworkApiForZone("RegionOne");
|
||||
NetworkApi api = neutronApi.getNetworkApi("RegionOne");
|
||||
|
||||
Network.CreateOptions createNetwork = Network.createOptions("jclouds-wibble")
|
||||
.networkType(NetworkType.LOCAL)
|
||||
|
|
@ -109,7 +109,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
NetworkApi api = neutronApi.getNetworkApiForZone("RegionOne");
|
||||
NetworkApi api = neutronApi.getNetworkApi("RegionOne");
|
||||
|
||||
Networks networks = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
|
||||
|
||||
|
|
@ -123,7 +123,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
* Check response
|
||||
*/
|
||||
assertNotNull(networks);
|
||||
assertEquals(networks.first().get().getId(),"396f12f8-521e-4b91-8e21-2e003500433a");
|
||||
assertEquals(networks.first().get().getId(), "396f12f8-521e-4b91-8e21-2e003500433a");
|
||||
} finally {
|
||||
server.shutdown();
|
||||
}
|
||||
|
|
@ -137,7 +137,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
NetworkApi api = neutronApi.getNetworkApiForZone("RegionOne");
|
||||
NetworkApi api = neutronApi.getNetworkApi("RegionOne");
|
||||
|
||||
Networks networks = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
|
||||
|
||||
|
|
@ -164,7 +164,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
NetworkApi api = neutronApi.getNetworkApiForZone("RegionOne");
|
||||
NetworkApi api = neutronApi.getNetworkApi("RegionOne");
|
||||
|
||||
// Note: Lazy! Have to actually look at the collection.
|
||||
List<Network> networks = api.list().concat().toList();
|
||||
|
|
@ -184,8 +184,8 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
* Check response
|
||||
*/
|
||||
assertNotNull(networks);
|
||||
assertEquals(networks.get(0).getId(),"396f12f8-521e-4b91-8e21-2e003500433a");
|
||||
assertEquals(networks.get(3).getId(),"71c1e68c-171a-4aa2-aca5-50ea153a3718_2");
|
||||
assertEquals(networks.get(0).getId(), "396f12f8-521e-4b91-8e21-2e003500433a");
|
||||
assertEquals(networks.get(3).getId(), "71c1e68c-171a-4aa2-aca5-50ea153a3718_2");
|
||||
} finally {
|
||||
server.shutdown();
|
||||
}
|
||||
|
|
@ -198,7 +198,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
NetworkApi api = neutronApi.getNetworkApiForZone("RegionOne");
|
||||
NetworkApi api = neutronApi.getNetworkApi("RegionOne");
|
||||
|
||||
// Note: Lazy! Have to actually look at the collection.
|
||||
List<Network> networks = api.list().concat().toList();
|
||||
|
|
@ -227,7 +227,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
NetworkApi api = neutronApi.getNetworkApiForZone("RegionOne");
|
||||
NetworkApi api = neutronApi.getNetworkApi("RegionOne");
|
||||
|
||||
Network network = api.get("12345");
|
||||
|
||||
|
|
@ -242,8 +242,8 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
* Check response
|
||||
*/
|
||||
assertNotNull(network);
|
||||
assertEquals(network.getName(),"jclouds-wibble");
|
||||
assertEquals(network.getId(),"624312ff-d14b-4ba3-9834-1c78d23d574d");
|
||||
assertEquals(network.getName(), "jclouds-wibble");
|
||||
assertEquals(network.getId(), "624312ff-d14b-4ba3-9834-1c78d23d574d");
|
||||
} finally {
|
||||
server.shutdown();
|
||||
}
|
||||
|
|
@ -256,7 +256,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
NetworkApi api = neutronApi.getNetworkApiForZone("RegionOne");
|
||||
NetworkApi api = neutronApi.getNetworkApi("RegionOne");
|
||||
|
||||
Network network = api.get("12345");
|
||||
|
||||
|
|
@ -283,7 +283,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
NetworkApi api = neutronApi.getNetworkApiForZone("RegionOne");
|
||||
NetworkApi api = neutronApi.getNetworkApi("RegionOne");
|
||||
|
||||
Network.CreateOptions createNetwork1 = Network.createOptions("jclouds-wibble")
|
||||
.networkType(NetworkType.LOCAL)
|
||||
|
|
@ -330,7 +330,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
NetworkApi api = neutronApi.getNetworkApiForZone("RegionOne");
|
||||
NetworkApi api = neutronApi.getNetworkApi("RegionOne");
|
||||
|
||||
Network.CreateOptions createNetwork1 = Network.createOptions("jclouds-wibble")
|
||||
.networkType(NetworkType.LOCAL)
|
||||
|
|
@ -353,7 +353,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
NetworkApi api = neutronApi.getNetworkApiForZone("RegionOne");
|
||||
NetworkApi api = neutronApi.getNetworkApi("RegionOne");
|
||||
|
||||
Network.UpdateOptions updateNetwork = Network.updateOptions()
|
||||
.name("jclouds-wibble-updated")
|
||||
|
|
@ -366,14 +366,14 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
* Check request
|
||||
*/
|
||||
assertAuthentication(server);
|
||||
assertRequest(server.takeRequest(), "PUT", "/v2.0/networks/123456","/network_update_request.json");
|
||||
assertRequest(server.takeRequest(), "PUT", "/v2.0/networks/123456", "/network_update_request.json");
|
||||
|
||||
/*
|
||||
* Check response
|
||||
*/
|
||||
assertNotNull(network);
|
||||
assertEquals(network.getName(),"updated_name");
|
||||
assertEquals(network.getId(),"fc68ea2c-b60b-4b4f-bd82-94ec81110766");
|
||||
assertEquals(network.getName(), "updated_name");
|
||||
assertEquals(network.getId(), "fc68ea2c-b60b-4b4f-bd82-94ec81110766");
|
||||
} finally {
|
||||
server.shutdown();
|
||||
}
|
||||
|
|
@ -386,7 +386,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
NetworkApi api = neutronApi.getNetworkApiForZone("RegionOne");
|
||||
NetworkApi api = neutronApi.getNetworkApi("RegionOne");
|
||||
|
||||
Network.UpdateOptions updateNetwork = Network.updateOptions()
|
||||
.name("jclouds-wibble-updated")
|
||||
|
|
@ -417,7 +417,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
NetworkApi api = neutronApi.getNetworkApiForZone("RegionOne");
|
||||
NetworkApi api = neutronApi.getNetworkApi("RegionOne");
|
||||
|
||||
boolean result = api.delete("123456");
|
||||
|
||||
|
|
@ -443,7 +443,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
NetworkApi api = neutronApi.getNetworkApiForZone("RegionOne");
|
||||
NetworkApi api = neutronApi.getNetworkApi("RegionOne");
|
||||
|
||||
boolean result = api.delete("123456");
|
||||
|
||||
|
|
|
|||
|
|
@ -43,10 +43,10 @@ import static org.testng.Assert.assertTrue;
|
|||
public class PortApiLiveTest extends BaseNeutronApiLiveTest {
|
||||
|
||||
public void testCreateUpdateAndDeletePort() {
|
||||
for (String zone : api.getConfiguredRegions()) {
|
||||
NetworkApi networkApi = api.getNetworkApiForZone(zone);
|
||||
SubnetApi subnetApi = api.getSubnetApiForZone(zone);
|
||||
PortApi portApi = api.getPortApiForZone(zone);
|
||||
for (String region : api.getConfiguredRegions()) {
|
||||
NetworkApi networkApi = api.getNetworkApi(region);
|
||||
SubnetApi subnetApi = api.getSubnetApi(region);
|
||||
PortApi portApi = api.getPortApi(region);
|
||||
String networkId = networkApi.create(
|
||||
Network.createOptions("JClouds-Live-Network").networkType(NetworkType.LOCAL).build()).getId();
|
||||
String ipv4SubnetId = subnetApi.create(Subnet.createOptions(networkId, "198.51.100.0/24").ipVersion(4)
|
||||
|
|
@ -64,9 +64,9 @@ public class PortApiLiveTest extends BaseNeutronApiLiveTest {
|
|||
.fixedIps(ImmutableSet.copyOf(getFixedAddresses(ipv6SubnetId))).build()).getId();
|
||||
|
||||
/* List and get test */
|
||||
Port portList = api.getPortApiForZone(zone).list().concat().toSet().iterator().next();
|
||||
Port portList = api.getPortApi(region).list().concat().toSet().iterator().next();
|
||||
assertNotNull(portList);
|
||||
Port portGet = api.getPortApiForZone(zone).get(portList.getId());
|
||||
Port portGet = api.getPortApi(region).get(portList.getId());
|
||||
assertEquals(portList, portGet);
|
||||
/****/
|
||||
|
||||
|
|
@ -96,10 +96,10 @@ public class PortApiLiveTest extends BaseNeutronApiLiveTest {
|
|||
}
|
||||
|
||||
public void testBulkCreatePort() {
|
||||
for (String zone : api.getConfiguredRegions()) {
|
||||
NetworkApi networkApi = api.getNetworkApiForZone(zone);
|
||||
SubnetApi subnetApi = api.getSubnetApiForZone(zone);
|
||||
PortApi portApi = api.getPortApiForZone(zone);
|
||||
for (String region : api.getConfiguredRegions()) {
|
||||
NetworkApi networkApi = api.getNetworkApi(region);
|
||||
SubnetApi subnetApi = api.getSubnetApi(region);
|
||||
PortApi portApi = api.getPortApi(region);
|
||||
|
||||
String networkId = networkApi.create(
|
||||
Network.createOptions("JClouds-Live-Network").networkType(NetworkType.LOCAL).build()).getId();
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
PortApi api = neutronApi.getPortApiForZone("RegionOne");
|
||||
PortApi api = neutronApi.getPortApi("RegionOne");
|
||||
|
||||
Port.CreateOptions createPort = Port.createOptions("6aeaf34a-c482-4bd3-9dc3-7faf36412f12")
|
||||
.name("port1")
|
||||
|
|
@ -80,8 +80,8 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
* Check response
|
||||
*/
|
||||
assertNotNull(port);
|
||||
assertEquals(port.getAllowedAddressPairs().iterator().next().getIpAddress(),"192.168.1.1");
|
||||
assertEquals(port.getAllowedAddressPairs().iterator().next().getMacAddress(),"12:12");
|
||||
assertEquals(port.getAllowedAddressPairs().iterator().next().getIpAddress(), "192.168.1.1");
|
||||
assertEquals(port.getAllowedAddressPairs().iterator().next().getMacAddress(), "12:12");
|
||||
assertEquals(port.getName(), "port1");
|
||||
assertEquals(port.getStatus(), NetworkStatus.ACTIVE);
|
||||
assertEquals(port.getId(), "ebe69f1e-bc26-4db5-bed0-c0afb4afe3db");
|
||||
|
|
@ -106,13 +106,13 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
PortApi api = neutronApi.getPortApiForZone("RegionOne");
|
||||
PortApi api = neutronApi.getPortApi("RegionOne");
|
||||
|
||||
Port.CreateOptions createPort = Port.createOptions("6aeaf34a-c482-4bd3-9dc3-7faf36412f12")
|
||||
.name("port1")
|
||||
.adminStateUp(true)
|
||||
.deviceId("d6b4d3a5-c700-476f-b609-1493dd9dadc0")
|
||||
.allowedAddressPairs(ImmutableSet.of(AddressPair.createOptions("12","111.222.333.444").build()))
|
||||
.allowedAddressPairs(ImmutableSet.of(AddressPair.createOptions("12", "111.222.333.444").build()))
|
||||
.build();
|
||||
|
||||
Port port = api.create(createPort);
|
||||
|
|
@ -128,7 +128,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
PortApi api = neutronApi.getPortApiForZone("RegionOne");
|
||||
PortApi api = neutronApi.getPortApi("RegionOne");
|
||||
|
||||
Ports ports = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
|
||||
|
||||
|
|
@ -143,7 +143,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
*/
|
||||
assertNotNull(ports);
|
||||
assertEquals(ports.size(), 2);
|
||||
assertEquals(ports.first().get().getId(),"24e6637e-c521-45fc-8b8b-d7331aa3c99f");
|
||||
assertEquals(ports.first().get().getId(), "24e6637e-c521-45fc-8b8b-d7331aa3c99f");
|
||||
} finally {
|
||||
server.shutdown();
|
||||
}
|
||||
|
|
@ -156,7 +156,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
PortApi api = neutronApi.getPortApiForZone("RegionOne");
|
||||
PortApi api = neutronApi.getPortApi("RegionOne");
|
||||
|
||||
Ports ports = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
|
||||
|
||||
|
|
@ -183,7 +183,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
PortApi api = neutronApi.getPortApiForZone("RegionOne");
|
||||
PortApi api = neutronApi.getPortApi("RegionOne");
|
||||
|
||||
// Note: Lazy! Have to actually look at the collection.
|
||||
List<Port> ports = api.list().concat().toList();
|
||||
|
|
@ -201,8 +201,8 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
*/
|
||||
assertNotNull(ports);
|
||||
assertEquals(ports.size(), 4);
|
||||
assertEquals(ports.get(0).getId(),"24e6637e-c521-45fc-8b8b-d7331aa3c99f");
|
||||
assertEquals(ports.get(3).getId(),"e54dfd9b-ce6e-47f7-af47-1609cfd1cdb0_4");
|
||||
assertEquals(ports.get(0).getId(), "24e6637e-c521-45fc-8b8b-d7331aa3c99f");
|
||||
assertEquals(ports.get(3).getId(), "e54dfd9b-ce6e-47f7-af47-1609cfd1cdb0_4");
|
||||
} finally {
|
||||
server.shutdown();
|
||||
}
|
||||
|
|
@ -215,7 +215,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
PortApi api = neutronApi.getPortApiForZone("RegionOne");
|
||||
PortApi api = neutronApi.getPortApi("RegionOne");
|
||||
|
||||
// Note: Lazy! Have to actually look at the collection.
|
||||
List<Port> ports = api.list().concat().toList();
|
||||
|
|
@ -244,7 +244,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
PortApi api = neutronApi.getPortApiForZone("RegionOne");
|
||||
PortApi api = neutronApi.getPortApi("RegionOne");
|
||||
|
||||
Port.CreateOptions createPort1 = Port.createOptions("64239a54-dcc4-4b39-920b-b37c2144effa")
|
||||
.name("port1")
|
||||
|
|
@ -289,7 +289,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
PortApi api = neutronApi.getPortApiForZone("RegionOne");
|
||||
PortApi api = neutronApi.getPortApi("RegionOne");
|
||||
|
||||
Port.CreateOptions createPort1 = Port.createOptions("64239a54-dcc4-4b39-920b-b37c2144effa")
|
||||
.name("port1")
|
||||
|
|
@ -319,7 +319,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
PortApi api = neutronApi.getPortApiForZone("RegionOne");
|
||||
PortApi api = neutronApi.getPortApi("RegionOne");
|
||||
|
||||
Port port = api.get("12345");
|
||||
|
||||
|
|
@ -355,7 +355,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
PortApi api = neutronApi.getPortApiForZone("RegionOne");
|
||||
PortApi api = neutronApi.getPortApi("RegionOne");
|
||||
|
||||
Port port = api.get("12345");
|
||||
|
||||
|
|
@ -382,7 +382,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
PortApi api = neutronApi.getPortApiForZone("RegionOne");
|
||||
PortApi api = neutronApi.getPortApi("RegionOne");
|
||||
|
||||
Port.UpdateOptions updatePort = Port.updateOptions()
|
||||
.securityGroups(
|
||||
|
|
@ -415,10 +415,10 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
PortApi api = neutronApi.getPortApiForZone("RegionOne");
|
||||
PortApi api = neutronApi.getPortApi("RegionOne");
|
||||
|
||||
Port.UpdateOptions updatePort = Port.updateOptions()
|
||||
.securityGroups(ImmutableSet.of("85cc3048-abc3-43cc-89b3-377341426ac5","c5ab5c29-2c99-44cb-a4b8-e70a88b77799"))
|
||||
.securityGroups(ImmutableSet.of("85cc3048-abc3-43cc-89b3-377341426ac5", "c5ab5c29-2c99-44cb-a4b8-e70a88b77799"))
|
||||
.build();
|
||||
|
||||
Port port = api.update("12345", updatePort);
|
||||
|
|
@ -445,7 +445,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
PortApi api = neutronApi.getPortApiForZone("RegionOne");
|
||||
PortApi api = neutronApi.getPortApi("RegionOne");
|
||||
|
||||
boolean result = api.delete("12345");
|
||||
|
||||
|
|
@ -471,7 +471,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
PortApi api = neutronApi.getPortApiForZone("RegionOne");
|
||||
PortApi api = neutronApi.getPortApi("RegionOne");
|
||||
|
||||
boolean result = api.delete("12345");
|
||||
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@ import static org.testng.Assert.assertTrue;
|
|||
public class RouterApiLiveTest extends BaseNeutronApiLiveTest {
|
||||
|
||||
public void testCreateUpdateAndDeleteRouter() {
|
||||
for (String zone : api.getConfiguredRegions()) {
|
||||
RouterApi routerApi = api.getRouterExtensionForZone(zone).get();
|
||||
NetworkApi networkApi = api.getNetworkApiForZone(zone);
|
||||
SubnetApi subnetApi = api.getSubnetApiForZone(zone);
|
||||
for (String region : api.getConfiguredRegions()) {
|
||||
RouterApi routerApi = api.getRouterExtensionApi(region).get();
|
||||
NetworkApi networkApi = api.getNetworkApi(region);
|
||||
SubnetApi subnetApi = api.getSubnetApi(region);
|
||||
|
||||
Network network = networkApi.create(
|
||||
Network.createOptions("jclouds-network-test").external(true).networkType(NetworkType.LOCAL).build());
|
||||
|
|
@ -58,9 +58,9 @@ public class RouterApiLiveTest extends BaseNeutronApiLiveTest {
|
|||
assertNotNull(router);
|
||||
|
||||
/* List and Get test */
|
||||
Set<Router> routers = api.getRouterExtensionForZone(zone).get().list().concat().toSet();
|
||||
Set<Router> routers = api.getRouterExtensionApi(region).get().list().concat().toSet();
|
||||
Router routerList = routers.iterator().next();
|
||||
Router routerGet = api.getRouterExtensionForZone(zone).get().get(routerList.getId());
|
||||
Router routerGet = api.getRouterExtensionApi(region).get().get(routerList.getId());
|
||||
|
||||
assertNotNull(routerGet);
|
||||
assertEquals(routerGet, routerList);
|
||||
|
|
@ -88,10 +88,10 @@ public class RouterApiLiveTest extends BaseNeutronApiLiveTest {
|
|||
}
|
||||
|
||||
public void testCreateAndDeleteRouterInterfaceForSubnet() {
|
||||
for (String zone : api.getConfiguredRegions()) {
|
||||
RouterApi routerApi = api.getRouterExtensionForZone(zone).get();
|
||||
NetworkApi networkApi = api.getNetworkApiForZone(zone);
|
||||
SubnetApi subnetApi = api.getSubnetApiForZone(zone);
|
||||
for (String region : api.getConfiguredRegions()) {
|
||||
RouterApi routerApi = api.getRouterExtensionApi(region).get();
|
||||
NetworkApi networkApi = api.getNetworkApi(region);
|
||||
SubnetApi subnetApi = api.getSubnetApi(region);
|
||||
|
||||
Network network = networkApi.create(Network.createOptions("jclouds-network-test").external(true).networkType(NetworkType.LOCAL).build());
|
||||
assertNotNull(network);
|
||||
|
|
@ -125,11 +125,11 @@ public class RouterApiLiveTest extends BaseNeutronApiLiveTest {
|
|||
}
|
||||
|
||||
public void testCreateAndDeleteRouterInterfaceForPort() {
|
||||
for (String zone : api.getConfiguredRegions()) {
|
||||
RouterApi routerApi = api.getRouterExtensionForZone(zone).get();
|
||||
NetworkApi networkApi = api.getNetworkApiForZone(zone);
|
||||
SubnetApi subnetApi = api.getSubnetApiForZone(zone);
|
||||
PortApi portApi = api.getPortApiForZone(zone);
|
||||
for (String region : api.getConfiguredRegions()) {
|
||||
RouterApi routerApi = api.getRouterExtensionApi(region).get();
|
||||
NetworkApi networkApi = api.getNetworkApi(region);
|
||||
SubnetApi subnetApi = api.getSubnetApi(region);
|
||||
PortApi portApi = api.getPortApi(region);
|
||||
|
||||
Network network = networkApi.create(Network.createOptions("jclouds-network-test").external(true).networkType(NetworkType.LOCAL).build());
|
||||
assertNotNull(network);
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
Router.CreateOptions createRouter = Router.createOptions().name("another_router").adminStateUp(true)
|
||||
.externalGatewayInfo(ExternalGatewayInfo.builder().networkId("8ca37218-28ff-41cb-9b10-039601ea7e6b").build())
|
||||
|
|
@ -94,7 +94,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
Router.CreateOptions createRouter = Router.createOptions().name("another_router").adminStateUp(true)
|
||||
.externalGatewayInfo(ExternalGatewayInfo.builder().networkId("8ca37218-28ff-41cb-9b10-039601ea7e6b").build())
|
||||
|
|
@ -115,7 +115,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
Routers routers = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
|
||||
|
||||
|
|
@ -130,7 +130,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
*/
|
||||
assertNotNull(routers);
|
||||
assertEquals(routers.size(), 2);
|
||||
assertEquals(routers.first().get().getId(),"a9254bdb-2613-4a13-ac4c-adc581fba50d");
|
||||
assertEquals(routers.first().get().getId(), "a9254bdb-2613-4a13-ac4c-adc581fba50d");
|
||||
} finally {
|
||||
server.shutdown();
|
||||
}
|
||||
|
|
@ -143,7 +143,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
Routers routers = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
|
||||
|
||||
|
|
@ -171,7 +171,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
// Note: Lazy! Have to actually look at the collection.
|
||||
List<Router> routers = api.list().concat().toList();
|
||||
|
|
@ -189,8 +189,8 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
*/
|
||||
assertNotNull(routers);
|
||||
assertEquals(routers.size(), 4);
|
||||
assertEquals(routers.get(0).getId(),"a9254bdb-2613-4a13-ac4c-adc581fba50d");
|
||||
assertEquals(routers.get(3).getId(),"a9254bdb-2613-4a13-ac4c-adc581fba50d_4");
|
||||
assertEquals(routers.get(0).getId(), "a9254bdb-2613-4a13-ac4c-adc581fba50d");
|
||||
assertEquals(routers.get(3).getId(), "a9254bdb-2613-4a13-ac4c-adc581fba50d_4");
|
||||
} finally {
|
||||
server.shutdown();
|
||||
}
|
||||
|
|
@ -203,7 +203,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
// Note: Lazy! Have to actually look at the collection.
|
||||
List<Router> routers = api.list().concat().toList();
|
||||
|
|
@ -233,7 +233,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
Router router = api.get("12345");
|
||||
|
||||
|
|
@ -266,7 +266,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
Router router = api.get("12345");
|
||||
|
||||
|
|
@ -293,7 +293,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
Router.UpdateOptions updateOptions = Router.updateOptions()
|
||||
.externalGatewayInfo(
|
||||
|
|
@ -331,7 +331,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
Router.UpdateOptions updateOptions = Router.updateOptions()
|
||||
.externalGatewayInfo(
|
||||
|
|
@ -363,7 +363,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
boolean result = api.delete("12345");
|
||||
|
||||
|
|
@ -390,7 +390,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
boolean result = api.delete("12345");
|
||||
|
||||
|
|
@ -417,7 +417,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
RouterInterface routerInterface = api.addInterfaceForSubnet("12345", "a2f1f29d-571b-4533-907f-5803ab96ead1");
|
||||
|
||||
|
|
@ -446,7 +446,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
RouterInterface routerInterface = api.addInterfaceForSubnet("12345", "a2f1f29d-571b-4533-907f-5803ab96ead1");
|
||||
|
||||
|
|
@ -473,7 +473,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
RouterInterface routerInterface = api.addInterfaceForPort("12345", "portid");
|
||||
|
||||
|
|
@ -502,7 +502,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
RouterInterface routerInterface = api.addInterfaceForPort("12345", "portid");
|
||||
|
||||
|
|
@ -529,7 +529,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
boolean result = api.removeInterfaceForSubnet("12345", "a2f1f29d-571b-4533-907f-5803ab96ead1");
|
||||
|
||||
|
|
@ -556,7 +556,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
boolean result = api.removeInterfaceForSubnet("12345", "a2f1f29d-571b-4533-907f-5803ab96ead1");
|
||||
|
||||
|
|
@ -583,7 +583,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
boolean result = api.removeInterfaceForPort("12345", "portid");
|
||||
|
||||
|
|
@ -610,7 +610,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
RouterApi api = neutronApi.getRouterExtensionForZone("RegionOne").get();
|
||||
RouterApi api = neutronApi.getRouterExtensionApi("RegionOne").get();
|
||||
|
||||
boolean result = api.removeInterfaceForPort("12345", "portid");
|
||||
|
||||
|
|
|
|||
|
|
@ -42,11 +42,11 @@ import static org.testng.Assert.assertTrue;
|
|||
public class SubnetApiLiveTest extends BaseNeutronApiLiveTest {
|
||||
|
||||
public void testCreateUpdateAndDeleteSubnet() {
|
||||
for (String zone : api.getConfiguredRegions()) {
|
||||
NetworkApi networkApi = api.getNetworkApiForZone(zone);
|
||||
for (String region : api.getConfiguredRegions()) {
|
||||
NetworkApi networkApi = api.getNetworkApi(region);
|
||||
String networkId = networkApi.create(Network.createOptions("jclouds-live-test").networkType(NetworkType.LOCAL).build()).getId();
|
||||
|
||||
SubnetApi subnetApi = api.getSubnetApiForZone(zone);
|
||||
SubnetApi subnetApi = api.getSubnetApi(region);
|
||||
ImmutableSet<AllocationPool> allocationPools = ImmutableSet.of(
|
||||
AllocationPool.builder().start("a3:bc00::10").end("a3:bc00::20").build(),
|
||||
AllocationPool.builder().start("a3:bc00::50").end("a3:bc00::90").build()
|
||||
|
|
@ -58,9 +58,9 @@ public class SubnetApiLiveTest extends BaseNeutronApiLiveTest {
|
|||
assertNotNull(subnet);
|
||||
|
||||
/* Test list and get */
|
||||
Subnet subnetList = api.getSubnetApiForZone(zone).list().concat().toSet().iterator().next();
|
||||
Subnet subnetList = api.getSubnetApi(region).list().concat().toSet().iterator().next();
|
||||
assertNotNull(subnetList);
|
||||
Subnet subnetGet = api.getSubnetApiForZone(zone).get(subnetList.getId());
|
||||
Subnet subnetGet = api.getSubnetApi(region).get(subnetList.getId());
|
||||
assertEquals(subnetList, subnetGet);
|
||||
/***/
|
||||
|
||||
|
|
@ -89,11 +89,11 @@ public class SubnetApiLiveTest extends BaseNeutronApiLiveTest {
|
|||
}
|
||||
|
||||
public void testBulkCreateSubnet() {
|
||||
for (String zone : api.getConfiguredRegions()) {
|
||||
NetworkApi networkApi = api.getNetworkApiForZone(zone);
|
||||
for (String region : api.getConfiguredRegions()) {
|
||||
NetworkApi networkApi = api.getNetworkApi(region);
|
||||
String networkId = networkApi.create(Network.createOptions("jclouds-live-test").networkType(NetworkType.LOCAL).build()).getId();
|
||||
|
||||
SubnetApi subnetApi = api.getSubnetApiForZone(zone);
|
||||
SubnetApi subnetApi = api.getSubnetApi(region);
|
||||
Set<? extends Subnet> subnets = subnetApi.createBulk(
|
||||
ImmutableList.of(
|
||||
Subnet.createOptions("jclouds-live-test-1", "a3:bd01::/48").ipVersion(6).networkId(networkId).build(),
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
SubnetApi api = neutronApi.getSubnetApiForZone("RegionOne");
|
||||
SubnetApi api = neutronApi.getSubnetApi("RegionOne");
|
||||
|
||||
Subnet.CreateOptions createSubnet = Subnet.createOptions("1234567890", "10.0.3.0/24")
|
||||
.name("jclouds-wibble")
|
||||
|
|
@ -72,7 +72,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
* Check response
|
||||
*/
|
||||
assertNotNull(subnet);
|
||||
assertEquals(subnet.getName(),"jclouds-wibble");
|
||||
assertEquals(subnet.getName(), "jclouds-wibble");
|
||||
assertEquals(subnet.getIpVersion().intValue(), 4);
|
||||
assertEquals(subnet.getCidr(), "10.0.3.0/24");
|
||||
assertEquals(subnet.getTenantId(), "1234567890");
|
||||
|
|
@ -90,7 +90,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
SubnetApi api = neutronApi.getSubnetApiForZone("RegionOne");
|
||||
SubnetApi api = neutronApi.getSubnetApi("RegionOne");
|
||||
|
||||
Subnet.CreateOptions createSubnet = Subnet.createOptions("1234567890", "cidr")
|
||||
.name("jclouds-wibble")
|
||||
|
|
@ -110,7 +110,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
SubnetApi api = neutronApi.getSubnetApiForZone("RegionOne");
|
||||
SubnetApi api = neutronApi.getSubnetApi("RegionOne");
|
||||
|
||||
Subnets subnets = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
|
||||
|
||||
|
|
@ -124,7 +124,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
* Check response
|
||||
*/
|
||||
assertNotNull(subnets);
|
||||
assertEquals(subnets.first().get().getId(),"16dba3bc-f3fa-4775-afdc-237e12c72f6a");
|
||||
assertEquals(subnets.first().get().getId(), "16dba3bc-f3fa-4775-afdc-237e12c72f6a");
|
||||
} finally {
|
||||
server.shutdown();
|
||||
}
|
||||
|
|
@ -137,7 +137,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
SubnetApi api = neutronApi.getSubnetApiForZone("RegionOne");
|
||||
SubnetApi api = neutronApi.getSubnetApi("RegionOne");
|
||||
|
||||
Subnets subnets = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
|
||||
|
||||
|
|
@ -164,7 +164,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
SubnetApi api = neutronApi.getSubnetApiForZone("RegionOne");
|
||||
SubnetApi api = neutronApi.getSubnetApi("RegionOne");
|
||||
|
||||
// Note: Lazy! Have to actually look at the collection.
|
||||
List<Subnet> subnets = api.list().concat().toList();
|
||||
|
|
@ -182,8 +182,8 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
*/
|
||||
assertNotNull(subnets);
|
||||
assertEquals(subnets.size(), 4);
|
||||
assertEquals(subnets.get(0).getId(),"16dba3bc-f3fa-4775-afdc-237e12c72f6a");
|
||||
assertEquals(subnets.get(3).getId(),"6ba4c788-661f-49ab-9bf8-5f10cbbb2f57");
|
||||
assertEquals(subnets.get(0).getId(), "16dba3bc-f3fa-4775-afdc-237e12c72f6a");
|
||||
assertEquals(subnets.get(3).getId(), "6ba4c788-661f-49ab-9bf8-5f10cbbb2f57");
|
||||
} finally {
|
||||
server.shutdown();
|
||||
}
|
||||
|
|
@ -196,7 +196,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
SubnetApi api = neutronApi.getSubnetApiForZone("RegionOne");
|
||||
SubnetApi api = neutronApi.getSubnetApi("RegionOne");
|
||||
|
||||
// Note: Lazy! Have to actually look at the collection.
|
||||
List<Subnet> subnets = api.list().concat().toList();
|
||||
|
|
@ -224,7 +224,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
SubnetApi api = neutronApi.getSubnetApiForZone("RegionOne");
|
||||
SubnetApi api = neutronApi.getSubnetApi("RegionOne");
|
||||
|
||||
Subnet subnet = api.get("12345");
|
||||
|
||||
|
|
@ -239,9 +239,9 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
* Check response
|
||||
*/
|
||||
assertNotNull(subnet);
|
||||
assertEquals(subnet.getName(),"jclouds-wibble");
|
||||
assertEquals(subnet.getId(),"624312ff-d14b-4ba3-9834-1c78d23d574d");
|
||||
assertEquals(subnet.getTenantId(),"1234567890");
|
||||
assertEquals(subnet.getName(), "jclouds-wibble");
|
||||
assertEquals(subnet.getId(), "624312ff-d14b-4ba3-9834-1c78d23d574d");
|
||||
assertEquals(subnet.getTenantId(), "1234567890");
|
||||
assertEquals(subnet.getIPv6AddressMode(), IPv6DHCPMode.SLAAC);
|
||||
} finally {
|
||||
server.shutdown();
|
||||
|
|
@ -255,7 +255,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
SubnetApi api = neutronApi.getSubnetApiForZone("RegionOne");
|
||||
SubnetApi api = neutronApi.getSubnetApi("RegionOne");
|
||||
|
||||
Subnet subnet = api.get("12345");
|
||||
|
||||
|
|
@ -282,7 +282,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
SubnetApi api = neutronApi.getSubnetApiForZone("RegionOne");
|
||||
SubnetApi api = neutronApi.getSubnetApi("RegionOne");
|
||||
|
||||
Subnet.CreateOptions createSubnet1 = Subnet.createOptions("e6031bc2-901a-4c66-82da-f4c32ed89406",
|
||||
"192.168.199.0/24")
|
||||
|
|
@ -331,7 +331,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
SubnetApi api = neutronApi.getSubnetApiForZone("RegionOne");
|
||||
SubnetApi api = neutronApi.getSubnetApi("RegionOne");
|
||||
|
||||
Subnet.CreateOptions createSubnet1 = Subnet.createOptions("e6031bc2-901a-4c66-82da-f4c32ed89406",
|
||||
"192.168.199.0/24")
|
||||
|
|
@ -356,7 +356,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
SubnetApi api = neutronApi.getSubnetApiForZone("RegionOne");
|
||||
SubnetApi api = neutronApi.getSubnetApi("RegionOne");
|
||||
|
||||
Subnet.UpdateOptions updateSubnet = Subnet.updateOptions()
|
||||
.name("new_name")
|
||||
|
|
@ -376,9 +376,9 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
* Check response
|
||||
*/
|
||||
assertNotNull(subnet);
|
||||
assertEquals(subnet.getName(),"new_name");
|
||||
assertEquals(subnet.getId(),"9436e561-47bf-436a-b1f1-fe23a926e031");
|
||||
assertEquals(subnet.getTenantId(),"c1210485b2424d48804aad5d39c61b8f");
|
||||
assertEquals(subnet.getName(), "new_name");
|
||||
assertEquals(subnet.getId(), "9436e561-47bf-436a-b1f1-fe23a926e031");
|
||||
assertEquals(subnet.getTenantId(), "c1210485b2424d48804aad5d39c61b8f");
|
||||
} finally {
|
||||
server.shutdown();
|
||||
}
|
||||
|
|
@ -391,7 +391,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
SubnetApi api = neutronApi.getSubnetApiForZone("RegionOne");
|
||||
SubnetApi api = neutronApi.getSubnetApi("RegionOne");
|
||||
|
||||
Subnet.UpdateOptions updateSubnet = Subnet.updateOptions()
|
||||
.name("new_name")
|
||||
|
|
@ -423,7 +423,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
SubnetApi api = neutronApi.getSubnetApiForZone("RegionOne");
|
||||
SubnetApi api = neutronApi.getSubnetApi("RegionOne");
|
||||
|
||||
boolean result = api.delete("12345");
|
||||
|
||||
|
|
@ -450,7 +450,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
|
|||
|
||||
try {
|
||||
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
|
||||
SubnetApi api = neutronApi.getSubnetApiForZone("RegionOne");
|
||||
SubnetApi api = neutronApi.getSubnetApi("RegionOne");
|
||||
|
||||
boolean result = api.delete("12345");
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue