Repository: jclouds Updated Branches: refs/heads/1.8.x 7682f94ff -> ba04fa043
http://git-wip-us.apache.org/repos/asf/jclouds/blob/ba04fa04/providers/cloudsigma-lvs/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaLasVegasTemplateBuilderLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/cloudsigma-lvs/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaLasVegasTemplateBuilderLiveTest.java b/providers/cloudsigma-lvs/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaLasVegasTemplateBuilderLiveTest.java deleted file mode 100644 index 317342e..0000000 --- a/providers/cloudsigma-lvs/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaLasVegasTemplateBuilderLiveTest.java +++ /dev/null @@ -1,85 +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.cloudsigma.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.compute.domain.OsFamily; -import org.jclouds.compute.domain.OsFamilyVersion64Bit; -import org.jclouds.compute.domain.Template; -import org.jclouds.compute.internal.BaseTemplateBuilderLiveTest; -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 = "CloudSigmaLasVegasTemplateBuilderLiveTest") -public class CloudSigmaLasVegasTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest { - - public CloudSigmaLasVegasTemplateBuilderLiveTest() { - provider = "cloudsigma-lvs"; - } - - @Override - protected Predicate<OsFamilyVersion64Bit> defineUnsupportedOperatingSystems() { - return Predicates.not(new Predicate<OsFamilyVersion64Bit>() { - @Override - public boolean apply(OsFamilyVersion64Bit input) { - switch (input.family) { - case UBUNTU: - return (ImmutableSet.of("11.04", "10.10").contains(input.version) && input.is64Bit) - || (input.version.equals("11.10") && !input.is64Bit) || input.version.equals("") - || input.version.equals("10.04") || input.version.equals("12.04"); - case SOLARIS: - return (input.version.equals("") || input.version.equals("10")) && input.is64Bit; - case DEBIAN: - return input.version.equals("") || (input.version.equals("5.0") && !input.is64Bit) - || (input.version.equals("6.0") && input.is64Bit); - case CENTOS: - return (input.version.equals("") || input.version.equals("5.5") || input.version.equals("5.7") || input.version - .equals("6.0")) && input.is64Bit; - case WINDOWS: - return input.version.equals("2008") || input.version.equals("2003") || input.version.equals(""); - default: - return false; - } - } - - }); - } - - @Override - public void testDefaultTemplateBuilder() throws IOException { - Template defaultTemplate = view.getComputeService().templateBuilder().build(); - assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "11.04"); - assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); - assertEquals(defaultTemplate.getImage().getId(), "6aab1938-71b3-4252-ac1c-a3cb17c284ab"); - assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); - assertEquals(defaultTemplate.getImage().getDefaultCredentials().identity, "root"); - assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); - } - - @Override - protected Set<String> getIso3166Codes() { - return ImmutableSet.<String> of("US-NV"); - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/ba04fa04/providers/cloudsigma-zrh/pom.xml ---------------------------------------------------------------------- diff --git a/providers/cloudsigma-zrh/pom.xml b/providers/cloudsigma-zrh/pom.xml deleted file mode 100644 index f84ceca..0000000 --- a/providers/cloudsigma-zrh/pom.xml +++ /dev/null @@ -1,126 +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</groupId> - <artifactId>jclouds-project</artifactId> - <version>1.8.1-SNAPSHOT</version> - <relativePath>../../project/pom.xml</relativePath> - </parent> - <groupId>org.apache.jclouds.provider</groupId> - <artifactId>cloudsigma-zrh</artifactId> - <name>jclouds CloudSigma provider</name> - <description>ComputeService binding to the CloudSigma datacenter in Zürich</description> - <packaging>bundle</packaging> - - <properties> - <test.cloudsigma-zrh.endpoint>https://api.zrh.cloudsigma.com</test.cloudsigma-zrh.endpoint> - <test.cloudsigma-zrh.api-version>1.0</test.cloudsigma-zrh.api-version> - <test.cloudsigma-zrh.build-version /> - <test.cloudsigma-zrh.identity>FIXME_IDENTITY</test.cloudsigma-zrh.identity> - <test.cloudsigma-zrh.credential>FIXME_CREDENTIAL</test.cloudsigma-zrh.credential> - <test.cloudsigma-zrh.template /> - <jclouds.osgi.export>org.jclouds.cloudsigma*;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>cloudsigma</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>cloudsigma</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</groupId> - <artifactId>jclouds-compute</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> - <systemPropertyVariables> - <test.cloudsigma-zrh.endpoint>${test.cloudsigma-zrh.endpoint}</test.cloudsigma-zrh.endpoint> - <test.cloudsigma-zrh.api-version>${test.cloudsigma-zrh.api-version}</test.cloudsigma-zrh.api-version> - <test.cloudsigma-zrh.build-version>${test.cloudsigma-zrh.build-version}</test.cloudsigma-zrh.build-version> - <test.cloudsigma-zrh.identity>${test.cloudsigma-zrh.identity}</test.cloudsigma-zrh.identity> - <test.cloudsigma-zrh.credential>${test.cloudsigma-zrh.credential}</test.cloudsigma-zrh.credential> - <test.cloudsigma-zrh.template>${test.cloudsigma-zrh.template}</test.cloudsigma-zrh.template> - </systemPropertyVariables> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - -</project> - http://git-wip-us.apache.org/repos/asf/jclouds/blob/ba04fa04/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderMetadata.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderMetadata.java deleted file mode 100644 index ec3ce01..0000000 --- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderMetadata.java +++ /dev/null @@ -1,81 +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.cloudsigma; - -import java.net.URI; -import java.util.Properties; - -import org.jclouds.providers.ProviderMetadata; -import org.jclouds.providers.internal.BaseProviderMetadata; - -/** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for CloudSigma Zurich. - - */ -public class CloudSigmaZurichProviderMetadata extends BaseProviderMetadata { - - public static Builder builder() { - return new Builder(); - } - - @Override - public Builder toBuilder() { - return builder().fromProviderMetadata(this); - } - - public CloudSigmaZurichProviderMetadata() { - super(builder()); - } - - public CloudSigmaZurichProviderMetadata(Builder builder) { - super(builder); - } - - public static Properties defaultProperties() { - Properties properties = new Properties(); - return properties; - } - - public static class Builder - extends - BaseProviderMetadata.Builder { - - protected Builder() { - id("cloudsigma-zrh") - .name("CloudSigma Zurich") - .apiMetadata(new CloudSigmaApiMetadata()) - .homepage(URI.create("http://www.cloudsigma.com/en/our-cloud/features";)) - .console(URI.create("https://gui.zrh.cloudsigma.com/";)) - .iso3166Codes("CH-ZH") - .endpoint("https://api.zrh.cloudsigma.com";) - .defaultProperties(CloudSigmaZurichProviderMetadata.defaultProperties()); - } - - @Override - public CloudSigmaZurichProviderMetadata build() { - return new CloudSigmaZurichProviderMetadata(this); - } - - @Override - public Builder fromProviderMetadata( - ProviderMetadata in) { - super.fromProviderMetadata(in); - return this; - } - - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/ba04fa04/providers/cloudsigma-zrh/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata ---------------------------------------------------------------------- diff --git a/providers/cloudsigma-zrh/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/cloudsigma-zrh/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 8a1ef55..0000000 --- a/providers/cloudsigma-zrh/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.cloudsigma.CloudSigmaZurichProviderMetadata http://git-wip-us.apache.org/repos/asf/jclouds/blob/ba04fa04/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaZurichClientLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaZurichClientLiveTest.java b/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaZurichClientLiveTest.java deleted file mode 100644 index 189c057..0000000 --- a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaZurichClientLiveTest.java +++ /dev/null @@ -1,26 +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.cloudsigma; - -import org.testng.annotations.Test; - -@Test(groups = "live", singleThreaded = true, testName = "CloudSigmaZurichClientLiveTest") -public class CloudSigmaZurichClientLiveTest extends CloudSigmaClientLiveTest { - public CloudSigmaZurichClientLiveTest() { - provider = "cloudsigma-zrh"; - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/ba04fa04/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderTest.java ---------------------------------------------------------------------- diff --git a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderTest.java b/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderTest.java deleted file mode 100644 index e17cedf..0000000 --- a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderTest.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.cloudsigma; - -import org.jclouds.providers.internal.BaseProviderMetadataTest; -import org.testng.annotations.Test; - -@Test(groups = "unit", testName = "CloudSigmaZurichProviderTest") -public class CloudSigmaZurichProviderTest extends BaseProviderMetadataTest { - - public CloudSigmaZurichProviderTest() { - super(new CloudSigmaZurichProviderMetadata(), new CloudSigmaApiMetadata()); - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/ba04fa04/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichComputeServiceLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichComputeServiceLiveTest.java b/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichComputeServiceLiveTest.java deleted file mode 100644 index 11a0e15..0000000 --- a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichComputeServiceLiveTest.java +++ /dev/null @@ -1,75 +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.cloudsigma.compute; - -import static com.google.common.collect.Iterables.contains; -import static com.google.common.collect.Iterables.get; -import static org.jclouds.cloudsigma.compute.options.CloudSigmaTemplateOptions.Builder.diskDriveAffinity; -import static org.jclouds.compute.predicates.NodePredicates.inGroup; -import static org.testng.Assert.assertTrue; - -import java.util.Set; - -import org.jclouds.cloudsigma.CloudSigmaApi; -import org.jclouds.cloudsigma.compute.options.CloudSigmaTemplateOptions; -import org.jclouds.cloudsigma.domain.AffinityType; -import org.jclouds.cloudsigma.domain.Device; -import org.jclouds.cloudsigma.domain.DriveInfo; -import org.jclouds.cloudsigma.domain.ServerInfo; -import org.jclouds.compute.RunNodesException; -import org.jclouds.compute.domain.NodeMetadata; -import org.jclouds.compute.domain.Template; -import org.jclouds.compute.domain.TemplateBuilder; -import org.testng.annotations.Test; - -@Test(groups = "live", singleThreaded = true, testName = "CloudSigmaZurichComputeServiceLiveTest") -public class CloudSigmaZurichComputeServiceLiveTest extends CloudSigmaComputeServiceLiveTest { - - public CloudSigmaZurichComputeServiceLiveTest() { - provider = "cloudsigma-zrh"; - } - - @Test - public void testStartNodeWithSSD() throws RunNodesException { - String group = this.group + "-ssd"; - - TemplateBuilder builder = client.templateBuilder(); - assert builder instanceof CloudSigmaTemplateBuilderImpl; - - Template template = builder.options(diskDriveAffinity(AffinityType.SSD)).build(); - assert template.getOptions() instanceof CloudSigmaTemplateOptions; - - try { - Set<? extends NodeMetadata> nodes = client.createNodesInGroup(group, 1, template); - NodeMetadata node = get(nodes, 0); - - CloudSigmaApi api = client.getContext().unwrapApi(CloudSigmaApi.class); - - // Note: I wanted to use node.getHardware().getVolumes() but there is no - // way to go from a Volume to a DriveInfo - - ServerInfo serverInfo = api.getServerInfo(node.getId()); - Device rootDevice = get(serverInfo.getDevices().values(), 0); - DriveInfo driveInfo = api.getDriveInfo(rootDevice.getDriveUuid()); - assertTrue(contains(driveInfo.getTags(), "affinity:ssd")); - - } finally { - client.destroyNodesMatching(inGroup(group)); - } - } - -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/ba04fa04/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichTemplateBuilderLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichTemplateBuilderLiveTest.java b/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichTemplateBuilderLiveTest.java deleted file mode 100644 index cb9409e..0000000 --- a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichTemplateBuilderLiveTest.java +++ /dev/null @@ -1,82 +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.cloudsigma.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.compute.domain.OsFamily; -import org.jclouds.compute.domain.OsFamilyVersion64Bit; -import org.jclouds.compute.domain.Template; -import org.jclouds.compute.internal.BaseTemplateBuilderLiveTest; -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", singleThreaded = true, testName = "CloudSigmaZurichTemplateBuilderLiveTest") -public class CloudSigmaZurichTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest { - - public CloudSigmaZurichTemplateBuilderLiveTest() { - provider = "cloudsigma-zrh"; - } - - @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("10.10") && input.is64Bit) - || (input.version.equals("11.04") && !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.7")) && input.is64Bit; - case WINDOWS: - return input.version.equals("") || input.version.matches("200[38]") - || (input.version.equals("2008 R2") && input.is64Bit); - default: - return false; - } - } - - }); - } - - @Override - public void testDefaultTemplateBuilder() throws IOException { - Template defaultTemplate = view.getComputeService().templateBuilder().build(); - assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), ""); - assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); - assertEquals(defaultTemplate.getImage().getId(), "c9df6b90-420c-4c46-b7f2-8d9e99929a09"); - assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); - assertEquals(defaultTemplate.getImage().getDefaultCredentials().identity, "root"); - assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); - } - - @Override - protected Set<String> getIso3166Codes() { - return ImmutableSet.<String> of("CH-ZH"); - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/ba04fa04/providers/pom.xml ---------------------------------------------------------------------- diff --git a/providers/pom.xml b/providers/pom.xml index 7acf28c..0f5262f 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -31,8 +31,6 @@ <name>jclouds providers project</name> <modules> <module>gogrid</module> - <module>cloudsigma-zrh</module> - <module>cloudsigma-lvs</module> <module>azureblob</module> <module>aws-s3</module> <module>aws-ec2</module>
