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 06:10:36 UTC
[3/8] JCLOUDS-757 drop fgcp provider.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/MapWithStatusResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/MapWithStatusResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/MapWithStatusResponse.java
deleted file mode 100644
index 443ced1..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/MapWithStatusResponse.java
+++ /dev/null
@@ -1,54 +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.xml.internal;
-
-import javax.xml.bind.annotation.XmlElement;
-
-import com.google.common.collect.ForwardingMap;
-
-/**
- * Special base class extending (forwardable) Map with fields for the elements
- * that FGCP XML responses specify.
- * <p>
- * This is useful for methods that return a set of elements that are better
- * represented as key value pairs.
- */
-public abstract class MapWithStatusResponse<K, V> extends ForwardingMap<K, V>
- implements StatusQuerable {
- @XmlElement(required = true)
- private String responseMessage;
- @XmlElement(required = true)
- private String responseStatus;
-
- public String getResponseMessage() {
- return responseMessage;
- }
-
- public String getResponseStatus() {
- return responseStatus;
- }
-
- public boolean isError() {
- return !"SUCCESS".equals(responseStatus);
- }
-
- @Override
- public String toString() {
- return "StatusResponse{" + "responseMessage='" + responseMessage + '\''
- + ", responseStatus='" + responseStatus + '\'' + '}';
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/PublicIPWithSystemId.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/PublicIPWithSystemId.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/PublicIPWithSystemId.java
deleted file mode 100644
index 216960f..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/PublicIPWithSystemId.java
+++ /dev/null
@@ -1,39 +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.xml.internal;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.fujitsu.fgcp.domain.PublicIP;
-
-/**
- * Represents a public IP address with its system id.
- */
-@XmlRootElement(name = "publicip")
-public class PublicIPWithSystemId extends PublicIP {
- private String vsysId;
-
- public String getVsysId() {
- return vsysId;
- }
-
- @Override
- public String toString() {
- return "PublicIP{" + "address='" + address + '\'' + ", IP version='"
- + version + '\'' + ", vsysId='" + vsysId + '\'' + '}';
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/SetWithStatusResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/SetWithStatusResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/SetWithStatusResponse.java
deleted file mode 100644
index 99b0317..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/SetWithStatusResponse.java
+++ /dev/null
@@ -1,54 +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.xml.internal;
-
-import javax.xml.bind.annotation.XmlElement;
-
-import com.google.common.collect.ForwardingSet;
-
-/**
- * Special base class extending (forwardable) Set with fields for the elements
- * that FGCP XML responses specify.
- * <p>
- * This is useful for methods that return a Set and the XML response has no
- * other elements but the set of elements (and message and status of course).
- */
-public abstract class SetWithStatusResponse<T> extends ForwardingSet<T>
- implements StatusQuerable {
- @XmlElement(required = true)
- private String responseMessage;
- @XmlElement(required = true)
- private String responseStatus;
-
- public String getResponseMessage() {
- return responseMessage;
- }
-
- public String getResponseStatus() {
- return responseStatus;
- }
-
- public boolean isError() {
- return !"SUCCESS".equals(responseStatus);
- }
-
- @Override
- public String toString() {
- return delegate().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/SingleElementResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/SingleElementResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/SingleElementResponse.java
deleted file mode 100644
index eec26f5..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/SingleElementResponse.java
+++ /dev/null
@@ -1,25 +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.xml.internal;
-
-/**
- * Wrapper for CreateVSYSResponse.
- */
-public interface SingleElementResponse {
-
- Object getElement();
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/StatusQuerable.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/StatusQuerable.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/StatusQuerable.java
deleted file mode 100644
index 387b297..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/StatusQuerable.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.fujitsu.fgcp.xml.internal;
-
-/**
- * Exposes methods to obtain the status and message from the API server.
- */
-public interface StatusQuerable {
- String getResponseMessage();
-
- String getResponseStatus();
-
- boolean isError();
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/StatusResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/StatusResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/StatusResponse.java
deleted file mode 100644
index 6439e0e..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/StatusResponse.java
+++ /dev/null
@@ -1,57 +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.xml.internal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * Base class with fields for the elements that FGCP XML responses specify.
- */
-@XmlRootElement(name = "OViSSResponse")
-public class StatusResponse implements StatusQuerable {
- @XmlElement(required = true)
- private String responseMessage;
- @XmlElement(required = true)
- private String responseStatus;
-
- public String getResponseMessage() {
- return responseMessage;
- }
-
- public void setResponseMessage(String responseMessage) {
- this.responseMessage = responseMessage;
- }
-
- public String getResponseStatus() {
- return responseStatus;
- }
-
- public void setResponseStatus(String responseStatus) {
- this.responseStatus = responseStatus;
- }
-
- public boolean isError() {
- return !"SUCCESS".equals(responseStatus);
- }
-
- @Override
- public String toString() {
- return "StatusResponse{" + "responseMessage='" + responseMessage + '\''
- + ", responseStatus='" + responseStatus + '\'' + '}';
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/package-info.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/package-info.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/package-info.java
deleted file mode 100644
index 20a4c5b..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-@XmlSchema(namespace = "http://apioviss.jp.fujitsu.com", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-//@XmlJavaTypeAdapter(value=SetOfServerTypesXMLAdapter.class,type= Set.class)
-//@XmlJavaTypeAdapter(value=SetOfServerTypesXMLAdapter.class,type= ListServerTypeResponse.class)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.fujitsu.fgcp.xml.internal;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSchema;
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/fgcp/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/fgcp/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index f2a75c0..0000000
--- a/fgcp/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.fujitsu.fgcp.FGCPApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/main/resources/org/jclouds/fujitsu/fgcp/domain/jaxb.index
----------------------------------------------------------------------
diff --git a/fgcp/src/main/resources/org/jclouds/fujitsu/fgcp/domain/jaxb.index b/fgcp/src/main/resources/org/jclouds/fujitsu/fgcp/domain/jaxb.index
deleted file mode 100644
index ef54f69..0000000
--- a/fgcp/src/main/resources/org/jclouds/fujitsu/fgcp/domain/jaxb.index
+++ /dev/null
@@ -1,62 +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.
-#
-
-#listing of all classes in the domain package (at this time of writing)
-#as some or all are likely to contain JAXB annotations
-#note that even if (newer) classes are missing, as long as they are statically referenced from
-#any of these classes they'll be included in the JAXB context.
-AddressRange
-BuiltinServer
-BuiltinServerStatus
-Cause
-CPU
-Direction
-Disk
-DiskImage
-ErrorStatistics
-EventLog
-Firewall
-Group
-Image
-Information
-IntermediateCACert
-LoadStatistics
-Memory
-NAT
-PerformanceInfo
-Period
-Policy
-Product
-PublicIPStatus
-Rule
-ServerCert
-ServerType
-SLB
-Software
-Target
-UsageInfo
-VDisk
-VDiskStatus
-VNet
-VNIC
-VServer
-VServerStatus
-VServerWithDetails
-VSystem
-VSystemDescriptor
-VSystemStatus
-VSystemWithDetails
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/main/resources/org/jclouds/fujitsu/fgcp/xml/internal/jaxb.index
----------------------------------------------------------------------
diff --git a/fgcp/src/main/resources/org/jclouds/fujitsu/fgcp/xml/internal/jaxb.index b/fgcp/src/main/resources/org/jclouds/fujitsu/fgcp/xml/internal/jaxb.index
deleted file mode 100644
index 0e7c3a9..0000000
--- a/fgcp/src/main/resources/org/jclouds/fujitsu/fgcp/xml/internal/jaxb.index
+++ /dev/null
@@ -1,48 +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.
-#
-
-#listing of all classes in the xml.internal package (at this time of writing)
-CreateVDiskResponse
-CreateEFMResponse
-CreateVServerResponse
-CreateVSYSResponse
-GetAddressRangeResponse
-GetDiskImageAttributesResponse
-GetEFMAttributesResponse
-GetEFMStatusResponse
-GetEventLogResponse
-GetPublicIPAttributesResponse
-GetPublicIPStatusResponse
-GetVDiskAttributesResponse
-GetVServerAttributesResponse
-GetVServerConfigurationResponse
-GetVServerInitialPasswordResponse
-GetVServerStatusResponse
-GetVSYSAttributesResponse
-GetVSYSConfigurationResponse
-GetVSYSDescriptorConfigurationResponse
-GetVSYSStatusResponse
-ListDiskImageResponse
-ListEFMBackupResponse
-ListEFMResponse
-ListPublicIPResponse
-ListServerTypeResponse
-ListVDiskResponse
-ListVServerResponse
-ListVSYSResponse
-PublicIPWithSystemId
-StatusResponse
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/FGCPCredentialsTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/FGCPCredentialsTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/FGCPCredentialsTest.java
deleted file mode 100644
index bca91f1..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/FGCPCredentialsTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.fujitsu.fgcp;
-
-import static com.google.common.base.Suppliers.ofInstance;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import java.io.File;
-import java.io.IOException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import java.security.spec.InvalidKeySpecException;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-
-import org.jclouds.domain.Credentials;
-import org.jclouds.fujitsu.fgcp.suppliers.FGCPCredentialsSupplier;
-import org.jclouds.fujitsu.fgcp.suppliers.FGCPCredentialsSupplier.FGCPCredentialsForCredentials;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit")
-public class FGCPCredentialsTest {
-
- /**
- * Test loading the credentials by extracting a pk from a PKCS12 keystore.
- */
- public static FGCPCredentials loadFGCPCredentials(File pathToPem) throws IOException, NoSuchAlgorithmException,
- CertificateException, InvalidKeySpecException {
- FGCPCredentialsSupplier loader = new FGCPCredentialsSupplier(ofInstance(new Credentials("foo",
- Files.asCharSource(pathToPem, Charsets.UTF_8).read())),
- new FGCPCredentialsForCredentials());
- return loader.get();
- }
-
- public void testLoadPKStringFromTestCert() throws IOException, NoSuchAlgorithmException, KeyStoreException,
- CertificateException, UnrecoverableKeyException, InvalidKeySpecException {
- FGCPCredentials creds = loadFGCPCredentials(new File("src/test/resources/certs/jclouds-test-fgcp.pem"));
- assertNotNull(creds);
- assertEquals(creds.identity, "foo");
- assertNotNull(creds.privateKey);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPApiMetadataTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPApiMetadataTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPApiMetadataTest.java
deleted file mode 100644
index 5c50628..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPApiMetadataTest.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.fujitsu.fgcp.compute;
-
-import org.jclouds.View;
-import org.jclouds.fujitsu.fgcp.FGCPApiMetadata;
-import org.jclouds.rest.internal.BaseHttpApiMetadataTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.reflect.TypeToken;
-
-@Test(groups = "unit", testName = "FGCPApiMetadataTest")
-public class FGCPApiMetadataTest extends BaseHttpApiMetadataTest {
-
- public FGCPApiMetadataTest() {
- super(new FGCPApiMetadata(), ImmutableSet.<TypeToken<? extends View>> of());
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPBaseComputeServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPBaseComputeServiceLiveTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPBaseComputeServiceLiveTest.java
deleted file mode 100644
index 017d27d..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPBaseComputeServiceLiveTest.java
+++ /dev/null
@@ -1,133 +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.Properties;
-
-import org.jclouds.Constants;
-import org.jclouds.compute.domain.ExecResponse;
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.internal.BaseComputeServiceLiveTest;
-import org.jclouds.rest.AuthorizationException;
-import org.jclouds.sshj.config.SshjSshClientModule;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-
-public abstract class FGCPBaseComputeServiceLiveTest extends
- BaseComputeServiceLiveTest {
-
- public FGCPBaseComputeServiceLiveTest() {
- // create operation must complete before start request is sent, taking a
- // few minutes
- nonBlockDurationSeconds = 300; // 5 min.
- }
-
- @Override
- protected Properties setupProperties() {
- Properties overrides = super.setupProperties();
-
- String proxy = System.getenv("http_proxy");
- if (proxy != null) {
-
- String[] parts = proxy.split("http://|:|@");
-
- overrides.setProperty(Constants.PROPERTY_PROXY_HOST, parts[parts.length - 2]);
- overrides.setProperty(Constants.PROPERTY_PROXY_PORT, parts[parts.length - 1]);
-
- if (parts.length >= 4) {
- overrides.setProperty(Constants.PROPERTY_PROXY_USER, parts[parts.length - 4]);
- overrides.setProperty(Constants.PROPERTY_PROXY_PASSWORD, parts[parts.length - 3]);
- }
-
- overrides.setProperty(Constants.PROPERTY_PROXY_FOR_SOCKETS, "false");
- }
-
- // enables peer verification using the CAs bundled with the JRE (or
- // value of javax.net.ssl.trustStore if set)
- overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "false");
-
- return overrides;
- }
-
- @Override
- protected Module getSshModule() {
- return new SshjSshClientModule();
- }
-
- @Override
- // fatal handshake is not returned as AuthorizationException; should it?
- @Test(enabled = false, expectedExceptions = AuthorizationException.class)
- public void testCorrectAuthException() throws Exception {
- }
-
- // fgcp does not support metadata
- @Override
- protected void checkUserMetadataContains(NodeMetadata node, ImmutableMap<String, String> userMetadata) {
- assert node.getUserMetadata().isEmpty() : String.format(
- "node userMetadata not empty: %s %s", node,
- node.getUserMetadata());
- }
-
- // node name can't be retrieved through the API and is therefore null
- @Override
- protected void checkResponseEqualsHostname(ExecResponse execResponse,
- NodeMetadata node) {
- assert node.getHostname() == null : node + " with hostname: "
- + node.getHostname();
- }
-
- // tags are not (yet) supported for fgcp
- @Override
- protected void checkTagsInNodeEquals(NodeMetadata node,
- ImmutableSet<String> tags) {
- assert node.getTags().isEmpty() : String.format(
- "node tags found %s (%s) in node %s", node.getTags(), tags, node);
- }
-
- // using user/pwd based auth to ssh to nodes instead
- @Override
- protected void setupKeyPairForTest() {
- }
-
- // these tests require network access to the VMs they create:
- // before running it, start an SSL/VPN connection to the last updated vsys'
- // DMZ.
- // May also need to configure SNAT and FW rules to allow the VM to
- // communicate out (53/tcp-udp for DNS, 80/tcp for yum).
-/* @Override
- @Test(enabled = true, dependsOnMethods = { "testCompareSizes" })
- public void testAScriptExecutionAfterBootWithBasicTemplate()
- throws Exception {
- super.testAScriptExecutionAfterBootWithBasicTemplate();
- }
- @Override
- @Test(enabled = true)
- public void testCreateAndRunAService() throws Exception {
- super.testCreateAndRunAService();
- }
- @Override
- @Test(enabled = true, dependsOnMethods = "testCompareSizes")
- public void testConcurrentUseOfComputeServiceToCreateNodes() throws Exception {
- super.testConcurrentUseOfComputeServiceToCreateNodes();
- }
-*/
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPBaseTemplateBuilderLiveTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPBaseTemplateBuilderLiveTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPBaseTemplateBuilderLiveTest.java
deleted file mode 100644
index 45aba74..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/FGCPBaseTemplateBuilderLiveTest.java
+++ /dev/null
@@ -1,95 +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 static org.jclouds.compute.util.ComputeServiceUtils.getCores;
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import org.jclouds.Constants;
-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 com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-
-public abstract class FGCPBaseTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
-
- @Override
- protected Properties setupProperties() {
- Properties overrides = super.setupProperties();
-
- String proxy = System.getenv("http_proxy");
- if (proxy != null) {
-
- String[] parts = proxy.split("http://|:|@");
-
- overrides.setProperty(Constants.PROPERTY_PROXY_HOST, parts[parts.length - 2]);
- overrides.setProperty(Constants.PROPERTY_PROXY_PORT, parts[parts.length - 1]);
-
- if (parts.length >= 4) {
- overrides.setProperty(Constants.PROPERTY_PROXY_USER, parts[parts.length - 4]);
- overrides.setProperty(Constants.PROPERTY_PROXY_PASSWORD, parts[parts.length - 3]);
- }
- overrides.setProperty(Constants.PROPERTY_PROXY_FOR_SOCKETS, "false");
- }
-
- // enables peer verification using the CAs bundled with the JRE (or
- // value of javax.net.ssl.trustStore if set)
- overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "false");
-
- return overrides;
- }
-
- @Override
- protected Predicate<OsFamilyVersion64Bit> defineUnsupportedOperatingSystems() {
- return Predicates.not(new Predicate<OsFamilyVersion64Bit>() {
-
- @Override
- public boolean apply(OsFamilyVersion64Bit input) {
- switch (input.family) {
- case CENTOS:
- return ("".equals(input.version) && input.is64Bit) || (input.version.matches("5.[46]") && input.is64Bit)
- || input.version.equals("6.[2]");
- case RHEL:
- return ("".equals(input.version) && input.is64Bit) || (input.version.matches("5.[78]") && input.is64Bit)
- || input.version.equals("6.[3]");
- case WINDOWS:
- return ("".equals(input.version) && input.is64Bit)
- || (input.version.equals("2008 R2 SE") || input.version.equals("2008 R2 EE")) && input.is64Bit;
- default:
- return false;
- }
- }
-
- });
- }
-
- public void testDefaultTemplateBuilder() throws IOException {
- Template defaultTemplate = view.getComputeService().templateBuilder().build();
- assert defaultTemplate.getImage().getOperatingSystem().getVersion().matches("6.2") : defaultTemplate.getImage()
- .getOperatingSystem().getVersion();
- assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.CENTOS);
- assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskImageToOperatingSystemTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskImageToOperatingSystemTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskImageToOperatingSystemTest.java
deleted file mode 100644
index 6a8c5d0..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/compute/functions/DiskImageToOperatingSystemTest.java
+++ /dev/null
@@ -1,176 +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 org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.fujitsu.fgcp.domain.DiskImage;
-import org.jclouds.fujitsu.fgcp.domain.DiskImage.Builder;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "DiskImageToOperatingSystemTest")
-public class DiskImageToOperatingSystemTest {
- // Operating Systems available JAN 2012 (taken from osName)
- private static final List<String> operatingSystems = Arrays.asList(
- // JP
- "CentOS 5.6 32bit (English)",
- "CentOS 5.6 64bit (English)",
- "Red Hat Enterprise Linux 5.5 32bit (Japanese)",
- "Red Hat Enterprise Linux 5.5 64bit (Japanese)",
- "Windows Server 2003 R2 EE 32bit SP2 (日本語版) サポート付",
- "Windows Server 2003 R2 EE 32bit SP2 (日本語版)",
- "Windows Server 2008 R2 EE 64bit (日本語版) サポート付",
- "Windows Server 2008 R2 EE 64bit (日本語版)",
- "Windows Server 2008 R2 SE 64bit (日本語版) サポート付",
- "Windows Server 2008 R2 SE 64bit (日本語版)",
- "Windows Server 2008 SE 32bit SP2 (日本語版) サポート付",
- "Windows Server 2008 SE 32bit SP2 (日本語版)",
- // AU
- "CentOS 5.4 64bit (English)", "CentOS 5.4 32bit (English)",
- "Windows Server 2008 R2 SE 64bit (English)",
- "Windows Server 2008 R2 EE 64bit (English)");
-
- @Test
- public void testConversion() {
- for (String description : operatingSystems) {
- Builder builder = DiskImage.builder();
- builder.osName(description);
- builder.osType("hvm");
- builder.creatorName("creator");
- builder.registrant("registrant");
- builder.description("description");
- builder.id("ABCDEFGH");
- DiskImage image = builder.build();
-
- OperatingSystem os = new DiskImageToOperatingSystem().apply(image);
-
- assertNotNull(os, description);
- assertNotNull(os.getFamily(), description);
- assertNotEquals(OsFamily.UNRECOGNIZED, os.getFamily(),
- "OsFamily not recognised: " + description);
- assertNotNull(os.getVersion(), "Version not recognised: "
- + description);
- assertEquals(os.getName(), description);
- assertEquals(os.getDescription(), description);
- assertNotNull(os.getArch(), description);
- }
- }
-
- @Test
- public void testOsFamilyUnrecognized() {
- DiskImage image = DiskImage.builder()
- .osName("not a known operating system").build();
-
- OperatingSystem os = new DiskImageToOperatingSystem().apply(image);
-
- assertNotNull(os);
- assertEquals(os.getFamily(), OsFamily.UNRECOGNIZED);
- }
-
- @Test
- public void test64BitsWithSpace() {
- DiskImage image = DiskImage.builder().osName("a (64 bit) os").build();
-
- OperatingSystem os = new DiskImageToOperatingSystem().apply(image);
-
- assertNotNull(os);
- assertTrue(os.is64Bit());
- }
-
- @Test
- public void test64BitsNoSpace() {
- DiskImage image = DiskImage.builder().osName("a (64bit) os").build();
-
- OperatingSystem os = new DiskImageToOperatingSystem().apply(image);
-
- assertNotNull(os);
- assertTrue(os.is64Bit());
- }
-
- @Test
- public void test32BitsNoSpace() {
- DiskImage image = DiskImage.builder().osName("a (32bit) os").build();
-
- OperatingSystem os = new DiskImageToOperatingSystem().apply(image);
-
- assertNotNull(os);
- assertFalse(os.is64Bit());
- }
-
- @Test
- public void testx64NoSpace() {
- DiskImage image = DiskImage.builder().osName("a (x64) os").build();
-
- OperatingSystem os = new DiskImageToOperatingSystem().apply(image);
-
- assertNotNull(os);
- assertTrue(os.is64Bit());
- }
-
- @Test
- public void testWindowsVersion() {
- DiskImage image = DiskImage.builder()
- .osName("Windows Server 2008 R2 SE 64 bit").build();
-
- OperatingSystem os = new DiskImageToOperatingSystem().apply(image);
-
- assertNotNull(os);
- assertEquals(os.getVersion(), "2008 R2 SE");
- }
-
- @Test
- public void testCentOSVersion() {
- DiskImage image = DiskImage.builder()
- .osName("CentOS 6.2 64bit (English)").build();
-
- OperatingSystem os = new DiskImageToOperatingSystem().apply(image);
-
- assertNotNull(os);
- assertEquals(os.getVersion(), "6.2");
- }
-
- @Test
- public void testUnrecognizedOsVersion() {
- DiskImage image = DiskImage.builder()
- .osName("Windows Server 2099 (256 bit)").build();
-
- OperatingSystem os = new DiskImageToOperatingSystem().apply(image);
-
- assertNotNull(os);
- assertNull(os.getVersion());
- }
-
- @Test
- public void testOsVersionMissing() {
- DiskImage image = DiskImage.builder().osName("asd Server").build();
-
- OperatingSystem os = new DiskImageToOperatingSystem().apply(image);
- assertNotNull(os);
- assertNull(os.getVersion(), "os.getVersion(): \'" + os.getVersion()
- + "\'");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticatorTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticatorTest.java
deleted file mode 100644
index 58e29e3..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticatorTest.java
+++ /dev/null
@@ -1,161 +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.filters;
-
-import static org.testng.Assert.assertEquals;
-
-import java.util.Calendar;
-import java.util.TimeZone;
-
-import javax.inject.Provider;
-
-import org.jclouds.fujitsu.fgcp.FGCPCredentials;
-import org.jclouds.fujitsu.fgcp.filters.RequestAuthenticator.SignatureForCredentials;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpUtils;
-import org.jclouds.http.internal.SignatureWire;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Supplier;
-
-public class RequestAuthenticatorTest {
-
- Provider<Calendar> calendarProvider = new Provider<Calendar>() {
- public Calendar get() {
- Calendar c = Calendar.getInstance(TimeZone.getTimeZone("Australia/Sydney"));
- c.setTimeInMillis(1358747939000L); // Mon Jan 21 16:58:59 +1100 2013
- return c;
- }
- };
- Supplier<FGCPCredentials> creds = new Supplier<FGCPCredentials>() {
- @Override
- public FGCPCredentials get() {
- return null;
- }
- };
- RequestAuthenticator a = new RequestAuthenticator(creds, new SignatureForCredentials(), calendarProvider,
- new HttpUtils(0, 0, 0, 0), new SignatureWire(), "");
-
- @Test
- public void testGenerateAccessKeyIdWithNewline() throws Exception {
- String accessKeyId = a.generateAccessKeyId();
- assertEquals(
- accessKeyId,
- "RWFzdGVybiBTdGFuZGFyZCBUaW1lIChOZXcgU291dGggV2FsZXMpJjEzNTg3N\nDc5MzkwMDAmMS4wJlNIQTF3aXRoUlNB");
- }
-
- @Test
- public void testAddQueryParamsToRequest() throws Exception {
- String accessKeyId = "accessKeyId";
- String signature = "signature";
- String lang = "en";
-
- HttpRequest request = HttpRequest
- .builder()
- .endpoint("https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?Version=2012-02-18")
- .method("GET")
- .build();
- HttpRequest newRequest = a.addQueryParamsToRequest(request, accessKeyId, signature, lang);
- assertEquals(
- newRequest.getRequestLine(),
- "GET https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?Version=2012-02-18&Locale=en&AccessKeyId=accessKeyId&Signature=signature HTTP/1.1");
- }
-
- @Test
- public void testAddQueryParamsWithRealValuesToRequest() throws Exception {
- String accessKeyId = "RWFzdGVybiBTdGFuZGFyZCBUaW1lIChOZXcgU291dGggV2FsZXMpJjEzNTg4M\nzg4OTgwNTcmMS4wJlNIQTF3aXRoUlNB";
- String signature = "QFAmuZ0XyOjy6fmMLkMCH/xObY6Jhyltjo2hBcUrXHape8ecTmAlbCUO/+lKr\nQ3Qeu1cNqh8BXSnoc4vXR3aezR6V94aBlQ/4uowQuZP3S8yjnC0aPjWQ70JcB\nULR+qSGNmc97agOTMmIl4JJcukCBEEyLSzRDDe2ib2PqN11RA55GmAP/xx7qg\n0fj6ieauzuzImL1tJq03w0tPdCSuB6lnZe/81Z+Rbqwfl3kdGNBnV7YrdD3Qg\nRBDOKgA2okMlc5pzgk59i/O07ScfoJs7A58HnTZZ2KyVPFgHq6YGpCA2PqII6\nHUlqx6hkX9HFXIz+wz52gbSwBrqgloAw8w8Iw==";
- String lang = "en";
-
- HttpRequest request = HttpRequest
- .builder()
- .endpoint("https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?Version=2012-02-18")
- .method("GET")
- .build();
- HttpRequest newRequest = a.addQueryParamsToRequest(request, accessKeyId, signature, lang);
- assertEquals(
- newRequest.getRequestLine(),
- "GET https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?Version=2012-02-18&Locale=en&AccessKeyId=RWFzdGVybiBTdGFuZGFyZCBUaW1lIChOZXcgU291dGggV2FsZXMpJjEzNTg4M%0Azg4OTgwNTcmMS4wJlNIQTF3aXRoUlNB&Signature=QFAmuZ0XyOjy6fmMLkMCH/xObY6Jhyltjo2hBcUrXHape8ecTmAlbCUO/%2BlKr%0AQ3Qeu1cNqh8BXSnoc4vXR3aezR6V94aBlQ/4uowQuZP3S8yjnC0aPjWQ70JcB%0AULR%2BqSGNmc97agOTMmIl4JJcukCBEEyLSzRDDe2ib2PqN11RA55GmAP/xx7qg%0A0fj6ieauzuzImL1tJq03w0tPdCSuB6lnZe/81Z%2BRbqwfl3kdGNBnV7YrdD3Qg%0ARBDOKgA2okMlc5pzgk59i/O07ScfoJs7A58HnTZZ2KyVPFgHq6YGpCA2PqII6%0AHUlqx6hkX9HFXIz%2Bwz52gbSwBrqgloAw8w8Iw%3D%3D HTTP/1.1");
- }
-
- @Test
- public void testAddQueryParamsWithSlashes() throws Exception {
- String accessKeyId = "accessKeyId";
- String signature = "sig/na/ture";
- String lang = "en";
-
- HttpRequest request = HttpRequest
- .builder()
- .endpoint("https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?Version=2012-02-18")
- .method("GET")
- .build();
- HttpRequest newRequest = a.addQueryParamsToRequest(request, accessKeyId, signature, lang);
- assertEquals(
- newRequest.getRequestLine(),
- "GET https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?Version=2012-02-18&Locale=en&AccessKeyId=accessKeyId&Signature=sig/na/ture HTTP/1.1");
- }
-
- @Test
- public void testAddQueryParamsWithNewlines() throws Exception {
- String accessKeyId = "accessKey\nId";
- String signature = "sig\nna\nture";
- String lang = "en";
-
- HttpRequest request = HttpRequest
- .builder()
- .endpoint("https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?Version=2012-02-18")
- .method("GET")
- .build();
- HttpRequest newRequest = a.addQueryParamsToRequest(request, accessKeyId, signature, lang);
- assertEquals(
- newRequest.getRequestLine(),
- "GET https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?Version=2012-02-18&Locale=en&AccessKeyId=accessKey%0AId&Signature=sig%0Ana%0Ature HTTP/1.1");
- }
-
- @Test
- public void testAddQueryParamsWithPlus() throws Exception {
- String accessKeyId = "accessKey+Id";
- String signature = "sign+ature";
- String lang = "en";
-
- HttpRequest request = HttpRequest
- .builder()
- .endpoint("https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?Version=2012-02-18")
- .method("GET")
- .build();
- HttpRequest newRequest = a.addQueryParamsToRequest(request, accessKeyId, signature, lang);
- assertEquals(newRequest.getRequestLine(),
- "GET https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?Version=2012-02-18&Locale=en&AccessKeyId=accessKey%2BId&Signature=sign%2Bature HTTP/1.1");
- }
-
- @Test
- public void testAddQueryParamsWithBase64Symbols() throws Exception {
- String accessKeyId = "accessKeyId\nWith/And+And=";
- String signature = "signature\nWith/And+And=";
- String lang = "en";
-
- HttpRequest request = HttpRequest
- .builder()
- .endpoint("https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?Version=2012-02-18")
- .method("GET")
- .build();
- HttpRequest newRequest = a.addQueryParamsToRequest(request, accessKeyId, signature, lang);
- assertEquals(
- newRequest.getRequestLine(),
- "GET https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?Version=2012-02-18&Locale=en&AccessKeyId=accessKeyId%0AWith/And%2BAnd%3D&Signature=signature%0AWith/And%2BAnd%3D HTTP/1.1");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/AdditionalDiskApiExpectTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/AdditionalDiskApiExpectTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/AdditionalDiskApiExpectTest.java
deleted file mode 100644
index 973e657..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/AdditionalDiskApiExpectTest.java
+++ /dev/null
@@ -1,152 +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.services;
-
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "AdditionalDiskApiExpectTest", singleThreaded = true)
-public class AdditionalDiskApiExpectTest extends BaseFGCPRestApiExpectTest {
-
- public void testGet() {
- HttpRequest request = buildGETWithQuery("Action=GetVDiskAttributes"
- + "&vdiskId=CONTRACT-VSYS00001-D-0001"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/GetVDiskAttributes-response.xml"))
- .build();
-
- AdditionalDiskApi api = requestSendsResponse(request, response)
- .getAdditionalDiskApi();
-
- assertEquals(api.get("CONTRACT-VSYS00001-D-0001").getSize(), 10.0);
- }
-
- public void testGetStatus() {
- HttpRequest request = buildGETWithQuery("Action=GetVDiskStatus"
- + "&vdiskId=CONTRACT-VSYS00001-S-0001"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/GetVDiskStatus-response.xml"))
- .build();
-
- AdditionalDiskApi api = requestSendsResponse(request, response)
- .getAdditionalDiskApi();
-
- // api is returning STOPPED which is not a documented status. Documentation error?
-// assertEquals(api.getStatus("CONTRACT-VSYS00001-S-0001"), VDiskStatus.STOPPED);
- }
-
- public void testUpdate() {
- HttpRequest request = buildGETWithQuery("Action=UpdateVDiskAttribute"
- + "&vdiskId=CONTRACT-VSYS00001-D-0001"
- + "&attributeName=updateName" + "&attributeValue=new-name"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/UpdateVDiskAttribute-response.xml"))
- .build();
-
- AdditionalDiskApi api = requestSendsResponse(request, response)
- .getAdditionalDiskApi();
-
- api.update("CONTRACT-VSYS00001-D-0001", "updateName", "new-name");
- }
-
- public void testDestroy() {
- HttpRequest request = buildGETWithQuery("Action=DestroyVDisk"
- + "&vdiskId=CONTRACT-VSYS00001-D-0001"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/DestroyVDisk-response.xml"))
- .build();
-
- AdditionalDiskApi api = requestSendsResponse(request, response)
- .getAdditionalDiskApi();
-
- api.destroy("CONTRACT-VSYS00001-D-0001");
- }
-
- public void testBackup() {
- HttpRequest request = buildGETWithQuery("Action=BackupVDisk"
- + "&vdiskId=CONTRACT-VSYS00001-D-0001"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/BackupVDisk-response.xml"))
- .build();
-
- AdditionalDiskApi api = requestSendsResponse(request, response)
- .getAdditionalDiskApi();
-
- api.backup("CONTRACT-VSYS00001-D-0001");
- }
-
- public void testRestore() {
- HttpRequest request = buildGETWithQuery("Action=RestoreVDisk"
- + "&vsysId=CONTRACT-VSYS00001"
- + "&backupId=003");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/RestoreVDisk-response.xml"))
- .build();
-
- AdditionalDiskApi api = requestSendsResponse(request, response)
- .getAdditionalDiskApi();
-
- api.restore("CONTRACT-VSYS00001", "003");
- }
-
- public void testDetach() {
- HttpRequest request = buildGETWithQuery("Action=DetachVDisk"
- + "&vdiskId=CONTRACT-VSYS00001-D-0001"
- + "&vserverId=CONTRACT-VSYS00001-S-0006"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/DetachVDisk-response.xml"))
- .build();
-
- AdditionalDiskApi api = requestSendsResponse(request, response)
- .getAdditionalDiskApi();
-
- api.detach("CONTRACT-VSYS00001-D-0001", "CONTRACT-VSYS00001-S-0006");
- }
-
- public void testDestroyBackup() {
- HttpRequest request = buildGETWithQuery("Action=DestroyVDiskBackup"
- + "&vsysId=CONTRACT-VSYS00001"
- + "&backupId=003");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/DestroyVDiskBackup-response.xml"))
- .build();
-
- AdditionalDiskApi api = requestSendsResponse(request, response)
- .getAdditionalDiskApi();
-
- api.destroyBackup("CONTRACT-VSYS00001", "003");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/BaseFGCPApiLiveTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/BaseFGCPApiLiveTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/BaseFGCPApiLiveTest.java
deleted file mode 100644
index 9090224..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/BaseFGCPApiLiveTest.java
+++ /dev/null
@@ -1,61 +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.services;
-
-import java.util.Properties;
-
-import org.jclouds.Constants;
-import org.jclouds.apis.BaseApiLiveTest;
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-
-
-public class BaseFGCPApiLiveTest extends BaseApiLiveTest<FGCPApi> {
-
- public BaseFGCPApiLiveTest() {
- provider = "fgcp";
- }
-
- @Override
- protected Properties setupProperties() {
- Properties overrides = super.setupProperties();
-
- String proxy = System.getenv("http_proxy");
- if (proxy != null) {
-
- String[] parts = proxy.split("http://|:|@");
-
- overrides.setProperty(Constants.PROPERTY_PROXY_HOST,
- parts[parts.length - 2]);
- overrides.setProperty(Constants.PROPERTY_PROXY_PORT,
- parts[parts.length - 1]);
-
- if (parts.length >= 4) {
- overrides.setProperty(Constants.PROPERTY_PROXY_USER,
- parts[parts.length - 4]);
- overrides.setProperty(Constants.PROPERTY_PROXY_PASSWORD,
- parts[parts.length - 3]);
- }
- overrides.setProperty(Constants.PROPERTY_PROXY_FOR_SOCKETS, "false");
- }
-
- // enables peer verification using the CAs bundled with the JRE (or
- // value of javax.net.ssl.trustStore if set)
- overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "false");
-
- return overrides;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/BaseFGCPRestApiExpectTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/BaseFGCPRestApiExpectTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/BaseFGCPRestApiExpectTest.java
deleted file mode 100644
index 8bc1938..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/BaseFGCPRestApiExpectTest.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.fujitsu.fgcp.services;
-
-import static org.testng.Assert.assertNotNull;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Calendar;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.FGCPProviderMetadata;
-import org.jclouds.fujitsu.fgcp.config.FGCPHttpApiModule;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.io.Payload;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.rest.ConfiguresHttpApi;
-import org.jclouds.rest.internal.BaseRestApiExpectTest;
-
-import com.google.common.base.Charsets;
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.io.Resources;
-import com.google.inject.Module;
-
-public class BaseFGCPRestApiExpectTest extends BaseRestApiExpectTest<FGCPApi> {
-
- /**
- * self-signed dummy cert: <br>
- * keytool -genkey -alias test-fgcp -keyalg RSA -keysize 1024 -validity 5475
- * -dname "CN=localhost" -keystore jclouds-test-fgcp.p12 -storepass
- * jcloudsjclouds -storetype pkcs12 <br>
- * openssl pkcs12 -nodes -in jclouds-test-fgcp.p12 -out jclouds-test-fgcp.pem
- */
- public BaseFGCPRestApiExpectTest() {
- provider = "fgcp";
-
- String cert = "/certs/jclouds-test-fgcp.pem";
- URL url = this.getClass().getResource(cert);
- assertNotNull(url, cert + " not found");
-
- try {
- credential = Resources.toString(url, Charsets.UTF_8);
- } catch (IOException e) {
- throw Throwables.propagate(e);
- }
- }
-
- @ConfiguresHttpApi
- protected static final class TestFGCPHttpApiModule extends FGCPHttpApiModule {
-
- @Override
- protected Calendar provideCalendar() {
- // pick country/TZ with no DST just in case to maintain constant
- // time wherever the tests are run.
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT-9"), Locale.JAPAN);
- cal.setTimeInMillis(1234567890);
- return cal;
- }
- }
-
- @Override
- protected Module createModule() {
- return new TestFGCPHttpApiModule();
- }
-
- @Override
- protected ProviderMetadata createProviderMetadata() {
- return new FGCPProviderMetadata();
- }
-
- @Override
- public Payload payloadFromResource(String resource) {
- return super.payloadFromResource("/responses" + resource);
- }
-
- protected static HttpRequest buildGETWithQuery(String query) {
- URI uri = URI
- .create("https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint"
- + "?Version=2012-02-18"
- + "&"
- + query
- + "&Locale=en"
- + "&AccessKeyId=R01ULTA5OjAwJjEyMzQ1Njc4OTAmMS4wJlNIQTF3aXRoUlNB"
- + "&Signature=G2rGfLAkbq0IURQfXIWYxj3BnMGbjRk4KPnZLAze3Lt4SMMRt8lkjqKvR5Cm%2B%0AnFpDN7J6IprVCCsIrRq5BqPeXT6xtWyb6qMNds2BAr1h/JePGs0UosOh2tgPU%0AMSFlZwLVjgNyrSa2zeHA3AEHjF6H1jqcWXXqfCAD4SOHaNavk%3D");
- return HttpRequest.builder().method("GET").endpoint(uri).addHeader("Accept", "text/xml")
- .addHeader("User-Agent", "OViSS-API-CLIENT").build();
- }
-
- protected HttpRequest preparePOSTForAction(String action) {
- return HttpRequest
- .builder()
- .method("POST")
- .endpoint(URI.create("https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint"))
- .payload(
- payloadFromResourceWithContentType("/" + action.toLowerCase() + "-request.xml", MediaType.TEXT_XML))
- .headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "text/xml")
- .put("User-Agent", "OViSS-API-CLIENT").build()).build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/BuiltinServerApiExpectTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/BuiltinServerApiExpectTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/BuiltinServerApiExpectTest.java
deleted file mode 100644
index 2e9cd9d..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/BuiltinServerApiExpectTest.java
+++ /dev/null
@@ -1,210 +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.services;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import java.util.Set;
-
-import org.jclouds.fujitsu.fgcp.domain.BuiltinServer;
-import org.jclouds.fujitsu.fgcp.domain.BuiltinServerBackup;
-import org.jclouds.fujitsu.fgcp.domain.BuiltinServerStatus;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "BuiltinServerApiExpectTest", singleThreaded = true)
-public class BuiltinServerApiExpectTest extends BaseFGCPRestApiExpectTest {
-
- public void testStart() {
- HttpRequest request = buildGETWithQuery("Action=StartEFM"
- + "&efmId=CONTRACT-VSYS00001-S-0001"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/StartEFM-response.xml"))
- .build();
-
- BuiltinServerApi api = requestSendsResponse(request, response)
- .getFirewallApi();
-
- api.start("CONTRACT-VSYS00001-S-0001");
- }
-
- public void testStop() {
- HttpRequest request = buildGETWithQuery("Action=StopEFM"
- + "&efmId=CONTRACT-VSYS00001-S-0001"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/StopEFM-response.xml"))
- .build();
-
- BuiltinServerApi api = requestSendsResponse(request, response)
- .getFirewallApi();
-
- api.stop("CONTRACT-VSYS00001-S-0001");
- }
-
- public void testDestroy() {
- HttpRequest request = buildGETWithQuery("Action=DestroyEFM"
- + "&efmId=CONTRACT-VSYS00001-S-0001"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/DestroyEFM-response.xml"))
- .build();
-
- BuiltinServerApi api = requestSendsResponse(request, response)
- .getFirewallApi();
-
- api.destroy("CONTRACT-VSYS00001-S-0001");
- }
-
- public void testGet() {
- HttpRequest request = buildGETWithQuery("Action=GetEFMAttributes"
- + "&efmId=CONTRACT-VSYS00001-S-0001"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/GetEFMAttributes-response.xml"))
- .build();
-
- BuiltinServerApi api = requestSendsResponse(request, response)
- .getFirewallApi();
-
- assertEquals(api.get("CONTRACT-VSYS00001-S-0001").getType(), BuiltinServer.BuiltinServerType.FW);
- }
-
-/*
- public void testGetDetails() {
- HttpRequest request = buildGETWithQuery("Action=GetEFMConfiguration"
- + "&efmId=CONTRACT-VSYS00001-S-0001"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/GetEFMConfiguration-response.xml"))
- .build();
-
- BuiltinServerApi api = requestSendsResponse(request, response)
- .getFirewallApi();
-
-// assertNotNull(api.getDetails("CONTRACT-VSYS00001-S-0001"));
- }
-*/
-
- public void testGetStatus() {
- HttpRequest request = buildGETWithQuery("Action=GetEFMStatus"
- + "&efmId=CONTRACT-VSYS00001-S-0001"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/GetEFMStatus-response.xml"))
- .build();
-
- BuiltinServerApi api = requestSendsResponse(request, response)
- .getFirewallApi();
-
- assertEquals(api.getStatus("CONTRACT-VSYS00001-S-0001"), BuiltinServerStatus.RUNNING);
- }
-
- public void testUpdate() {
- HttpRequest request = buildGETWithQuery("Action=UpdateEFMAttribute"
- + "&efmId=CONTRACT-VSYS00001-S-0001"
- + "&attributeName=vserverName"
- + "&attributeValue=new%20name"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/UpdateEFMAttribute-response.xml"))
- .build();
-
- BuiltinServerApi api = requestSendsResponse(request, response)
- .getFirewallApi();
-
- api.update("CONTRACT-VSYS00001-S-0001", "vserverName", "new name");
- }
-
- public void testBackup() {
- HttpRequest request = buildGETWithQuery("Action=BackupEFM"
- + "&efmId=CONTRACT-VSYS00001-S-0001"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/BackupEFM-response.xml"))
- .build();
-
- BuiltinServerApi api = requestSendsResponse(request, response)
- .getFirewallApi();
-
- api.backup("CONTRACT-VSYS00001-S-0001");
- }
-
- public void testRestore() {
- HttpRequest request = buildGETWithQuery("Action=RestoreEFM"
- + "&efmId=CONTRACT-VSYS00001-S-0001"
- + "&backupId=003"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/RestoreEFM-response.xml"))
- .build();
-
- BuiltinServerApi api = requestSendsResponse(request, response)
- .getFirewallApi();
-
- api.restore("CONTRACT-VSYS00001-S-0001", "003");
- }
-
- public void testListBackups() {
- HttpRequest request = buildGETWithQuery("Action=ListEFMBackup"
- + "&efmId=CONTRACT-VSYS00001-S-0001"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/ListEFMBackup-response.xml"))
- .build();
-
- BuiltinServerApi api = requestSendsResponse(request, response)
- .getFirewallApi();
-
- Set<BuiltinServerBackup> backups = api.listBackups("CONTRACT-VSYS00001-S-0001");
- assertNotNull(backups, "backups");
- assertEquals(backups.size(), 2);
- assertEquals(backups.iterator().next().getId(), "001");
- assertEquals(backups.iterator().next().getTime(), "20121008201127");
- }
-
- public void testDestroyBackup() {
- HttpRequest request = buildGETWithQuery("Action=DestroyEFMBackup"
- + "&efmId=CONTRACT-VSYS00001-S-0001"
- + "&backupId=003"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/DestroyEFMBackup-response.xml"))
- .build();
-
- BuiltinServerApi api = requestSendsResponse(request, response)
- .getFirewallApi();
-
- api.destroyBackup("CONTRACT-VSYS00001-S-0001", "003");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/DiskImageApiExpectTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/DiskImageApiExpectTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/DiskImageApiExpectTest.java
deleted file mode 100644
index b9a374c..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/DiskImageApiExpectTest.java
+++ /dev/null
@@ -1,74 +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.services;
-
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.fujitsu.fgcp.domain.DiskImage;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "DiskImageApiExpectTest", singleThreaded = true)
-public class DiskImageApiExpectTest extends BaseFGCPRestApiExpectTest {
-
- public void testGet() {
- HttpRequest request = buildGETWithQuery("Action=GetDiskImageAttributes"
- + "&diskImageId=IMG_A1B2C3_1234567890ABCD");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/GetDiskImageAttributes-response.xml"))
- .build();
-
- DiskImageApi api = requestSendsResponse(request, response)
- .getDiskImageApi();
-
- DiskImage image = api.get("IMG_A1B2C3_1234567890ABCD");
-
- assertEquals(image.getId(), "IMG_A1B2C3_1234567890ABCD");
- assertEquals(image.getCreatorName(), "ABCDEFGH");
- }
-
- public void testUpdate() {
- HttpRequest request = buildGETWithQuery("Action=UpdateDiskImageAttribute"
- + "&diskImageId=IMG_A1B2C3_1234567890ABCD"
- + "&updateLcId=en"
- + "&attributeName=updateName"
- + "&attributeValue=new-name");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/UpdateDiskImageAttribute-response.xml"))
- .build();
-
- DiskImageApi api = requestSendsResponse(request, response)
- .getDiskImageApi();
-
- api.update("IMG_A1B2C3_1234567890ABCD", "en", "updateName", "new-name");
- }
-
- public void testDeregister() {
- HttpRequest request = buildGETWithQuery("Action=UnregisterDiskImage"
- + "&diskImageId=IMG_A1B2C3_1234567890ABCD");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/UnregisterDiskImage-response.xml"))
- .build();
-
- DiskImageApi api = requestSendsResponse(request, response)
- .getDiskImageApi();
-
- api.deregister("IMG_A1B2C3_1234567890ABCD");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/ErrorResponseExpectTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/ErrorResponseExpectTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/ErrorResponseExpectTest.java
deleted file mode 100644
index 391cbb0..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/ErrorResponseExpectTest.java
+++ /dev/null
@@ -1,110 +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.services;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.rest.AuthorizationException;
-import org.jclouds.rest.ResourceNotFoundException;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "ErrorResponseExpectTest", singleThreaded = true)
-public class ErrorResponseExpectTest extends BaseFGCPRestApiExpectTest {
-
- public void testIllegalStateDueToSystemReconfiguration() {
- HttpRequest request = buildGETWithQuery("Action=CreateVServer" + "&vserverName=vm1" + "&vserverType=economy"
- + "&diskImageId=IMG_A1B2C3_1234567890ABCD" + "&networkId=ABCDEFGH-A123B456CE-N-DMZ"
- + "&vsysId=ABCDEFGH-A123B456CE");
- HttpResponse response = HttpResponse.builder().statusCode(500)
- .payload(payloadFromResource("/IllegalState_RECONFIG_ING-response.xml")).build();
- VirtualSystemApi api = requestSendsResponse(request, response).getVirtualSystemApi();
-
- try {
- api.createServer("vm1", "economy", "IMG_A1B2C3_1234567890ABCD", "ABCDEFGH-A123B456CE-N-DMZ");
- fail("should have thrown an exception");
- } catch (IllegalStateException e) {
- assertTrue(e.getMessage().contains("RECONFIG_ING"), e.getMessage());
- }
- }
-
- public void testAuthorizationErrorDueToCertFromDifferentRegion() {
- HttpRequest request = buildGETWithQuery("Action=CreateVServer" + "&vserverName=vm1" + "&vserverType=economy"
- + "&diskImageId=IMG_A1B2C3_1234567890ABCD" + "&networkId=ABCDEFGH-A123B456CE-N-DMZ"
- + "&vsysId=ABCDEFGH-A123B456CE");
- HttpResponse response = HttpResponse.builder().statusCode(500)
- .payload(payloadFromResource("/Auth_UserNotInSelectData-response.xml")).build();
- VirtualSystemApi api = requestSendsResponse(request, response).getVirtualSystemApi();
-
- try {
- api.createServer("vm1", "economy", "IMG_A1B2C3_1234567890ABCD", "ABCDEFGH-A123B456CE-N-DMZ");
- fail("should have thrown an exception");
- } catch (AuthorizationException e) {
- assertEquals(e.getMessage(), "ERROR: User not found in selectData. searchKey:userid");
- }
- }
-
- public void testIllegalStateDueToStartingRunningServer() {
- HttpRequest request = buildGETWithQuery("Action=StartVServer" + "&vserverId=ABCDEFGH-A123B456CE-S-0004"
- + "&vsysId=ABCDEFGH-A123B456CE");
- HttpResponse response = HttpResponse.builder().statusCode(500)
- .payload(payloadFromResource("/IllegalState_RUNNING-response.xml")).build();
- VirtualServerApi api = requestSendsResponse(request, response).getVirtualServerApi();
-
- try {
- api.start("ABCDEFGH-A123B456CE-S-0004");
- fail("should have thrown an exception");
- } catch (IllegalStateException e) {
- assertTrue(e.getMessage().contains("RUNNING"), e.getMessage());
- }
- }
-
- public void testIllegalStateDueToStoppingStoppedServer() {
- HttpRequest request = buildGETWithQuery("Action=StopVServer" + "&vserverId=ABCDEFGH-A123B456CE-S-0004"
- + "&vsysId=ABCDEFGH-A123B456CE");
- HttpResponse response = HttpResponse.builder().statusCode(500)
- .payload(payloadFromResource("/IllegalState_ALREADY_STOPPED-response.xml")).build();
- VirtualServerApi api = requestSendsResponse(request, response).getVirtualServerApi();
-
- try {
- api.stop("ABCDEFGH-A123B456CE-S-0004");
- fail("should have thrown an exception");
- } catch (IllegalStateException e) {
- assertTrue(e.getMessage().contains("ALREADY_STOPPED"), e.getMessage());
- }
- }
-
- public void testErrorDueToWrongResourceId() {
- HttpRequest request = buildGETWithQuery("Action=CreateVServer" + "&vserverName=vm1" + "&vserverType=economy"
- + "&diskImageId=IMG_DOES_NOT_EXIST" + "&networkId=ABCDEFGH-A123B456CE-N-DMZ"
- + "&vsysId=ABCDEFGH-A123B456CE");
- HttpResponse response = HttpResponse.builder().statusCode(500)
- .payload(payloadFromResource("/RESOURCE_NOT_FOUND-response.xml")).build();
- VirtualSystemApi api = requestSendsResponse(request, response).getVirtualSystemApi();
-
- try {
- api.createServer("vm1", "economy", "IMG_DOES_NOT_EXIST", "ABCDEFGH-A123B456CE-N-DMZ");
- fail("should have thrown an exception");
- } catch (ResourceNotFoundException e) {
- assertTrue(e.getMessage().contains("RESOURCE_NOT_FOUND"), e.getMessage());
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/PublicIPAddressApiExpectTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/PublicIPAddressApiExpectTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/PublicIPAddressApiExpectTest.java
deleted file mode 100644
index 6d1850f..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/PublicIPAddressApiExpectTest.java
+++ /dev/null
@@ -1,104 +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.services;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import org.jclouds.fujitsu.fgcp.domain.PublicIP;
-import org.jclouds.fujitsu.fgcp.domain.PublicIPStatus;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "PublicIPAddressApiExpectTest", singleThreaded = true)
-public class PublicIPAddressApiExpectTest extends BaseFGCPRestApiExpectTest {
-
- public void testAttach() {
- HttpRequest request = buildGETWithQuery("Action=AttachPublicIP"
- + "&vsysId=CONTRACT-VSYS00001"
- + "&publicIp=123.45.67.89");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/AttachPublicIP-response.xml"))
- .build();
-
- PublicIPAddressApi api = requestSendsResponse(request, response)
- .getPublicIPAddressApi();
-
- api.attach("CONTRACT-VSYS00001", "123.45.67.89");
- }
-
- public void testDetach() {
- HttpRequest request = buildGETWithQuery("Action=DetachPublicIP"
- + "&vsysId=CONTRACT-VSYS00001"
- + "&publicIp=123.45.67.89");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/DetachPublicIP-response.xml"))
- .build();
-
- PublicIPAddressApi api = requestSendsResponse(request, response)
- .getPublicIPAddressApi();
-
- api.detach("CONTRACT-VSYS00001", "123.45.67.89");
- }
-
- public void testFree() {
- HttpRequest request = buildGETWithQuery("Action=FreePublicIP"
- + "&vsysId=CONTRACT-VSYS00001"
- + "&publicIp=123.45.67.89");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/FreePublicIP-response.xml"))
- .build();
-
- PublicIPAddressApi api = requestSendsResponse(request, response)
- .getPublicIPAddressApi();
-
- api.free("CONTRACT-VSYS00001", "123.45.67.89");
- }
-
- public void testGetStatus() {
- HttpRequest request = buildGETWithQuery("Action=GetPublicIPStatus"
- + "&publicIp=123.45.67.89");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/GetPublicIPStatus-response.xml"))
- .build();
-
- PublicIPAddressApi api = requestSendsResponse(request, response)
- .getPublicIPAddressApi();
-
- PublicIPStatus status = api.getStatus("123.45.67.89");
- assertEquals(status, PublicIPStatus.ATTACHED);
- }
-
- public void testGet() {
- HttpRequest request = buildGETWithQuery("Action=GetPublicIPAttributes"
- + "&publicIp=123.45.67.89");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/GetPublicIPAttributes-response.xml"))
- .build();
-
- PublicIPAddressApi api = requestSendsResponse(request, response)
- .getPublicIPAddressApi();
-
- PublicIP ip = api.get("123.45.67.89");
-
- assertNotNull(ip, "ip");
- assertEquals(ip.getAddress(), "123.45.67.89");
- assertEquals(ip.getVersion(), PublicIP.Version.IPv4);
- }
-
-}