You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/05 19:50:10 UTC
[02/20] git commit: Remove greenqloud-compute,
which hasn't been published in over a year.
Remove greenqloud-compute, which hasn't been published in over a year.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/bd4992b8
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/bd4992b8
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/bd4992b8
Branch: refs/heads/1.8.x
Commit: bd4992b8107174ed94aff9dd1dda925723770462
Parents: f5f3fbb
Author: Adrian Cole <ad...@gmail.com>
Authored: Sun Oct 5 09:20:13 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Sun Oct 5 10:29:21 2014 -0700
----------------------------------------------------------------------
greenqloud-compute/pom.xml | 130 ----------
.../GreenQloudComputeProviderMetadata.java | 94 -------
...QloudComputeComputeServiceContextModule.java | 34 ---
.../GreenQloudComputeReviseParsedImage.java | 60 -----
.../GreenQloudEC2HardwareSupplier.java | 102 --------
.../org.jclouds.providers.ProviderMetadata | 1 -
...udComputeComputeServiceLiveTestDisabled.java | 28 --
.../compute/GreenQloudComputeProviderTest.java | 30 ---
...reenQloudComputeTemplateBuilderLiveTest.java | 101 --------
.../DescribeRegionsResponseHandlerTest.java | 52 ----
.../services/GreenQloudAMIClientLiveTest.java | 28 --
...AvailabilityZoneAndRegionClientLiveTest.java | 28 --
...eenQloudElasticBlockStoreClientLiveTest.java | 28 --
...reenQloudElasticIPAddressClientLiveTest.java | 28 --
.../GreenQloudInstanceClientLiveTest.java | 28 --
.../GreenQloudKeyPairClientLiveTest.java | 28 --
.../GreenQloudSecurityGroupClientLiveTest.java | 28 --
.../GreenQloudComputeReviseParsedImageTest.java | 251 ------------------
.../src/test/resources/greenqloud_images.xml | 257 -------------------
19 files changed, 1336 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/pom.xml
----------------------------------------------------------------------
diff --git a/greenqloud-compute/pom.xml b/greenqloud-compute/pom.xml
deleted file mode 100644
index 577a336..0000000
--- a/greenqloud-compute/pom.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?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.labs</groupId>
- <artifactId>jclouds-labs</artifactId>
- <version>1.8.0-SNAPSHOT</version>
- </parent>
-
- <!-- TODO: when out of labs, switch to org.jclouds.provider -->
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>greenqloud-compute</artifactId>
- <name>jclouds Greenqloud compute provider</name>
- <description>Compute implementation targeted to Greenqloud Web Services</description>
- <packaging>bundle</packaging>
-
- <properties>
- <test.greenqloud-compute.endpoint>https://api.greenqloud.com</test.greenqloud-compute.endpoint>
- <test.greenqloud-compute.api-version>2010-06-15</test.greenqloud-compute.api-version>
- <test.greenqloud-compute.build-version />
- <test.greenqloud-compute.identity>${test.greenqloud.identity}</test.greenqloud-compute.identity>
- <test.greenqloud-compute.credential>${test.greenqloud.credential}</test.greenqloud-compute.credential>
- <test.greenqloud-compute.template />
- <test.greenqloud-compute.ebs-template>imageId=is-1/qmi-9ac92558</test.greenqloud-compute.ebs-template>
-
- <jclouds.osgi.export>org.jclouds.greenqloud.compute*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>ec2</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>ec2</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${project.version}</version>
- <scope>test</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>
- <threadCount>1</threadCount>
- <systemPropertyVariables>
- <test.greenqloud-compute.endpoint>${test.greenqloud-compute.endpoint}</test.greenqloud-compute.endpoint>
- <test.greenqloud-compute.api-version>${test.greenqloud-compute.api-version}</test.greenqloud-compute.api-version>
- <test.greenqloud-compute.build-version>${test.greenqloud-compute.build-version}</test.greenqloud-compute.build-version>
- <test.greenqloud-compute.identity>${test.greenqloud-compute.identity}</test.greenqloud-compute.identity>
- <test.greenqloud-compute.credential>${test.greenqloud-compute.credential}</test.greenqloud-compute.credential>
- <test.greenqloud-compute.template>${test.greenqloud-compute.template}</test.greenqloud-compute.template>
- <test.greenqloud-compute.ebs-template>${test.greenqloud-compute.ebs-template}</test.greenqloud-compute.ebs-template>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/GreenQloudComputeProviderMetadata.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/GreenQloudComputeProviderMetadata.java b/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/GreenQloudComputeProviderMetadata.java
deleted file mode 100644
index 2f270e4..0000000
--- a/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/GreenQloudComputeProviderMetadata.java
+++ /dev/null
@@ -1,94 +0,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.
- */
-package org.jclouds.greenqloud.compute;
-
-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 java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.ec2.EC2ApiMetadata;
-import org.jclouds.ec2.compute.config.EC2ResolveImagesModule;
-import org.jclouds.ec2.config.EC2RestClientModule;
-import org.jclouds.greenqloud.compute.config.GreenQloudComputeComputeServiceContextModule;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-
-/**
- * Implementation of {@link org.jclouds.providers.ProviderMetadata} for Greenqloud Compute Cloud.
- */
-public class GreenQloudComputeProviderMetadata extends BaseProviderMetadata {
-
- public static Builder builder() {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder() {
- return builder().fromProviderMetadata(this);
- }
-
- public GreenQloudComputeProviderMetadata() {
- super(builder());
- }
-
- public GreenQloudComputeProviderMetadata(Builder builder) {
- super(builder);
- }
-
- public static Properties defaultProperties() {
- Properties properties = new Properties();
- properties.setProperty(PROPERTY_REGIONS, "is-1");
- properties.setProperty(PROPERTY_REGION + ".is-1." + ISO3166_CODES, "IS-1");
- return properties;
- }
-
- public static class Builder extends BaseProviderMetadata.Builder {
-
- protected Builder(){
- id("greenqloud-compute")
- .name("Greenqloud Compute Cloud")
- .apiMetadata(
- new EC2ApiMetadata().toBuilder()
- .defaultModules(ImmutableSet.<Class<? extends Module>>of(EC2RestClientModule.class, EC2ResolveImagesModule.class, GreenQloudComputeComputeServiceContextModule.class))
- .build())
- .homepage(URI.create("http://www.greenqloud.com"))
- .console(URI.create("https://manage.greenqloud.com"))
- .linkedServices("greenqloud-compute", "greenqloud-storage")
- .iso3166Codes("IS-1")
- .endpoint("https://api.greenqloud.com")
- .defaultProperties(GreenQloudComputeProviderMetadata.defaultProperties());
- }
-
- @Override
- public GreenQloudComputeProviderMetadata build() {
- return new GreenQloudComputeProviderMetadata(this);
- }
-
- @Override
- public Builder fromProviderMetadata(
- ProviderMetadata in) {
- super.fromProviderMetadata(in);
- return this;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/config/GreenQloudComputeComputeServiceContextModule.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/config/GreenQloudComputeComputeServiceContextModule.java b/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/config/GreenQloudComputeComputeServiceContextModule.java
deleted file mode 100644
index 9f4887d..0000000
--- a/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/config/GreenQloudComputeComputeServiceContextModule.java
+++ /dev/null
@@ -1,34 +0,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.
- */
-package org.jclouds.greenqloud.compute.config;
-
-import org.jclouds.ec2.compute.config.EC2ComputeServiceContextModule;
-import org.jclouds.ec2.compute.strategy.ReviseParsedImage;
-import org.jclouds.ec2.compute.suppliers.EC2HardwareSupplier;
-import org.jclouds.greenqloud.compute.strategy.GreenQloudComputeReviseParsedImage;
-import org.jclouds.greenqloud.compute.suppliers.GreenQloudEC2HardwareSupplier;
-
-public class GreenQloudComputeComputeServiceContextModule extends EC2ComputeServiceContextModule {
-
- @Override
- protected void configure() {
- super.configure();
- bind(ReviseParsedImage.class).to(GreenQloudComputeReviseParsedImage.class);
- bind(EC2HardwareSupplier.class).to(GreenQloudEC2HardwareSupplier.class);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/strategy/GreenQloudComputeReviseParsedImage.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/strategy/GreenQloudComputeReviseParsedImage.java b/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/strategy/GreenQloudComputeReviseParsedImage.java
deleted file mode 100644
index d1ac361..0000000
--- a/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/strategy/GreenQloudComputeReviseParsedImage.java
+++ /dev/null
@@ -1,60 +0,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.
- */
-package org.jclouds.greenqloud.compute.strategy;
-
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.compute.domain.ImageBuilder;
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.compute.util.ComputeServiceUtils;
-import org.jclouds.ec2.compute.strategy.ReviseParsedImage;
-import org.jclouds.logging.Logger;
-
-@Singleton
-public class GreenQloudComputeReviseParsedImage implements ReviseParsedImage {
- public static final Pattern DEFAULT_PATTERN = Pattern.compile("(([^ ]*) ([0-9.]+) ?.*)");
-
- @javax.annotation.Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
-
- private final Map<OsFamily, Map<String, String>> osVersionMap;
-
- @Inject
- public GreenQloudComputeReviseParsedImage(Map<OsFamily, Map<String, String>> osVersionMap) {
- this.osVersionMap = osVersionMap;
- }
-
- public void reviseParsedImage(org.jclouds.ec2.domain.Image from, ImageBuilder builder, OsFamily family,
- OperatingSystem.Builder osBuilder) {
- if (from.getDescription() != null)
- osBuilder.is64Bit(from.getDescription().contains("64-bit"));
-
- Matcher matcher = DEFAULT_PATTERN.matcher(from.getDescription());
- if (matcher.find() && matcher.groupCount() >= 3) {
- osBuilder.version(ComputeServiceUtils.parseVersionOrReturnEmptyString(family, matcher.group(3), osVersionMap));
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/suppliers/GreenQloudEC2HardwareSupplier.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/suppliers/GreenQloudEC2HardwareSupplier.java b/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/suppliers/GreenQloudEC2HardwareSupplier.java
deleted file mode 100644
index 7881c03..0000000
--- a/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/suppliers/GreenQloudEC2HardwareSupplier.java
+++ /dev/null
@@ -1,102 +0,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.
- */
-package org.jclouds.greenqloud.compute.suppliers;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Singleton;
-import org.jclouds.compute.domain.Hardware;
-import org.jclouds.compute.domain.Processor;
-import org.jclouds.compute.domain.Volume;
-import org.jclouds.compute.domain.internal.VolumeImpl;
-import org.jclouds.ec2.compute.domain.EC2HardwareBuilder;
-import org.jclouds.ec2.compute.suppliers.EC2HardwareSupplier;
-
-
-import java.util.Set;
-
-@Singleton
-public class GreenQloudEC2HardwareSupplier extends EC2HardwareSupplier {
-
- @Override
- public Set<? extends Hardware> get() {
- return ImmutableSet.of(t1_nano().build(),
- t1_micro().build(),
- t1_milli().build(),
- m1_small().build(),
- m1_medium().build(),
- m1_large().build(),
- m1_xlarge().build(),
- m2_2xlarge().build());
- }
-
- public EC2HardwareBuilder t1_nano() {
- return new EC2HardwareBuilder("t1.nano")
- .ram(256)
- .processors(ImmutableList.of(new Processor(1, 1)))
- .volumes(ImmutableList.<Volume>of(new VolumeImpl(10.0f, true, true)));
- }
-
- public EC2HardwareBuilder t1_micro() {
- return new EC2HardwareBuilder("t1.micro")
- .ram(512)
- .processors(ImmutableList.of(new Processor(1, 1)))
- .volumes(ImmutableList.<Volume>of(new VolumeImpl(20.0f, true, true)));
- }
-
- public EC2HardwareBuilder t1_milli() {
- return new EC2HardwareBuilder("t1.milli")
- .ram(1024)
- .processors(ImmutableList.of(new Processor(1, 1)))
- .volumes(ImmutableList.<Volume>of(new VolumeImpl(40.0f, true, true)));
- }
-
- public EC2HardwareBuilder m1_small() {
- return new EC2HardwareBuilder("m1.small")
- .ram(2048)
- .processors(ImmutableList.of(new Processor(2, 1)))
- .volumes(ImmutableList.<Volume>of(new VolumeImpl(80.0f, true, true)));
- }
-
- public EC2HardwareBuilder m1_medium() {
- return new EC2HardwareBuilder("m1.medium")
- .ram(4096)
- .processors(ImmutableList.of(new Processor(4, 1)))
- .volumes(ImmutableList.<Volume>of(new VolumeImpl(160.0f, true, true)));
- }
-
- public EC2HardwareBuilder m1_large() {
- return new EC2HardwareBuilder("m1.large")
- .ram(8192)
- .processors(ImmutableList.of(new Processor(8, 1)))
- .volumes(ImmutableList.<Volume>of(new VolumeImpl(320.0f, true, true)));
- }
-
- public EC2HardwareBuilder m1_xlarge() {
- return new EC2HardwareBuilder("m1.xlarge")
- .ram(15872)
- .processors(ImmutableList.of(new Processor(16, 1)))
- .volumes(ImmutableList.<Volume>of(new VolumeImpl(640.0f, true, true)));
- }
-
- public EC2HardwareBuilder m2_2xlarge() {
- return new EC2HardwareBuilder("m2.2xlarge")
- .ram(30720)
- .processors(ImmutableList.of(new Processor(16, 1)))
- .volumes(ImmutableList.<Volume>of(new VolumeImpl(640.0f, true, true)));
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/greenqloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index ddcff31..0000000
--- a/greenqloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.greenqloud.compute.GreenQloudComputeProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeComputeServiceLiveTestDisabled.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeComputeServiceLiveTestDisabled.java b/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeComputeServiceLiveTestDisabled.java
deleted file mode 100644
index d85e809..0000000
--- a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeComputeServiceLiveTestDisabled.java
+++ /dev/null
@@ -1,28 +0,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.
- */
-package org.jclouds.greenqloud.compute;
-
-import org.jclouds.ec2.compute.EC2ComputeServiceLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "GreenQloudComputeComputeServiceLiveTest")
-public class GreenQloudComputeComputeServiceLiveTestDisabled extends EC2ComputeServiceLiveTest {
-
- public GreenQloudComputeComputeServiceLiveTestDisabled() {
- provider = "greenqloud-compute";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeProviderTest.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeProviderTest.java b/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeProviderTest.java
deleted file mode 100644
index 8f50122..0000000
--- a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeProviderTest.java
+++ /dev/null
@@ -1,30 +0,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.
- */
-package org.jclouds.greenqloud.compute;
-
-import org.jclouds.ec2.EC2ApiMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadataTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "GreenQloudComputeProviderTest")
-public class GreenQloudComputeProviderTest extends BaseProviderMetadataTest {
-
- public GreenQloudComputeProviderTest() {
- super(new GreenQloudComputeProviderMetadata(), new EC2ApiMetadata());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeTemplateBuilderLiveTest.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeTemplateBuilderLiveTest.java b/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeTemplateBuilderLiveTest.java
deleted file mode 100644
index 10620e9..0000000
--- a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeTemplateBuilderLiveTest.java
+++ /dev/null
@@ -1,101 +0,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.
- */
-package org.jclouds.greenqloud.compute;
-
-import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Set;
-
-import org.jclouds.aws.util.AWSUtils;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.compute.domain.OsFamilyVersion64Bit;
-import org.jclouds.compute.domain.Template;
-import org.jclouds.compute.internal.BaseTemplateBuilderLiveTest;
-import org.jclouds.domain.LocationScope;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "live", testName = "GreenQloudComputeTemplateBuilderLiveTest")
-public class GreenQloudComputeTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
-
- public GreenQloudComputeTemplateBuilderLiveTest() {
- provider = "greenqloud-compute";
- }
-
- @Override
- protected Predicate<OsFamilyVersion64Bit> defineUnsupportedOperatingSystems() {
- return Predicates.not(new Predicate<OsFamilyVersion64Bit>() {
- @Override
- public boolean apply(OsFamilyVersion64Bit input) {
- switch (input.family) {
- case UBUNTU:
- return (input.version.equals("")
- || input.version.equals("10.04")
- || input.version.equals("11.10")
- || input.version.equals("12.04.1")
- || input.version.equals("12.10"))
- && input.is64Bit;
- case DEBIAN:
- return (input.version.equals("") || input.version.equals("6.0"))
- && input.is64Bit;
- case CENTOS:
- return (input.version.equals("")
- || input.version.equals("5.8")
- || input.version.equals("6.0")
- || input.version.equals("6.3"))
- && input.is64Bit;
- case FEDORA:
- return (input.version.equals("") || input.version.equals("16"))
- && input.is64Bit;
- case WINDOWS:
- return (input.version.equals("")
- || input.version.equals("2008 R2")
- || input.version.equals("2012"))
- && input.is64Bit;
- default:
- return false;
- }
- }
-
- });
- }
-
- @Test
- public void testDefaultTemplateBuilder() throws IOException {
- Template defaultTemplate = view.getComputeService().templateBuilder().build();
- assert (defaultTemplate.getImage().getProviderId().startsWith("qmi-")) : defaultTemplate;
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "11.10");
- assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
- assertEquals(defaultTemplate.getImage().getUserMetadata().get("rootDeviceType"), "ebs");
- assertEquals(defaultTemplate.getHardware().getId(), "t1.nano");
- assertEquals(defaultTemplate.getLocation().getId(), "is-1");
- assertEquals(defaultTemplate.getLocation().getScope(), LocationScope.REGION);
- assertEquals(AWSUtils.getRegionFromLocationOrNull(defaultTemplate.getLocation()), "is-1");
- assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
- }
-
- @Override
- protected Set<String> getIso3166Codes() {
- return ImmutableSet.<String> of("IS-1");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/parse/DescribeRegionsResponseHandlerTest.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/parse/DescribeRegionsResponseHandlerTest.java b/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/parse/DescribeRegionsResponseHandlerTest.java
deleted file mode 100644
index 72c97f2..0000000
--- a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/parse/DescribeRegionsResponseHandlerTest.java
+++ /dev/null
@@ -1,52 +0,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.
- */
-package org.jclouds.greenqloud.compute.parse;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-import java.util.Map;
-
-import org.jclouds.ec2.xml.DescribeRegionsResponseHandler;
-import org.jclouds.http.functions.BaseHandlerTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-
-// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire
-@Test(groups = "unit", testName = "DescribeRegionsResponseHandlerTest")
-public class DescribeRegionsResponseHandlerTest extends BaseHandlerTest {
-
- public void test() {
- String text = new StringBuilder()
- .append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
- .append("<DescribeRegionsResponse xmlns=\"http://ec2.amazonaws.com/doc/2010-06-15/\"><requestId>0a5a6b4d-c0d7-4531-9ba9-bbc0b94d2007</requestId><regionInfo><item><regionName>is-1</regionName><regionEndpoint>api.greenqloud.com</regionEndpoint></item></regionInfo></DescribeRegionsResponse>\n")
- .toString();
-
- Map<String, URI> expected = expected();
-
- DescribeRegionsResponseHandler handler = injector.getInstance(DescribeRegionsResponseHandler.class);
- Map<String, URI> result = factory.create(handler).parse(text);
-
- assertEquals(result.toString(), expected.toString());
-
- }
-
- public Map<String, URI> expected() {
- return ImmutableMap.of("is-1", URI.create("https://api.greenqloud.com"));
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudAMIClientLiveTest.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudAMIClientLiveTest.java b/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudAMIClientLiveTest.java
deleted file mode 100644
index dc75e25..0000000
--- a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudAMIClientLiveTest.java
+++ /dev/null
@@ -1,28 +0,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.
- */
-package org.jclouds.greenqloud.compute.services;
-
-import org.jclouds.ec2.services.AMIClientLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "GreenQloudAMIClientLiveTest")
-public class GreenQloudAMIClientLiveTest extends AMIClientLiveTest {
- public GreenQloudAMIClientLiveTest() {
- provider = "greenqloud-compute";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudAvailabilityZoneAndRegionClientLiveTest.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudAvailabilityZoneAndRegionClientLiveTest.java b/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudAvailabilityZoneAndRegionClientLiveTest.java
deleted file mode 100644
index eaaeaa1..0000000
--- a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudAvailabilityZoneAndRegionClientLiveTest.java
+++ /dev/null
@@ -1,28 +0,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.
- */
-package org.jclouds.greenqloud.compute.services;
-
-import org.jclouds.ec2.services.AvailabilityZoneAndRegionClientLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "GreenQloudAvailabilityZoneAndRegionClientLiveTest")
-public class GreenQloudAvailabilityZoneAndRegionClientLiveTest extends AvailabilityZoneAndRegionClientLiveTest {
- public GreenQloudAvailabilityZoneAndRegionClientLiveTest() {
- provider = "greenqloud-compute";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudElasticBlockStoreClientLiveTest.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudElasticBlockStoreClientLiveTest.java b/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudElasticBlockStoreClientLiveTest.java
deleted file mode 100644
index 596a48d..0000000
--- a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudElasticBlockStoreClientLiveTest.java
+++ /dev/null
@@ -1,28 +0,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.
- */
-package org.jclouds.greenqloud.compute.services;
-
-import org.jclouds.ec2.services.ElasticBlockStoreClientLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "GreenQloudElasticBlockStoreClientLiveTest")
-public class GreenQloudElasticBlockStoreClientLiveTest extends ElasticBlockStoreClientLiveTest {
- public GreenQloudElasticBlockStoreClientLiveTest() {
- provider = "greenqloud-compute";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudElasticIPAddressClientLiveTest.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudElasticIPAddressClientLiveTest.java b/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudElasticIPAddressClientLiveTest.java
deleted file mode 100644
index d1f9f1e..0000000
--- a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudElasticIPAddressClientLiveTest.java
+++ /dev/null
@@ -1,28 +0,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.
- */
-package org.jclouds.greenqloud.compute.services;
-
-import org.jclouds.ec2.services.ElasticIPAddressClientLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "GreenQloudElasticIPAddressClientLiveTest")
-public class GreenQloudElasticIPAddressClientLiveTest extends ElasticIPAddressClientLiveTest {
- public GreenQloudElasticIPAddressClientLiveTest() {
- provider = "greenqloud-compute";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudInstanceClientLiveTest.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudInstanceClientLiveTest.java b/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudInstanceClientLiveTest.java
deleted file mode 100644
index 2b52cc4..0000000
--- a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudInstanceClientLiveTest.java
+++ /dev/null
@@ -1,28 +0,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.
- */
-package org.jclouds.greenqloud.compute.services;
-
-import org.jclouds.ec2.services.InstanceClientLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "GreenQloudInstanceClientLiveTest")
-public class GreenQloudInstanceClientLiveTest extends InstanceClientLiveTest {
- public GreenQloudInstanceClientLiveTest() {
- provider = "greenqloud-compute";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudKeyPairClientLiveTest.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudKeyPairClientLiveTest.java b/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudKeyPairClientLiveTest.java
deleted file mode 100644
index 516a7f8..0000000
--- a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudKeyPairClientLiveTest.java
+++ /dev/null
@@ -1,28 +0,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.
- */
-package org.jclouds.greenqloud.compute.services;
-
-import org.jclouds.ec2.services.KeyPairClientLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "GreenQloudKeyPairClientLiveTest")
-public class GreenQloudKeyPairClientLiveTest extends KeyPairClientLiveTest {
- public GreenQloudKeyPairClientLiveTest() {
- provider = "greenqloud-compute";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudSecurityGroupClientLiveTest.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudSecurityGroupClientLiveTest.java b/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudSecurityGroupClientLiveTest.java
deleted file mode 100644
index 35298bb..0000000
--- a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/services/GreenQloudSecurityGroupClientLiveTest.java
+++ /dev/null
@@ -1,28 +0,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.
- */
-package org.jclouds.greenqloud.compute.services;
-
-import org.jclouds.ec2.services.SecurityGroupClientLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "GreenQloudSecurityGroupClientLiveTest")
-public class GreenQloudSecurityGroupClientLiveTest extends SecurityGroupClientLiveTest {
- public GreenQloudSecurityGroupClientLiveTest() {
- provider = "greenqloud-compute";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/strategy/GreenQloudComputeReviseParsedImageTest.java
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/strategy/GreenQloudComputeReviseParsedImageTest.java b/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/strategy/GreenQloudComputeReviseParsedImageTest.java
deleted file mode 100644
index 1a3b9a7..0000000
--- a/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/strategy/GreenQloudComputeReviseParsedImageTest.java
+++ /dev/null
@@ -1,251 +0,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.
- */
-package org.jclouds.greenqloud.compute.strategy;
-
-import static org.testng.Assert.assertEquals;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.compute.config.BaseComputeServiceContextModule;
-import org.jclouds.compute.domain.ImageBuilder;
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.domain.Location;
-import org.jclouds.domain.LocationBuilder;
-import org.jclouds.domain.LocationScope;
-import org.jclouds.domain.LoginCredentials;
-import org.jclouds.ec2.compute.config.EC2ComputeServiceDependenciesModule;
-import org.jclouds.ec2.compute.functions.EC2ImageParser;
-import org.jclouds.ec2.compute.strategy.EC2PopulateDefaultLoginCredentialsForImageStrategy;
-import org.jclouds.ec2.domain.Image;
-import org.jclouds.ec2.xml.DescribeImagesResponseHandlerTest;
-import org.jclouds.greenqloud.compute.strategy.GreenQloudComputeReviseParsedImage;
-import org.jclouds.json.Json;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicates;
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-import com.google.inject.Guice;
-
-@Test(groups = "unit", testName = "GreenQloudComputeReviseParsedImageTest")
-public class GreenQloudComputeReviseParsedImageTest {
-
- public void testParseGreenQloudImage() {
-
- Set<org.jclouds.compute.domain.Image> result = convertImages("/greenqloud_images.xml");
- assertEquals(result.size(), 9);
-
- assertEquals(
- Iterables.get(result, 0).toString(),
- new ImageBuilder()
- .operatingSystem(
- OperatingSystem.builder().family(OsFamily.UBUNTU).version("10.04")
- .description("Ubuntu Server 10.04 (64-bit)").is64Bit(true)
- .arch("paravirtual").build())
- .description("Ubuntu Server 10.04 (64-bit)")
- .name("Ubuntu Server 10.04.3")
- .defaultCredentials(LoginCredentials.builder().user("root").build())
- .id("us-east-1/qmi-4e5b842f")
- .providerId("qmi-4e5b842f")
- .location(defaultLocation)
- .userMetadata(
- ImmutableMap.of("owner", "admin", "rootDeviceType", "ebs", "virtualizationType",
- "paravirtual", "hypervisor", "xen"))
- .status(org.jclouds.compute.domain.Image.Status.AVAILABLE).backendStatus("available").build().toString());
- assertEquals(Iterables.get(result, 0).getStatus(), org.jclouds.compute.domain.Image.Status.AVAILABLE);
-
- assertEquals(
- Iterables.get(result, 1).toString(),
- new ImageBuilder()
- .operatingSystem(
- OperatingSystem.builder().family(OsFamily.UBUNTU).version("11.10")
- .description("Ubuntu Server 11.10 (64-bit)").is64Bit(true)
- .arch("paravirtual").build())
- .description("Ubuntu Server 11.10 (64-bit)")
- .name("Ubuntu Server 11.10")
- .defaultCredentials(LoginCredentials.builder().user("root").build())
- .id("us-east-1/qmi-9ac92558")
- .providerId("qmi-9ac92558")
- .location(defaultLocation)
- .userMetadata(
- ImmutableMap.of("owner", "admin", "rootDeviceType", "ebs", "virtualizationType",
- "paravirtual", "hypervisor", "xen"))
- .status(org.jclouds.compute.domain.Image.Status.AVAILABLE).backendStatus("available").build().toString());
- assertEquals(Iterables.get(result, 1).getStatus(), org.jclouds.compute.domain.Image.Status.AVAILABLE);
-
- assertEquals(
- Iterables.get(result, 2).toString(),
- new ImageBuilder()
- .operatingSystem(
- OperatingSystem.builder().family(OsFamily.CENTOS).version("5.5")
- .description("CentOS 5.5 Server 64-bit").is64Bit(true)
- .arch("paravirtual").build())
- .description("CentOS 5.5 Server 64-bit")
- .name("CentOS 5.5 Server")
- .defaultCredentials(LoginCredentials.builder().user("root").build())
- .id("us-east-1/qmi-33a467aa")
- .providerId("qmi-33a467aa")
- .location(defaultLocation)
- .userMetadata(
- ImmutableMap.of("owner", "admin", "rootDeviceType", "ebs", "virtualizationType",
- "paravirtual", "hypervisor", "xen"))
- .status(org.jclouds.compute.domain.Image.Status.AVAILABLE).backendStatus("available").build().toString());
- assertEquals(Iterables.get(result, 2).getStatus(), org.jclouds.compute.domain.Image.Status.AVAILABLE);
-
- assertEquals(
- Iterables.get(result, 3).toString(),
- new ImageBuilder()
- .operatingSystem(
- OperatingSystem.builder().family(OsFamily.DEBIAN).version("6.0")
- .description("Debian 6.0 (64-bit)").is64Bit(true)
- .arch("paravirtual").build())
- .description("Debian 6.0 (64-bit)")
- .name("Debian 6.0")
- .defaultCredentials(LoginCredentials.builder().user("root").build())
- .id("us-east-1/qmi-f2a9d2ba")
- .providerId("qmi-f2a9d2ba")
- .location(defaultLocation)
- .userMetadata(
- ImmutableMap.of("owner", "admin", "rootDeviceType", "ebs", "virtualizationType",
- "paravirtual", "hypervisor", "xen"))
- .status(org.jclouds.compute.domain.Image.Status.AVAILABLE).backendStatus("available").build().toString());
- assertEquals(Iterables.get(result, 3).getStatus(), org.jclouds.compute.domain.Image.Status.AVAILABLE);
-
- assertEquals(
- Iterables.get(result, 4).toString(),
- new ImageBuilder()
- .operatingSystem(
- OperatingSystem.builder().family(OsFamily.CENTOS).version("6.0")
- .description("CentOS 6.0 (64-bit)").is64Bit(true)
- .arch("paravirtual").build())
- .description("CentOS 6.0 (64-bit)")
- .name("CentOS 6.0")
- .defaultCredentials(LoginCredentials.builder().user("root").build())
- .id("us-east-1/qmi-96f82145")
- .providerId("qmi-96f82145")
- .location(defaultLocation)
- .userMetadata(
- ImmutableMap.of("owner", "admin", "rootDeviceType", "ebs", "virtualizationType",
- "paravirtual", "hypervisor", "xen"))
- .status(org.jclouds.compute.domain.Image.Status.AVAILABLE).backendStatus("available").build().toString());
- assertEquals(Iterables.get(result, 4).getStatus(), org.jclouds.compute.domain.Image.Status.AVAILABLE);
-
- assertEquals(
- Iterables.get(result, 5).toString(),
- new ImageBuilder()
- .operatingSystem(
- OperatingSystem.builder().family(OsFamily.CENTOS).version("6.0")
- .description("CentOS 6.0 GUI (64-bit)").is64Bit(true)
- .arch("paravirtual").build())
- .description("CentOS 6.0 GUI (64-bit)")
- .name("CentOS 6.0 GUI")
- .defaultCredentials(LoginCredentials.builder().user("root").build())
- .id("us-east-1/qmi-42e877f6")
- .providerId("qmi-42e877f6")
- .location(defaultLocation)
- .userMetadata(
- ImmutableMap.of("owner", "admin", "rootDeviceType", "ebs", "virtualizationType",
- "paravirtual", "hypervisor", "xen"))
- .status(org.jclouds.compute.domain.Image.Status.AVAILABLE).backendStatus("available").build().toString());
- assertEquals(Iterables.get(result, 5).getStatus(), org.jclouds.compute.domain.Image.Status.AVAILABLE);
-
- assertEquals(
- Iterables.get(result, 6).toString(),
- new ImageBuilder()
- .operatingSystem(
- OperatingSystem.builder().family(OsFamily.UBUNTU).version("11.04")
- .description("Ubuntu Server 11.04 (64-bit)").is64Bit(true)
- .arch("paravirtual").build())
- .description("Ubuntu Server 11.04 (64-bit)")
- .name("Ubuntu Server 11.04")
- .defaultCredentials(LoginCredentials.builder().user("root").build())
- .id("us-east-1/qmi-eed8cea7")
- .providerId("qmi-eed8cea7")
- .location(defaultLocation)
- .userMetadata(
- ImmutableMap.of("owner", "admin", "rootDeviceType", "ebs", "virtualizationType",
- "paravirtual", "hypervisor", "xen"))
- .status(org.jclouds.compute.domain.Image.Status.AVAILABLE).backendStatus("available").build().toString());
- assertEquals(Iterables.get(result, 6).getStatus(), org.jclouds.compute.domain.Image.Status.AVAILABLE);
-
- assertEquals(
- Iterables.get(result, 7).toString(),
- new ImageBuilder()
- .operatingSystem(
- // fedora is not in the image version map, yet
- OperatingSystem.builder().family(OsFamily.FEDORA).version("")
- .description("Fedora 16 Server").is64Bit(false)
- .arch("paravirtual").build())
- .description("Fedora 16 Server")
- .name("Fedora 16 Server")
- .defaultCredentials(LoginCredentials.builder().user("root").build())
- .id("us-east-1/qmi-fa4bdae0")
- .providerId("qmi-fa4bdae0")
- .location(defaultLocation)
- .userMetadata(
- ImmutableMap.of("owner", "admin", "rootDeviceType", "ebs", "virtualizationType",
- "paravirtual", "hypervisor", "xen"))
- .status(org.jclouds.compute.domain.Image.Status.AVAILABLE).backendStatus("available").build().toString());
- assertEquals(Iterables.get(result, 7).getStatus(), org.jclouds.compute.domain.Image.Status.AVAILABLE);
-
- assertEquals(
- Iterables.get(result, 8).toString(),
- new ImageBuilder()
- .operatingSystem(
- OperatingSystem.builder().family(OsFamily.CENTOS).version("5.6")
- .description("CentOS 5.6 Server GUI 64-bit").is64Bit(true)
- .arch("paravirtual").build())
- .description("CentOS 5.6 Server GUI 64-bit")
- .name("CentOS 5.6 GUI")
- .defaultCredentials(LoginCredentials.builder().user("root").build())
- .id("us-east-1/qmi-93271d32")
- .providerId("qmi-93271d32")
- .location(defaultLocation)
- .userMetadata(
- ImmutableMap.of("owner", "admin", "rootDeviceType", "ebs", "virtualizationType",
- "paravirtual", "hypervisor", "xen"))
- .status(org.jclouds.compute.domain.Image.Status.AVAILABLE).backendStatus("available").build().toString());
- assertEquals(Iterables.get(result, 8).getStatus(), org.jclouds.compute.domain.Image.Status.AVAILABLE);
-
- }
-
- static Location defaultLocation = new LocationBuilder().scope(LocationScope.REGION).id("us-east-1").description(
- "us-east-1").build();
-
- public static Set<org.jclouds.compute.domain.Image> convertImages(String resource) {
-
- Map<OsFamily, Map<String, String>> map = new BaseComputeServiceContextModule() {
- }.provideOsVersionMap(new ComputeServiceConstants.ReferenceData(), Guice.createInjector(new GsonModule())
- .getInstance(Json.class));
-
- // note this method is what mandates the location id as us-east-1
- Set<Image> result = DescribeImagesResponseHandlerTest.parseImages(resource);
- EC2ImageParser parser = new EC2ImageParser(EC2ComputeServiceDependenciesModule.toPortableImageStatus,
- new EC2PopulateDefaultLoginCredentialsForImageStrategy(), map, Suppliers
- .<Set<? extends Location>> ofInstance(ImmutableSet.<Location> of(defaultLocation)), Suppliers
- .ofInstance(defaultLocation), new GreenQloudComputeReviseParsedImage(map));
- return Sets.newLinkedHashSet(Iterables.filter(Iterables.transform(result, parser), Predicates.notNull()));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/bd4992b8/greenqloud-compute/src/test/resources/greenqloud_images.xml
----------------------------------------------------------------------
diff --git a/greenqloud-compute/src/test/resources/greenqloud_images.xml b/greenqloud-compute/src/test/resources/greenqloud_images.xml
deleted file mode 100644
index 8052445..0000000
--- a/greenqloud-compute/src/test/resources/greenqloud_images.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-06-15/">
- <requestId>1c016525-12ae-4fc6-8d4e-754692412bbc</requestId>
- <imagesSet>
- <item>
- <imageId>qmi-4e5b842f</imageId>
- <imageLocation>Ubuntu Server 10.04 (64-bit)</imageLocation>
- <imageState>available</imageState>
- <imageOwnerId>admin</imageOwnerId>
- <isPublic>true</isPublic>
- <productCodes>
- <item>
- <productCode></productCode>
- </item>
- </productCodes>
- <architecture></architecture>
- <imageType>machine</imageType>
- <kernelId></kernelId>
- <ramdiskId></ramdiskId>
- <platform></platform>
- <stateReason>
- <code></code>
- <message></message>
- </stateReason>
- <imageOwnerAlias></imageOwnerAlias>
- <name>Ubuntu Server 10.04.3</name>
- <description>Ubuntu Server 10.04 (64-bit)</description>
- <rootDeviceType>ebs</rootDeviceType>
- <rootDeviceName></rootDeviceName>
- <blockDeviceMapping />
- <hypervisor>xen</hypervisor>
- </item>
- <item>
- <imageId>qmi-9ac92558</imageId>
- <imageLocation>Ubuntu Server 11.10 (64-bit)</imageLocation>
- <imageState>available</imageState>
- <imageOwnerId>admin</imageOwnerId>
- <isPublic>true</isPublic>
- <productCodes>
- <item>
- <productCode></productCode>
- </item>
- </productCodes>
- <architecture></architecture>
- <imageType>machine</imageType>
- <kernelId></kernelId>
- <ramdiskId></ramdiskId>
- <platform></platform>
- <stateReason>
- <code></code>
- <message></message>
- </stateReason>
- <imageOwnerAlias></imageOwnerAlias>
- <name>Ubuntu Server 11.10</name>
- <description>Ubuntu Server 11.10 (64-bit)</description>
- <rootDeviceType>ebs</rootDeviceType>
- <rootDeviceName></rootDeviceName>
- <blockDeviceMapping />
- <hypervisor>xen</hypervisor>
- </item>
- <item>
- <imageId>qmi-33a467aa</imageId>
- <imageLocation>CentOS 5.5 Server 64-bit</imageLocation>
- <imageState>available</imageState>
- <imageOwnerId>admin</imageOwnerId>
- <isPublic>true</isPublic>
- <productCodes>
- <item>
- <productCode></productCode>
- </item>
- </productCodes>
- <architecture></architecture>
- <imageType>machine</imageType>
- <kernelId></kernelId>
- <ramdiskId></ramdiskId>
- <platform></platform>
- <stateReason>
- <code></code>
- <message></message>
- </stateReason>
- <imageOwnerAlias></imageOwnerAlias>
- <name>CentOS 5.5 Server</name>
- <description>CentOS 5.5 Server 64-bit</description>
- <rootDeviceType>ebs</rootDeviceType>
- <rootDeviceName></rootDeviceName>
- <blockDeviceMapping />
- <hypervisor>xen</hypervisor>
- </item>
- <item>
- <imageId>qmi-f2a9d2ba</imageId>
- <imageLocation>Debian 6.0 (64-bit)</imageLocation>
- <imageState>available</imageState>
- <imageOwnerId>admin</imageOwnerId>
- <isPublic>true</isPublic>
- <productCodes>
- <item>
- <productCode></productCode>
- </item>
- </productCodes>
- <architecture></architecture>
- <imageType>machine</imageType>
- <kernelId></kernelId>
- <ramdiskId></ramdiskId>
- <platform></platform>
- <stateReason>
- <code></code>
- <message></message>
- </stateReason>
- <imageOwnerAlias></imageOwnerAlias>
- <name>Debian 6.0</name>
- <description>Debian 6.0 (64-bit)</description>
- <rootDeviceType>ebs</rootDeviceType>
- <rootDeviceName></rootDeviceName>
- <blockDeviceMapping />
- <hypervisor>xen</hypervisor>
- </item>
- <item>
- <imageId>qmi-96f82145</imageId>
- <imageLocation>CentOS 6.0 (64-bit)</imageLocation>
- <imageState>available</imageState>
- <imageOwnerId>admin</imageOwnerId>
- <isPublic>true</isPublic>
- <productCodes>
- <item>
- <productCode></productCode>
- </item>
- </productCodes>
- <architecture></architecture>
- <imageType>machine</imageType>
- <kernelId></kernelId>
- <ramdiskId></ramdiskId>
- <platform></platform>
- <stateReason>
- <code></code>
- <message></message>
- </stateReason>
- <imageOwnerAlias></imageOwnerAlias>
- <name>CentOS 6.0</name>
- <description>CentOS 6.0 (64-bit)</description>
- <rootDeviceType>ebs</rootDeviceType>
- <rootDeviceName></rootDeviceName>
- <blockDeviceMapping />
- <hypervisor>xen</hypervisor>
- </item>
- <item>
- <imageId>qmi-42e877f6</imageId>
- <imageLocation>CentOS 6.0 GUI (64-bit)</imageLocation>
- <imageState>available</imageState>
- <imageOwnerId>admin</imageOwnerId>
- <isPublic>true</isPublic>
- <productCodes>
- <item>
- <productCode></productCode>
- </item>
- </productCodes>
- <architecture></architecture>
- <imageType>machine</imageType>
- <kernelId></kernelId>
- <ramdiskId></ramdiskId>
- <platform></platform>
- <stateReason>
- <code></code>
- <message></message>
- </stateReason>
- <imageOwnerAlias></imageOwnerAlias>
- <name>CentOS 6.0 GUI</name>
- <description>CentOS 6.0 GUI (64-bit)</description>
- <rootDeviceType>ebs</rootDeviceType>
- <rootDeviceName></rootDeviceName>
- <blockDeviceMapping />
- <hypervisor>xen</hypervisor>
- </item>
- <item>
- <imageId>qmi-eed8cea7</imageId>
- <imageLocation>Ubuntu Server 11.04 (64-bit)</imageLocation>
- <imageState>available</imageState>
- <imageOwnerId>admin</imageOwnerId>
- <isPublic>true</isPublic>
- <productCodes>
- <item>
- <productCode></productCode>
- </item>
- </productCodes>
- <architecture></architecture>
- <imageType>machine</imageType>
- <kernelId></kernelId>
- <ramdiskId></ramdiskId>
- <platform></platform>
- <stateReason>
- <code></code>
- <message></message>
- </stateReason>
- <imageOwnerAlias></imageOwnerAlias>
- <name>Ubuntu Server 11.04</name>
- <description>Ubuntu Server 11.04 (64-bit)</description>
- <rootDeviceType>ebs</rootDeviceType>
- <rootDeviceName></rootDeviceName>
- <blockDeviceMapping />
- <hypervisor>xen</hypervisor>
- </item>
- <item>
- <imageId>qmi-fa4bdae0</imageId>
- <imageLocation>Fedora 16 Server</imageLocation>
- <imageState>available</imageState>
- <imageOwnerId>admin</imageOwnerId>
- <isPublic>true</isPublic>
- <productCodes>
- <item>
- <productCode></productCode>
- </item>
- </productCodes>
- <architecture></architecture>
- <imageType>machine</imageType>
- <kernelId></kernelId>
- <ramdiskId></ramdiskId>
- <platform></platform>
- <stateReason>
- <code></code>
- <message></message>
- </stateReason>
- <imageOwnerAlias></imageOwnerAlias>
- <name>Fedora 16 Server</name>
- <description>Fedora 16 Server</description>
- <rootDeviceType>ebs</rootDeviceType>
- <rootDeviceName></rootDeviceName>
- <blockDeviceMapping />
- <hypervisor>xen</hypervisor>
- </item>
- <item>
- <imageId>qmi-93271d32</imageId>
- <imageLocation>CentOS 5.6 Server GUI 64-bit</imageLocation>
- <imageState>available</imageState>
- <imageOwnerId>admin</imageOwnerId>
- <isPublic>true</isPublic>
- <productCodes>
- <item>
- <productCode></productCode>
- </item>
- </productCodes>
- <architecture></architecture>
- <imageType>machine</imageType>
- <kernelId></kernelId>
- <ramdiskId></ramdiskId>
- <platform></platform>
- <stateReason>
- <code></code>
- <message></message>
- </stateReason>
- <imageOwnerAlias></imageOwnerAlias>
- <name>CentOS 5.6 GUI</name>
- <description>CentOS 5.6 Server GUI 64-bit</description>
- <rootDeviceType>ebs</rootDeviceType>
- <rootDeviceName></rootDeviceName>
- <blockDeviceMapping />
- <hypervisor>xen</hypervisor>
- </item>
- </imagesSet>
-</DescribeImagesResponse>
\ No newline at end of file