You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/24 16:58:58 UTC
[8/8] git commit: JCLOUDS-757 Drop FCGP labs provider
JCLOUDS-757 Drop FCGP labs provider
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/5d23c2be
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/5d23c2be
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/5d23c2be
Branch: refs/heads/master
Commit: 5d23c2be09fba9ff94f650f2017a735c531a932a
Parents: 7f307e8
Author: Adrian Cole <ad...@gmail.com>
Authored: Thu Oct 23 21:12:35 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Fri Oct 24 07:58:38 2014 -0700
----------------------------------------------------------------------
fgcp-au/pom.xml | 160 ----------
.../fujitsu/fgcp/FGCPAUProviderMetadata.java | 73 -----
.../org.jclouds.providers.ProviderMetadata | 1 -
.../fujitsu/fgcp/FGCPAUProviderTest.java | 29 --
.../compute/FGCPAUComputeServiceLiveTest.java | 30 --
.../compute/FGCPAUTemplateBuilderLiveTest.java | 37 ---
fgcp-de/pom.xml | 160 ----------
.../fujitsu/fgcp/FGCPDEProviderMetadata.java | 73 -----
.../org.jclouds.providers.ProviderMetadata | 1 -
.../fujitsu/fgcp/FGCPDEProviderTest.java | 29 --
.../compute/FGCPDEComputeServiceLiveTest.java | 32 --
.../compute/FGCPDETemplateBuilderLiveTest.java | 37 ---
fgcp/pom.xml | 154 ----------
.../java/org/jclouds/fujitsu/fgcp/FGCPApi.java | 64 ----
.../jclouds/fujitsu/fgcp/FGCPApiMetadata.java | 94 ------
.../jclouds/fujitsu/fgcp/FGCPCredentials.java | 108 -------
.../fujitsu/fgcp/FGCPProviderMetadata.java | 53 ----
.../fgcp/binders/BindAlsoToSystemId.java | 66 -----
.../config/FGCPComputeServiceContextModule.java | 136 ---------
.../fgcp/compute/functions/CPUToProcessor.java | 41 ---
.../compute/functions/DiskImageToImage.java | 64 ----
.../functions/DiskImageToOperatingSystem.java | 67 -----
.../fgcp/compute/functions/DiskToVolume.java | 50 ----
.../functions/ResourceIdToFirewallId.java | 47 ---
.../compute/functions/ResourceIdToSystemId.java | 48 ---
.../compute/functions/ServerTypeToHardware.java | 64 ----
.../SingleElementResponseToElement.java | 32 --
.../VServerMetadataToNodeMetadata.java | 240 ---------------
.../compute/options/FGCPTemplateOptions.java | 23 --
.../fgcp/compute/predicates/ServerStarted.java | 54 ----
.../fgcp/compute/predicates/ServerStopped.java | 55 ----
.../compute/predicates/SystemStatusNormal.java | 54 ----
.../strategy/FGCPComputeServiceAdapter.java | 289 -------------------
.../fgcp/compute/strategy/VServerMetadata.java | 174 -----------
.../fujitsu/fgcp/config/FGCPHttpApiModule.java | 108 -------
.../fujitsu/fgcp/domain/AddressRange.java | 53 ----
.../fujitsu/fgcp/domain/BuiltinServer.java | 69 -----
.../fgcp/domain/BuiltinServerBackup.java | 72 -----
.../fgcp/domain/BuiltinServerConfiguration.java | 64 ----
.../fgcp/domain/BuiltinServerStatus.java | 56 ----
.../org/jclouds/fujitsu/fgcp/domain/CPU.java | 74 -----
.../org/jclouds/fujitsu/fgcp/domain/Cause.java | 96 ------
.../jclouds/fujitsu/fgcp/domain/Direction.java | 110 -------
.../org/jclouds/fujitsu/fgcp/domain/Disk.java | 81 ------
.../jclouds/fujitsu/fgcp/domain/DiskImage.java | 197 -------------
.../fujitsu/fgcp/domain/ErrorStatistics.java | 49 ----
.../jclouds/fujitsu/fgcp/domain/EventLog.java | 96 ------
.../jclouds/fujitsu/fgcp/domain/Firewall.java | 129 ---------
.../org/jclouds/fujitsu/fgcp/domain/Group.java | 223 --------------
.../org/jclouds/fujitsu/fgcp/domain/Image.java | 111 -------
.../fujitsu/fgcp/domain/Information.java | 102 -------
.../fujitsu/fgcp/domain/IntermediateCACert.java | 117 --------
.../fujitsu/fgcp/domain/LoadStatistics.java | 65 -----
.../org/jclouds/fujitsu/fgcp/domain/Memory.java | 63 ----
.../org/jclouds/fujitsu/fgcp/domain/NAT.java | 62 ----
.../fujitsu/fgcp/domain/PerformanceInfo.java | 146 ----------
.../org/jclouds/fujitsu/fgcp/domain/Period.java | 57 ----
.../org/jclouds/fujitsu/fgcp/domain/Policy.java | 192 ------------
.../jclouds/fujitsu/fgcp/domain/Product.java | 81 ------
.../jclouds/fujitsu/fgcp/domain/PublicIP.java | 91 ------
.../fujitsu/fgcp/domain/PublicIPStatus.java | 53 ----
.../org/jclouds/fujitsu/fgcp/domain/Rule.java | 81 ------
.../org/jclouds/fujitsu/fgcp/domain/SLB.java | 196 -------------
.../jclouds/fujitsu/fgcp/domain/ServerCert.java | 118 --------
.../jclouds/fujitsu/fgcp/domain/ServerType.java | 142 ---------
.../jclouds/fujitsu/fgcp/domain/Software.java | 100 -------
.../org/jclouds/fujitsu/fgcp/domain/Target.java | 123 --------
.../jclouds/fujitsu/fgcp/domain/UsageInfo.java | 91 ------
.../org/jclouds/fujitsu/fgcp/domain/VDisk.java | 83 ------
.../fujitsu/fgcp/domain/VDiskStatus.java | 51 ----
.../org/jclouds/fujitsu/fgcp/domain/VNIC.java | 70 -----
.../org/jclouds/fujitsu/fgcp/domain/VNet.java | 58 ----
.../jclouds/fujitsu/fgcp/domain/VServer.java | 81 ------
.../fujitsu/fgcp/domain/VServerStatus.java | 50 ----
.../fujitsu/fgcp/domain/VServerWithDetails.java | 55 ----
.../fujitsu/fgcp/domain/VServerWithVNICs.java | 45 ---
.../jclouds/fujitsu/fgcp/domain/VSystem.java | 81 ------
.../fujitsu/fgcp/domain/VSystemDescriptor.java | 100 -------
.../fujitsu/fgcp/domain/VSystemStatus.java | 50 ----
.../fujitsu/fgcp/domain/VSystemWithDetails.java | 76 -----
.../fujitsu/fgcp/domain/package-info.java | 24 --
.../fgcp/filters/RequestAuthenticator.java | 205 -------------
.../FGCPBackoffLimitedRetryHandler.java | 27 --
.../handlers/FGCPServerErrorRetryHandler.java | 72 -----
.../handlers/ResponseNotSuccessHandler.java | 100 -------
...fErrorJavaUrlHttpCommandExecutorService.java | 74 -----
...stemAndNetworkSegmentToLocationSupplier.java | 91 ------
.../fgcp/reference/RequestParameters.java | 81 ------
.../fgcp/services/AdditionalDiskApi.java | 113 --------
.../fujitsu/fgcp/services/BuiltinServerApi.java | 151 ----------
.../fujitsu/fgcp/services/DiskImageApi.java | 70 -----
.../fujitsu/fgcp/services/FirewallApi.java | 65 -----
.../fujitsu/fgcp/services/LoadBalancerApi.java | 47 ---
.../fgcp/services/PublicIPAddressApi.java | 85 ------
.../fgcp/services/SystemTemplateApi.java | 79 -----
.../fujitsu/fgcp/services/VirtualDCApi.java | 202 -------------
.../fujitsu/fgcp/services/VirtualServerApi.java | 155 ----------
.../fujitsu/fgcp/services/VirtualSystemApi.java | 184 ------------
.../fgcp/suppliers/FGCPCredentialsSupplier.java | 152 ----------
.../suppliers/SSLContextWithKeysSupplier.java | 81 ------
.../fgcp/xml/BindParamsToXmlPayload.java | 95 ------
.../fujitsu/fgcp/xml/FGCPJAXBParser.java | 78 -----
.../fgcp/xml/internal/CreateEFMResponse.java | 40 ---
.../fgcp/xml/internal/CreateVDiskResponse.java | 40 ---
.../fgcp/xml/internal/CreateVSYSResponse.java | 40 ---
.../xml/internal/CreateVServerResponse.java | 40 ---
.../xml/internal/GetAddressRangeResponse.java | 46 ---
.../GetDiskImageAttributesResponse.java | 42 ---
.../xml/internal/GetEFMAttributesResponse.java | 42 ---
.../fgcp/xml/internal/GetEFMStatusResponse.java | 42 ---
.../fgcp/xml/internal/GetEventLogResponse.java | 45 ---
.../GetPerformanceInformationResponse.java | 46 ---
.../internal/GetPublicIPAttributesResponse.java | 48 ---
.../xml/internal/GetPublicIPStatusResponse.java | 42 ---
.../internal/GetVDiskAttributesResponse.java | 42 ---
.../xml/internal/GetVSYSAttributesResponse.java | 42 ---
.../internal/GetVSYSConfigurationResponse.java | 42 ---
.../GetVSYSDescriptorConfigurationResponse.java | 42 ---
.../xml/internal/GetVSYSStatusResponse.java | 42 ---
.../internal/GetVServerAttributesResponse.java | 42 ---
.../GetVServerConfigurationResponse.java | 42 ---
.../GetVServerInitialPasswordResponse.java | 35 ---
.../xml/internal/GetVServerStatusResponse.java | 42 ---
.../xml/internal/ListDiskImageResponse.java | 45 ---
.../xml/internal/ListEFMBackupResponse.java | 46 ---
.../fgcp/xml/internal/ListEFMResponse.java | 45 ---
.../fgcp/xml/internal/ListPublicIPResponse.java | 66 -----
.../xml/internal/ListServerTypeResponse.java | 44 ---
.../fgcp/xml/internal/ListVDiskResponse.java | 45 ---
.../fgcp/xml/internal/ListVSYSResponse.java | 45 ---
.../fgcp/xml/internal/ListVServerResponse.java | 45 ---
.../xml/internal/MapWithStatusResponse.java | 54 ----
.../fgcp/xml/internal/PublicIPWithSystemId.java | 39 ---
.../xml/internal/SetWithStatusResponse.java | 54 ----
.../xml/internal/SingleElementResponse.java | 25 --
.../fgcp/xml/internal/StatusQuerable.java | 28 --
.../fgcp/xml/internal/StatusResponse.java | 57 ----
.../fujitsu/fgcp/xml/internal/package-info.java | 26 --
.../services/org.jclouds.apis.ApiMetadata | 1 -
.../org/jclouds/fujitsu/fgcp/domain/jaxb.index | 62 ----
.../fujitsu/fgcp/xml/internal/jaxb.index | 48 ---
.../fujitsu/fgcp/FGCPCredentialsTest.java | 60 ----
.../fgcp/compute/FGCPApiMetadataTest.java | 33 ---
.../compute/FGCPBaseComputeServiceLiveTest.java | 133 ---------
.../FGCPBaseTemplateBuilderLiveTest.java | 95 ------
.../DiskImageToOperatingSystemTest.java | 176 -----------
.../fgcp/filters/RequestAuthenticatorTest.java | 161 -----------
.../services/AdditionalDiskApiExpectTest.java | 152 ----------
.../fgcp/services/BaseFGCPApiLiveTest.java | 61 ----
.../services/BaseFGCPRestApiExpectTest.java | 120 --------
.../services/BuiltinServerApiExpectTest.java | 210 --------------
.../fgcp/services/DiskImageApiExpectTest.java | 74 -----
.../fgcp/services/ErrorResponseExpectTest.java | 110 -------
.../services/PublicIPAddressApiExpectTest.java | 104 -------
.../services/SystemTemplateApiExpectTest.java | 96 ------
.../fgcp/services/VirtualDCApiExpectTest.java | 202 -------------
.../fgcp/services/VirtualDCApiLiveTest.java | 64 ----
.../services/VirtualServerApiExpectTest.java | 216 --------------
.../services/VirtualSystemApiExpectTest.java | 252 ----------------
.../test/resources/certs/jclouds-test-fgcp.p12 | Bin 1546 -> 0 bytes
.../test/resources/certs/jclouds-test-fgcp.pem | 35 ---
fgcp/src/test/resources/log4j.xml | 194 -------------
fgcp/src/test/resources/logback.xml | 64 ----
.../resources/requests/CreateVSYS-request.xml | 10 -
.../responses/AddAddressRange-response.xml | 5 -
.../responses/AllocatePublicIP-response.xml | 5 -
.../responses/AttachPublicIP-response.xml | 5 -
.../responses/AttachVDisk-response.xml | 5 -
.../Auth_UserNotInSelectData-response.xml | 5 -
.../resources/responses/BackupEFM-response.xml | 5 -
.../responses/BackupVDisk-response.xml | 5 -
.../responses/CreateAddressPool-response.xml | 5 -
.../resources/responses/CreateEFM-response.xml | 6 -
.../responses/CreateVDisk-response.xml | 6 -
.../resources/responses/CreateVSYS-response.xml | 6 -
.../responses/CreateVServer-response.xml | 6 -
.../responses/DeleteAddressRange-response.xml | 5 -
.../resources/responses/DestroyEFM-response.xml | 5 -
.../responses/DestroyEFMBackup-response.xml | 5 -
.../responses/DestroyVDisk-response.xml | 5 -
.../responses/DestroyVDiskBackup-response.xml | 5 -
.../responses/DestroyVServer-response.xml | 5 -
.../responses/DetachPublicIP-response.xml | 5 -
.../responses/DetachVDisk-response.xml | 5 -
.../responses/FreePublicIP-response.xml | 5 -
.../responses/GetAddressRange-response.xml | 12 -
.../GetDiskImageAttributes-response.xml | 16 -
.../responses/GetEFMAttributes-response.xml | 11 -
.../responses/GetEFMStatus-response.xml | 6 -
.../responses/GetEventLog-response.xml | 5 -
.../GetPerformanceInformation-response.xml | 9 -
.../GetPublicIPAttributes-response.xml | 11 -
.../responses/GetPublicIPStatus-response.xml | 6 -
.../responses/GetVDiskAttributes-response.xml | 12 -
.../responses/GetVDiskStatus-response.xml | 6 -
.../responses/GetVSYSAttributes-response.xml | 12 -
.../responses/GetVSYSConfiguration-response.xml | 78 -----
.../GetVSYSDescriptorConfiguration-response.xml | 21 --
.../responses/GetVSYSStatus-response.xml | 6 -
.../responses/GetVServerAttributes-response.xml | 12 -
.../GetVServerConfiguration-response.xml | 40 ---
.../GetVServerInitialPassword-response.xml | 6 -
.../responses/GetVServerStatus-response.xml | 6 -
.../IllegalState_ALREADY_STOPPED-response.xml | 5 -
.../IllegalState_RECONFIG_ING-response.xml | 5 -
.../responses/IllegalState_RUNNING-response.xml | 5 -
.../responses/ListDiskImage-response.xml | 18 --
.../responses/ListDiskImages-response.xml | 118 --------
.../resources/responses/ListEFM-response.xml | 13 -
.../responses/ListEFMBackup-response.xml | 15 -
.../responses/ListPublicIP-response.xml | 17 --
.../ListPublicIP_one_vsys-response.xml | 17 --
.../responses/ListServerType-response.xml | 82 ------
.../resources/responses/ListVDisk-response.xml | 14 -
.../resources/responses/ListVSYS-response.xml | 21 --
.../responses/ListVServer-response.xml | 21 --
.../responses/RESOURCE_NOT_FOUND-response.xml | 5 -
.../resources/responses/RestoreEFM-response.xml | 5 -
.../responses/RestoreVDisk-response.xml | 5 -
.../resources/responses/StartEFM-response.xml | 5 -
.../responses/StartVServer-response.xml | 5 -
.../resources/responses/StopEFM-response.xml | 5 -
.../responses/StopVServer-response.xml | 5 -
.../responses/UnregisterDiskImage-response.xml | 5 -
...UnregisterPrivateVSYSDescriptor-response.xml | 5 -
.../UnregisterVSYSDescriptor-response.xml | 5 -
.../UpdateDiskImageAttribute-response.xml | 5 -
.../responses/UpdateEFMAttribute-response.xml | 5 -
.../responses/UpdateVDiskAttribute-response.xml | 5 -
.../UpdateVSYSDescriptorAttribute-response.xml | 5 -
.../UpdateVServerAttribute-response.xml | 5 -
pom.xml | 3 -
232 files changed, 14232 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp-au/pom.xml
----------------------------------------------------------------------
diff --git a/fgcp-au/pom.xml b/fgcp-au/pom.xml
deleted file mode 100644
index f27ca7c..0000000
--- a/fgcp-au/pom.xml
+++ /dev/null
@@ -1,160 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>jclouds-labs</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <!-- TODO: when out of labs, switch to org.jclouds.provider -->
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>fgcp-au</artifactId>
- <name>jclouds Fujitsu Global Cloud Platform AU provider</name>
- <description>jclouds components to access Fujitsu Global Cloud Platform in Australia</description>
- <url>http://globalcloud.fujitsu.com.au</url>
-
- <packaging>bundle</packaging>
-
- <developers>
- <developer>
- <name>Dies Koper</name>
- <id>dkoper</id>
- <email>diesk -at- fast -dot- au -dot- fujitsu -dot- com</email>
- <organization>Fujitsu</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>+10</timezone>
- </developer>
- </developers>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <test.fgcp-au.endpoint>https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint</test.fgcp-au.endpoint>
- <test.fgcp-au.apiversion>2011-01-31</test.fgcp-au.apiversion>
- <test.fgcp-au.build-version />
- <test.fgcp-au.identity>fgcp-id</test.fgcp-au.identity>
- <test.fgcp-au.credential>fgcp-cred</test.fgcp-au.credential>
- <test.fgcp-au.image-id />
- <test.fgcp-au.image.login-user />
- <test.fgcp-au.image.authenticate-sudo />
- <jclouds.osgi.export>org.jclouds.fujitsu.fgcp*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.labs*;version="${project.version}",
- org.jclouds.providers*;version="${jclouds.version}",
- *
- </jclouds.osgi.import>
- </properties>
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>fgcp</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>fgcp</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <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.fgcp-au.identity>${test.fgcp-au.identity}</test.fgcp-au.identity>
- <test.fgcp-au.credential>${test.fgcp-au.credential}</test.fgcp-au.credential>
- <test.fgcp-au.endpoint>${test.fgcp-au.endpoint}</test.fgcp-au.endpoint>
- <test.fgcp-au.apiversion>${test.fgcp-au.apiversion}</test.fgcp-au.apiversion>
- <test.fgcp-au.build-version>${test.fgcp-au.build-version}</test.fgcp-au.build-version>
- <test.fgcp-au.image-id>${test.fgcp-au.image-id}</test.fgcp-au.image-id>
- <test.fgcp-au.image.login-user>${test.fgcp-au.image.login-user}</test.fgcp-au.image.login-user>
- <test.fgcp-au.image.authenticate-sudo>${test.fgcp-au.image.authenticate-sudo}</test.fgcp-au.image.authenticate-sudo>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp-au/src/main/java/org/jclouds/fujitsu/fgcp/FGCPAUProviderMetadata.java
----------------------------------------------------------------------
diff --git a/fgcp-au/src/main/java/org/jclouds/fujitsu/fgcp/FGCPAUProviderMetadata.java b/fgcp-au/src/main/java/org/jclouds/fujitsu/fgcp/FGCPAUProviderMetadata.java
deleted file mode 100644
index 1336851..0000000
--- a/fgcp-au/src/main/java/org/jclouds/fujitsu/fgcp/FGCPAUProviderMetadata.java
+++ /dev/null
@@ -1,73 +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.fujitsu.fgcp;
-
-import java.net.URI;
-
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-
-/**
- * Implementation of {@link org.jclouds.providers.ProviderMetadata} for FGCP.
- */
-public class FGCPAUProviderMetadata extends FGCPProviderMetadata {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public FGCPAUProviderMetadata() {
- super(builder());
- }
-
- public FGCPAUProviderMetadata(Builder builder) {
- super(builder);
- }
-
- @Override
- public Builder toBuilder() {
- return builder().fromProviderMetadata(this);
- }
-
- public static class Builder extends BaseProviderMetadata.Builder {
-
- protected Builder() {
- id("fgcp-au")
- .name("Fujitsu Global Cloud Platform (FGCP) - AU")
- .apiMetadata(new FGCPApiMetadata())
- .homepage(
- URI.create("http://www.fujitsu.com/global/solutions/cloud/solutions/global-cloud-platform/index.html"))
- .console(URI.create("http://globalcloud.fujitsu.com.au"))
- .defaultProperties(FGCPApiMetadata.defaultProperties())
- .iso3166Codes("AU-NSW")
- .endpoint(
- "https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint")
- .defaultProperties(FGCPProviderMetadata.defaultProperties());
- }
-
- @Override
- public FGCPAUProviderMetadata build() {
- return new FGCPAUProviderMetadata(this);
- }
-
- @Override
- public Builder fromProviderMetadata(ProviderMetadata in) {
- super.fromProviderMetadata(in);
- return this;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp-au/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/fgcp-au/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/fgcp-au/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 83cbc20..0000000
--- a/fgcp-au/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.fujitsu.fgcp.FGCPAUProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp-au/src/test/java/org/jclouds/fujitsu/fgcp/FGCPAUProviderTest.java
----------------------------------------------------------------------
diff --git a/fgcp-au/src/test/java/org/jclouds/fujitsu/fgcp/FGCPAUProviderTest.java b/fgcp-au/src/test/java/org/jclouds/fujitsu/fgcp/FGCPAUProviderTest.java
deleted file mode 100644
index 15cc86c..0000000
--- a/fgcp-au/src/test/java/org/jclouds/fujitsu/fgcp/FGCPAUProviderTest.java
+++ /dev/null
@@ -1,29 +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.fujitsu.fgcp;
-
-import org.jclouds.providers.internal.BaseProviderMetadataTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "FGCPAUProviderTest")
-public class FGCPAUProviderTest extends BaseProviderMetadataTest {
-
- public FGCPAUProviderTest() {
- super(new FGCPAUProviderMetadata(), new FGCPApiMetadata());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp-au/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPAUComputeServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/fgcp-au/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPAUComputeServiceLiveTest.java b/fgcp-au/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPAUComputeServiceLiveTest.java
deleted file mode 100644
index cb36f83..0000000
--- a/fgcp-au/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPAUComputeServiceLiveTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.fujitsu.fgcp.compute;
-
-import org.testng.annotations.Test;
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "FGCPAUComputeServiceLiveTest")
-public class FGCPAUComputeServiceLiveTest extends FGCPBaseComputeServiceLiveTest {
-
- @Override
- @Test(enabled = false)
- public void setServiceDefaults() {
- provider = "fgcp-au";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp-au/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPAUTemplateBuilderLiveTest.java
----------------------------------------------------------------------
diff --git a/fgcp-au/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPAUTemplateBuilderLiveTest.java b/fgcp-au/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPAUTemplateBuilderLiveTest.java
deleted file mode 100644
index 73b6d66..0000000
--- a/fgcp-au/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPAUTemplateBuilderLiveTest.java
+++ /dev/null
@@ -1,37 +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.fujitsu.fgcp.compute;
-
-import java.util.Set;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "FGCPAUTemplateBuilderLiveTest")
-public class FGCPAUTemplateBuilderLiveTest extends
- FGCPBaseTemplateBuilderLiveTest {
-
- public FGCPAUTemplateBuilderLiveTest() {
- provider = "fgcp-au";
- }
-
- @Override
- protected Set<String> getIso3166Codes() {
- return ImmutableSet.<String> of("AU-NSW");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp-de/pom.xml
----------------------------------------------------------------------
diff --git a/fgcp-de/pom.xml b/fgcp-de/pom.xml
deleted file mode 100644
index 9c308b8..0000000
--- a/fgcp-de/pom.xml
+++ /dev/null
@@ -1,160 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>jclouds-labs</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <!-- TODO: when out of labs, switch to org.jclouds.provider -->
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>fgcp-de</artifactId>
- <name>jclouds Fujitsu Global Cloud Platform DE provider</name>
- <description>jclouds components to access Fujitsu Global Cloud Platform in Germany</description>
- <url>http://globalcloud.de.fujitsu.com</url>
-
- <packaging>bundle</packaging>
-
- <developers>
- <developer>
- <name>Dies Koper</name>
- <id>dkoper</id>
- <email>diesk -at- fast -dot- au -dot- fujitsu -dot- com</email>
- <organization>Fujitsu</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>+10</timezone>
- </developer>
- </developers>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <test.fgcp-de.endpoint>https://api.globalcloud.de.fujitsu.com/ovissapi/endpoint</test.fgcp-de.endpoint>
- <test.fgcp-de.apiversion>2011-01-31</test.fgcp-de.apiversion>
- <test.fgcp-de.build-version />
- <test.fgcp-de.identity>fgcp-id</test.fgcp-de.identity>
- <test.fgcp-de.credential>fgcp-cred</test.fgcp-de.credential>
- <test.fgcp-de.image-id />
- <test.fgcp-de.image.login-user />
- <test.fgcp-de.image.authenticate-sudo />
- <jclouds.osgi.export>org.jclouds.fujitsu.fgcp*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.labs*;version="${project.version}",
- org.jclouds.providers*;version="${jclouds.version}",
- *
- </jclouds.osgi.import>
- </properties>
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>fgcp</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>fgcp</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <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.fgcp-de.identity>${test.fgcp-de.identity}</test.fgcp-de.identity>
- <test.fgcp-de.credential>${test.fgcp-de.credential}</test.fgcp-de.credential>
- <test.fgcp-de.endpoint>${test.fgcp-de.endpoint}</test.fgcp-de.endpoint>
- <test.fgcp-de.apiversion>${test.fgcp-de.apiversion}</test.fgcp-de.apiversion>
- <test.fgcp-de.build-version>${test.fgcp-de.build-version}</test.fgcp-de.build-version>
- <test.fgcp-de.image-id>${test.fgcp-de.image-id}</test.fgcp-de.image-id>
- <test.fgcp-de.image.login-user>${test.fgcp-de.image.login-user}</test.fgcp-de.image.login-user>
- <test.fgcp-de.image.authenticate-sudo>${test.fgcp-de.image.authenticate-sudo}</test.fgcp-de.image.authenticate-sudo>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp-de/src/main/java/org/jclouds/fujitsu/fgcp/FGCPDEProviderMetadata.java
----------------------------------------------------------------------
diff --git a/fgcp-de/src/main/java/org/jclouds/fujitsu/fgcp/FGCPDEProviderMetadata.java b/fgcp-de/src/main/java/org/jclouds/fujitsu/fgcp/FGCPDEProviderMetadata.java
deleted file mode 100644
index d2ff50d..0000000
--- a/fgcp-de/src/main/java/org/jclouds/fujitsu/fgcp/FGCPDEProviderMetadata.java
+++ /dev/null
@@ -1,73 +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.fujitsu.fgcp;
-
-import java.net.URI;
-
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-
-/**
- * Implementation of {@link org.jclouds.providers.ProviderMetadata} for FGCP.
- */
-public class FGCPDEProviderMetadata extends FGCPProviderMetadata {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public FGCPDEProviderMetadata() {
- super(builder());
- }
-
- public FGCPDEProviderMetadata(Builder builder) {
- super(builder);
- }
-
- @Override
- public Builder toBuilder() {
- return builder().fromProviderMetadata(this);
- }
-
- public static class Builder extends BaseProviderMetadata.Builder {
-
- protected Builder() {
- id("fgcp-de")
- .name("Fujitsu Global Cloud Platform (FGCP) - DE")
- .apiMetadata(new FGCPApiMetadata())
- .homepage(
- URI.create("http://www.fujitsu.com/global/solutions/cloud/solutions/global-cloud-platform/index.html"))
- .console(URI.create("http://globalcloud.de.fujitsu.com"))
- .defaultProperties(FGCPApiMetadata.defaultProperties())
- .iso3166Codes("DE-BY")
- .endpoint(
- "https://api.globalcloud.de.fujitsu.com/ovissapi/endpoint")
- .defaultProperties(FGCPProviderMetadata.defaultProperties());
- }
-
- @Override
- public FGCPDEProviderMetadata build() {
- return new FGCPDEProviderMetadata(this);
- }
-
- @Override
- public Builder fromProviderMetadata(ProviderMetadata in) {
- super.fromProviderMetadata(in);
- return this;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp-de/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/fgcp-de/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/fgcp-de/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 9e952cb..0000000
--- a/fgcp-de/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.fujitsu.fgcp.FGCPDEProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp-de/src/test/java/org/jclouds/fujitsu/fgcp/FGCPDEProviderTest.java
----------------------------------------------------------------------
diff --git a/fgcp-de/src/test/java/org/jclouds/fujitsu/fgcp/FGCPDEProviderTest.java b/fgcp-de/src/test/java/org/jclouds/fujitsu/fgcp/FGCPDEProviderTest.java
deleted file mode 100644
index 23bd52f..0000000
--- a/fgcp-de/src/test/java/org/jclouds/fujitsu/fgcp/FGCPDEProviderTest.java
+++ /dev/null
@@ -1,29 +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.fujitsu.fgcp;
-
-import org.jclouds.providers.internal.BaseProviderMetadataTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "FGCPDEProviderTest")
-public class FGCPDEProviderTest extends BaseProviderMetadataTest {
-
- public FGCPDEProviderTest() {
- super(new FGCPDEProviderMetadata(), new FGCPApiMetadata());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp-de/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPDEComputeServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/fgcp-de/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPDEComputeServiceLiveTest.java b/fgcp-de/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPDEComputeServiceLiveTest.java
deleted file mode 100644
index 3f3e433..0000000
--- a/fgcp-de/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPDEComputeServiceLiveTest.java
+++ /dev/null
@@ -1,32 +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.fujitsu.fgcp.compute;
-
-
-import org.testng.annotations.Test;
-
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "FGCPDEComputeServiceLiveTest")
-public class FGCPDEComputeServiceLiveTest extends FGCPBaseComputeServiceLiveTest {
-
- @Override
- @Test(enabled = false)
- public void setServiceDefaults() {
- provider = "fgcp-de";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp-de/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPDETemplateBuilderLiveTest.java
----------------------------------------------------------------------
diff --git a/fgcp-de/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPDETemplateBuilderLiveTest.java b/fgcp-de/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPDETemplateBuilderLiveTest.java
deleted file mode 100644
index 017b757..0000000
--- a/fgcp-de/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPDETemplateBuilderLiveTest.java
+++ /dev/null
@@ -1,37 +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.fujitsu.fgcp.compute;
-
-import java.util.Set;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "FGCPDETemplateBuilderLiveTest")
-public class FGCPDETemplateBuilderLiveTest extends
- FGCPBaseTemplateBuilderLiveTest {
-
- public FGCPDETemplateBuilderLiveTest() {
- provider = "fgcp-de";
- }
-
- @Override
- protected Set<String> getIso3166Codes() {
- return ImmutableSet.<String> of("DE-BY");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/pom.xml
----------------------------------------------------------------------
diff --git a/fgcp/pom.xml b/fgcp/pom.xml
deleted file mode 100644
index 7ad84f0..0000000
--- a/fgcp/pom.xml
+++ /dev/null
@@ -1,154 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>jclouds-labs</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <!-- TODO: when out of labs, switch to org.jclouds.api -->
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>fgcp</artifactId>
- <name>jclouds Fujitsu Global Cloud Platform</name>
- <description>jclouds components to access Fujitsu Global Cloud Platform</description>
-
- <packaging>bundle</packaging>
-
- <developers>
- <developer>
- <name>Dies Koper</name>
- <id>dkoper</id>
- <email>diesk -at- fast -dot- au -dot- fujitsu -dot- com</email>
- <organization>Fujitsu</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>+10</timezone>
- </developer>
- </developers>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <test.fgcp-au.endpoint>https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint</test.fgcp-au.endpoint>
- <test.fgcp-au.apiversion>2011-01-31</test.fgcp-au.apiversion>
- <test.fgcp-au.build-version />
- <test.fgcp-au.identity>fgcp-id</test.fgcp-au.identity>
- <test.fgcp-au.credential>fgcp-cred</test.fgcp-au.credential>
- <test.fgcp-au.image-id>IMG_3c9820_S24FWXU0Q9VH0JK</test.fgcp-au.image-id><!-- CentOS 6.2 64bit(EN) in AU -->
- <test.fgcp-au.image.login-user />
- <test.fgcp-au.image.authenticate-sudo />
- <jclouds.osgi.export>org.jclouds.fujitsu.fgcp*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${jclouds.version}",
- org.jclouds.rest.internal;version="${jclouds.version}",
- org.jclouds.labs*;version="${project.version}",
- org.jclouds*;version="${jclouds.version}",
- *
- </jclouds.osgi.import>
- </properties>
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </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.fgcp-au.identity>${test.fgcp-au.identity}</test.fgcp-au.identity>
- <test.fgcp-au.credential>${test.fgcp-au.credential}</test.fgcp-au.credential>
- <test.fgcp-au.endpoint>${test.fgcp-au.endpoint}</test.fgcp-au.endpoint>
- <test.fgcp-au.apiversion>${test.fgcp-au.apiversion}</test.fgcp-au.apiversion>
- <test.fgcp-au.build-version>${test.fgcp-au.build-version}</test.fgcp-au.build-version>
- <test.fgcp-au.image-id>${test.fgcp-au.image-id}</test.fgcp-au.image-id>
- <test.fgcp-au.image.login-user>${test.fgcp-au.image.login-user}</test.fgcp-au.image.login-user>
- <test.fgcp-au.image.authenticate-sudo>${test.fgcp-au.image.authenticate-sudo}</test.fgcp-au.image.authenticate-sudo>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPApi.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPApi.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPApi.java
deleted file mode 100644
index df67202..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPApi.java
+++ /dev/null
@@ -1,64 +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.fujitsu.fgcp;
-
-import java.io.Closeable;
-
-import org.jclouds.fujitsu.fgcp.services.AdditionalDiskApi;
-import org.jclouds.fujitsu.fgcp.services.DiskImageApi;
-import org.jclouds.fujitsu.fgcp.services.FirewallApi;
-import org.jclouds.fujitsu.fgcp.services.LoadBalancerApi;
-import org.jclouds.fujitsu.fgcp.services.PublicIPAddressApi;
-import org.jclouds.fujitsu.fgcp.services.SystemTemplateApi;
-import org.jclouds.fujitsu.fgcp.services.VirtualDCApi;
-import org.jclouds.fujitsu.fgcp.services.VirtualServerApi;
-import org.jclouds.fujitsu.fgcp.services.VirtualSystemApi;
-import org.jclouds.rest.annotations.Delegate;
-
-/**
- * Provides access to FGCP services.
- */
-public interface FGCPApi extends Closeable {
- String VERSION = "2012-02-18";
-
- @Delegate
- VirtualDCApi getVirtualDCApi();
-
- @Delegate
- VirtualSystemApi getVirtualSystemApi();
-
- @Delegate
- VirtualServerApi getVirtualServerApi();
-
- @Delegate
- AdditionalDiskApi getAdditionalDiskApi();
-
- @Delegate
- SystemTemplateApi getSystemTemplateApi();
-
- @Delegate
- DiskImageApi getDiskImageApi();
-
- @Delegate
- FirewallApi getFirewallApi();
-
- @Delegate
- LoadBalancerApi getLoadBalancerApi();
-
- @Delegate
- PublicIPAddressApi getPublicIPAddressApi();
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPApiMetadata.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPApiMetadata.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPApiMetadata.java
deleted file mode 100644
index f163b01..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPApiMetadata.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.fujitsu.fgcp;
-
-import static org.jclouds.reflect.Reflection2.typeToken;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.Constants;
-import org.jclouds.compute.ComputeServiceContext;
-import org.jclouds.fujitsu.fgcp.compute.config.FGCPComputeServiceContextModule;
-import org.jclouds.fujitsu.fgcp.config.FGCPHttpApiModule;
-import org.jclouds.rest.internal.BaseHttpApiMetadata;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-
-/**
- * Implementation of {@link ApiMetadata} for Fujitsu's Global Cloud Platform (FGCP)
- */
-public class FGCPApiMetadata extends BaseHttpApiMetadata<FGCPApi> {
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromApiMetadata(this);
- }
-
- public FGCPApiMetadata() {
- this(new Builder());
- }
-
- protected FGCPApiMetadata(Builder builder) {
- super(builder);
- }
-
- public static Properties defaultProperties() {
- Properties properties = BaseHttpApiMetadata.defaultProperties();
- // enables peer verification using the CAs bundled with the JRE (or
- // value of javax.net.ssl.trustStore if set)
- properties.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "false");
- // create/delete operations on resources in the same system in FGCP are not
- // allowed to run simultaneously: the 2nd operation will get an error.
- // Tuning retry parameters accordingly:
- properties.setProperty(Constants.PROPERTY_RETRY_DELAY_START, "10000L"); // 10 sec.
- properties.setProperty(Constants.PROPERTY_MAX_RETRIES, "100"); // means 1000s (17min) timeout
- return properties;
- }
-
- public static class Builder extends BaseHttpApiMetadata.Builder<FGCPApi, Builder> {
-
- protected Builder() {
- id("fgcp")
- .name("Fujitsu Global Cloud Platform (FGCP)")
- .identityName("user name (not used)")
- .credentialName("PEM converted from UserCert.p12")
- .documentation(
- URI.create("https://globalcloud.fujitsu.com.au/portala/ctrl/aboutSopManual"))
- .version(FGCPApi.VERSION)
- .defaultEndpoint(
- "https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint")
- .defaultProperties(FGCPApiMetadata.defaultProperties())
- .view(typeToken(ComputeServiceContext.class))
- .defaultModules(
- ImmutableSet.<Class<? extends Module>> of(
- FGCPComputeServiceContextModule.class,
- FGCPHttpApiModule.class));
- }
-
- @Override
- public FGCPApiMetadata build() {
- return new FGCPApiMetadata(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java
deleted file mode 100644
index 70fe72b..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java
+++ /dev/null
@@ -1,108 +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.fujitsu.fgcp;
-
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
-import java.util.Collection;
-
-import org.jclouds.domain.Credentials;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
-
-/**
- * Credentials for the FGCP that include a private key to sign the access key id
- * and its chain of certificates for HTTPS client authentication.
- */
-public class FGCPCredentials extends Credentials {
- public final PrivateKey privateKey;
- public final Collection<X509Certificate> certificates;
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return builder().fromFGCPCredentials(this);
- }
-
- public FGCPCredentials(String identity, String credential, PrivateKey privateKey, Collection<X509Certificate> certs) {
- super(identity, credential);
- this.privateKey = privateKey;
- certificates = certs;
- }
-
- public static class Builder extends Credentials.Builder<FGCPCredentials> {
- protected PrivateKey privateKey;
- protected Collection<X509Certificate> certificates;
-
- public Builder identity(String identity) {
- this.identity = identity;
- return this;
- }
-
- public Builder credential(String credential) {
- this.credential = Preconditions.checkNotNull(credential, "credential");
- return this;
- }
-
- public Builder privateKey(PrivateKey privateKey) {
- this.privateKey = Preconditions.checkNotNull(privateKey);
- return this;
- }
-
- public Builder certificates(Collection<X509Certificate> certs) {
- certificates = Preconditions.checkNotNull(certs);
- return this;
- }
-
- public FGCPCredentials build() {
- return new FGCPCredentials(identity, Preconditions.checkNotNull(credential), privateKey, certificates);
- }
-
- public Builder fromFGCPCredentials(FGCPCredentials credentials) {
- return (new Builder()).certificates(credentials.certificates).privateKey(credentials.privateKey)
- .identity(credentials.identity).credential(credentials.credential);
- }
- }
-
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass()) {
- return false;
- } else {
- FGCPCredentials other = (FGCPCredentials) obj;
- return Objects.equal(identity, other.identity) && Objects.equal(credential, other.credential)
- && Objects.equal(privateKey, other.privateKey) && Objects.equal(certificates, other.certificates);
- }
- }
-
- public int hashCode() {
- return Objects.hashCode(new Object[] { identity, credential, privateKey, certificates });
- }
-
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("identity", identity)
- .add("credential", credential == null ? null : ((Object) (Integer.valueOf(credential.hashCode()))))
- .add("privateKey", privateKey.hashCode()).add("certificates", certificates.hashCode()).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPProviderMetadata.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPProviderMetadata.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPProviderMetadata.java
deleted file mode 100644
index 1c39ea2..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPProviderMetadata.java
+++ /dev/null
@@ -1,53 +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.fujitsu.fgcp;
-
-import static org.jclouds.compute.config.ComputeServiceProperties.TEMPLATE;
-
-import java.util.Properties;
-
-import org.jclouds.compute.config.ComputeServiceProperties;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-
-/**
- * Base implementation of {@link org.jclouds.providers.ProviderMetadata} for FGCP.
- */
-public class FGCPProviderMetadata extends BaseProviderMetadata {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public FGCPProviderMetadata() {
- super(builder());
- }
-
- public FGCPProviderMetadata(Builder builder) {
- super(builder);
- }
-
- public static Properties defaultProperties() {
- Properties properties = new Properties();
- properties.setProperty(TEMPLATE, "osFamily=CENTOS,osVersionMatches=6.2,os64Bit=true");
- properties.setProperty(ComputeServiceProperties.POLL_INITIAL_PERIOD, 5 * 1000L + ""); // 5 sec.
- properties.setProperty(ComputeServiceProperties.POLL_MAX_PERIOD, 20 * 1000L + ""); // 20 sec.
- // (clean) node shutdown time depends on what's running inside, so give it enough time
- properties.setProperty(ComputeServiceProperties.TIMEOUT_NODE_SUSPENDED, 6 * 60 * 1000L + ""); // 6 min.
-
- return properties;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/binders/BindAlsoToSystemId.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/binders/BindAlsoToSystemId.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/binders/BindAlsoToSystemId.java
deleted file mode 100644
index 5b5fd0b..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/binders/BindAlsoToSystemId.java
+++ /dev/null
@@ -1,66 +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.fujitsu.fgcp.binders;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpRequest.Builder;
-import org.jclouds.rest.Binder;
-
-/**
- * Adds system id to resource id and binds them to query parameters
- */
-@Singleton
-public class BindAlsoToSystemId implements Binder {
-
- /**
- *
- * @param request
- * request where the query params will be set
- * @param input
- * array of String params
- */
- @SuppressWarnings("unchecked")
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object input) {
-
- checkNotNull(input);
- checkArgument(
- input instanceof String,
- "this binder only applies to String arguments: "
- + input.getClass());
-
- Pattern pattern = Pattern.compile("^(\\w+-\\w+)\\b.*");
- Matcher matcher = pattern.matcher((String) input);
-
- checkArgument(matcher.find(),
- "no valid resource id found to construct vsys id from: "
- + input.toString());
-
- Builder<?> builder = request.toBuilder();
- builder.replaceQueryParam("vsysId", matcher.group(1));
-
- return (R) builder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/config/FGCPComputeServiceContextModule.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/config/FGCPComputeServiceContextModule.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/config/FGCPComputeServiceContextModule.java
deleted file mode 100644
index 38b5c83..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/config/FGCPComputeServiceContextModule.java
+++ /dev/null
@@ -1,136 +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.fujitsu.fgcp.compute.config;
-
-import org.jclouds.compute.ComputeServiceAdapter;
-import org.jclouds.compute.config.ComputeServiceAdapterContextModule;
-import org.jclouds.compute.domain.Hardware;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.domain.Processor;
-import org.jclouds.compute.domain.Volume;
-import org.jclouds.compute.options.TemplateOptions;
-import org.jclouds.domain.Location;
-import org.jclouds.fujitsu.fgcp.compute.functions.CPUToProcessor;
-import org.jclouds.fujitsu.fgcp.compute.functions.DiskImageToImage;
-import org.jclouds.fujitsu.fgcp.compute.functions.DiskImageToOperatingSystem;
-import org.jclouds.fujitsu.fgcp.compute.functions.DiskToVolume;
-import org.jclouds.fujitsu.fgcp.compute.functions.ServerTypeToHardware;
-import org.jclouds.fujitsu.fgcp.compute.functions.VServerMetadataToNodeMetadata;
-import org.jclouds.fujitsu.fgcp.compute.options.FGCPTemplateOptions;
-import org.jclouds.fujitsu.fgcp.compute.strategy.FGCPComputeServiceAdapter;
-import org.jclouds.fujitsu.fgcp.compute.strategy.VServerMetadata;
-import org.jclouds.fujitsu.fgcp.domain.CPU;
-import org.jclouds.fujitsu.fgcp.domain.Disk;
-import org.jclouds.fujitsu.fgcp.domain.DiskImage;
-import org.jclouds.fujitsu.fgcp.domain.ServerType;
-import org.jclouds.functions.IdentityFunction;
-
-import com.google.common.base.Function;
-import com.google.inject.TypeLiteral;
-//import org.jclouds.fujitsu.fgcp.compute.predicates.ServerStopped;
-
-/**
- * Added in FGCPContextBuilder
- */
-public class FGCPComputeServiceContextModule
- extends
- ComputeServiceAdapterContextModule<VServerMetadata, ServerType, DiskImage, Location> {
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- @Override
- protected void configure() {
- super.configure();
- // installDependencies();
-
- bind(
- new TypeLiteral<ComputeServiceAdapter<VServerMetadata, ServerType, DiskImage, Location>>() {
- }).to(FGCPComputeServiceAdapter.class);
-
- // the following bind functions that map FGCP domain specific resources
- // to jclouds'
- bind(new TypeLiteral<Function<VServerMetadata, NodeMetadata>>() {
- }).to(VServerMetadataToNodeMetadata.class);
- bind(new TypeLiteral<Function<DiskImage, Image>>() {
- }).to(DiskImageToImage.class);
- bind(new TypeLiteral<Function<DiskImage, OperatingSystem>>() {
- }).to(DiskImageToOperatingSystem.class);
- bind(new TypeLiteral<Function<ServerType, Hardware>>() {
- }).to(ServerTypeToHardware.class);
- bind(new TypeLiteral<Function<Disk, Volume>>() {
- }).to(DiskToVolume.class);
- bind(new TypeLiteral<Function<CPU, Processor>>() {
- }).to(CPUToProcessor.class);
-
- // we aren't converting hardware from a provider-specific type
- bind(new TypeLiteral<Function<Location, Location>>() {
- }).to((Class) IdentityFunction.class);
- bind(new TypeLiteral<Function<Hardware, Hardware>>() {
- }).to((Class) IdentityFunction.class);
-
- bind(TemplateOptions.class).to(FGCPTemplateOptions.class);
-
-
- // bind(new TypeLiteral<Predicate<String>>() {
- // }).to((Class) ServerStopped.class);
-
- // need to look into the following later for to map (create) jclouds'
- // location to FGCP.
- // see LocationScope:
- // PROVIDER: FGCP
- // REGION: country?/country+state?
- // ZONE: virtual DC: contractId
- // NETWORK: VSYS? DMZ/SECURE1/SECURE2?
- // RACK: N/A?
- // HOST: N/A?
- // there are no locations except the provider
- // bind(new TypeLiteral<Supplier<Location>>() {
- // }).to(OnlyLocationOrFirstZone.class);
-
- // install(new FGCPBindComputeStrategiesByClass());
- // install(new FGCPBindComputeSuppliersByClass());
- // bind(ReviseParsedImage.class).to(AWSEC2ReviseParsedImage.class);
- // bind(CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class).to(
- // CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class);
- // bind(EC2HardwareSupplier.class).to(AWSEC2HardwareSupplier.class);
- // bind(EC2TemplateBuilderImpl.class).to(AWSEC2TemplateBuilderImpl.class);
- // bind(EC2GetNodeMetadataStrategy.class).to(AWSEC2GetNodeMetadataStrategy.class);
- // bind(InstancePresent.class).to(AWSEC2InstancePresent.class);
- // bind(EC2CreateNodesInGroupThenAddToSet.class).to(AWSEC2CreateNodesInGroupThenAddToSet.class);
- // bind(RunningInstanceToNodeMetadata.class).to(AWSRunningInstanceToNodeMetadata.class);
- }
-
- // @Provides
- // @Singleton
- // @Named("SECURITY")
- // protected Predicate<String> provideServerStopped(ServerStopped
- // serverStopped, Timeouts timeouts) {
- // return RetryablePredicate.create(serverStopped,
- // timeouts.nodeSuspended);
- // }
-
- protected void installDependencies() {
- // install(new FGCPComputeServiceDependenciesModule());
- }
-
- /*
- * @Override protected TemplateBuilder provideTemplate(Injector injector,
- * TemplateBuilder template) { return
- * template.osFamily(CENTOS).os64Bit(true); }
- */
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/CPUToProcessor.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/CPUToProcessor.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/CPUToProcessor.java
deleted file mode 100644
index dc94de0..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/CPUToProcessor.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.fujitsu.fgcp.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.inject.Singleton;
-
-import org.jclouds.compute.domain.Processor;
-import org.jclouds.fujitsu.fgcp.domain.CPU;
-
-import com.google.common.base.Function;
-
-/**
- * Created by IntelliJ IDEA.
- */
-@Singleton
-public class CPUToProcessor implements Function<CPU, Processor> {
-
- @Override
- public Processor apply(CPU cpu) {
- checkNotNull(cpu, "cpu");
-
- return new Processor(Double.valueOf(cpu.getCores()), Double.valueOf(cpu
- .getSpeedPerCore()));
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskImageToImage.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskImageToImage.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskImageToImage.java
deleted file mode 100644
index 4f884b5..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskImageToImage.java
+++ /dev/null
@@ -1,64 +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.fujitsu.fgcp.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.Image.Status;
-import org.jclouds.compute.domain.ImageBuilder;
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.domain.LoginCredentials;
-import org.jclouds.fujitsu.fgcp.domain.DiskImage;
-
-import com.google.common.base.Function;
-
-/**
- * Created by IntelliJ IDEA.
- */
-@Singleton
-public class DiskImageToImage implements Function<DiskImage, Image> {
-
- private final DiskImageToOperatingSystem diskImageToOperatingSystem;
-
- @Inject
- public DiskImageToImage(DiskImageToOperatingSystem diskImageToOperatingSystem) {
- this.diskImageToOperatingSystem = checkNotNull(diskImageToOperatingSystem, "diskImageToOperatingSystem");
- }
-
- @Override
- public Image apply(DiskImage from) {
- checkNotNull(from, "disk image");
-
- ImageBuilder builder = new ImageBuilder();
-
- builder.ids(from.getId());
- builder.name(from.getName());
- builder.description(from.getDescription());
- // in fgcp, if the image is listed it is available
- builder.status(Status.AVAILABLE);
- OperatingSystem os = diskImageToOperatingSystem.apply(from);
- builder.operatingSystem(os);
- String user = os.getFamily() == OsFamily.WINDOWS ? "Administrator" : "root";
- builder.defaultCredentials(LoginCredentials.builder().identity(user).noPassword().build());
- return builder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskImageToOperatingSystem.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskImageToOperatingSystem.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskImageToOperatingSystem.java
deleted file mode 100644
index 7e4ac3d..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskImageToOperatingSystem.java
+++ /dev/null
@@ -1,67 +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.fujitsu.fgcp.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.inject.Singleton;
-
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.compute.util.ComputeServiceUtils;
-import org.jclouds.fujitsu.fgcp.domain.DiskImage;
-
-import com.google.common.base.Function;
-
-@Singleton
-public class DiskImageToOperatingSystem implements
- Function<DiskImage, OperatingSystem> {
-
- private static final Pattern OS_VERSION_PATTERN = Pattern
- .compile("^.*?(\\d.*)\\s(32|64).*$");
-
- @Override
- public OperatingSystem apply(DiskImage image) {
- checkNotNull(image, "disk image");
-
- // convert to short name rhel to accommodate ComputeServiceUtils
- // conventions
- String shortOsName = image.getOsName().replace(
- "Red Hat Enterprise Linux", "rhel");
- OsFamily osFamily = ComputeServiceUtils
- .parseOsFamilyOrUnrecognized(shortOsName);
- OperatingSystem.Builder builder = OperatingSystem.builder();
-
- builder.name(image.getOsName());
- builder.family(osFamily);
- builder.is64Bit(image.getOsName().contains("64bit")
- || image.getOsName().contains("64 bit")
- || image.getOsName().contains("x64"));
- // OsType returns guest type (hvm, pv), which aws-ec2 is mapping to arch
- builder.arch(image.getOsType());
- Matcher m = OS_VERSION_PATTERN.matcher(image.getOsName());
- if (m.matches()) {
- builder.version(m.group(1));
- }
- builder.description(image.getOsName());
-
- return builder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskToVolume.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskToVolume.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskToVolume.java
deleted file mode 100644
index 28c5d4f..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskToVolume.java
+++ /dev/null
@@ -1,50 +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.fujitsu.fgcp.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.inject.Singleton;
-
-import org.jclouds.compute.domain.Volume;
-import org.jclouds.compute.domain.VolumeBuilder;
-import org.jclouds.fujitsu.fgcp.domain.Disk;
-
-import com.google.common.base.Function;
-
-/**
- * Created by IntelliJ IDEA.
- */
-@Singleton
-public class DiskToVolume implements Function<Disk, Volume> {
-
- @Override
- public Volume apply(Disk disk) {
- checkNotNull(disk, "disk");
-
- VolumeBuilder builder = new VolumeBuilder();
-
- builder.size(1000f * Float.valueOf(disk.getSize()));
- // "Disk"'s are additional disks; they can't be booted disk(?)
- builder.bootDevice(false);
- builder.durable(true);
- builder.type(Volume.Type.SAN);
- builder.id("type: " + disk.getType() + " usage: " + disk.getUsage());
-
- return builder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/ResourceIdToFirewallId.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/ResourceIdToFirewallId.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/ResourceIdToFirewallId.java
deleted file mode 100644
index 8ce27b5..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/ResourceIdToFirewallId.java
+++ /dev/null
@@ -1,47 +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.fujitsu.fgcp.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import com.google.common.base.Function;
-
-/**
- * Determines the id of the firewall associated with a virtual system, server,
- * load balancer or disk.
- */
-@Singleton
-public class ResourceIdToFirewallId implements Function<String, String> {
-
- private ResourceIdToSystemId toSystemId;
-
- @Inject
- private ResourceIdToFirewallId(ResourceIdToSystemId resourceIdToSystemId) {
- this.toSystemId = checkNotNull(resourceIdToSystemId,
- "resourceIdToSystemId");
- }
-
- @Override
- public String apply(String id) {
- checkNotNull(id, "resource id");
-
- return toSystemId.apply(id) + "-S-0001";
- }
-}