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 2013/09/30 18:15:23 UTC
[03/17] JCLOUDS-304. Remove broken terremark providers
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandler.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandler.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandler.java
deleted file mode 100644
index 0c36a05..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandler.java
+++ /dev/null
@@ -1,59 +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.trmk.ecloud.xml;
-
-import static org.jclouds.util.SaxUtils.currentOrNull;
-import static org.jclouds.util.SaxUtils.equalsOrSuffix;
-
-import java.util.Map;
-
-import org.jclouds.http.functions.ParseSax;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-
-/**
- * @author Adrian Cole
- */
-public class TagNameToUsageCountHandler extends ParseSax.HandlerWithResult<Map<String, Integer>> {
- protected StringBuilder currentText = new StringBuilder();
-
- private Builder<String, Integer> builder = ImmutableMap.builder();
- private String name;
-
- public Map<String, Integer> getResult() {
- try {
- return builder.build();
- } finally {
- builder = ImmutableMap.<String, Integer> builder();
- }
- }
-
- @Override
- public void endElement(String uri, String localName, String qName) {
- if (equalsOrSuffix(qName, "Name")) {
- name = currentOrNull(currentText);
- } else if (equalsOrSuffix(qName, "UsageCount")) {
- builder.put(name, Integer.valueOf(currentOrNull(currentText)));
- }
- currentText = new StringBuilder();
- }
-
- public void characters(char ch[], int start, int length) {
- currentText.append(ch, start, length);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/trmk-ecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index e852319..0000000
--- a/providers/trmk-ecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.trmk.ecloud.TerremarkECloudProviderMetadata
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/BaseTerremarkECloudApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/BaseTerremarkECloudApiLiveTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/BaseTerremarkECloudApiLiveTest.java
deleted file mode 100644
index 77258c6..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/BaseTerremarkECloudApiLiveTest.java
+++ /dev/null
@@ -1,41 +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.trmk.ecloud;
-
-import java.util.Properties;
-
-import org.jclouds.trmk.vcloud_0_8.internal.BaseTerremarkApiLiveTest;
-import org.jclouds.trmk.vcloud_0_8.reference.VCloudConstants;
-import org.testng.annotations.Test;
-
-/**
- * @author Adrian Cole
- */
-@Test(groups = "live", enabled = true, singleThreaded = true)
-public class BaseTerremarkECloudApiLiveTest extends BaseTerremarkApiLiveTest {
- @Override
- protected Properties setupProperties() {
- Properties props = super.setupProperties();
- props.setProperty(VCloudConstants.PROPERTY_VCLOUD_DEFAULT_VDC,
- ".* - " + System.getProperty("test.trmk-ecloud.datacenter", "MIA"));
- return props;
- }
-
- protected TerremarkECloudApi api() {
- return TerremarkECloudApi.class.cast(api);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/BaseTerremarkECloudApiTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/BaseTerremarkECloudApiTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/BaseTerremarkECloudApiTest.java
deleted file mode 100644
index 33d8cfc..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/BaseTerremarkECloudApiTest.java
+++ /dev/null
@@ -1,268 +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.trmk.ecloud;
-
-import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.rest.AuthorizationException;
-import org.jclouds.rest.ConfiguresRestClient;
-import org.jclouds.rest.internal.BaseAsyncClientTest;
-import org.jclouds.trmk.ecloud.config.TerremarkECloudHttpApiModule;
-import org.jclouds.trmk.ecloud.domain.internal.ECloudOrgImpl;
-import org.jclouds.trmk.vcloud_0_8.domain.Org;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-import org.jclouds.trmk.vcloud_0_8.domain.VCloudSession;
-import org.jclouds.trmk.vcloud_0_8.domain.VDC;
-import org.jclouds.trmk.vcloud_0_8.domain.internal.CatalogImpl;
-import org.jclouds.trmk.vcloud_0_8.domain.internal.CatalogItemImpl;
-import org.jclouds.trmk.vcloud_0_8.domain.internal.ReferenceTypeImpl;
-import org.jclouds.trmk.vcloud_0_8.domain.internal.VDCImpl;
-import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie;
-import org.jclouds.trmk.vcloud_0_8.internal.TerremarkVCloudLoginApi;
-import org.jclouds.trmk.vcloud_0_8.internal.TerremarkVCloudVersionsApi;
-
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.AbstractModule;
-import com.google.inject.Module;
-import com.google.inject.TypeLiteral;
-
-/**
- * @author Adrian Cole
- */
-public abstract class BaseTerremarkECloudApiTest<T> extends BaseAsyncClientTest<T> {
-
- @Override
- protected void checkFilters(HttpRequest request) {
- assertEquals(request.getFilters().size(), 1);
- assertEquals(request.getFilters().get(0).getClass(), SetVCloudTokenCookie.class);
- }
-
- @Override
- protected Module createModule() {
- return new TerremarkECloudHttpApiModuleExtension();
- }
-
- @Override
- public ProviderMetadata createProviderMetadata() {
- return new TerremarkECloudProviderMetadata();
- }
-
- protected static final ReferenceTypeImpl ORG_REF = new ReferenceTypeImpl("org", TerremarkECloudMediaType.ORG_XML,
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/org/1"));
-
- protected static final ReferenceTypeImpl CATALOG_REF = new ReferenceTypeImpl("catalog",
- TerremarkECloudMediaType.CATALOG_XML, URI.create("https://vcloud.safesecureweb.com/api/v0.8/catalog/1"));
-
- protected static final ReferenceTypeImpl TASKSLIST_REF = new ReferenceTypeImpl("tasksList",
- TerremarkECloudMediaType.TASKSLIST_XML, URI.create("https://vcloud.safesecureweb.com/api/v0.8/tasksList/1"));
-
- protected static final ReferenceTypeImpl VDC_REF = new ReferenceTypeImpl("vdc", TerremarkECloudMediaType.VDC_XML,
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/vdc/1"));
-
- protected static final ReferenceTypeImpl KEYSLIST_REF = new ReferenceTypeImpl("keysList",
- TerremarkECloudMediaType.KEYSLIST_XML, URI.create("https://vcloud.safesecureweb.com/api/v0.8/keysList/1"));
- protected static final ReferenceTypeImpl TAGSLIST_REF = new ReferenceTypeImpl("deviceTags",
- TerremarkECloudMediaType.TAGSLISTLIST_XML,
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/deviceTags/1"));
- protected static final ReferenceTypeImpl VAPPCATALOGLIST_REF = new ReferenceTypeImpl("vappCatalog",
- TerremarkECloudMediaType.VAPPCATALOGLIST_XML,
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/vappCatalog/1"));
- protected static final ReferenceTypeImpl DATACENTERSLIST_REF = new ReferenceTypeImpl("dataCentersList",
- TerremarkECloudMediaType.DATACENTERSLIST_XML,
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/datacentersList/1"));
- protected static final ReferenceTypeImpl NETWORK_REF = new ReferenceTypeImpl("network",
- TerremarkECloudMediaType.NETWORK_XML, URI.create("https://vcloud.safesecureweb.com/network/1990"));
-
- protected static final ReferenceTypeImpl PUBLICIPS_REF = new ReferenceTypeImpl("publicIps",
- TerremarkECloudMediaType.PUBLICIPSLIST_XML,
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/publicIps/1"));
-
- protected static final ReferenceTypeImpl INTERNETSERVICES_REF = new ReferenceTypeImpl("internetServices",
- TerremarkECloudMediaType.INTERNETSERVICESLIST_XML,
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/internetServices/1"));
-
- protected static final Org ORG = new ECloudOrgImpl(ORG_REF.getName(), ORG_REF.getType(), ORG_REF.getHref(), "org",
- ImmutableMap.<String, ReferenceType> of(CATALOG_REF.getName(), CATALOG_REF),
- ImmutableMap.<String, ReferenceType> of(VDC_REF.getName(), VDC_REF), ImmutableMap.<String, ReferenceType> of(
- TASKSLIST_REF.getName(), TASKSLIST_REF), KEYSLIST_REF, DATACENTERSLIST_REF, TAGSLIST_REF,
- VAPPCATALOGLIST_REF);
-
- protected static final VDC VDC = new VDCImpl(VDC_REF.getName(), VDC_REF.getType(), VDC_REF.getHref(), "description",
- CATALOG_REF, PUBLICIPS_REF, INTERNETSERVICES_REF, ImmutableMap.<String, ReferenceType> of(
- "vapp",
- new ReferenceTypeImpl("vapp", "application/vnd.vmware.vcloud.vApp+xml", URI
- .create("https://vcloud.safesecureweb.com/api/v0.8/vApp/188849-1")),
- "network",
- new ReferenceTypeImpl("network", "application/vnd.vmware.vcloud.vAppTemplate+xml", URI
- .create("https://vcloud.safesecureweb.com/api/v0.8/vdcItem/2"))),
- ImmutableMap.<String, ReferenceType> of(NETWORK_REF.getName(), NETWORK_REF));
-
- @ConfiguresRestClient
- protected static class TerremarkECloudHttpApiModuleExtension extends TerremarkECloudHttpApiModule {
-
- @Override
- protected Supplier<URI> provideAuthenticationURI(TerremarkVCloudVersionsApi versionService, String version) {
- return Suppliers.ofInstance(URI.create("https://vcloud.safesecureweb.com/api/v0.8/login"));
- }
-
- @Override
- protected Supplier<Org> provideOrg(Supplier<Map<String, ? extends Org>> orgSupplier,
- @org.jclouds.trmk.vcloud_0_8.endpoints.Org Supplier<ReferenceType> defaultOrg) {
- return Suppliers.ofInstance(ORG);
- }
-
- @Override
- protected void installDefaultVCloudEndpointsModule() {
- install(new AbstractModule() {
-
- @Override
- protected void configure() {
- TypeLiteral<Supplier<ReferenceType>> refTypeSupplier = new TypeLiteral<Supplier<ReferenceType>>() {
- };
- bind(refTypeSupplier).annotatedWith(org.jclouds.trmk.vcloud_0_8.endpoints.Org.class).toInstance(
- Suppliers.<ReferenceType> ofInstance(ORG_REF));
- bind(refTypeSupplier).annotatedWith(org.jclouds.trmk.vcloud_0_8.endpoints.Catalog.class).toInstance(
- Suppliers.<ReferenceType> ofInstance(CATALOG_REF));
- bind(refTypeSupplier).annotatedWith(org.jclouds.trmk.vcloud_0_8.endpoints.TasksList.class).toInstance(
- Suppliers.<ReferenceType> ofInstance(TASKSLIST_REF));
- bind(refTypeSupplier).annotatedWith(org.jclouds.trmk.vcloud_0_8.endpoints.VDC.class).toInstance(
- Suppliers.<ReferenceType> ofInstance(VDC_REF));
- bind(refTypeSupplier).annotatedWith(org.jclouds.trmk.vcloud_0_8.endpoints.Network.class).toInstance(
- Suppliers.<ReferenceType> ofInstance(NETWORK_REF));
- }
-
- });
- }
-
- @Override
- protected Supplier<VCloudSession> provideVCloudTokenCache(@Named(PROPERTY_SESSION_INTERVAL) long seconds,
- AtomicReference<AuthorizationException> authException, TerremarkVCloudLoginApi login) {
- return Suppliers.<VCloudSession> ofInstance(new VCloudSession() {
-
- @Override
- public Map<String, ReferenceType> getOrgs() {
- return ImmutableMap.<String, ReferenceType> of(ORG_REF.getName(), ORG_REF);
- }
-
- @Override
- public String getVCloudToken() {
- return "token";
- }
-
- });
-
- }
-
- @Override
- protected void configure() {
- super.configure();
- bind(OrgMapSupplier.class).to(TestOrgMapSupplier.class);
- bind(OrgCatalogSupplier.class).to(TestOrgCatalogSupplier.class);
- bind(OrgCatalogItemSupplier.class).to(TestOrgCatalogItemSupplier.class);
- }
-
- @Override
- protected Supplier<Map<String, Map<String, ? extends org.jclouds.trmk.vcloud_0_8.domain.VDC>>> provideOrgVDCSupplierCache(
- @Named(PROPERTY_SESSION_INTERVAL) long seconds, AtomicReference<AuthorizationException> authException,
- OrgVDCSupplier supplier) {
- return Suppliers
- .<Map<String, Map<String, ? extends org.jclouds.trmk.vcloud_0_8.domain.VDC>>> ofInstance(ImmutableMap
- .<String, Map<String, ? extends org.jclouds.trmk.vcloud_0_8.domain.VDC>> of(ORG_REF.getName(),
- ImmutableMap.<String, org.jclouds.trmk.vcloud_0_8.domain.VDC> of(VDC.getName(), VDC)));
- }
-
- @Singleton
- public static class TestOrgMapSupplier extends OrgMapSupplier {
-
- @Inject
- protected TestOrgMapSupplier() {
- super(null, null);
- }
-
- @Override
- public Map<String, Org> get() {
- return ImmutableMap.<String, Org> of(ORG.getName(), ORG);
- }
- }
-
- @Singleton
- public static class TestOrgCatalogSupplier extends OrgCatalogSupplier {
- @Inject
- protected TestOrgCatalogSupplier() {
- super(null, null);
- }
-
- @Override
- public Map<String, Map<String, ? extends org.jclouds.trmk.vcloud_0_8.domain.Catalog>> get() {
- return ImmutableMap.<String, Map<String, ? extends org.jclouds.trmk.vcloud_0_8.domain.Catalog>> of(ORG_REF
- .getName(), ImmutableMap.<String, org.jclouds.trmk.vcloud_0_8.domain.Catalog> of(
- CATALOG_REF.getName(),
- new CatalogImpl(CATALOG_REF.getName(), CATALOG_REF.getType(), CATALOG_REF.getHref(), null,
- ImmutableMap.<String, ReferenceType> of(
- "item",
- new ReferenceTypeImpl("item", "application/vnd.vmware.vcloud.catalogItem+xml", URI
- .create("https://vcloud.safesecureweb.com/api/v0.8/catalogItem/1")),
- "template",
- new ReferenceTypeImpl("template", "application/vnd.vmware.vcloud.vAppTemplate+xml", URI
- .create("https://vcloud.safesecureweb.com/api/v0.8/catalogItem/2"))))));
- }
- }
-
- @Singleton
- public static class TestOrgCatalogItemSupplier extends OrgCatalogItemSupplier {
- protected TestOrgCatalogItemSupplier() {
- super(null, null);
- }
-
- @Override
- public Map<String, Map<String, Map<String, ? extends org.jclouds.trmk.vcloud_0_8.domain.CatalogItem>>> get() {
- return ImmutableMap
- .<String, Map<String, Map<String, ? extends org.jclouds.trmk.vcloud_0_8.domain.CatalogItem>>> of(
- ORG_REF.getName(),
- ImmutableMap.<String, Map<String, ? extends org.jclouds.trmk.vcloud_0_8.domain.CatalogItem>> of(
- CATALOG_REF.getName(),
- ImmutableMap
- .<String, org.jclouds.trmk.vcloud_0_8.domain.CatalogItem> of(
- "template",
- new CatalogItemImpl(
- "template",
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/catalogItem/2"),
- "description",
- new ReferenceTypeImpl(
- "template",
- "application/vnd.vmware.vcloud.vAppTemplate+xml",
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/vAppTemplate/2")),
- null, null, ImmutableMap.<String, String> of()))));
-
- }
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudApiLiveTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudApiLiveTest.java
deleted file mode 100644
index 80b851c..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudApiLiveTest.java
+++ /dev/null
@@ -1,69 +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.trmk.ecloud;
-
-import java.util.Map.Entry;
-import java.util.Properties;
-
-import org.jclouds.domain.LoginCredentials;
-import org.jclouds.ssh.SshClient;
-import org.jclouds.trmk.ecloud.suppliers.TerremarkECloudInternetServiceAndPublicIpAddressSupplier;
-import org.jclouds.trmk.vcloud_0_8.TerremarkApiLiveTest;
-import org.jclouds.trmk.vcloud_0_8.domain.InternetService;
-import org.jclouds.trmk.vcloud_0_8.domain.Protocol;
-import org.jclouds.trmk.vcloud_0_8.domain.PublicIpAddress;
-import org.jclouds.trmk.vcloud_0_8.domain.VApp;
-import org.jclouds.trmk.vcloud_0_8.reference.VCloudConstants;
-import org.testng.annotations.Test;
-
-import com.google.common.net.HostAndPort;
-
-/**
- * Tests behavior of {@code TerremarkECloudApi}
- *
- * @author Adrian Cole
- */
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "TerremarkECloudApiLiveTest")
-public class TerremarkECloudApiLiveTest extends TerremarkApiLiveTest {
-
- public TerremarkECloudApiLiveTest() {
- this.provider = "trmk-ecloud";
- this.itemName = "Ubuntu Server 10.04 x64";
- this.expectedOs = "Ubuntu Linux (64-bit)";
- }
-
- @Override
- protected Properties setupProperties() {
- Properties props = super.setupProperties();
- props.setProperty(VCloudConstants.PROPERTY_VCLOUD_DEFAULT_VDC,
- ".* - " + System.getProperty("test.trmk-ecloud.datacenter", "MIA"));
- return props;
- }
-
- @Override
- protected SshClient getConnectionFor(HostAndPort socket) {
- return sshFactory.create(socket, LoginCredentials.builder().user("ecloud").password("TmrkCl0ud1s#1!").privateKey(
- key.getPrivateKey()).authenticateSudo(true).build());
- }
-
- @Override
- protected Entry<InternetService, PublicIpAddress> getNewInternetServiceAndIpForSSH(VApp vApp) {
- return new TerremarkECloudInternetServiceAndPublicIpAddressSupplier(TerremarkECloudApi.class.cast(api))
- .getNewInternetServiceAndIp(vApp, 22, Protocol.TCP);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudApiTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudApiTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudApiTest.java
deleted file mode 100644
index f072162..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudApiTest.java
+++ /dev/null
@@ -1,529 +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.trmk.ecloud;
-
-import static org.jclouds.reflect.Reflection2.method;
-import static org.jclouds.trmk.vcloud_0_8.options.AddInternetServiceOptions.Builder.disabled;
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.net.URI;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.http.functions.ReleasePayloadAndReturn;
-import org.jclouds.rest.ResourceNotFoundException;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.jclouds.trmk.vcloud_0_8.domain.Protocol;
-import org.jclouds.trmk.vcloud_0_8.functions.ParseTaskFromLocationHeader;
-import org.jclouds.trmk.vcloud_0_8.options.AddInternetServiceOptions;
-import org.jclouds.trmk.vcloud_0_8.options.AddNodeOptions;
-import org.jclouds.trmk.vcloud_0_8.options.InstantiateVAppTemplateOptions;
-import org.jclouds.trmk.vcloud_0_8.options.InstantiateVAppTemplateOptions.NetworkConfig;
-import org.jclouds.trmk.vcloud_0_8.xml.CatalogHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.CustomizationParametersHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.InternetServiceHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.InternetServicesHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.KeyPairByNameHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.KeyPairHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.KeyPairsHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.NetworkHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.NodeHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.NodesHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.PublicIpAddressHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.VAppExtendedInfoHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.VAppHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.VDCHandler;
-import org.jclouds.util.Strings2;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code TerremarkECloudApi}
- *
- * @author Adrian Cole
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", singleThreaded = true, testName = "TerremarkECloudApiTest")
-public class TerremarkECloudApiTest extends BaseTerremarkECloudApiTest<TerremarkECloudApi> {
-
- public void testListOrgs() {
- assertEquals(injector.getInstance(TerremarkECloudApi.class).listOrgs().toString(),
- ImmutableMap.of(ORG_REF.getName(), ORG_REF).toString());
- }
-
- public void testNetwork() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "getNetwork", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/vdcItem/2")));
-
- assertRequestLineEquals(request, "GET https://vcloud.safesecureweb.com/api/v0.8/vdcItem/2 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.vmware.vcloud.network+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, NetworkHandler.class);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testDelete() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "deleteVApp", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/vApp/1")));
-
- assertRequestLineEquals(request, "DELETE https://vcloud.safesecureweb.com/api/v0.8/vApp/1 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseTaskFromLocationHeader.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testFindNetworkInOrgVDCNamed() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "findNetworkInOrgVDCNamed", String.class,
- String.class, String.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of("org", "vdc", "network"));
-
- assertRequestLineEquals(request, "GET https://vcloud.safesecureweb.com/network/1990 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.vmware.vcloud.network+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, NetworkHandler.class);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- /**
- * ignore parameter of catalog id since this doesn't work
- */
- public void testCatalog() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "getCatalog", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://catalog")));
-
- assertRequestLineEquals(request, "GET https://catalog HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.vmware.vcloud.catalog+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, CatalogHandler.class);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testGetVDC() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "getVDC", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/vdc/1")));
-
- assertRequestLineEquals(request, "GET https://vcloud/vdc/1 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.vmware.vcloud.vdc+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, VDCHandler.class);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testInstantiateVAppTemplateInVDCURI() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "instantiateVAppTemplateInVDC", URI.class, URI.class,
- String.class, InstantiateVAppTemplateOptions[].class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/vdc/1"), URI.create("https://vcloud/vAppTemplate/3"),
- "name"));
-
- assertRequestLineEquals(request,
- "POST https://vcloud.safesecureweb.com/api/v0.8/vdc/1/action/instantiateVAppTemplate HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.vmware.vcloud.vApp+xml\n");
- assertPayloadEquals(request,
- Strings2.toStringAndClose(getClass().getResourceAsStream("/InstantiateVAppTemplateParams-test.xml")),
- "application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml", false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, VAppHandler.class);
- assertFallbackClassEquals(method, null);
-
- checkFilters(request);
- }
-
- public void testInstantiateVAppTemplateInVDCURIOptions() throws SecurityException, NoSuchMethodException,
- IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "instantiateVAppTemplateInVDC", URI.class, URI.class,
- String.class, InstantiateVAppTemplateOptions[].class);
- GeneratedHttpRequest request = processor.createRequest(
- method, ImmutableList.<Object> of(
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/vdc/1"),
- URI.create("https://vcloud/vAppTemplate/3"),
- "name",
- InstantiateVAppTemplateOptions.Builder.processorCount(2).memory(512).inGroup("group")
- .withPassword("password").inRow("row")
- .addNetworkConfig(new NetworkConfig(URI.create("http://network")))));
-
- assertRequestLineEquals(request,
- "POST https://vcloud.safesecureweb.com/api/v0.8/vdc/1/action/instantiateVAppTemplate HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.vmware.vcloud.vApp+xml\n");
- assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream(
- "/InstantiateVAppTemplateParams-options-test.xml")),
- "application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml", false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, VAppHandler.class);
- assertFallbackClassEquals(method, null);
-
- checkFilters(request);
- }
-
- public void testActivatePublicIpInVDC() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "activatePublicIpInVDC", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/vdc/1")));
-
- assertRequestLineEquals(request, "POST https://vcloud.safesecureweb.com/api/v0.8/publicIps/1 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.ecloud.publicIp+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, PublicIpAddressHandler.class);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testGetAllInternetServices() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "getAllInternetServicesInVDC", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/vdc/1")));
-
- assertRequestLineEquals(request, "GET https://vcloud.safesecureweb.com/api/v0.8/internetServices/1 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.ecloud.internetServicesList+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, InternetServicesHandler.class);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testGetInternetService() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "getInternetService", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/extensions/internetService/12")));
-
- assertRequestLineEquals(request, "GET https://vcloud/extensions/internetService/12 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.ecloud.internetServicesList+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, InternetServiceHandler.class);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testDeleteInternetService() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "deleteInternetService", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/extensions/internetService/12")));
-
- assertRequestLineEquals(request, "DELETE https://vcloud/extensions/internetService/12 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, VoidOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testAddInternetServiceToExistingIp() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "addInternetServiceToExistingIp", URI.class,
- String.class, Protocol.class, int.class, AddInternetServiceOptions[].class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/extensions/publicIp/12"),
- "name", Protocol.TCP, 22));
-
- assertRequestLineEquals(request, "POST https://vcloud/extensions/publicIp/12/internetServices HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.ecloud.internetService+xml\n");
- assertPayloadEquals(
- request,
- Strings2.toStringAndClose(getClass().getResourceAsStream("/CreateInternetService-test2.xml")).replace(
- "vCloudExpressExtensions-1.6", "eCloudExtensions-2.8"),
- "application/vnd.tmrk.ecloud.internetService+xml", false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, InternetServiceHandler.class);
- assertFallbackClassEquals(method, null);
-
- checkFilters(request);
- }
-
- public void testAddInternetServiceToExistingIpOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "addInternetServiceToExistingIp", URI.class,
- String.class, Protocol.class, int.class, AddInternetServiceOptions[].class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/extensions/publicIp/12"),
- "name", Protocol.TCP, 22, disabled().withDescription("yahoo").monitorDisabled()));
-
- assertRequestLineEquals(request, "POST https://vcloud/extensions/publicIp/12/internetServices HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.ecloud.internetService+xml\n");
- assertPayloadEquals(request,
- Strings2.toStringAndClose(getClass().getResourceAsStream("/CreateInternetService-options-test.xml"))
- .replace("vCloudExpressExtensions-1.6", "eCloudExtensions-2.8"),
- "application/vnd.tmrk.ecloud.internetService+xml", false);
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, InternetServiceHandler.class);
- assertFallbackClassEquals(method, null);
-
- checkFilters(request);
- }
-
- public void testAddNode() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "addNode", URI.class, String.class, String.class,
- int.class, AddNodeOptions[].class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/extensions/internetService/12"),
- "10.2.2.2", "name", 22));
-
- assertRequestLineEquals(request, "POST https://vcloud/extensions/internetService/12/nodeServices HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.vCloud.nodeService+xml\n");
- assertPayloadEquals(
- request,
- Strings2.toStringAndClose(getClass().getResourceAsStream("/CreateNodeService-test2.xml")).replace(
- "vCloudExpressExtensions-1.6", "eCloudExtensions-2.8"),
- "application/vnd.tmrk.vCloud.nodeService+xml", false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, NodeHandler.class);
- assertFallbackClassEquals(method, null);
-
- checkFilters(request);
- }
-
- public void testAddNodeOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "addNode", URI.class, String.class, String.class,
- int.class, AddNodeOptions[].class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/extensions/internetService/12"),
- "10.2.2.2", "name", 22, AddNodeOptions.Builder.disabled().withDescription("yahoo")));
-
- assertRequestLineEquals(request, "POST https://vcloud/extensions/internetService/12/nodeServices HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.vCloud.nodeService+xml\n");
-
- assertPayloadEquals(
- request,
- Strings2.toStringAndClose(getClass().getResourceAsStream("/CreateNodeService-options-test.xml")).replace(
- "vCloudExpressExtensions-1.6", "eCloudExtensions-2.8"),
- "application/vnd.tmrk.vCloud.nodeService+xml", false);
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, NodeHandler.class);
- assertFallbackClassEquals(method, null);
-
- checkFilters(request);
- }
-
- public void testGetKeyPairInOrg() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "findKeyPairInOrg", URI.class, String.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/org/1"), "keyPair"));
-
- assertRequestLineEquals(request, "GET https://vcloud.safesecureweb.com/api/v0.8/keysList/1 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.ecloud.keysList+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, KeyPairByNameHandler.class);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testConfigureNodeWithDescription() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "configureNode", URI.class, String.class,
- boolean.class, String.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/extensions/nodeService/12"),
- "name", true, "eggs"));
-
- assertRequestLineEquals(request, "PUT https://vcloud/extensions/nodeService/12 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.vCloud.nodeService+xml\n");
- assertPayloadEquals(
- request,
- "<NodeService xmlns=\"urn:tmrk:eCloudExtensions-2.8\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><Name>name</Name><Enabled>true</Enabled><Description>eggs</Description></NodeService>",
- "application/vnd.tmrk.vCloud.nodeService+xml", false);
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, NodeHandler.class);
- assertFallbackClassEquals(method, null);
-
- checkFilters(request);
- }
-
- public void testConfigureNodeNoDescription() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "configureNode", URI.class, String.class,
- boolean.class, String.class);
- GeneratedHttpRequest request = processor.createRequest(method, Lists.<Object> newArrayList(URI.create("https://vcloud/extensions/nodeService/12"),
- "name", true, null));
-
- assertRequestLineEquals(request, "PUT https://vcloud/extensions/nodeService/12 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.vCloud.nodeService+xml\n");
- assertPayloadEquals(
- request,
- "<NodeService xmlns=\"urn:tmrk:eCloudExtensions-2.8\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><Name>name</Name><Enabled>true</Enabled></NodeService>",
- "application/vnd.tmrk.vCloud.nodeService+xml", false);
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, NodeHandler.class);
- assertFallbackClassEquals(method, null);
-
- checkFilters(request);
- }
-
- public void testGetNodes() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "getNodes", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/extensions/internetService/12")));
-
- assertRequestLineEquals(request, "GET https://vcloud/extensions/internetService/12/nodeServices HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.vCloud.nodeService+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, NodesHandler.class);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testDeleteNode() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "deleteNode", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/extensions/nodeService/12")));
-
- assertRequestLineEquals(request, "DELETE https://vcloud/extensions/nodeService/12 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, VoidOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testGetCustomizationOptionsOfCatalogItem() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "getCustomizationOptions", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/extensions/template/12")));
-
- assertRequestLineEquals(request, "GET https://vcloud/extensions/template/12 HTTP/1.1");
- assertNonPayloadHeadersEqual(request,
- "Accept: application/vnd.tmrk.vCloud.catalogItemCustomizationParameters+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, CustomizationParametersHandler.class);
- assertFallbackClassEquals(method, null);
-
- checkFilters(request);
- }
-
- public void testListKeyPairsInOrg() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "listKeyPairsInOrg", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/org/1")));
-
- assertRequestLineEquals(request, "GET https://vcloud.safesecureweb.com/api/v0.8/keysList/1 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.ecloud.keysList+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, KeyPairsHandler.class);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testListKeyPairsInOrgNotFound() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "listKeyPairsInOrg", URI.class);
- processor.createRequest(method, ImmutableList.<Object> of(URI.create("d")));
- }
-
- public void testGetKeyPair() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "getKeyPair", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/extensions/key/12")));
-
- assertRequestLineEquals(request, "GET https://vcloud/extensions/key/12 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, KeyPairHandler.class);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testDeleteKeyPair() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "deleteKeyPair", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/extensions/key/12")));
-
- assertRequestLineEquals(request, "DELETE https://vcloud/extensions/key/12 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, VoidOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testGetNode() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "getNode", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/extensions/nodeService/12")));
-
- assertRequestLineEquals(request, "GET https://vcloud/extensions/nodeService/12 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.vCloud.nodeService+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, NodeHandler.class);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testGetExtendedInfo() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TerremarkECloudApi.class, "getVAppExtendedInfo", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(URI.create("https://vcloud/extensions/vapp/12")));
-
- assertRequestLineEquals(request, "GET https://vcloud/extensions/vapp/12 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.ecloud.vApp+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, VAppExtendedInfoHandler.class);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudClientMockTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudClientMockTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudClientMockTest.java
deleted file mode 100644
index 9113a71..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudClientMockTest.java
+++ /dev/null
@@ -1,114 +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.trmk.ecloud;
-
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
-import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import org.jclouds.ContextBuilder;
-import org.jclouds.concurrent.config.ExecutorServiceModule;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-import com.google.mockwebserver.MockResponse;
-import com.google.mockwebserver.MockWebServer;
-import com.google.mockwebserver.QueueDispatcher;
-import com.google.mockwebserver.RecordedRequest;
-
-/**
- *
- * @author Adrian Cole
- */
-@Test(singleThreaded = true)
-public class TerremarkECloudClientMockTest {
-
- private static final Set<Module> modules = ImmutableSet.<Module> of(
- new ExecutorServiceModule(sameThreadExecutor(), sameThreadExecutor()));
-
- static TerremarkECloudApi mockTerremarkECloudClient(String uri) {
- Properties overrides = new Properties();
- overrides.setProperty(PROPERTY_MAX_RETRIES, "1");
- return ContextBuilder.newBuilder("trmk-ecloud")
- .credentials("user", "password")
- .endpoint(uri)
- .overrides(overrides)
- .modules(modules)
- .buildApi(TerremarkECloudApi.class);
- }
-
- String versionXML = "<SupportedVersions><VersionInfo><Version>0.8b-ext2.8</Version><LoginUrl>URLv0.8/login</LoginUrl></VersionInfo></SupportedVersions>";
-
- @Test
- public void testLoginSetsContentLength() throws IOException, InterruptedException {
- MockWebServer server = new MockWebServer();
- server.play();
- server.setDispatcher(replaceURLWithLocalhostPort(server.getPort()));
- server.enqueue(new MockResponse().setResponseCode(200).setBody(versionXML));
- server.enqueue(new MockResponse().setResponseCode(200)
- .addHeader("x-vcloud-authorization", "cookie")
- .setBody("<OrgList />"));
-
- TerremarkECloudApi api = mockTerremarkECloudClient(server.getUrl("/").toString());
-
- try {
- api.listOrgs();
- RecordedRequest getVersions = server.takeRequest();
- assertEquals(getVersions.getRequestLine(), "GET /versions HTTP/1.1");
-
- RecordedRequest login = server.takeRequest();
- assertEquals(login.getRequestLine(), "POST /v0.8/login HTTP/1.1");
- assertEquals(login.getHeader("Authorization"), "Basic dXNlcjpwYXNzd29yZA==");
- assertEquals(login.getHeader("Content-Length"), "0");
- } finally {
- server.shutdown();
- }
- }
-
- /**
- * this pattern is used for HATEOAS or similar apis which return urls for
- * further requests. If we don't replace here, the test cannot be bound to
- * the same MWS instance as it was created with.
- */
- private QueueDispatcher replaceURLWithLocalhostPort(final int port) {
- return new QueueDispatcher() {
- protected final BlockingQueue<MockResponse> responseQueue = new LinkedBlockingQueue<MockResponse>();
-
- @Override
- public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
- MockResponse response = responseQueue.take();
- if (response.getBody() != null) {
- String newBody = new String(response.getBody()).replace("URL", "http://localhost:" + port + "/");
- response = response.setBody(newBody);
- }
- return response;
- }
-
- @Override
- public void enqueueResponse(MockResponse response) {
- responseQueue.add(response);
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderTest.java
deleted file mode 100644
index 56039ca..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderTest.java
+++ /dev/null
@@ -1,33 +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.trmk.ecloud;
-
-import org.jclouds.providers.internal.BaseProviderMetadataTest;
-import org.testng.annotations.Test;
-
-/**
- * The TerremarkECloudProviderTest tests the org.jclouds.providers.TerremarkECloudProvider class.
- *
- * @author Adrian Cole
- */
-@Test(groups = "unit", testName = "TerremarkECloudProviderTest")
-public class TerremarkECloudProviderTest extends BaseProviderMetadataTest {
-
- public TerremarkECloudProviderTest() {
- super(new TerremarkECloudProviderMetadata(), new TerremarkECloudApiMetadata());
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/TerremarkECloudComputeServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/TerremarkECloudComputeServiceLiveTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/TerremarkECloudComputeServiceLiveTest.java
deleted file mode 100644
index b1ba895..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/TerremarkECloudComputeServiceLiveTest.java
+++ /dev/null
@@ -1,120 +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.trmk.ecloud.compute;
-
-import static org.testng.Assert.assertEquals;
-
-import java.util.Properties;
-
-import org.jclouds.compute.domain.ComputeMetadata;
-import org.jclouds.compute.domain.ComputeType;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.compute.domain.Template;
-import org.jclouds.compute.domain.TemplateBuilder;
-import org.jclouds.compute.internal.BaseComputeServiceLiveTest;
-import org.jclouds.sshj.config.SshjSshClientModule;
-import org.jclouds.trmk.ecloud.TerremarkECloudApi;
-import org.jclouds.trmk.vcloud_0_8.domain.VApp;
-import org.jclouds.trmk.vcloud_0_8.reference.VCloudConstants;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.Module;
-
-/**
- * This test is disabled, as it doesn't work while there are too few public ip
- * addresses.
- *
- * @author Adrian Cole
- */
-@Test(groups = "live", enabled = true, singleThreaded = true)
-public class TerremarkECloudComputeServiceLiveTest extends BaseComputeServiceLiveTest {
-
- @Override
- protected Properties setupProperties() {
- Properties props = super.setupProperties();
- props.setProperty(VCloudConstants.PROPERTY_VCLOUD_DEFAULT_VDC,
- ".* - " + System.getProperty("test.trmk-ecloud.datacenter", "MIA"));
- return props;
- }
-
- public TerremarkECloudComputeServiceLiveTest() {
- provider = "trmk-ecloud";
- }
-
- @Override
- public void setServiceDefaults() {
- group = "te";
- }
-
- // terremark does not support metadata
- @Override
- protected void checkUserMetadataContains(NodeMetadata node, ImmutableMap<String, String> userMetadata) {
- assert node.getUserMetadata().equals(ImmutableMap.<String, String> of()) : String.format(
- "node userMetadata did not match %s %s", userMetadata, node);
- }
-
- @Override
- protected Template buildTemplate(TemplateBuilder templateBuilder) {
- Template template = super.buildTemplate(templateBuilder);
- Image image = template.getImage();
- assert image.getDefaultCredentials() != null && image.getDefaultCredentials().identity != null : image;
- assert image.getDefaultCredentials() != null && image.getDefaultCredentials().credential != null : image;
- return template;
- }
-
- @Override
- public void testListImages() throws Exception {
- for (Image image : client.listImages()) {
- assert image.getProviderId() != null : image;
- // image.getLocationId() can be null, if it is a location-free image
- assertEquals(image.getType(), ComputeType.IMAGE);
- if (image.getOperatingSystem().getFamily() != OsFamily.WINDOWS
- && image.getOperatingSystem().getFamily() != OsFamily.SOLARIS) {
- assert image.getDefaultCredentials() != null && image.getDefaultCredentials().identity != null : image;
- assert image.getDefaultCredentials().credential != null : image;
- }
- }
- }
-
- @Override
- public void testListNodes() throws Exception {
- for (ComputeMetadata node : client.listNodes()) {
- assert node.getProviderId() != null;
- assert node.getLocation() != null;
- assertEquals(node.getType(), ComputeType.NODE);
- NodeMetadata allData = client.getNodeMetadata(node.getId());
- TerremarkECloudApi api = view.utils().injector().getInstance(TerremarkECloudApi.class);
- VApp vApp = api.findVAppInOrgVDCNamed(allData.getLocation().getParent().getDescription(),
- allData.getLocation().getDescription(), allData.getName());
- assertEquals(vApp.getName(), allData.getName());
- }
- }
-
- @Override
- public void testDestroyNodes() {
- super.testDestroyNodes();
- }
-
- @Override
- protected Module getSshModule() {
- return new SshjSshClientModule();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/TerremarkECloudTemplateBuilderLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/TerremarkECloudTemplateBuilderLiveTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/TerremarkECloudTemplateBuilderLiveTest.java
deleted file mode 100644
index 4ce40a3..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/TerremarkECloudTemplateBuilderLiveTest.java
+++ /dev/null
@@ -1,93 +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.trmk.ecloud.compute;
-
-import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Properties;
-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.jclouds.trmk.vcloud_0_8.reference.VCloudConstants;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-
-/**
- *
- * @author Adrian Cole
- */
-@Test(groups = "live", testName = "TerremarkECloudTemplateBuilderLiveTest")
-public class TerremarkECloudTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
- @Override
- protected Properties setupProperties() {
- Properties props = super.setupProperties();
- props.setProperty(VCloudConstants.PROPERTY_VCLOUD_DEFAULT_VDC,
- ".* - " + System.getProperty("test.trmk-ecloud.datacenter", "MIA"));
- return props;
- }
-
- public TerremarkECloudTemplateBuilderLiveTest() {
- provider = "trmk-ecloud";
- }
-
- @Override
- protected Predicate<OsFamilyVersion64Bit> defineUnsupportedOperatingSystems() {
- return new Predicate<OsFamilyVersion64Bit>() {
-
- @Override
- public boolean apply(OsFamilyVersion64Bit input) {
- switch (input.family) {
- case RHEL:
- return !input.version.equals("") && !input.version.matches("5.[50]");
- case SOLARIS:
- return !input.is64Bit;
- case CENTOS:
- return !input.version.equals("") && !input.version.matches("5.[50]");
- case UBUNTU:
- return !input.version.equals("") && !input.version.equals("10.04") && !input.version.equals("8.04");
- case WINDOWS:
- return !input.version.equals("") && !input.version.equals("2003 R2") //
- && !(input.version.equals("2008") && !input.is64Bit) //
- && !(input.version.matches("2008( R2)?") && input.is64Bit);
- default:
- return true;
- }
- }
- };
- }
-
- @Test
- public void testDefaultTemplateBuilder() throws IOException {
- Template defaultTemplate = view.getComputeService().templateBuilder().build();
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04");
- assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
- assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
- }
-
- @Override
- protected Set<String> getIso3166Codes() {
- return ImmutableSet.<String> of("US-FL", "US-VA", "NL-NH", "BR-SP");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/functions/TerremarkECloudParseOsFromVAppTemplateNameTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/functions/TerremarkECloudParseOsFromVAppTemplateNameTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/functions/TerremarkECloudParseOsFromVAppTemplateNameTest.java
deleted file mode 100644
index 106e33d..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/functions/TerremarkECloudParseOsFromVAppTemplateNameTest.java
+++ /dev/null
@@ -1,170 +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.trmk.ecloud.compute.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.http.functions.ParseSax.Factory;
-import org.jclouds.http.functions.config.SaxParserModule;
-import org.jclouds.json.Json;
-import org.jclouds.json.config.GsonModule;
-import org.jclouds.trmk.vcloud_0_8.xml.CatalogHandler;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.TypeLiteral;
-
-/**
- * @author Adrian Cole
- */
-@Test(groups = "unit", testName = "TerremarkECloudParseOsFromVAppTemplateNameTest")
-public class TerremarkECloudParseOsFromVAppTemplateNameTest {
-
- public Set<String> parseNames(String resource) {
- InputStream is = getClass().getResourceAsStream(resource);
- Injector injector = Guice.createInjector(new SaxParserModule());
- Factory factory = injector.getInstance(ParseSax.Factory.class);
- return factory.create(injector.getInstance(CatalogHandler.class)).parse(is).keySet();
- }
-
- public void test() {
-
- TerremarkECloudParseOsFromVAppTemplateName function = new TerremarkECloudParseOsFromVAppTemplateName(Guice
- .createInjector(new GsonModule())
- .getInstance(Json.class)
- .<Map<OsFamily, Map<String, String>>> fromJson(
- new ComputeServiceConstants.ReferenceData().osVersionMapJson,
- new TypeLiteral<Map<OsFamily, Map<String, String>>>() {
- }.getType()));
- Set<String> names = parseNames("/catalog-ecloud.xml");
- assertEquals(
- Sets.newLinkedHashSet(Iterables.transform(names, function)),
- ImmutableSet.of(
-
- // CentOS 5 (x64)
- new OperatingSystem.Builder().family(OsFamily.CENTOS).version("5.0").description("CentOS 5 (x64)")
- .is64Bit(true).build(),
- // CentOS 5 (x86)
- new OperatingSystem.Builder().family(OsFamily.CENTOS).version("5.0").description("CentOS 5 (x86)")
- .is64Bit(false).build(),
- // CentOS 5.5 x32
- new OperatingSystem.Builder().family(OsFamily.CENTOS).version("5.5").description("CentOS 5.5 x32")
- .is64Bit(false).build(),
- // CentOS 5.5 x64
- new OperatingSystem.Builder().family(OsFamily.CENTOS).version("5.5").description("CentOS 5.5 x64")
- .is64Bit(true).build(),
- // Red Hat Enterprise Linux 5 (x64)
- new OperatingSystem.Builder().family(OsFamily.RHEL).version("5.0")
- .description("Red Hat Enterprise Linux 5 (x64)").is64Bit(true).build(),
- // Red Hat Enterprise Linux 5 (x86)
- new OperatingSystem.Builder().family(OsFamily.RHEL).version("5.0")
- .description("Red Hat Enterprise Linux 5 (x86)").is64Bit(false).build(),
- // Red Hat Enterprise Linux 5.5 x32
- new OperatingSystem.Builder().family(OsFamily.RHEL).version("5.5")
- .description("Red Hat Enterprise Linux 5.5 x32").is64Bit(false).build(),
- // Red Hat Enterprise Linux 5.5 x64
- new OperatingSystem.Builder().family(OsFamily.RHEL).version("5.5")
- .description("Red Hat Enterprise Linux 5.5 x64").is64Bit(true).build(),
- // Sun Solaris 10 (x64)
- new OperatingSystem.Builder().family(OsFamily.SOLARIS).version("10")
- .description("Sun Solaris 10 (x64)").is64Bit(true).build(),
- // Ubuntu 8.04 LTS (x64)
- new OperatingSystem.Builder().family(OsFamily.UBUNTU).version("8.04")
- .description("Ubuntu 8.04 LTS (x64)").is64Bit(true).build(),
- // Ubuntu 8.04 LTS (x86)
- new OperatingSystem.Builder().family(OsFamily.UBUNTU).version("8.04")
- .description("Ubuntu 8.04 LTS (x86)").is64Bit(false).build(),
- // Ubuntu Server 10.04 x32
- new OperatingSystem.Builder().family(OsFamily.UBUNTU).version("10.04")
- .description("Ubuntu Server 10.04 x32").is64Bit(false).build(),
- // Ubuntu Server 10.04 x64
- new OperatingSystem.Builder().family(OsFamily.UBUNTU).version("10.04")
- .description("Ubuntu Server 10.04 x64").is64Bit(true).build(),
- // -Windows 2003 Std. R2 SQL 2005 Std. (x64)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2003 R2")
- .description("-Windows 2003 Std. R2 SQL 2005 Std. (x64)").is64Bit(true).build(),
- // -Windows 2003 Std. R2 SQL 2008 Std. (x64)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2003 R2")
- .description("-Windows 2003 Std. R2 SQL 2008 Std. (x64)").is64Bit(true).build(),
- // -Windows 2008 R2 Std wSQL 2008 R2 Std (x64)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2008 R2")
- .description("-Windows 2008 R2 Std wSQL 2008 R2 Std (x64)").is64Bit(true).build(),
- // -Windows 2008 R2 Std wSQL 2008 R2 Web (x64)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2008 R2")
- .description("-Windows 2008 R2 Std wSQL 2008 R2 Web (x64)").is64Bit(true).build(),
- // -Windows 2008 Std wSQL 2008 Std (x64)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2008")
- .description("-Windows 2008 Std wSQL 2008 Std (x64)").is64Bit(true).build(),
- // -Windows 2008 Std wSQL 2008 Web (x64)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2008")
- .description("-Windows 2008 Std wSQL 2008 Web (x64)").is64Bit(true).build(),
- // -Windows Server 2003 R2 Enterprise Edition (x64)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2003 R2")
- .description("-Windows Server 2003 R2 Enterprise Edition (x64)").is64Bit(true).build(),
- // -Windows Server 2003 R2 Enterprise Edition (x86)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2003 R2")
- .description("-Windows Server 2003 R2 Enterprise Edition (x86)").is64Bit(false).build(),
- // -Windows Server 2003 R2 Standard Edition (x64)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2003 R2")
- .description("-Windows Server 2003 R2 Standard Edition (x64)").is64Bit(true).build(),
- // -Windows Server 2003 R2 Standard Edition (x86)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2003 R2")
- .description("-Windows Server 2003 R2 Standard Edition (x86)").is64Bit(false).build(),
- // -Windows Server 2008 Enterprise Edition (x64)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2008")
- .description("-Windows Server 2008 Enterprise Edition (x64)").is64Bit(true).build(),
- // -Windows Server 2008 Enterprise Edition (x86)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2008")
- .description("-Windows Server 2008 Enterprise Edition (x86)").is64Bit(false).build(),
- // -Windows Server 2008 R2 Enterprise Edition (x64)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2008 R2")
- .description("-Windows Server 2008 R2 Enterprise Edition (x64)").is64Bit(true).build(),
- // -Windows Server 2008 R2 Standard Edition (x64)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2008 R2")
- .description("-Windows Server 2008 R2 Standard Edition (x64)").is64Bit(true).build(),
- // -Windows Server 2008 R2 Web Edition (x64)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2008 R2")
- .description("-Windows Server 2008 R2 Web Edition (x64)").is64Bit(true).build(),
- // -Windows Server 2008 Standard Edition (x64)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2008")
- .description("-Windows Server 2008 Standard Edition (x64)").is64Bit(true).build(),
- // -Windows Server 2008 Standard Edition (x86)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2008")
- .description("-Windows Server 2008 Standard Edition (x86)").is64Bit(false).build(),
- // -Windows Server 2008 Web Edition (x64)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2008")
- .description("-Windows Server 2008 Web Edition (x64)").is64Bit(true).build(),
- // -Windows Server 2008 Web Edition (x86)
- new OperatingSystem.Builder().family(OsFamily.WINDOWS).version("2008")
- .description("-Windows Server 2008 Web Edition (x86)").is64Bit(false).build()
-
- ));
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApiLiveTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApiLiveTest.java
deleted file mode 100644
index 1ce7924..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApiLiveTest.java
+++ /dev/null
@@ -1,43 +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.trmk.ecloud.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import org.jclouds.trmk.ecloud.BaseTerremarkECloudApiLiveTest;
-import org.jclouds.trmk.ecloud.domain.ECloudOrg;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-import org.testng.annotations.Test;
-
-/**
- * @author Adrian Cole
- */
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "DataCenterOperationsApiLiveTest")
-public class DataCenterOperationsApiLiveTest extends BaseTerremarkECloudApiLiveTest {
- @Test
- public void testListDataCentersInOrg() throws Exception {
- for (ReferenceType response : api().listOrgs().values()) {
- ECloudOrg org = api().getOrg(response.getHref());
- assertNotNull(response);
- assertNotNull(response.getName());
- assertNotNull(response.getHref());
- assertEquals(api().getDataCenterOperationsApi().listDataCentersInOrg(org.getHref()), api()
- .getDataCenterOperationsApi().listDataCenters(org.getDataCenters().getHref()));
- }
- }
-}