You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2018/01/17 08:39:56 UTC
[01/15] jclouds git commit: Adds rackspace cloudnetworks-us provider
Repository: jclouds
Updated Branches:
refs/heads/master 3ac9279ac -> 5b4f5ee02
Adds rackspace cloudnetworks-us provider
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/eacf0043
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/eacf0043
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/eacf0043
Branch: refs/heads/master
Commit: eacf00436e8f6c6a627f5fa578681813bd21f363
Parents:
Author: Zack Shoylev <za...@rackspace.com>
Authored: Wed Oct 22 11:57:43 2014 -0500
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Sat Nov 15 05:55:32 2014 -0600
----------------------------------------------------------------------
providers/rackspace-cloudnetworks-us/README.md | 4 +
providers/rackspace-cloudnetworks-us/pom.xml | 128 +++++++++++++++++++
.../us/CloudNetworksUSProviderMetadata.java | 121 ++++++++++++++++++
.../us/CloudNetworksUSNetworkApiLiveTest.java | 76 +++++++++++
.../us/CloudNetworksUSPortApiLiveTest.java | 85 ++++++++++++
.../us/CloudNetworksUSProviderTest.java | 28 ++++
.../us/CloudNetworksUSSubnetApiLiveTest.java | 89 +++++++++++++
.../src/test/resources/logback.xml | 69 ++++++++++
8 files changed, 600 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/eacf0043/providers/rackspace-cloudnetworks-us/README.md
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/README.md b/providers/rackspace-cloudnetworks-us/README.md
new file mode 100644
index 0000000..4a83307
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-us/README.md
@@ -0,0 +1,4 @@
+Rackspace Networks US
+========================
+
+Beta
http://git-wip-us.apache.org/repos/asf/jclouds/blob/eacf0043/providers/rackspace-cloudnetworks-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/pom.xml b/providers/rackspace-cloudnetworks-us/pom.xml
new file mode 100644
index 0000000..7a62e1b
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-us/pom.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-project</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
+ <!-- TODO: when out of labs, switch to org.jclouds.provider -->
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>rackspace-cloudnetworks-us</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <name>jclouds Rackspace Cloud Networks US provider</name>
+ <description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks US</description>
+ <packaging>bundle</packaging>
+
+ <properties>
+ <!-- identity endpoint -->
+ <test.rackspace-cloudnetworks-us.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudnetworks-us.endpoint>
+ <test.rackspace-cloudnetworks-us.api-version>2.0</test.rackspace-cloudnetworks-us.api-version>
+ <test.rackspace-cloudnetworks-us.build-version />
+ <test.rackspace-cloudnetworks-us.identity>${test.rackspace-us.identity}</test.rackspace-cloudnetworks-us.identity>
+ <test.rackspace-cloudnetworks-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudnetworks-us.credential>
+ <jclouds.osgi.export>org.jclouds.rackspace.cloudnetworks.us*;version="${project.version}"</jclouds.osgi.export>
+ <jclouds.osgi.import>
+ org.jclouds*;version="${project.version}",*
+ </jclouds.osgi.import>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>openstack-neutron</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>rackspace-cloudidentity</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>openstack-neutron</artifactId>
+ <version>${project.parent.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${project.parent.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-slf4j</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.auto.value</groupId>
+ <artifactId>auto-value</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>live</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>integration</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <test.rackspace-cloudnetworks-us.endpoint>${test.rackspace-cloudnetworks-us.endpoint}</test.rackspace-cloudnetworks-us.endpoint>
+ <test.rackspace-cloudnetworks-us.api-version>${test.rackspace-cloudnetworks-us.api-version}</test.rackspace-cloudnetworks-us.api-version>
+ <test.rackspace-cloudnetworks-us.build-version>${test.rackspace-cloudnetworks-us.build-version}</test.rackspace-cloudnetworks-us.build-version>
+ <test.rackspace-cloudnetworks-us.identity>${test.rackspace-cloudnetworks-us.identity}</test.rackspace-cloudnetworks-us.identity>
+ <test.rackspace-cloudnetworks-us.credential>${test.rackspace-cloudnetworks-us.credential}</test.rackspace-cloudnetworks-us.credential>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/eacf0043/providers/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java b/providers/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java
new file mode 100644
index 0000000..6a84aac
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.rackspace.cloudnetworks.us;
+
+import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES;
+import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION;
+import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
+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 org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
+import org.jclouds.openstack.neutron.v2.NeutronApiMetadata;
+import org.jclouds.openstack.neutron.v2.config.NeutronHttpApiModule;
+import org.jclouds.providers.ProviderMetadata;
+import org.jclouds.providers.internal.BaseProviderMetadata;
+import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
+import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
+import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
+
+import com.google.auto.service.AutoService;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Module;
+
+@AutoService(ProviderMetadata.class)
+public class CloudNetworksUSProviderMetadata extends BaseProviderMetadata {
+
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ @Override
+ public Builder toBuilder() {
+ return builder().fromProviderMetadata(this);
+ }
+
+ public CloudNetworksUSProviderMetadata() {
+ this(new Builder());
+ }
+
+ protected CloudNetworksUSProviderMetadata(Builder builder) {
+ super(builder);
+ }
+
+ /**
+ * @return a {@link Properties} object containing the default provider properties.
+ * This returns the credential type, service type, and configured regions.
+ */
+ public static Properties defaultProperties() {
+ Properties properties = new Properties();
+ properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
+ properties.setProperty(SERVICE_TYPE, "networks");
+
+ properties.setProperty(PROPERTY_REGIONS, "ORD,DFW,IAD,SYD,HKG");
+ properties.setProperty(PROPERTY_REGION + ".ORD." + ISO3166_CODES, "US-IL");
+ properties.setProperty(PROPERTY_REGION + ".DFW." + ISO3166_CODES, "US-TX");
+ properties.setProperty(PROPERTY_REGION + ".IAD." + ISO3166_CODES, "US-VA");
+ properties.setProperty(PROPERTY_REGION + ".SYD." + ISO3166_CODES, "AU-NSW");
+ properties.setProperty(PROPERTY_REGION + ".HKG." + ISO3166_CODES, "HK");
+
+ return properties;
+ }
+
+ public static class Builder extends BaseProviderMetadata.Builder {
+
+ protected Builder() {
+ id("rackspace-cloudnetworks-us")
+ .name("Rackspace Cloud Networks US")
+ .apiMetadata(new NeutronApiMetadata().toBuilder()
+ .identityName("${userName}")
+ .credentialName("${apiKey}")
+ .defaultEndpoint("https://identity.api.rackspacecloud.com/v2.0/")
+ .documentation(URI.create("http://docs.rackspace.com/networks/api/v1/cf-devguide/content/index.html"))
+ .endpointName("Rackspace Cloud Identity service URL ending in /v2.0/")
+ .version("2.0")
+ .defaultModules(ImmutableSet.<Class<? extends Module>>builder()
+ .add(CloudIdentityAuthenticationApiModule.class)
+ .add(CloudIdentityAuthenticationModule.class)
+ .add(RegionModule.class)
+ .add(NeutronHttpApiModule.class)
+ .build())
+ .build())
+ .homepage(URI.create("http://www.rackspace.com/cloud/networks"))
+ .console(URI.create("https://mycloud.rackspace.com"))
+ .linkedServices("rackspace-autoscale-us", "rackspace-cloudblockstorage-us",
+ "rackspace-clouddatabases-us", "rackspace-clouddns-us",
+ "rackspace-cloudidentity", "rackspace-cloudloadbalancers-us",
+ "rackspace-cloudqueues-us")
+ .iso3166Codes("US-IL", "US-TX", "US-VA", "AU-NSW", "HK")
+ .defaultProperties(CloudNetworksUSProviderMetadata.defaultProperties());
+
+ }
+
+ @Override
+ public CloudNetworksUSProviderMetadata build() {
+ return new CloudNetworksUSProviderMetadata(this);
+ }
+
+ @Override
+ public Builder fromProviderMetadata(ProviderMetadata in) {
+ super.fromProviderMetadata(in);
+ return this;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/eacf0043/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSNetworkApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSNetworkApiLiveTest.java b/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSNetworkApiLiveTest.java
new file mode 100644
index 0000000..c8e09c5
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSNetworkApiLiveTest.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.rackspace.cloudnetworks.us;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+import org.jclouds.openstack.neutron.v2.domain.Network;
+import org.jclouds.openstack.neutron.v2.features.NetworkApi;
+import org.jclouds.openstack.neutron.v2.features.NetworkApiLiveTest;
+import org.testng.SkipException;
+import org.testng.annotations.Test;
+
+@Test(groups = "live", testName = "CloudNetworksUSNetworkApiLiveTest", singleThreaded = true)
+public class CloudNetworksUSNetworkApiLiveTest extends NetworkApiLiveTest {
+ public CloudNetworksUSNetworkApiLiveTest() {
+ provider = "rackspace-cloudnetworks-us";
+ }
+
+ @Override
+ public void testCreateUpdateAndDeleteNetwork() {
+ for (String region : api.getConfiguredRegions()) {
+ NetworkApi networkApi = api.getNetworkApi(region);
+ Network net = networkApi.create(Network.createBuilder("jclouds-test").build());
+ Network test = networkApi.create(Network.createBuilder("jclouds-test").build());
+ assertNotNull(net);
+
+ /* List and get tests */
+ Network networkList = api.getNetworkApi(region).list().concat().toSet().iterator().next();
+ assertNotNull(networkList);
+ Network networkGet = api.getNetworkApi(region).get(networkList.getId());
+ assertEquals(networkList, networkGet);
+ /****/
+
+ Network network = networkApi.get(net.getId());
+
+ assertEquals(network.getId(), net.getId());
+ assertEquals(network.getName(), "jclouds-test");
+ assertTrue(network.getSubnets().isEmpty());
+ assertNotNull(networkApi.update(net.getId(), Network.updateBuilder().name("jclouds-live-test").build()));
+
+ network = networkApi.get(net.getId());
+
+ assertEquals(network.getId(), net.getId());
+ assertEquals(network.getName(), "jclouds-live-test");
+ assertTrue(network.getSubnets().isEmpty());
+
+ Network net2 = networkApi.create(Network.createBuilder("jclouds-test2").build());
+ assertNotNull(net2);
+
+ assertTrue(networkApi.delete(net.getId()));
+ assertTrue(networkApi.delete(net2.getId()));
+ assertTrue(networkApi.delete(test.getId()));
+ }
+ }
+
+ @Override
+ public void testBulkCreateNetwork() {
+ throw new SkipException("unsupported functionality");
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/eacf0043/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSPortApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSPortApiLiveTest.java b/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSPortApiLiveTest.java
new file mode 100644
index 0000000..07efb87
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSPortApiLiveTest.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.rackspace.cloudnetworks.us;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+import org.jclouds.openstack.neutron.v2.domain.Network;
+import org.jclouds.openstack.neutron.v2.domain.Port;
+import org.jclouds.openstack.neutron.v2.domain.Subnet;
+import org.jclouds.openstack.neutron.v2.features.NetworkApi;
+import org.jclouds.openstack.neutron.v2.features.PortApi;
+import org.jclouds.openstack.neutron.v2.features.PortApiLiveTest;
+import org.jclouds.openstack.neutron.v2.features.SubnetApi;
+import org.testng.SkipException;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+@Test(groups = "live", testName = "CloudNetworksUSPortApiLiveTest", singleThreaded = true)
+public class CloudNetworksUSPortApiLiveTest extends PortApiLiveTest {
+ public CloudNetworksUSPortApiLiveTest() {
+ provider = "rackspace-cloudnetworks-us";
+ }
+
+ public void testCreateUpdateAndDeletePort() {
+ 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.createBuilder("JClouds-Live-Network").build()).getId();
+ String ipv4SubnetId = subnetApi.create(Subnet.createBuilder(networkId, "192.168.0.0/30").ipVersion(4)
+ .name("JClouds-Live-IPv4-Subnet").build()).getId();
+
+ assertNotNull(networkId);
+ assertNotNull(ipv4SubnetId);
+
+ String ipv4PortId = portApi.create(Port.createBuilder(networkId).name("JClouds-Live-IPv4-Port")
+ .fixedIps(ImmutableSet.copyOf(getFixedAddresses(ipv4SubnetId))).build()).getId();
+
+ /* List and get test */
+ Port portList = api.getPortApi(region).list().concat().toSet().iterator().next();
+ assertNotNull(portList);
+ Port portGet = api.getPortApi(region).get(portList.getId());
+ assertEquals(portList, portGet);
+ /****/
+
+ assertNotNull(ipv4PortId);
+
+ Port ipv4Port = portApi.get(ipv4PortId);
+ assertNotNull(ipv4Port);
+ assertEquals(ipv4Port.getId(), ipv4PortId);
+ assertEquals(ipv4Port.getName(), "JClouds-Live-IPv4-Port");
+
+ assertNotNull(portApi.update(ipv4PortId, Port.updateBuilder().name("Updated").build()));
+ Port updatedIpv4Port = portApi.get(ipv4PortId);
+ assertEquals(updatedIpv4Port.getName(), "Updated");
+
+ assertTrue(portApi.delete(ipv4PortId));
+ assertTrue(subnetApi.delete(ipv4SubnetId));
+ assertTrue(networkApi.delete(networkId));
+ }
+ }
+
+ @Override
+ public void testBulkCreatePort() {
+ throw new SkipException("unsupported functionality");
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/eacf0043/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderTest.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderTest.java b/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderTest.java
new file mode 100644
index 0000000..21dab6f
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.rackspace.cloudnetworks.us;
+
+import org.jclouds.openstack.neutron.v2.NeutronApiMetadata;
+import org.jclouds.providers.internal.BaseProviderMetadataTest;
+import org.testng.annotations.Test;
+
+@Test(groups = "unit", testName = "CloudNetworksUSProviderTest", singleThreaded = true)
+public class CloudNetworksUSProviderTest extends BaseProviderMetadataTest {
+ public CloudNetworksUSProviderTest() {
+ super(new CloudNetworksUSProviderMetadata(), new NeutronApiMetadata());
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/eacf0043/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSubnetApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSubnetApiLiveTest.java b/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSubnetApiLiveTest.java
new file mode 100644
index 0000000..8156da2
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSubnetApiLiveTest.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.rackspace.cloudnetworks.us;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+import org.jclouds.openstack.neutron.v2.domain.AllocationPool;
+import org.jclouds.openstack.neutron.v2.domain.HostRoute;
+import org.jclouds.openstack.neutron.v2.domain.Network;
+import org.jclouds.openstack.neutron.v2.domain.Subnet;
+import org.jclouds.openstack.neutron.v2.features.NetworkApi;
+import org.jclouds.openstack.neutron.v2.features.SubnetApi;
+import org.jclouds.openstack.neutron.v2.features.SubnetApiLiveTest;
+import org.testng.SkipException;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+@Test(groups = "live", testName = "CloudNetworksUSSubnetApiLiveTest", singleThreaded = true)
+public class CloudNetworksUSSubnetApiLiveTest extends SubnetApiLiveTest {
+ public CloudNetworksUSSubnetApiLiveTest() {
+ provider = "rackspace-cloudnetworks-us";
+ }
+
+ @Override
+ public void testCreateUpdateAndDeleteSubnet() {
+ for (String region : api.getConfiguredRegions()) {
+ NetworkApi networkApi = api.getNetworkApi(region);
+ String networkId = networkApi.create(
+ Network.createBuilder("jclouds-live-test").build()).getId();
+
+ SubnetApi subnetApi = api.getSubnetApi(region);
+ ImmutableSet<AllocationPool> allocationPools = ImmutableSet.of(
+ AllocationPool.builder().start("192.168.100.0").end("192.168.100.2").build()
+ );
+ ImmutableSet<HostRoute> hostRoutes = ImmutableSet.of(
+ HostRoute.builder().destinationCidr("192.168.100.0/30").nextHop("192.168.100.4").build()
+ );
+ Subnet subnet = subnetApi.create(Subnet.createBuilder(networkId, "192.168.100.0/30").ipVersion(4).allocationPools(allocationPools).hostRoutes(hostRoutes).build());
+ assertNotNull(subnet);
+
+ /* Test list and get */
+ Subnet subnetList = api.getSubnetApi(region).list().concat().toSet().iterator().next();
+ assertNotNull(subnetList);
+ Subnet subnetGet = api.getSubnetApi(region).get(subnetList.getId());
+ assertEquals(subnetList, subnetGet);
+ /***/
+
+ Subnet retrievedSubnet = subnetApi.get(subnet.getId());
+
+ assertEquals(retrievedSubnet.getId(), subnet.getId());
+ assertEquals(retrievedSubnet.getCidr(), "192.168.100.0/30");
+ assertTrue(retrievedSubnet.getDnsNameservers().isEmpty());
+ assertEquals(retrievedSubnet.getAllocationPools().size(), 1);
+ assertEquals(retrievedSubnet.getHostRoutes().size(), 1);
+ assertNotNull(subnetApi.update(retrievedSubnet.getId(), Subnet.updateBuilder().name("jclouds-live-test-update").build()));
+
+ retrievedSubnet = subnetApi.get(retrievedSubnet.getId());
+
+ assertEquals(retrievedSubnet.getId(), subnet.getId());
+ assertEquals(retrievedSubnet.getName(), "jclouds-live-test-update");
+ assertTrue(retrievedSubnet.getDnsNameservers().isEmpty());
+
+ assertTrue(subnetApi.delete(subnet.getId()));
+ assertTrue(networkApi.delete(networkId));
+ }
+ }
+
+ @Override
+ public void testBulkCreateSubnet() {
+ throw new SkipException("unsupported functionality");
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/eacf0043/providers/rackspace-cloudnetworks-us/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/src/test/resources/logback.xml b/providers/rackspace-cloudnetworks-us/src/test/resources/logback.xml
new file mode 100644
index 0000000..6559c23
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-us/src/test/resources/logback.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<configuration scan="false">
+ <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+ <file>target/test-data/jclouds.log</file>
+
+ <encoder>
+ <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+ </encoder>
+ </appender>
+
+ <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
+ <file>target/test-data/jclouds-wire.log</file>
+
+ <encoder>
+ <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+ </encoder>
+ </appender>
+
+ <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
+ <file>target/test-data/jclouds-blobstore.log</file>
+
+ <encoder>
+ <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+ </encoder>
+ </appender>
+
+ <root>
+ <level value="warn" />
+ </root>
+
+ <logger name="org.jclouds">
+ <level value="DEBUG" />
+ <appender-ref ref="FILE" />
+ </logger>
+
+ <logger name="jclouds.wire">
+ <level value="DEBUG" />
+ <appender-ref ref="WIREFILE" />
+ </logger>
+
+ <logger name="jclouds.headers">
+ <level value="DEBUG" />
+ <appender-ref ref="WIREFILE" />
+ </logger>
+
+ <logger name="jclouds.blobstore">
+ <level value="DEBUG" />
+ <appender-ref ref="BLOBSTOREFILE" />
+ </logger>
+
+</configuration>
[11/15] jclouds git commit: [Openstack-Neutron] move SecurityGroupApi
from extensions to features
Posted by na...@apache.org.
[Openstack-Neutron] move SecurityGroupApi from extensions to features
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/6aa759ce
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6aa759ce
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6aa759ce
Branch: refs/heads/master
Commit: 6aa759cebc67f93288a9da14e51aa41793fa3a90
Parents: 6b5f522
Author: Andrea Turli <an...@gmail.com>
Authored: Tue Nov 21 12:34:12 2017 +0100
Committer: Andrea Turli <an...@gmail.com>
Committed: Tue Dec 12 09:47:11 2017 +0100
----------------------------------------------------------------------
.../cloudnetworks/us/CloudNetworksUSSecurityGroupApiLiveTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6aa759ce/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSecurityGroupApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSecurityGroupApiLiveTest.java b/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSecurityGroupApiLiveTest.java
index b53de9c..dee11f3 100644
--- a/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSecurityGroupApiLiveTest.java
+++ b/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSecurityGroupApiLiveTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.rackspace.cloudnetworks.us;
-import org.jclouds.openstack.neutron.v2.extensions.SecurityGroupApiLiveTest;
+import org.jclouds.openstack.neutron.v2.features.SecurityGroupApiLiveTest;
import org.testng.annotations.Test;
@Test(groups = "live", testName = "CloudNetworksUSSecurityGroupApiLiveTest", singleThreaded = true)
[15/15] jclouds git commit: Fix ProfitBricks pom
Posted by na...@apache.org.
Fix ProfitBricks pom
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/5b4f5ee0
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/5b4f5ee0
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/5b4f5ee0
Branch: refs/heads/master
Commit: 5b4f5ee023511a6ca3839c2a7a290990da368d07
Parents: a7383af
Author: Ignasi Barrera <na...@apache.org>
Authored: Wed Jan 17 09:24:27 2018 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Jan 17 09:24:27 2018 +0100
----------------------------------------------------------------------
providers/profitbricks/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/5b4f5ee0/providers/profitbricks/pom.xml
----------------------------------------------------------------------
diff --git a/providers/profitbricks/pom.xml b/providers/profitbricks/pom.xml
index 5b3aba6..51fb825 100644
--- a/providers/profitbricks/pom.xml
+++ b/providers/profitbricks/pom.xml
@@ -39,7 +39,7 @@
<test.profitbricks.api-version>1.3</test.profitbricks.api-version>
<jclouds.osgi.export>org.jclouds.profitbricks*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>
- org.jclouds.labs*;version="${project.version}",
+ org.jclouds.profitbricks*;version="${project.version}",
org.jclouds*;version="${project.version}",
*
</jclouds.osgi.import>
[06/15] jclouds git commit: Next development version 2.0.0-SNAPSHOT
Posted by na...@apache.org.
Next development version 2.0.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/1bd0a4a4
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/1bd0a4a4
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/1bd0a4a4
Branch: refs/heads/master
Commit: 1bd0a4a4cba705c878801270623a83731cf35126
Parents: ba4846e
Author: Ignasi Barrera <na...@apache.org>
Authored: Tue Mar 24 11:02:39 2015 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Tue Mar 24 11:02:39 2015 +0100
----------------------------------------------------------------------
providers/rackspace-cloudnetworks-uk/pom.xml | 4 ++--
providers/rackspace-cloudnetworks-us/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/1bd0a4a4/providers/rackspace-cloudnetworks-uk/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/pom.xml b/providers/rackspace-cloudnetworks-uk/pom.xml
index 3a6de14..1cf16fc 100644
--- a/providers/rackspace-cloudnetworks-uk/pom.xml
+++ b/providers/rackspace-cloudnetworks-uk/pom.xml
@@ -22,14 +22,14 @@
<parent>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-project</artifactId>
- <version>1.9.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath />
</parent>
<!-- TODO: when out of labs, switch to org.jclouds.provider -->
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>rackspace-cloudnetworks-uk</artifactId>
- <version>1.9.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>jclouds Rackspace Cloud Networks UK provider</name>
<description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks UK</description>
<packaging>bundle</packaging>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/1bd0a4a4/providers/rackspace-cloudnetworks-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/pom.xml b/providers/rackspace-cloudnetworks-us/pom.xml
index 3926897..fb960e9 100644
--- a/providers/rackspace-cloudnetworks-us/pom.xml
+++ b/providers/rackspace-cloudnetworks-us/pom.xml
@@ -22,14 +22,14 @@
<parent>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-project</artifactId>
- <version>1.9.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath />
</parent>
<!-- TODO: when out of labs, switch to org.jclouds.provider -->
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>rackspace-cloudnetworks-us</artifactId>
- <version>1.9.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>jclouds Rackspace Cloud Networks US provider</name>
<description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks US</description>
<packaging>bundle</packaging>
[08/15] jclouds git commit: Apache jclouds 2.0.0-rc3 release
Posted by na...@apache.org.
Apache jclouds 2.0.0-rc3 release
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/15a1c6ab
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/15a1c6ab
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/15a1c6ab
Branch: refs/heads/master
Commit: 15a1c6abfdf57009cee2334e32c5d4fc4d47cecc
Parents: 6073710
Author: Ignasi Barrera <na...@apache.org>
Authored: Wed Nov 9 22:43:56 2016 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Nov 9 22:43:56 2016 +0100
----------------------------------------------------------------------
providers/rackspace-cloudnetworks-uk/pom.xml | 4 ++--
providers/rackspace-cloudnetworks-us/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/15a1c6ab/providers/rackspace-cloudnetworks-uk/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/pom.xml b/providers/rackspace-cloudnetworks-uk/pom.xml
index 1cf16fc..934be5f 100644
--- a/providers/rackspace-cloudnetworks-uk/pom.xml
+++ b/providers/rackspace-cloudnetworks-uk/pom.xml
@@ -22,14 +22,14 @@
<parent>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-project</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath />
</parent>
<!-- TODO: when out of labs, switch to org.jclouds.provider -->
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>rackspace-cloudnetworks-uk</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<name>jclouds Rackspace Cloud Networks UK provider</name>
<description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks UK</description>
<packaging>bundle</packaging>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/15a1c6ab/providers/rackspace-cloudnetworks-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/pom.xml b/providers/rackspace-cloudnetworks-us/pom.xml
index fb960e9..375c28c 100644
--- a/providers/rackspace-cloudnetworks-us/pom.xml
+++ b/providers/rackspace-cloudnetworks-us/pom.xml
@@ -22,14 +22,14 @@
<parent>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-project</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath />
</parent>
<!-- TODO: when out of labs, switch to org.jclouds.provider -->
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>rackspace-cloudnetworks-us</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<name>jclouds Rackspace Cloud Networks US provider</name>
<description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks US</description>
<packaging>bundle</packaging>
[02/15] jclouds git commit: Use AutoService for creation of Service
Loader Metadata
Posted by na...@apache.org.
Use AutoService for creation of Service Loader Metadata
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/6bcaa972
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6bcaa972
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6bcaa972
Branch: refs/heads/master
Commit: 6bcaa97214a56eb11dddec5e232b4e7bb6418fe3
Parents: eacf004
Author: Jeremy Daggett <je...@rackspace.com>
Authored: Mon Nov 24 10:58:58 2014 -0800
Committer: Jeremy Daggett <je...@rackspace.com>
Committed: Wed Dec 3 09:50:08 2014 -0800
----------------------------------------------------------------------
providers/rackspace-cloudnetworks-us/pom.xml | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6bcaa972/providers/rackspace-cloudnetworks-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/pom.xml b/providers/rackspace-cloudnetworks-us/pom.xml
index 7a62e1b..fb960e9 100644
--- a/providers/rackspace-cloudnetworks-us/pom.xml
+++ b/providers/rackspace-cloudnetworks-us/pom.xml
@@ -42,9 +42,7 @@
<test.rackspace-cloudnetworks-us.identity>${test.rackspace-us.identity}</test.rackspace-cloudnetworks-us.identity>
<test.rackspace-cloudnetworks-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudnetworks-us.credential>
<jclouds.osgi.export>org.jclouds.rackspace.cloudnetworks.us*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds*;version="${project.version}",*
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -85,11 +83,10 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>com.google.auto.value</groupId>
- <artifactId>auto-value</artifactId>
- <scope>provided</scope>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
[12/15] jclouds git commit: Add support for Keystone V3
Posted by na...@apache.org.
Add support for Keystone V3
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/efeedb45
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/efeedb45
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/efeedb45
Branch: refs/heads/master
Commit: efeedb45261696e674a7b6b2b720b2def624f86a
Parents: 6aa759c
Author: Ignasi Barrera <na...@apache.org>
Authored: Mon Jan 15 15:06:02 2018 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Tue Jan 16 09:08:06 2018 +0100
----------------------------------------------------------------------
.../uk/CloudNetworksUKProviderMetadata.java | 12 +++++++-----
.../us/CloudNetworksUSProviderMetadata.java | 12 +++++++-----
2 files changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/efeedb45/providers/rackspace-cloudnetworks-uk/src/main/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/src/main/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderMetadata.java b/providers/rackspace-cloudnetworks-uk/src/main/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderMetadata.java
index 4cc4c16..620ad52 100644
--- a/providers/rackspace-cloudnetworks-uk/src/main/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderMetadata.java
+++ b/providers/rackspace-cloudnetworks-uk/src/main/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderMetadata.java
@@ -19,19 +19,20 @@ package org.jclouds.rackspace.cloudnetworks.uk;
import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES;
import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION;
import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
-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 static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE;
+import static org.jclouds.openstack.keystone.config.KeystoneProperties.KEYSTONE_VERSION;
+import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE;
import java.net.URI;
import java.util.Properties;
-import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
+import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule;
+import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule.RegionModule;
import org.jclouds.openstack.neutron.v2.NeutronApiMetadata;
import org.jclouds.openstack.neutron.v2.config.NeutronHttpApiModule;
import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
-import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
@@ -67,6 +68,7 @@ public class CloudNetworksUKProviderMetadata extends BaseProviderMetadata {
Properties properties = new Properties();
properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
properties.setProperty(SERVICE_TYPE, ServiceType.NETWORK);
+ properties.setProperty(KEYSTONE_VERSION, "2");
properties.setProperty(PROPERTY_REGIONS, "LON");
properties.setProperty(PROPERTY_REGION + ".LON." + ISO3166_CODES, "GB-SLG");
@@ -87,8 +89,8 @@ public class CloudNetworksUKProviderMetadata extends BaseProviderMetadata {
.endpointName("Rackspace Cloud Identity service URL ending in /v2.0/")
.version("2.0")
.defaultModules(ImmutableSet.<Class<? extends Module>>builder()
- .add(CloudIdentityAuthenticationApiModule.class)
.add(CloudIdentityAuthenticationModule.class)
+ .add(ServiceCatalogModule.class)
.add(RegionModule.class)
.add(NeutronHttpApiModule.class)
.build())
http://git-wip-us.apache.org/repos/asf/jclouds/blob/efeedb45/providers/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java b/providers/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java
index 3920c20..60bff94 100644
--- a/providers/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java
+++ b/providers/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java
@@ -19,19 +19,20 @@ package org.jclouds.rackspace.cloudnetworks.us;
import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES;
import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION;
import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
-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 static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE;
+import static org.jclouds.openstack.keystone.config.KeystoneProperties.KEYSTONE_VERSION;
+import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE;
import java.net.URI;
import java.util.Properties;
-import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
+import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule;
+import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule.RegionModule;
import org.jclouds.openstack.neutron.v2.NeutronApiMetadata;
import org.jclouds.openstack.neutron.v2.config.NeutronHttpApiModule;
import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
-import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
@@ -67,6 +68,7 @@ public class CloudNetworksUSProviderMetadata extends BaseProviderMetadata {
Properties properties = new Properties();
properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
properties.setProperty(SERVICE_TYPE, ServiceType.NETWORK);
+ properties.setProperty(KEYSTONE_VERSION, "2");
properties.setProperty(PROPERTY_REGIONS, "ORD,DFW,IAD,SYD,HKG");
properties.setProperty(PROPERTY_REGION + ".ORD." + ISO3166_CODES, "US-IL");
@@ -91,8 +93,8 @@ public class CloudNetworksUSProviderMetadata extends BaseProviderMetadata {
.endpointName("Rackspace Cloud Identity service URL ending in /v2.0/")
.version("2.0")
.defaultModules(ImmutableSet.<Class<? extends Module>>builder()
- .add(CloudIdentityAuthenticationApiModule.class)
.add(CloudIdentityAuthenticationModule.class)
+ .add(ServiceCatalogModule.class)
.add(RegionModule.class)
.add(NeutronHttpApiModule.class)
.build())
[14/15] jclouds git commit: Update pom.xml files after promoting
Rackspace Cloud Networks
Posted by na...@apache.org.
Update pom.xml files after promoting Rackspace Cloud Networks
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/a7383af2
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/a7383af2
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/a7383af2
Branch: refs/heads/master
Commit: a7383af25828b86694db11c6b797619cd0b49675
Parents: 68e3dc0
Author: Ignasi Barrera <na...@apache.org>
Authored: Wed Jan 17 09:19:18 2018 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Jan 17 09:19:18 2018 +0100
----------------------------------------------------------------------
providers/pom.xml | 2 ++
providers/rackspace-cloudnetworks-uk/README.md | 4 ----
providers/rackspace-cloudnetworks-uk/pom.xml | 21 +++++++++------------
providers/rackspace-cloudnetworks-us/README.md | 1 -
providers/rackspace-cloudnetworks-us/pom.xml | 21 +++++++++------------
5 files changed, 20 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a7383af2/providers/pom.xml
----------------------------------------------------------------------
diff --git a/providers/pom.xml b/providers/pom.xml
index df0fe88..29bd123 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -70,6 +70,8 @@
<module>rackspace-cloudfiles-us</module>
<module>rackspace-cloudloadbalancers-uk</module>
<module>rackspace-cloudloadbalancers-us</module>
+ <module>rackspace-cloudnetworks-uk</module>
+ <module>rackspace-cloudnetworks-us</module>
<module>rackspace-cloudservers-uk</module>
<module>rackspace-cloudservers-us</module>
<module>serverlove-z1-man</module>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a7383af2/providers/rackspace-cloudnetworks-uk/README.md
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/README.md b/providers/rackspace-cloudnetworks-uk/README.md
deleted file mode 100644
index dc52a0f..0000000
--- a/providers/rackspace-cloudnetworks-uk/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Rackspace Networks UK
-========================
-
-Beta
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a7383af2/providers/rackspace-cloudnetworks-uk/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/pom.xml b/providers/rackspace-cloudnetworks-uk/pom.xml
index 96935c9..20e6649 100644
--- a/providers/rackspace-cloudnetworks-uk/pom.xml
+++ b/providers/rackspace-cloudnetworks-uk/pom.xml
@@ -23,13 +23,10 @@
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-project</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath />
+ <relativePath>../../project/pom.xml</relativePath>
</parent>
-
- <!-- TODO: when out of labs, switch to org.jclouds.provider -->
- <groupId>org.apache.jclouds.labs</groupId>
+ <groupId>org.apache.jclouds.provider</groupId>
<artifactId>rackspace-cloudnetworks-uk</artifactId>
- <version>2.1.0-SNAPSHOT</version>
<name>jclouds Rackspace Cloud Networks UK provider</name>
<description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks UK</description>
<packaging>bundle</packaging>
@@ -47,35 +44,35 @@
<dependencies>
<dependency>
- <groupId>org.apache.jclouds.labs</groupId>
+ <groupId>org.apache.jclouds.api</groupId>
<artifactId>openstack-neutron</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>rackspace-cloudidentity</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
- <groupId>org.apache.jclouds.labs</groupId>
+ <groupId>org.apache.jclouds.api</groupId>
<artifactId>openstack-neutron</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-core</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-slf4j</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a7383af2/providers/rackspace-cloudnetworks-us/README.md
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/README.md b/providers/rackspace-cloudnetworks-us/README.md
index 4a83307..fa43188 100644
--- a/providers/rackspace-cloudnetworks-us/README.md
+++ b/providers/rackspace-cloudnetworks-us/README.md
@@ -1,4 +1,3 @@
Rackspace Networks US
========================
-Beta
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a7383af2/providers/rackspace-cloudnetworks-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/pom.xml b/providers/rackspace-cloudnetworks-us/pom.xml
index aeb8a3c..e34e389 100644
--- a/providers/rackspace-cloudnetworks-us/pom.xml
+++ b/providers/rackspace-cloudnetworks-us/pom.xml
@@ -23,13 +23,10 @@
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-project</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath />
+ <relativePath>../../project/pom.xml</relativePath>
</parent>
-
- <!-- TODO: when out of labs, switch to org.jclouds.provider -->
- <groupId>org.apache.jclouds.labs</groupId>
+ <groupId>org.apache.jclouds.provider</groupId>
<artifactId>rackspace-cloudnetworks-us</artifactId>
- <version>2.1.0-SNAPSHOT</version>
<name>jclouds Rackspace Cloud Networks US provider</name>
<description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks US</description>
<packaging>bundle</packaging>
@@ -47,35 +44,35 @@
<dependencies>
<dependency>
- <groupId>org.apache.jclouds.labs</groupId>
+ <groupId>org.apache.jclouds.api</groupId>
<artifactId>openstack-neutron</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>rackspace-cloudidentity</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
- <groupId>org.apache.jclouds.labs</groupId>
+ <groupId>org.apache.jclouds.api</groupId>
<artifactId>openstack-neutron</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-core</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-slf4j</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
[05/15] jclouds git commit: Apache jclouds 1.9.0 release
Posted by na...@apache.org.
Apache jclouds 1.9.0 release
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/ba4846e2
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/ba4846e2
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/ba4846e2
Branch: refs/heads/master
Commit: ba4846e2a8c8145e59fe385c29de18eabf7b1ba8
Parents: e36cf42
Author: Ignasi Barrera <na...@apache.org>
Authored: Tue Mar 24 10:59:36 2015 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Tue Mar 24 10:59:36 2015 +0100
----------------------------------------------------------------------
providers/rackspace-cloudnetworks-uk/pom.xml | 4 ++--
providers/rackspace-cloudnetworks-us/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/ba4846e2/providers/rackspace-cloudnetworks-uk/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/pom.xml b/providers/rackspace-cloudnetworks-uk/pom.xml
index 1cf16fc..3a6de14 100644
--- a/providers/rackspace-cloudnetworks-uk/pom.xml
+++ b/providers/rackspace-cloudnetworks-uk/pom.xml
@@ -22,14 +22,14 @@
<parent>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-project</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.9.0</version>
<relativePath />
</parent>
<!-- TODO: when out of labs, switch to org.jclouds.provider -->
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>rackspace-cloudnetworks-uk</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.9.0</version>
<name>jclouds Rackspace Cloud Networks UK provider</name>
<description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks UK</description>
<packaging>bundle</packaging>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/ba4846e2/providers/rackspace-cloudnetworks-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/pom.xml b/providers/rackspace-cloudnetworks-us/pom.xml
index fb960e9..3926897 100644
--- a/providers/rackspace-cloudnetworks-us/pom.xml
+++ b/providers/rackspace-cloudnetworks-us/pom.xml
@@ -22,14 +22,14 @@
<parent>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-project</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.9.0</version>
<relativePath />
</parent>
<!-- TODO: when out of labs, switch to org.jclouds.provider -->
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>rackspace-cloudnetworks-us</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.9.0</version>
<name>jclouds Rackspace Cloud Networks US provider</name>
<description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks US</description>
<packaging>bundle</packaging>
[10/15] jclouds git commit: Make auto service optional
Posted by na...@apache.org.
Make auto service optional
This makes dependencies consistent and eliminates warnings of the
form:
$M2_HOME/repository/org/apache/jclouds/driver/jclouds-slf4j/2.1.0-SNAPSHOT/jclouds-slf4j-2.1.0-SNAPSHOT.jar(org/jclouds/logging/slf4j/config/SLF4JLoggingModule.class): warning: Cannot find annotation method 'value()' in type 'AutoService': class file for com.google.auto.service.AutoService not found
Reference:
https://github.com/google/auto/tree/master/service#download
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/6b5f522f
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6b5f522f
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6b5f522f
Branch: refs/heads/master
Commit: 6b5f522f5c96981a621f869e00416d1cf39bdcf5
Parents: 1c49a1b
Author: Andrew Gaul <ga...@apache.org>
Authored: Wed Aug 30 12:27:08 2017 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Wed Aug 30 12:27:08 2017 -0700
----------------------------------------------------------------------
providers/rackspace-cloudnetworks-us/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b5f522f/providers/rackspace-cloudnetworks-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/pom.xml b/providers/rackspace-cloudnetworks-us/pom.xml
index 385118f..aeb8a3c 100644
--- a/providers/rackspace-cloudnetworks-us/pom.xml
+++ b/providers/rackspace-cloudnetworks-us/pom.xml
@@ -87,6 +87,7 @@
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
</dependencies>
[03/15] jclouds git commit: Updated service type from "networks" to
"network"
Posted by na...@apache.org.
Updated service type from "networks" to "network"
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/4e61d522
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/4e61d522
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/4e61d522
Branch: refs/heads/master
Commit: 4e61d52291061056888e3d5f2c86c82d54e77135
Parents: 6bcaa97
Author: Jeremy Daggett <je...@rackspace.com>
Authored: Wed Dec 3 12:46:44 2014 -0800
Committer: Jeremy Daggett <je...@rackspace.com>
Committed: Wed Dec 3 16:57:19 2014 -0800
----------------------------------------------------------------------
.../cloudnetworks/us/CloudNetworksUSProviderMetadata.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/4e61d522/providers/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java b/providers/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java
index 6a84aac..3920c20 100644
--- a/providers/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java
+++ b/providers/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java
@@ -28,6 +28,7 @@ import java.util.Properties;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
import org.jclouds.openstack.neutron.v2.NeutronApiMetadata;
import org.jclouds.openstack.neutron.v2.config.NeutronHttpApiModule;
+import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
@@ -65,7 +66,7 @@ public class CloudNetworksUSProviderMetadata extends BaseProviderMetadata {
public static Properties defaultProperties() {
Properties properties = new Properties();
properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
- properties.setProperty(SERVICE_TYPE, "networks");
+ properties.setProperty(SERVICE_TYPE, ServiceType.NETWORK);
properties.setProperty(PROPERTY_REGIONS, "ORD,DFW,IAD,SYD,HKG");
properties.setProperty(PROPERTY_REGION + ".ORD." + ISO3166_CODES, "US-IL");
[04/15] jclouds git commit: Support Rackspace Cloud Networks UK
Posted by na...@apache.org.
Support Rackspace Cloud Networks UK
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/e36cf423
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/e36cf423
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/e36cf423
Branch: refs/heads/master
Commit: e36cf4233f048823c1aa92116d386d0eabe98e71
Parents: 4e61d52
Author: Jeremy Daggett <je...@rackspace.com>
Authored: Wed Dec 3 13:38:24 2014 -0800
Committer: Jeremy Daggett <je...@rackspace.com>
Committed: Wed Jan 14 14:40:05 2015 -0800
----------------------------------------------------------------------
providers/rackspace-cloudnetworks-uk/README.md | 4 +
providers/rackspace-cloudnetworks-uk/pom.xml | 125 +++++++++++++++++++
.../uk/CloudNetworksUKProviderMetadata.java | 118 +++++++++++++++++
.../uk/CloudNetworksUKNetworkApiLiveTest.java | 76 +++++++++++
.../uk/CloudNetworksUKPortApiLiveTest.java | 85 +++++++++++++
.../uk/CloudNetworksUKProviderTest.java | 28 +++++
.../uk/CloudNetworksUKSubnetApiLiveTest.java | 89 +++++++++++++
.../src/test/resources/logback.xml | 56 +++++++++
8 files changed, 581 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/e36cf423/providers/rackspace-cloudnetworks-uk/README.md
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/README.md b/providers/rackspace-cloudnetworks-uk/README.md
new file mode 100644
index 0000000..dc52a0f
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-uk/README.md
@@ -0,0 +1,4 @@
+Rackspace Networks UK
+========================
+
+Beta
http://git-wip-us.apache.org/repos/asf/jclouds/blob/e36cf423/providers/rackspace-cloudnetworks-uk/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/pom.xml b/providers/rackspace-cloudnetworks-uk/pom.xml
new file mode 100644
index 0000000..1cf16fc
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-uk/pom.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-project</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
+ <!-- TODO: when out of labs, switch to org.jclouds.provider -->
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>rackspace-cloudnetworks-uk</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <name>jclouds Rackspace Cloud Networks UK provider</name>
+ <description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks UK</description>
+ <packaging>bundle</packaging>
+
+ <properties>
+ <!-- identity endpoint -->
+ <test.rackspace-cloudnetworks-uk.endpoint>https://lon.identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudnetworks-uk.endpoint>
+ <test.rackspace-cloudnetworks-uk.api-version>2.0</test.rackspace-cloudnetworks-uk.api-version>
+ <test.rackspace-cloudnetworks-uk.build-version />
+ <test.rackspace-cloudnetworks-uk.identity>${test.rackspace-uk.identity}</test.rackspace-cloudnetworks-uk.identity>
+ <test.rackspace-cloudnetworks-uk.credential>${test.rackspace-uk.credential}</test.rackspace-cloudnetworks-uk.credential>
+ <jclouds.osgi.export>org.jclouds.rackspace.cloudnetworks.uk*;version="${project.version}"</jclouds.osgi.export>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>openstack-neutron</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>rackspace-cloudidentity</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>openstack-neutron</artifactId>
+ <version>${project.parent.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${project.parent.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-slf4j</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>live</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>integration</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <test.rackspace-cloudnetworks-uk.endpoint>${test.rackspace-cloudnetworks-uk.endpoint}</test.rackspace-cloudnetworks-uk.endpoint>
+ <test.rackspace-cloudnetworks-uk.api-version>${test.rackspace-cloudnetworks-uk.api-version}</test.rackspace-cloudnetworks-uk.api-version>
+ <test.rackspace-cloudnetworks-uk.build-version>${test.rackspace-cloudnetworks-uk.build-version}</test.rackspace-cloudnetworks-uk.build-version>
+ <test.rackspace-cloudnetworks-uk.identity>${test.rackspace-cloudnetworks-uk.identity}</test.rackspace-cloudnetworks-uk.identity>
+ <test.rackspace-cloudnetworks-uk.credential>${test.rackspace-cloudnetworks-uk.credential}</test.rackspace-cloudnetworks-uk.credential>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/e36cf423/providers/rackspace-cloudnetworks-uk/src/main/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/src/main/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderMetadata.java b/providers/rackspace-cloudnetworks-uk/src/main/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderMetadata.java
new file mode 100644
index 0000000..4cc4c16
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-uk/src/main/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderMetadata.java
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.rackspace.cloudnetworks.uk;
+
+import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES;
+import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION;
+import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
+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 org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
+import org.jclouds.openstack.neutron.v2.NeutronApiMetadata;
+import org.jclouds.openstack.neutron.v2.config.NeutronHttpApiModule;
+import org.jclouds.openstack.v2_0.ServiceType;
+import org.jclouds.providers.ProviderMetadata;
+import org.jclouds.providers.internal.BaseProviderMetadata;
+import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
+import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
+import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
+
+import com.google.auto.service.AutoService;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Module;
+
+@AutoService(ProviderMetadata.class)
+public class CloudNetworksUKProviderMetadata extends BaseProviderMetadata {
+
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ @Override
+ public Builder toBuilder() {
+ return builder().fromProviderMetadata(this);
+ }
+
+ public CloudNetworksUKProviderMetadata() {
+ this(new Builder());
+ }
+
+ protected CloudNetworksUKProviderMetadata(Builder builder) {
+ super(builder);
+ }
+
+ /**
+ * @return a {@link Properties} object containing the default provider properties.
+ * This returns the credential type, service type, and configured regions.
+ */
+ public static Properties defaultProperties() {
+ Properties properties = new Properties();
+ properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
+ properties.setProperty(SERVICE_TYPE, ServiceType.NETWORK);
+
+ properties.setProperty(PROPERTY_REGIONS, "LON");
+ properties.setProperty(PROPERTY_REGION + ".LON." + ISO3166_CODES, "GB-SLG");
+
+ return properties;
+ }
+
+ public static class Builder extends BaseProviderMetadata.Builder {
+
+ protected Builder() {
+ id("rackspace-cloudnetworks-uk")
+ .name("Rackspace Cloud Networks UK")
+ .apiMetadata(new NeutronApiMetadata().toBuilder()
+ .identityName("${userName}")
+ .credentialName("${apiKey}")
+ .defaultEndpoint("https://lon.identity.api.rackspacecloud.com/v2.0/")
+ .documentation(URI.create("http://docs.rackspace.com/networks/api/v1/cf-devguide/content/index.html"))
+ .endpointName("Rackspace Cloud Identity service URL ending in /v2.0/")
+ .version("2.0")
+ .defaultModules(ImmutableSet.<Class<? extends Module>>builder()
+ .add(CloudIdentityAuthenticationApiModule.class)
+ .add(CloudIdentityAuthenticationModule.class)
+ .add(RegionModule.class)
+ .add(NeutronHttpApiModule.class)
+ .build())
+ .build())
+ .homepage(URI.create("http://www.rackspace.com/cloud/networks"))
+ .console(URI.create("https://mycloud.rackspace.co.uk"))
+ .linkedServices("rackspace-autoscale-uk", "rackspace-cloudblockstorage-uk",
+ "rackspace-clouddatabases-uk", "rackspace-clouddns-uk", "rackspace-cloudidentity",
+ "rackspace-cloudloadbalancers-uk", "rackspace-cloudqueues-uk",
+ "rackspace-cloudservers-uk")
+ .iso3166Codes("GB-SLG")
+ .defaultProperties(CloudNetworksUKProviderMetadata.defaultProperties());
+
+ }
+
+ @Override
+ public CloudNetworksUKProviderMetadata build() {
+ return new CloudNetworksUKProviderMetadata(this);
+ }
+
+ @Override
+ public Builder fromProviderMetadata(ProviderMetadata in) {
+ super.fromProviderMetadata(in);
+ return this;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/e36cf423/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKNetworkApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKNetworkApiLiveTest.java b/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKNetworkApiLiveTest.java
new file mode 100644
index 0000000..e6fd5c7
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKNetworkApiLiveTest.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.rackspace.cloudnetworks.uk;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+import org.jclouds.openstack.neutron.v2.domain.Network;
+import org.jclouds.openstack.neutron.v2.features.NetworkApi;
+import org.jclouds.openstack.neutron.v2.features.NetworkApiLiveTest;
+import org.testng.SkipException;
+import org.testng.annotations.Test;
+
+@Test(groups = "live", testName = "CloudNetworksUKNetworkApiLiveTest", singleThreaded = true)
+public class CloudNetworksUKNetworkApiLiveTest extends NetworkApiLiveTest {
+ public CloudNetworksUKNetworkApiLiveTest() {
+ provider = "rackspace-cloudnetworks-uk";
+ }
+
+ @Override
+ public void testCreateUpdateAndDeleteNetwork() {
+ for (String region : api.getConfiguredRegions()) {
+ NetworkApi networkApi = api.getNetworkApi(region);
+ Network net = networkApi.create(Network.createBuilder("jclouds-test").build());
+ Network test = networkApi.create(Network.createBuilder("jclouds-test").build());
+ assertNotNull(net);
+
+ /* List and get tests */
+ Network networkList = api.getNetworkApi(region).list().concat().toSet().iterator().next();
+ assertNotNull(networkList);
+ Network networkGet = api.getNetworkApi(region).get(networkList.getId());
+ assertEquals(networkList, networkGet);
+ /****/
+
+ Network network = networkApi.get(net.getId());
+
+ assertEquals(network.getId(), net.getId());
+ assertEquals(network.getName(), "jclouds-test");
+ assertTrue(network.getSubnets().isEmpty());
+ assertNotNull(networkApi.update(net.getId(), Network.updateBuilder().name("jclouds-live-test").build()));
+
+ network = networkApi.get(net.getId());
+
+ assertEquals(network.getId(), net.getId());
+ assertEquals(network.getName(), "jclouds-live-test");
+ assertTrue(network.getSubnets().isEmpty());
+
+ Network net2 = networkApi.create(Network.createBuilder("jclouds-test2").build());
+ assertNotNull(net2);
+
+ assertTrue(networkApi.delete(net.getId()));
+ assertTrue(networkApi.delete(net2.getId()));
+ assertTrue(networkApi.delete(test.getId()));
+ }
+ }
+
+ @Override
+ public void testBulkCreateNetwork() {
+ throw new SkipException("unsupported functionality");
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/e36cf423/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKPortApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKPortApiLiveTest.java b/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKPortApiLiveTest.java
new file mode 100644
index 0000000..1685766
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKPortApiLiveTest.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.rackspace.cloudnetworks.uk;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+import org.jclouds.openstack.neutron.v2.domain.Network;
+import org.jclouds.openstack.neutron.v2.domain.Port;
+import org.jclouds.openstack.neutron.v2.domain.Subnet;
+import org.jclouds.openstack.neutron.v2.features.NetworkApi;
+import org.jclouds.openstack.neutron.v2.features.PortApi;
+import org.jclouds.openstack.neutron.v2.features.PortApiLiveTest;
+import org.jclouds.openstack.neutron.v2.features.SubnetApi;
+import org.testng.SkipException;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+@Test(groups = "live", testName = "CloudNetworksUKPortApiLiveTest", singleThreaded = true)
+public class CloudNetworksUKPortApiLiveTest extends PortApiLiveTest {
+ public CloudNetworksUKPortApiLiveTest() {
+ provider = "rackspace-cloudnetworks-uk";
+ }
+
+ public void testCreateUpdateAndDeletePort() {
+ 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.createBuilder("JClouds-Live-Network").build()).getId();
+ String ipv4SubnetId = subnetApi.create(Subnet.createBuilder(networkId, "192.168.0.0/30").ipVersion(4)
+ .name("JClouds-Live-IPv4-Subnet").build()).getId();
+
+ assertNotNull(networkId);
+ assertNotNull(ipv4SubnetId);
+
+ String ipv4PortId = portApi.create(Port.createBuilder(networkId).name("JClouds-Live-IPv4-Port")
+ .fixedIps(ImmutableSet.copyOf(getFixedAddresses(ipv4SubnetId))).build()).getId();
+
+ /* List and get test */
+ Port portList = api.getPortApi(region).list().concat().toSet().iterator().next();
+ assertNotNull(portList);
+ Port portGet = api.getPortApi(region).get(portList.getId());
+ assertEquals(portList, portGet);
+ /****/
+
+ assertNotNull(ipv4PortId);
+
+ Port ipv4Port = portApi.get(ipv4PortId);
+ assertNotNull(ipv4Port);
+ assertEquals(ipv4Port.getId(), ipv4PortId);
+ assertEquals(ipv4Port.getName(), "JClouds-Live-IPv4-Port");
+
+ assertNotNull(portApi.update(ipv4PortId, Port.updateBuilder().name("Updated").build()));
+ Port updatedIpv4Port = portApi.get(ipv4PortId);
+ assertEquals(updatedIpv4Port.getName(), "Updated");
+
+ assertTrue(portApi.delete(ipv4PortId));
+ assertTrue(subnetApi.delete(ipv4SubnetId));
+ assertTrue(networkApi.delete(networkId));
+ }
+ }
+
+ @Override
+ public void testBulkCreatePort() {
+ throw new SkipException("unsupported functionality");
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/e36cf423/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderTest.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderTest.java b/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderTest.java
new file mode 100644
index 0000000..2b2a01c
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.rackspace.cloudnetworks.uk;
+
+import org.jclouds.openstack.neutron.v2.NeutronApiMetadata;
+import org.jclouds.providers.internal.BaseProviderMetadataTest;
+import org.testng.annotations.Test;
+
+@Test(groups = "unit", testName = "CloudNetworksUKProviderTest", singleThreaded = true)
+public class CloudNetworksUKProviderTest extends BaseProviderMetadataTest {
+ public CloudNetworksUKProviderTest() {
+ super(new CloudNetworksUKProviderMetadata(), new NeutronApiMetadata());
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/e36cf423/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKSubnetApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKSubnetApiLiveTest.java b/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKSubnetApiLiveTest.java
new file mode 100644
index 0000000..54df5e0
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-uk/src/test/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKSubnetApiLiveTest.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.rackspace.cloudnetworks.uk;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+import org.jclouds.openstack.neutron.v2.domain.AllocationPool;
+import org.jclouds.openstack.neutron.v2.domain.HostRoute;
+import org.jclouds.openstack.neutron.v2.domain.Network;
+import org.jclouds.openstack.neutron.v2.domain.Subnet;
+import org.jclouds.openstack.neutron.v2.features.NetworkApi;
+import org.jclouds.openstack.neutron.v2.features.SubnetApi;
+import org.jclouds.openstack.neutron.v2.features.SubnetApiLiveTest;
+import org.testng.SkipException;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+@Test(groups = "live", testName = "CloudNetworksUKSubnetApiLiveTest", singleThreaded = true)
+public class CloudNetworksUKSubnetApiLiveTest extends SubnetApiLiveTest {
+ public CloudNetworksUKSubnetApiLiveTest() {
+ provider = "rackspace-cloudnetworks-uk";
+ }
+
+ @Override
+ public void testCreateUpdateAndDeleteSubnet() {
+ for (String region : api.getConfiguredRegions()) {
+ NetworkApi networkApi = api.getNetworkApi(region);
+ String networkId = networkApi.create(
+ Network.createBuilder("jclouds-live-test").build()).getId();
+
+ SubnetApi subnetApi = api.getSubnetApi(region);
+ ImmutableSet<AllocationPool> allocationPools = ImmutableSet.of(
+ AllocationPool.builder().start("192.168.100.0").end("192.168.100.2").build()
+ );
+ ImmutableSet<HostRoute> hostRoutes = ImmutableSet.of(
+ HostRoute.builder().destinationCidr("192.168.100.0/30").nextHop("192.168.100.4").build()
+ );
+ Subnet subnet = subnetApi.create(Subnet.createBuilder(networkId, "192.168.100.0/30").ipVersion(4).allocationPools(allocationPools).hostRoutes(hostRoutes).build());
+ assertNotNull(subnet);
+
+ /* Test list and get */
+ Subnet subnetList = api.getSubnetApi(region).list().concat().toSet().iterator().next();
+ assertNotNull(subnetList);
+ Subnet subnetGet = api.getSubnetApi(region).get(subnetList.getId());
+ assertEquals(subnetList, subnetGet);
+ /***/
+
+ Subnet retrievedSubnet = subnetApi.get(subnet.getId());
+
+ assertEquals(retrievedSubnet.getId(), subnet.getId());
+ assertEquals(retrievedSubnet.getCidr(), "192.168.100.0/30");
+ assertTrue(retrievedSubnet.getDnsNameservers().isEmpty());
+ assertEquals(retrievedSubnet.getAllocationPools().size(), 1);
+ assertEquals(retrievedSubnet.getHostRoutes().size(), 1);
+ assertNotNull(subnetApi.update(retrievedSubnet.getId(), Subnet.updateBuilder().name("jclouds-live-test-update").build()));
+
+ retrievedSubnet = subnetApi.get(retrievedSubnet.getId());
+
+ assertEquals(retrievedSubnet.getId(), subnet.getId());
+ assertEquals(retrievedSubnet.getName(), "jclouds-live-test-update");
+ assertTrue(retrievedSubnet.getDnsNameservers().isEmpty());
+
+ assertTrue(subnetApi.delete(subnet.getId()));
+ assertTrue(networkApi.delete(networkId));
+ }
+ }
+
+ @Override
+ public void testBulkCreateSubnet() {
+ throw new SkipException("unsupported functionality");
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/e36cf423/providers/rackspace-cloudnetworks-uk/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/src/test/resources/logback.xml b/providers/rackspace-cloudnetworks-uk/src/test/resources/logback.xml
new file mode 100644
index 0000000..d7c463a
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-uk/src/test/resources/logback.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<configuration scan="false">
+ <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+ <file>target/test-data/jclouds.log</file>
+
+ <encoder>
+ <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+ </encoder>
+ </appender>
+
+ <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
+ <file>target/test-data/jclouds-wire.log</file>
+
+ <encoder>
+ <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+ </encoder>
+ </appender>
+
+ <root>
+ <level value="warn" />
+ </root>
+
+ <logger name="org.jclouds">
+ <level value="DEBUG" />
+ <appender-ref ref="FILE" />
+ </logger>
+
+ <logger name="jclouds.wire">
+ <level value="DEBUG" />
+ <appender-ref ref="WIREFILE" />
+ </logger>
+
+ <logger name="jclouds.headers">
+ <level value="DEBUG" />
+ <appender-ref ref="WIREFILE" />
+ </logger>
+
+</configuration>
[07/15] jclouds git commit: Enables live tests for neutron security
groups. Makes tests more robust.
Posted by na...@apache.org.
Enables live tests for neutron security groups. Makes tests more robust.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/60737100
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/60737100
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/60737100
Branch: refs/heads/master
Commit: 60737100cec28b6096ebd810c6e158c8cc656a44
Parents: 1bd0a4a
Author: Zack Shoylev <za...@rackspace.com>
Authored: Fri Feb 27 07:00:59 2015 -0600
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Fri Apr 3 13:53:14 2015 -0500
----------------------------------------------------------------------
...CloudNetworksUSSecurityGroupApiLiveTest.java | 27 ++++++++++++++++++++
1 file changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/60737100/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSecurityGroupApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSecurityGroupApiLiveTest.java b/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSecurityGroupApiLiveTest.java
new file mode 100644
index 0000000..b53de9c
--- /dev/null
+++ b/providers/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSecurityGroupApiLiveTest.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.rackspace.cloudnetworks.us;
+
+import org.jclouds.openstack.neutron.v2.extensions.SecurityGroupApiLiveTest;
+import org.testng.annotations.Test;
+
+@Test(groups = "live", testName = "CloudNetworksUSSecurityGroupApiLiveTest", singleThreaded = true)
+public class CloudNetworksUSSecurityGroupApiLiveTest extends SecurityGroupApiLiveTest {
+ public CloudNetworksUSSecurityGroupApiLiveTest() {
+ provider = "rackspace-cloudnetworks-us";
+ }
+}
[09/15] jclouds git commit: Next development version 2.1.0-SNAPSHOT
Posted by na...@apache.org.
Next development version 2.1.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/1c49a1b1
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/1c49a1b1
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/1c49a1b1
Branch: refs/heads/master
Commit: 1c49a1b170c750a2046c5884593fbc85f44bf0cc
Parents: 15a1c6a
Author: Ignasi Barrera <na...@apache.org>
Authored: Tue Nov 15 01:13:00 2016 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Tue Nov 15 01:13:00 2016 +0100
----------------------------------------------------------------------
providers/rackspace-cloudnetworks-uk/pom.xml | 4 ++--
providers/rackspace-cloudnetworks-us/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/1c49a1b1/providers/rackspace-cloudnetworks-uk/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-uk/pom.xml b/providers/rackspace-cloudnetworks-uk/pom.xml
index 934be5f..96935c9 100644
--- a/providers/rackspace-cloudnetworks-uk/pom.xml
+++ b/providers/rackspace-cloudnetworks-uk/pom.xml
@@ -22,14 +22,14 @@
<parent>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-project</artifactId>
- <version>2.0.0</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath />
</parent>
<!-- TODO: when out of labs, switch to org.jclouds.provider -->
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>rackspace-cloudnetworks-uk</artifactId>
- <version>2.0.0</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>jclouds Rackspace Cloud Networks UK provider</name>
<description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks UK</description>
<packaging>bundle</packaging>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/1c49a1b1/providers/rackspace-cloudnetworks-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudnetworks-us/pom.xml b/providers/rackspace-cloudnetworks-us/pom.xml
index 375c28c..385118f 100644
--- a/providers/rackspace-cloudnetworks-us/pom.xml
+++ b/providers/rackspace-cloudnetworks-us/pom.xml
@@ -22,14 +22,14 @@
<parent>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-project</artifactId>
- <version>2.0.0</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath />
</parent>
<!-- TODO: when out of labs, switch to org.jclouds.provider -->
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>rackspace-cloudnetworks-us</artifactId>
- <version>2.0.0</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>jclouds Rackspace Cloud Networks US provider</name>
<description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks US</description>
<packaging>bundle</packaging>
[13/15] jclouds git commit: Promote Rackspace Cloud Networks providers
Posted by na...@apache.org.
Promote Rackspace Cloud Networks providers
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/68e3dc05
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/68e3dc05
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/68e3dc05
Branch: refs/heads/master
Commit: 68e3dc059bad11a0593641302b4146533dcd2451
Parents: 3ac9279 efeedb4
Author: Ignasi Barrera <na...@apache.org>
Authored: Wed Jan 17 09:14:54 2018 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Jan 17 09:14:54 2018 +0100
----------------------------------------------------------------------
providers/rackspace-cloudnetworks-uk/README.md | 4 +
providers/rackspace-cloudnetworks-uk/pom.xml | 125 ++++++++++++++++++
.../uk/CloudNetworksUKProviderMetadata.java | 120 ++++++++++++++++++
.../uk/CloudNetworksUKNetworkApiLiveTest.java | 76 +++++++++++
.../uk/CloudNetworksUKPortApiLiveTest.java | 85 +++++++++++++
.../uk/CloudNetworksUKProviderTest.java | 28 +++++
.../uk/CloudNetworksUKSubnetApiLiveTest.java | 89 +++++++++++++
.../src/test/resources/logback.xml | 56 +++++++++
providers/rackspace-cloudnetworks-us/README.md | 4 +
providers/rackspace-cloudnetworks-us/pom.xml | 126 +++++++++++++++++++
.../us/CloudNetworksUSProviderMetadata.java | 124 ++++++++++++++++++
.../us/CloudNetworksUSNetworkApiLiveTest.java | 76 +++++++++++
.../us/CloudNetworksUSPortApiLiveTest.java | 85 +++++++++++++
.../us/CloudNetworksUSProviderTest.java | 28 +++++
...CloudNetworksUSSecurityGroupApiLiveTest.java | 27 ++++
.../us/CloudNetworksUSSubnetApiLiveTest.java | 89 +++++++++++++
.../src/test/resources/logback.xml | 69 ++++++++++
17 files changed, 1211 insertions(+)
----------------------------------------------------------------------