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:51 UTC
[1/8] JCLOUDS-757 Drop FCGP labs provider
Repository: jclouds-labs
Updated Branches:
refs/heads/master 7f307e859 -> 5d23c2be0
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/ListDiskImages-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/ListDiskImages-response.xml b/fgcp/src/test/resources/responses/ListDiskImages-response.xml
deleted file mode 100644
index c7f0e83..0000000
--- a/fgcp/src/test/resources/responses/ListDiskImages-response.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ListDiskImageResponse xmlns="http://apioviss.jp.fujitsu.com">
- <diskimages>
- <diskimage>
- <creatorName>ABCDEFGH</creatorName>
- <description />
- <diskimageId>IMG_A1B2C3_1234567890ABCA</diskimageId>
- <diskimageName />
- <licenseInfo>Included</licenseInfo>
- <osName>Windows Server 2008 R2 EE 64bit (English)</osName>
- <osType>hvm</osType>
- <registrant>ABCDEFGH</registrant>
- <size>40.0</size>
- </diskimage>
- <diskimage>
- <creatorName>ABCDEFGH</creatorName>
- <description />
- <diskimageId>IMG_A1B2C3_1234567890ABCB</diskimageId>
- <diskimageName>my image</diskimageName>
- <licenseInfo />
- <osName>CentOS 6.2 64bit (English)</osName>
- <osType>pv</osType>
- <registrant>ABCDEFGH</registrant>
- <size>10.0</size>
- </diskimage>
- <diskimage>
- <creatorName>ABCDEFGH</creatorName>
- <description />
- <diskimageId>IMG_A1B2C3_1234567890ABCC</diskimageId>
- <diskimageName>W2k8R2EE(EN)</diskimageName>
- <licenseInfo>Included</licenseInfo>
- <osName>Windows Server 2008 R2 EE 64bit (English)</osName>
- <osType>hvm</osType>
- <registrant>ABCDEFGH</registrant>
- <size>40.0</size>
- </diskimage>
- <diskimage>
- <creatorName>ABCDEFGH</creatorName>
- <description />
- <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
- <diskimageName>CentOS 5.6 64bit(EN)</diskimageName>
- <licenseInfo />
- <osName>CentOS 5.6 64bit (English)</osName>
- <osType>pv</osType>
- <registrant>ABCDEFGH</registrant>
- <size>10.0</size>
- </diskimage>
- <diskimage>
- <creatorName>ABCDEFGH</creatorName>
- <description />
- <diskimageId>IMG_A1B2C3_1234567890ABCE</diskimageId>
- <diskimageName>W2k8R2SE/SQL2k8R2(EN)</diskimageName>
- <licenseInfo>Included</licenseInfo>
- <osName>Windows Server 2008 R2 SE 64bit (English)</osName>
- <osType>hvm</osType>
- <registrant>ABCDEFGH</registrant>
- <size>40.0</size>
- <softwares>
- <software>
- <license>Included</license>
- <name>SQLServer 2008 R2 SE (English)</name>
- </software>
- </softwares>
- </diskimage>
- <diskimage>
- <creatorName>ABCDEFGH</creatorName>
- <description />
- <diskimageId>IMG_A1B2C3_1234567890ABCF</diskimageId>
- <diskimageName>W2k8R2SE(EN)</diskimageName>
- <licenseInfo>Included</licenseInfo>
- <osName>Windows Server 2008 R2 SE 64bit (English)</osName>
- <osType>hvm</osType>
- <registrant>ABCDEFGH</registrant>
- <size>40.0</size>
- </diskimage>
- <diskimage>
- <creatorName>ABCDEFGH</creatorName>
- <description />
- <diskimageId>IMG_A1B2C3_1234567890ABCG</diskimageId>
- <diskimageName>CentOS 6.0 64bit(EN)</diskimageName>
- <licenseInfo />
- <osName>CentOS 6.0 64bit (English)</osName>
- <osType>pv</osType>
- <registrant>ABCDEFGH</registrant>
- <size>10.0</size>
- </diskimage>
- <diskimage>
- <creatorName>ABCDEFGH</creatorName>
- <description />
- <diskimageId>IMG_A1B2C3_1234567890ABCH</diskimageId>
- <diskimageName>CentOS 6.0 32bit(EN)</diskimageName>
- <licenseInfo />
- <osName>CentOS 6.0 32bit (English)</osName>
- <osType>pv</osType>
- <registrant>ABCDEFGH</registrant>
- <size>10.0</size>
- </diskimage>
- <diskimage>
- <creatorName>ABCDEFGH</creatorName>
- <description />
- <diskimageId>IMG_A1B2C3_1234567890ABCI</diskimageId>
- <diskimageName>W2k8R2SE/IIS(EN)</diskimageName>
- <licenseInfo>Included</licenseInfo>
- <osName>Windows Server 2008 R2 SE 64bit (English)</osName>
- <osType>hvm</osType>
- <registrant>ABCDEFGH</registrant>
- <size>40.0</size>
- <softwares>
- <software>
- <license />
- <name>Internet Information Server 7.5</name>
- </software>
- </softwares>
- </diskimage>
- </diskimages>
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</ListDiskImageResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/ListEFM-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/ListEFM-response.xml b/fgcp/src/test/resources/responses/ListEFM-response.xml
deleted file mode 100644
index 3e4a1e3..0000000
--- a/fgcp/src/test/resources/responses/ListEFM-response.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ListEFMResponse xmlns="http://apioviss.jp.fujitsu.com">
- <efms>
- <efm>
- <creator>ABCDEFGH</creator>
- <efmId>ABCDEFGH-A123B456CE-S-0001</efmId>
- <efmName>Firewall</efmName>
- <efmType>FW</efmType>
- </efm>
- </efms>
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</ListEFMResponse>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/ListEFMBackup-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/ListEFMBackup-response.xml b/fgcp/src/test/resources/responses/ListEFMBackup-response.xml
deleted file mode 100644
index 780dbed..0000000
--- a/fgcp/src/test/resources/responses/ListEFMBackup-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ListEFMBackupResponse xmlns="http://apioviss.jp.fujitsu.com">
- <backups>
- <backup>
- <backupId>001</backupId>
- <backupTime>20121008201127</backupTime>
- </backup>
- <backup>
- <backupId>002</backupId>
- <backupTime>20121009201127</backupTime>
- </backup>
- </backups>
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</ListEFMBackupResponse>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/ListPublicIP-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/ListPublicIP-response.xml b/fgcp/src/test/resources/responses/ListPublicIP-response.xml
deleted file mode 100644
index 6286209..0000000
--- a/fgcp/src/test/resources/responses/ListPublicIP-response.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ListPublicIPResponse xmlns="http://apioviss.jp.fujitsu.com">
- <publicips>
- <publicip>
- <address>123.45.67.89</address>
- <v4v6Flag>IPv4</v4v6Flag>
- <vsysId>ABCDEFGH-A123B456CE</vsysId>
- </publicip>
- <publicip>
- <address>123.45.67.90</address>
- <v4v6Flag>IPv4</v4v6Flag>
- <vsysId>ABCDEFGH-A123B456CD</vsysId>
- </publicip>
- </publicips>
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</ListPublicIPResponse>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/ListPublicIP_one_vsys-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/ListPublicIP_one_vsys-response.xml b/fgcp/src/test/resources/responses/ListPublicIP_one_vsys-response.xml
deleted file mode 100644
index d470837..0000000
--- a/fgcp/src/test/resources/responses/ListPublicIP_one_vsys-response.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ListPublicIPResponse xmlns="http://apioviss.jp.fujitsu.com">
- <publicips>
- <publicip>
- <address>123.45.67.88</address>
- <v4v6Flag>IPv4</v4v6Flag>
- <vsysId>ABCDEFGH-A123B456CE</vsysId>
- </publicip>
- <publicip>
- <address>123.45.67.89</address>
- <v4v6Flag>IPv4</v4v6Flag>
- <vsysId>ABCDEFGH-A123B456CE</vsysId>
- </publicip>
- </publicips>
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</ListPublicIPResponse>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/ListServerType-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/ListServerType-response.xml b/fgcp/src/test/resources/responses/ListServerType-response.xml
deleted file mode 100644
index 0c9cee6..0000000
--- a/fgcp/src/test/resources/responses/ListServerType-response.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ListServerTypeResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <servertypes>
- <servertype>
- <chargeType>amount</chargeType>
- <cpu>
- <cpuArch>IA</cpuArch>
- <cpuPerf>4.0</cpuPerf>
- <numOfCpu>1</numOfCpu>
- </cpu>
- <expectedUsage>744</expectedUsage>
- <id>islanda-cbrm_144</id>
- <memory>
- <memorySize>7.5</memorySize>
- </memory>
- <name>advanced</name>
- <price>0.3</price>
- <productId>AUS-VM-0001-0003</productId>
- <productName>Advanced VM</productName>
- </servertype>
- <servertype>
- <chargeType>amount</chargeType>
- <cpu>
- <cpuArch>IA</cpuArch>
- <cpuPerf>1.0</cpuPerf>
- <numOfCpu>1</numOfCpu>
- </cpu>
- <expectedUsage>744</expectedUsage>
- <id>islanda-cbrm_140</id>
- <memory>
- <memorySize>1.7</memorySize>
- </memory>
- <name>economy</name>
- <price>0.1</price>
- <productId>AUS-VM-0001-0001</productId>
- <productName>Economy VM</productName>
- </servertype>
- <servertype>
- <chargeType>amount</chargeType>
- <cpu>
- <cpuArch>IA</cpuArch>
- <cpuPerf>4.0</cpuPerf>
- <numOfCpu>2</numOfCpu>
- </cpu>
- <expectedUsage>744</expectedUsage>
- <id>islanda-cbrm_146</id>
- <memory>
- <memorySize>15.0</memorySize>
- </memory>
- <name>high_performance</name>
- <price>0.4</price>
- <productId>AUS-VM-0001-0004</productId>
- <productName>High-Performance VM</productName>
- </servertype>
- <servertype>
- <chargeType>amount</chargeType>
- <cpu>
- <cpuArch>IA</cpuArch>
- <cpuPerf>2.0</cpuPerf>
- <numOfCpu>1</numOfCpu>
- </cpu>
- <disks>
- <disk>
- <diskSize>10</diskSize>
- <diskType>Disk type</diskType>
- <diskUsage>Disk purpose</diskUsage>
- </disk>
- </disks>
- <expectedUsage>744</expectedUsage>
- <id>islanda-cbrm_142</id>
- <memory>
- <memorySize>3.4</memorySize>
- </memory>
- <name>standard</name>
- <price>0.3</price>
- <productId>AUS-VM-0001-0002</productId>
- <productName>Standard VM</productName>
- </servertype>
- </servertypes>
-</ListServerTypeResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/ListVDisk-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/ListVDisk-response.xml b/fgcp/src/test/resources/responses/ListVDisk-response.xml
deleted file mode 100644
index e9e9242..0000000
--- a/fgcp/src/test/resources/responses/ListVDisk-response.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ListVDiskResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vdisks>
- <vdisk>
- <attachedTo>ABCDEFGH-A123B456CE-S-0006</attachedTo>
- <creator>ABCDEFGH</creator>
- <size>10.0</size>
- <vdiskId>ABCDEFGH-A123B456CE-S-0006</vdiskId>
- <vdiskName>VM1</vdiskName>
- </vdisk>
- </vdisks>
-</ListVDiskResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/ListVSYS-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/ListVSYS-response.xml b/fgcp/src/test/resources/responses/ListVSYS-response.xml
deleted file mode 100644
index 947f787..0000000
--- a/fgcp/src/test/resources/responses/ListVSYS-response.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ListVSYSResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vsyss>
- <vsys>
- <baseDescriptor>2-tier Skeleton</baseDescriptor>
- <creator>ABCDEFGH</creator>
- <description>2-tier Skeleton</description>
- <vsysId>ABCDEFGH-I123J456K</vsysId>
- <vsysName>expect test</vsysName>
- </vsys>
- <vsys>
- <baseDescriptor>2-tier Skeleton</baseDescriptor>
- <creator>ABCDEFGH</creator>
- <description>2-tier Skeleton</description>
- <vsysId>ABCDEFGH-L654J321I</vsysId>
- <vsysName>expect test 2</vsysName>
- </vsys>
- </vsyss>
-</ListVSYSResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/ListVServer-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/ListVServer-response.xml b/fgcp/src/test/resources/responses/ListVServer-response.xml
deleted file mode 100644
index 643925d..0000000
--- a/fgcp/src/test/resources/responses/ListVServer-response.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ListVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vservers>
- <vserver>
- <creator>ABCDEFGH</creator>
- <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
- <vserverId>ABCDEFGH-A123B456CE-S-0005</vserverId>
- <vserverName>VM1</vserverName>
- <vserverType>economy</vserverType>
- </vserver>
- <vserver>
- <creator>ABCDEFGH</creator>
- <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
- <vserverId>ABCDEFGH-A123B456CE-S-0006</vserverId>
- <vserverName>VM2</vserverName>
- <vserverType>standard</vserverType>
- </vserver>
- </vservers>
-</ListVServerResponse>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/RESOURCE_NOT_FOUND-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/RESOURCE_NOT_FOUND-response.xml b/fgcp/src/test/resources/responses/RESOURCE_NOT_FOUND-response.xml
deleted file mode 100644
index 2995c56..0000000
--- a/fgcp/src/test/resources/responses/RESOURCE_NOT_FOUND-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>RESOURCE_NOT_FOUND</responseMessage>
- <responseStatus>ERROR</responseStatus>
-</CreateVServerResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/RestoreEFM-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/RestoreEFM-response.xml b/fgcp/src/test/resources/responses/RestoreEFM-response.xml
deleted file mode 100644
index 03a9871..0000000
--- a/fgcp/src/test/resources/responses/RestoreEFM-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RestoreEFMResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</RestoreEFMResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/RestoreVDisk-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/RestoreVDisk-response.xml b/fgcp/src/test/resources/responses/RestoreVDisk-response.xml
deleted file mode 100644
index a4f4bd7..0000000
--- a/fgcp/src/test/resources/responses/RestoreVDisk-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RestoreVDiskResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</RestoreVDiskResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/StartEFM-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/StartEFM-response.xml b/fgcp/src/test/resources/responses/StartEFM-response.xml
deleted file mode 100644
index 1914e55..0000000
--- a/fgcp/src/test/resources/responses/StartEFM-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StartEFMResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</StartEFMResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/StartVServer-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/StartVServer-response.xml b/fgcp/src/test/resources/responses/StartVServer-response.xml
deleted file mode 100644
index 0648bb7..0000000
--- a/fgcp/src/test/resources/responses/StartVServer-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StartVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</StartVServerResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/StopEFM-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/StopEFM-response.xml b/fgcp/src/test/resources/responses/StopEFM-response.xml
deleted file mode 100644
index 332d315..0000000
--- a/fgcp/src/test/resources/responses/StopEFM-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StopVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</StopVServerResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/StopVServer-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/StopVServer-response.xml b/fgcp/src/test/resources/responses/StopVServer-response.xml
deleted file mode 100644
index 332d315..0000000
--- a/fgcp/src/test/resources/responses/StopVServer-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StopVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</StopVServerResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/UnregisterDiskImage-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/UnregisterDiskImage-response.xml b/fgcp/src/test/resources/responses/UnregisterDiskImage-response.xml
deleted file mode 100644
index 65d4052..0000000
--- a/fgcp/src/test/resources/responses/UnregisterDiskImage-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UnregisterDiskImageResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</UnregisterDiskImageResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/UnregisterPrivateVSYSDescriptor-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/UnregisterPrivateVSYSDescriptor-response.xml b/fgcp/src/test/resources/responses/UnregisterPrivateVSYSDescriptor-response.xml
deleted file mode 100644
index fcb6dce..0000000
--- a/fgcp/src/test/resources/responses/UnregisterPrivateVSYSDescriptor-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UnregisterPrivateVSYSDescriptorResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</UnregisterPrivateVSYSDescriptorResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/UnregisterVSYSDescriptor-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/UnregisterVSYSDescriptor-response.xml b/fgcp/src/test/resources/responses/UnregisterVSYSDescriptor-response.xml
deleted file mode 100644
index 884e5fd..0000000
--- a/fgcp/src/test/resources/responses/UnregisterVSYSDescriptor-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UnregisterVSYSDescriptorResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</UnregisterVSYSDescriptorResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/UpdateDiskImageAttribute-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/UpdateDiskImageAttribute-response.xml b/fgcp/src/test/resources/responses/UpdateDiskImageAttribute-response.xml
deleted file mode 100644
index 5210fc8..0000000
--- a/fgcp/src/test/resources/responses/UpdateDiskImageAttribute-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UpdateDiskImageAttributeResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</UpdateDiskImageAttributeResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/UpdateEFMAttribute-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/UpdateEFMAttribute-response.xml b/fgcp/src/test/resources/responses/UpdateEFMAttribute-response.xml
deleted file mode 100644
index 935b9a2..0000000
--- a/fgcp/src/test/resources/responses/UpdateEFMAttribute-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UpdateEFMAttributeResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</UpdateEFMAttributeResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/UpdateVDiskAttribute-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/UpdateVDiskAttribute-response.xml b/fgcp/src/test/resources/responses/UpdateVDiskAttribute-response.xml
deleted file mode 100644
index 57ad948..0000000
--- a/fgcp/src/test/resources/responses/UpdateVDiskAttribute-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UpdateVDiskAttributeResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</UpdateVDiskAttributeResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/UpdateVSYSDescriptorAttribute-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/UpdateVSYSDescriptorAttribute-response.xml b/fgcp/src/test/resources/responses/UpdateVSYSDescriptorAttribute-response.xml
deleted file mode 100644
index d660bee..0000000
--- a/fgcp/src/test/resources/responses/UpdateVSYSDescriptorAttribute-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UpdateVSYSDescriptorAttribute xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</UpdateVSYSDescriptorAttribute>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/UpdateVServerAttribute-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/UpdateVServerAttribute-response.xml b/fgcp/src/test/resources/responses/UpdateVServerAttribute-response.xml
deleted file mode 100644
index b1be001..0000000
--- a/fgcp/src/test/resources/responses/UpdateVServerAttribute-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UpdateVServerAttributeResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</UpdateVServerAttributeResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 85242a7..ebedd4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,9 +77,6 @@
<module>digitalocean</module>
<module>joyent-cloudapi</module>
<module>joyentcloud</module>
- <module>fgcp</module>
- <module>fgcp-au</module>
- <module>fgcp-de</module>
<module>abiquo</module>
<module>jclouds-representations</module>
<module>jclouds-management</module>
[2/8] JCLOUDS-757 Drop FCGP labs provider
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/SystemTemplateApiExpectTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/SystemTemplateApiExpectTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/SystemTemplateApiExpectTest.java
deleted file mode 100644
index b023fa1..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/SystemTemplateApiExpectTest.java
+++ /dev/null
@@ -1,96 +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 org.jclouds.fujitsu.fgcp.domain.VSystemDescriptor;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "SystemTemplateApiExpectTest", singleThreaded = true)
-public class SystemTemplateApiExpectTest extends BaseFGCPRestApiExpectTest {
-
- public void testGet() {
- HttpRequest request = buildGETWithQuery("Action=GetVSYSDescriptorConfiguration"
- + "&vsysDescriptorId=3-tier%20Skeleton");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/GetVSYSDescriptorConfiguration-response.xml"))
- .build();
- SystemTemplateApi client = requestSendsResponse(request, response)
- .getSystemTemplateApi();
-
- VSystemDescriptor desc = client.get("3-tier Skeleton");
- assertNotNull(desc, "desc");
-// assertEquals(desc.)
- }
-
-
- public void testUpdate() {
- HttpRequest request = buildGETWithQuery("Action=UpdateVSYSDescriptorAttribute"
- + "&vsysDescriptorId=3-tier%20Skeleton"
- + "&updateLcId=en" + "&attributeName=updateName"
- + "&attributeValue=new-name");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/UpdateVSYSDescriptorAttribute-response.xml"))
- .build();
-
- SystemTemplateApi api = requestSendsResponse(request, response)
- .getSystemTemplateApi();
-
- api.update("3-tier Skeleton", "en", "updateName", "new-name");
- }
-
- public void testDeregister() {
- HttpRequest request = buildGETWithQuery("Action=UnregisterVSYSDescriptor"
- + "&vsysDescriptorId=3-tier%20Skeleton");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/UnregisterVSYSDescriptor-response.xml"))
- .build();
-
- SystemTemplateApi api = requestSendsResponse(request, response)
- .getSystemTemplateApi();
-
- api.deregister("3-tier Skeleton");
- }
-
- public void testDeregisterPrivateTemplate() {
- HttpRequest request = buildGETWithQuery("Action=UnregisterPrivateVSYSDescriptor"
- + "&vsysDescriptorId=3-tier%20Skeleton");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/UnregisterPrivateVSYSDescriptor-response.xml"))
- .build();
-
- SystemTemplateApi api = requestSendsResponse(request, response)
- .getSystemTemplateApi();
-
- api.deregisterPrivateTemplate("3-tier Skeleton");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiExpectTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiExpectTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiExpectTest.java
deleted file mode 100644
index abdc492..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiExpectTest.java
+++ /dev/null
@@ -1,202 +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 static org.testng.Assert.assertTrue;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.fujitsu.fgcp.domain.AddressRange;
-import org.jclouds.fujitsu.fgcp.domain.DiskImage;
-import org.jclouds.fujitsu.fgcp.domain.EventLog;
-import org.jclouds.fujitsu.fgcp.domain.PublicIP;
-import org.jclouds.fujitsu.fgcp.domain.ServerType;
-import org.jclouds.fujitsu.fgcp.domain.VSystem;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "VirtualDCApiExpectTest", singleThreaded = true)
-public class VirtualDCApiExpectTest extends BaseFGCPRestApiExpectTest {
-
- public void testListVirtualSystems() {
- HttpRequest request = buildGETWithQuery("Action=ListVSYS");
- HttpResponse response = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/ListVSYS-response.xml"))
- .build();
-
- VirtualDCApi api = requestSendsResponse(request, response).getVirtualDCApi();
-
- Set<VSystem> vsysSet = api.listVirtualSystems();
- assertEquals(vsysSet.size(), 2);
- }
-
- public void testCreateVirtualSystem() {
- HttpRequest request = buildGETWithQuery("Action=CreateVSYS&vsysDescriptorId=myDescId&vsysName=myVSYS");
- HttpResponse response = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/CreateVSYS-response.xml"))
- .build();
- VirtualDCApi api = requestSendsResponse(request, response)
- .getVirtualDCApi();
-
- String vsysId = api.createVirtualSystem("myDescId", "myVSYS");
- assertEquals(vsysId, "CONTRACT-VSYS00001", "vsysId: " + vsysId);
- }
-
-
- public void testListServerTypes() {
- HttpRequest request = buildGETWithQuery("Action=ListServerType&diskImageId=dummy");
- HttpResponse response = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/ListServerType-response.xml"))
- .build();
- VirtualDCApi api = requestSendsResponse(request, response)
- .getVirtualDCApi();
-
- Set<ServerType> serverTypes = api.listServerTypes();
- assertNotNull(serverTypes, "serverTypes");
- assertEquals(serverTypes.size(), 4,
- "Unexpected number of server types: " + serverTypes.size());
- }
-
- public void testListPublicIPs() {
- HttpRequest request = buildGETWithQuery("Action=ListPublicIP");
- HttpResponse response = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/ListPublicIP-response.xml"))
- .build();
- VirtualDCApi api = requestSendsResponse(request, response)
- .getVirtualDCApi();
-
- Map<PublicIP, String> ips = api.listPublicIPs();
-
- assertNotNull(ips, "ips");
- assertEquals(ips.size(), 2, "Unexpected number of ips: " + ips.size());
- assertEquals(ips.keySet().size(), 2, "Unexpected number of ips: " + ips.size());
- assertTrue(ips.containsValue("ABCDEFGH-A123B456CE"), "missing system id");
- assertEquals(ips.keySet().iterator().next().getVersion(), PublicIP.Version.IPv4);
- }
-
- public void testListDiskImages() {
- HttpRequest request = buildGETWithQuery("Action=ListDiskImage");
- HttpResponse response = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/ListDiskImages-response.xml"))
- .build();
- VirtualDCApi api = requestSendsResponse(request, response)
- .getVirtualDCApi();
-
- Set<DiskImage> images = api.listDiskImages();
-
- assertNotNull(images, "images");
- assertTrue(images.size() > 5, "Unexpected number of images: " + images.size());
- }
-
- public void testListDiskImage() {
- HttpRequest request = buildGETWithQuery("Action=ListDiskImage&vsysDescriptorId=IMG_A1B2C3_1234567890ABCD");
- HttpResponse response = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/ListDiskImage-response.xml"))
- .build();
- VirtualDCApi api = requestSendsResponse(request, response)
- .getVirtualDCApi();
-
- Set<DiskImage> images = api.listDiskImages(null, "IMG_A1B2C3_1234567890ABCD");
-
- assertNotNull(images, "images");
- assertEquals(1, images.size(), "Unexpected number of images: " + images.size());
- }
-
- public void testGetAddressRange() {
- HttpRequest request = buildGETWithQuery("Action=GetAddressRange");
- HttpResponse response = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/GetAddressRange-response.xml"))
- .build();
- VirtualDCApi api = requestSendsResponse(request, response)
- .getVirtualDCApi();
-
- Set<AddressRange> range = api.getAddressRange();
- assertNotNull(range);
- assertEquals(range.size(), 1);
- }
-
- public void testAddAddressRange() {
- HttpRequest request = buildGETWithQuery("Action=AddAddressRange"
- + "&pipFrom=192.168.0.0"
- + "&pipTo=192.168.30.0");
- HttpResponse response = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/AddAddressRange-response.xml"))
- .build();
- VirtualDCApi api = requestSendsResponse(request, response)
- .getVirtualDCApi();
-
- api.addAddressRange("192.168.0.0", "192.168.30.0");
- }
-
- public void testDeleteAddressRange() {
- HttpRequest request = buildGETWithQuery("Action=DeleteAddressRange"
- + "&pipFrom=192.168.0.0"
- + "&pipTo=192.168.30.0");
- HttpResponse response = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/DeleteAddressRange-response.xml"))
- .build();
- VirtualDCApi api = requestSendsResponse(request, response)
- .getVirtualDCApi();
-
- api.deleteAddressRange("192.168.0.0", "192.168.30.0");
- }
-
- public void testCreateAddressPool() {
- HttpRequest request = buildGETWithQuery("Action=CreateAddressPool"
- + "&pipFrom=192.168.0.0"
- + "&pipTo=192.168.30.0");
- HttpResponse response = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/CreateAddressPool-response.xml"))
- .build();
- VirtualDCApi api = requestSendsResponse(request, response)
- .getVirtualDCApi();
-
- api.createAddressPool("192.168.0.0", "192.168.30.0");
- }
-
- public void testGetEventLog() {
- HttpRequest request = buildGETWithQuery("Action=GetEventLog");
- HttpResponse response = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/GetEventLog-response.xml"))
- .build();
- VirtualDCApi api = requestSendsResponse(request, response)
- .getVirtualDCApi();
-
- Set<EventLog> logs = api.getEventLogs();
- assertNotNull(logs);
- //TODO: get one with several
-// assertEquals(logs.size(), 1);
- }
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiLiveTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiLiveTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiLiveTest.java
deleted file mode 100644
index ed9a6c4..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiLiveTest.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.services;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.fujitsu.fgcp.domain.ServerType;
-import org.jclouds.fujitsu.fgcp.domain.VSystem;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "VirtualDCApiLiveTest")
-public class VirtualDCApiLiveTest extends BaseFGCPApiLiveTest {
-
- public void testListVirtualSystems() {
-/* Properties overrides = setupProperties();
- RestContext<FGCPClient, FGCPAsyncClientTest> context = new RestContextFactory().createContext(provider, ImmutableSet.<Module> of(new Log4JLoggingModule()),
- overrides);*/
-
- Set<VSystem> vsysSet = api.getVirtualDCApi().listVirtualSystems();
- assertNotNull(vsysSet, "vsysSet");
- assertTrue(!vsysSet.isEmpty(), "vsysSet.size() should be greater than 0");
- for (VSystem vsys : vsysSet) {
- System.out.println(vsys);
- }
- }
-
-/* public void testCreateVirtualSystem() {
- String vsysId = vdcApi.createVirtualSystem("abc", "def");
-
- assertNotNull(vsysId, "vsysId");
- assertNotEquals("", vsysId, "vsysId is empty (\"\")");
- System.out.println("vsysId: " + vsysId);
- }*/
-
- public void testListServerTypes() {
- Set<ServerType> serverTypes = api.getVirtualDCApi().listServerTypes();
-
- assertNotNull(serverTypes, "serverTypes");
- assertEquals(4, serverTypes.size(), "serverTypes.size should return 4, not " + serverTypes.size());
-
-// System.out.println("listServerTypes: " + serverTypes);
- }
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualServerApiExpectTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualServerApiExpectTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualServerApiExpectTest.java
deleted file mode 100644
index 678924e..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualServerApiExpectTest.java
+++ /dev/null
@@ -1,216 +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.AssertJUnit.assertNotNull;
-
-import org.jclouds.fujitsu.fgcp.domain.VServerStatus;
-import org.jclouds.fujitsu.fgcp.domain.VServerWithDetails;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "VirtualServerApiExpectTest", singleThreaded = true)
-public class VirtualServerApiExpectTest extends BaseFGCPRestApiExpectTest {
-
- public void testStart() {
- HttpRequest request = buildGETWithQuery("Action=StartVServer"
- + "&vserverId=CONTRACT-VSYS00001-S-0005"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/StartVServer-response.xml"))
- .build();
-
- VirtualServerApi api = requestSendsResponse(request, response)
- .getVirtualServerApi();
-
- api.start("CONTRACT-VSYS00001-S-0005");
- }
-
- public void testStop() {
- HttpRequest request = buildGETWithQuery("Action=StopVServer"
- + "&vserverId=CONTRACT-VSYS00001-S-0005"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/StopVServer-response.xml"))
- .build();
-
- VirtualServerApi api = requestSendsResponse(request, response)
- .getVirtualServerApi();
-
- api.stop("CONTRACT-VSYS00001-S-0005");
- }
-
- public void testStopForcefully() {
- HttpRequest request = buildGETWithQuery("Action=StopVServer"
- + "&force=true"
- + "&vserverId=CONTRACT-VSYS00001-S-0005"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/StopVServer-response.xml"))
- .build();
-
- VirtualServerApi api = requestSendsResponse(request, response)
- .getVirtualServerApi();
-
- api.stopForcefully("CONTRACT-VSYS00001-S-0005");
- }
-
- public void testDestroy() {
- HttpRequest request = buildGETWithQuery("Action=DestroyVServer"
- + "&vserverId=CONTRACT-VSYS00001-S-0005"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/DestroyVServer-response.xml"))
- .build();
-
- VirtualServerApi api = requestSendsResponse(request, response)
- .getVirtualServerApi();
-
- api.destroy("CONTRACT-VSYS00001-S-0005");
- }
-
- public void testGet() {
- HttpRequest request = buildGETWithQuery("Action=GetVServerAttributes"
- + "&vserverId=CONTRACT-VSYS00001-S-0005"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/GetVServerAttributes-response.xml"))
- .build();
-
- VirtualServerApi api = requestSendsResponse(request, response)
- .getVirtualServerApi();
-
- assertNotNull(api.get("CONTRACT-VSYS00001-S-0005"));
- }
-
- public void testGetDetails() {
- HttpRequest request = buildGETWithQuery("Action=GetVServerConfiguration"
- + "&vserverId=CONTRACT-VSYS00001-S-0005"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/GetVServerConfiguration-response.xml"))
- .build();
-
- VirtualServerApi api = requestSendsResponse(request, response)
- .getVirtualServerApi();
-
- VServerWithDetails server = api.getDetails("CONTRACT-VSYS00001-S-0005");
- assertNotNull(server);
- assertEquals(server.getId(), "CONTRACT-VSYS00001-S-0005");
- assertEquals(server.getVnics().iterator().next().getNicNo(), 0);
- assertEquals(server.getVnics().iterator().next().getPrivateIp(), "192.168.4.13");
- assertEquals(server.getVnics().iterator().next().getNetworkId(), "CONTRACT-VSYS00001-N-DMZ");
- assertEquals(server.getImage().getId(), "IMG_A1B2C3_1234567890ABCD");
- assertEquals(server.getImage().getSysvolSize(), 10.0f);
- }
-
- public void testGetStatus() {
- HttpRequest request = buildGETWithQuery("Action=GetVServerStatus"
- + "&vserverId=CONTRACT-VSYS00001-S-0005"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/GetVServerStatus-response.xml"))
- .build();
-
- VirtualServerApi api = requestSendsResponse(request, response)
- .getVirtualServerApi();
-
- assertEquals(api.getStatus("CONTRACT-VSYS00001-S-0005"), VServerStatus.STOPPED);
- }
-
- public void testInitialPassword() {
- HttpRequest request = buildGETWithQuery("Action=GetVServerInitialPassword"
- + "&vserverId=CONTRACT-VSYS00001-S-0005"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/GetVServerInitialPassword-response.xml"))
- .build();
-
- VirtualServerApi api = requestSendsResponse(request, response)
- .getVirtualServerApi();
-
- assertEquals(api.getInitialPassword("CONTRACT-VSYS00001-S-0005"), "mySecretpwd1");
- }
-
- public void testUpdate() {
- HttpRequest request = buildGETWithQuery("Action=UpdateVServerAttribute"
- + "&vserverId=CONTRACT-VSYS00001-S-0005"
- + "&attributeName=vserverName"
- + "&attributeValue=new%20name"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/UpdateVServerAttribute-response.xml"))
- .build();
-
- VirtualServerApi api = requestSendsResponse(request, response)
- .getVirtualServerApi();
-
- api.update("CONTRACT-VSYS00001-S-0005", "vserverName", "new name");
- }
-
- public void testAttachDisk() {
- HttpRequest request = buildGETWithQuery("Action=AttachVDisk"
- + "&vserverId=CONTRACT-VSYS00001-S-0005"
- + "&vdiskId=CONTRACT-VSYS00001-D-0001"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/AttachVDisk-response.xml"))
- .build();
-
- VirtualServerApi api = requestSendsResponse(request, response)
- .getVirtualServerApi();
-
- api.attachDisk("CONTRACT-VSYS00001-S-0005", "CONTRACT-VSYS00001-D-0001");
- }
-
-/* public void testGetPerformanceInformation() {
- HttpRequest request = buildGETWithQuery("Action=GetPerformanceInformation"
- + "&serverId=CONTRACT-VSYS00001-S-0005"
- + "&interval=10minute"
- + "&vsysId=CONTRACT-VSYS00001");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/GetPerformanceInformation-response.xml"))
- .build();
-
- VirtualServerApi api = requestSendsResponse(request, response)
- .getVirtualServerApi();
-
- assertNotNull(api.getPerformanceInformation(
- "CONTRACT-VSYS00001-S-0005", "10minute"));
- }
-*/
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualSystemApiExpectTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualSystemApiExpectTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualSystemApiExpectTest.java
deleted file mode 100644
index 618ba38..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualSystemApiExpectTest.java
+++ /dev/null
@@ -1,252 +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.PublicIP;
-import org.jclouds.fujitsu.fgcp.domain.VDisk;
-import org.jclouds.fujitsu.fgcp.domain.VServer;
-import org.jclouds.fujitsu.fgcp.domain.VSystem;
-import org.jclouds.fujitsu.fgcp.domain.VSystemStatus;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "VirtualSystemApiExpectTest", singleThreaded = true)
-public class VirtualSystemApiExpectTest extends BaseFGCPRestApiExpectTest {
-
- public void testGet() {
- HttpRequest request = buildGETWithQuery("Action=GetVSYSAttributes&vsysId=ABCDEFGH-A123B456CE");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/GetVSYSAttributes-response.xml"))
- .build();
- VirtualSystemApi api = requestSendsResponse(request, response)
- .getVirtualSystemApi();
-
- VSystem system = api.get("ABCDEFGH-A123B456CE");
- assertNotNull(system, "system");
- }
-
- public void testGetDetails() {
- HttpRequest request = buildGETWithQuery("Action=GetVSYSConfiguration&vsysId=ABCDEFGH-A123B456CE");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/GetVSYSConfiguration-response.xml"))
- .build();
- VirtualSystemApi api = requestSendsResponse(request, response)
- .getVirtualSystemApi();
-
- VSystem system = api.getDetails("ABCDEFGH-A123B456CE");
- assertNotNull(system, "system");
- }
-
- public void testGetStatus() {
- HttpRequest request = buildGETWithQuery("Action=GetVSYSStatus"
- + "&vsysId=ABCDEFGH-A123B456CE");
- HttpResponse response = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/GetVSYSStatus-response.xml"))
- .build();
- VirtualSystemApi api = requestSendsResponse(request, response)
- .getVirtualSystemApi();
-
- assertEquals(api.getStatus("ABCDEFGH-A123B456CE"), VSystemStatus.NORMAL);
- }
-
- public void testUpdate() {
- HttpRequest request = buildGETWithQuery("Action=UpdateVSYSAttribute"
- + "&vsysId=ABCDEFGH-A123B456CE"
- + "&attributeName=updateName" + "&attributeValue=new-name");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/UpdateVDiskAttribute-response.xml"))
- .build();
-
- VirtualSystemApi api = requestSendsResponse(request, response)
- .getVirtualSystemApi();
-
- api.update("ABCDEFGH-A123B456CE", "updateName", "new-name");
- }
-
- public void testListPublicIPs() {
- HttpRequest request = buildGETWithQuery("Action=ListPublicIP"
- + "&vsysId=ABCDEFGH-A123B456CE");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/ListPublicIP_one_vsys-response.xml"))
- .build();
- VirtualSystemApi api = requestSendsResponse(request, response)
- .getVirtualSystemApi();
-
- Set<PublicIP> ips = api.listPublicIPs("ABCDEFGH-A123B456CE");
- assertNotNull(ips, "ips");
- assertEquals(2, ips.size(), "Unexpected number of ips: " + ips.size());
- assertEquals(ips.iterator().next().getVersion(), PublicIP.Version.IPv4);
- }
-
- public void testListServers() {
- HttpRequest request = buildGETWithQuery("Action=ListVServer"
- + "&vsysId=ABCDEFGH-A123B456CE");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/ListVServer-response.xml"))
- .build();
- VirtualSystemApi api = requestSendsResponse(request, response)
- .getVirtualSystemApi();
-
- Set<VServer> servers = api.listServers("ABCDEFGH-A123B456CE");
- assertNotNull(servers, "servers");
- assertEquals(servers.size(), 2);
- }
-
- public void testDisks() {
- HttpRequest request = buildGETWithQuery("Action=ListVDisk"
- + "&vsysId=ABCDEFGH-A123B456CE");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/ListVDisk-response.xml"))
- .build();
- VirtualSystemApi api = requestSendsResponse(request, response)
- .getVirtualSystemApi();
-
- Set<VDisk> disks = api.listDisks("ABCDEFGH-A123B456CE");
- assertNotNull(disks, "disks");
- assertEquals(disks.size(), 1);
- }
-
- public void testListBuiltinServers() {
- HttpRequest request = buildGETWithQuery("Action=ListEFM"
- + "&vsysId=ABCDEFGH-A123B456CE" + "&efmType=FW");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/ListEFM-response.xml"))
- .build();
- VirtualSystemApi api = requestSendsResponse(request, response)
- .getVirtualSystemApi();
-
- Set<BuiltinServer> fws = api.listBuiltinServers("ABCDEFGH-A123B456CE", "FW");
- assertNotNull(fws, "fws");
- assertEquals(fws.size(), 1);
- }
-
- public void testAllocatePublicIP() {
- HttpRequest request = buildGETWithQuery("Action=AllocatePublicIP&vsysId=ABCDEFGH-A123B456CE");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/AllocatePublicIP-response.xml"))
- .build();
- VirtualSystemApi api = requestSendsResponse(request, response)
- .getVirtualSystemApi();
-
- api.allocatePublicIP("ABCDEFGH-A123B456CE");
- }
-
- public void testCreateBuiltinServer() {
- HttpRequest request = buildGETWithQuery("Action=CreateEFM"
- + "&efmType=SLB"
- + "&efmName=web%20load%20balancer"
- + "&networkId=ABCDEFGH-A123B456CE-N-DMZ"
- + "&vsysId=ABCDEFGH-A123B456CE");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/CreateEFM-response.xml"))
- .build();
- VirtualSystemApi api = requestSendsResponse(request, response)
- .getVirtualSystemApi();
-
- String id = api.createBuiltinServer("web load balancer",
- "ABCDEFGH-A123B456CE-N-DMZ");
- assertEquals(id, "CONTRACT-EFM00001");
- }
-
- public void testCreateServer() {
- 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(200)
- .payload(
- payloadFromResource("/CreateVServer-response.xml"))
- .build();
- VirtualSystemApi api = requestSendsResponse(request, response)
- .getVirtualSystemApi();
-
- String id = api.createServer("vm1", "economy", "IMG_A1B2C3_1234567890ABCD",
- "ABCDEFGH-A123B456CE-N-DMZ");
- assertEquals(id, "ABCDEFGH-A123B456CE-S-0007");
- }
-
- public void testCreateDisk() {
- HttpRequest request = buildGETWithQuery("Action=CreateVDisk"
- + "&vsysId=ABCDEFGH-A123B456CE" + "&vdiskName=disk1"
- + "&size=10");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/CreateVDisk-response.xml"))
- .build();
- VirtualSystemApi api = requestSendsResponse(request, response)
- .getVirtualSystemApi();
-
- String id = api.createDisk("ABCDEFGH-A123B456CE", "disk1", 10);
- assertEquals(id, "ABCDEFGH-A123B456CE-S-0006");
- }
-
-/*
- public void testRegisterAsPrivateImage() {
- HttpRequest request = buildGETWithQuery("Action=AllocatePublicIP&vsysId=ABCDEFGH-A123B456CE");
- HttpResponse response = HttpResponse
- .builder()
- .statusCode(200)
- .payload(
- payloadFromResource("/AllocatePublicIP-response.xml"))
- .build();
- VirtualSystemApi api = requestSendsResponse(request, response)
- .getVirtualSystemApi();
-
- api.registerAsPrivateVSYSDescriptor("ABCDEFGH-A123B456CE");
- }
-*/
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/certs/jclouds-test-fgcp.p12
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/certs/jclouds-test-fgcp.p12 b/fgcp/src/test/resources/certs/jclouds-test-fgcp.p12
deleted file mode 100644
index 6ff5786..0000000
Binary files a/fgcp/src/test/resources/certs/jclouds-test-fgcp.p12 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/certs/jclouds-test-fgcp.pem
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/certs/jclouds-test-fgcp.pem b/fgcp/src/test/resources/certs/jclouds-test-fgcp.pem
deleted file mode 100644
index 33da396..0000000
--- a/fgcp/src/test/resources/certs/jclouds-test-fgcp.pem
+++ /dev/null
@@ -1,35 +0,0 @@
-Bag Attributes
- friendlyName: test-fgcp
- localKeyID: 54 69 6D 65 20 31 33 32 36 36 38 34 30 33 32 34 35 31
-Key Attributes: <No Attributes>
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCHj9j4voqoMfTVvsAUjxoJYCz9cXpmRzkPwoxOOP99bc+xnIEe
-K8jOVrlCy0Zwr0fr+PZT15RX8tAzg69kP7WLiVBqYeW7TKZ+9b+HgxUvDd6aaj1C
-SVdgHyQPmpcBLe2E2ADvbeEWYFiqhm5ms8Qes/Hb7S5Ct/Ux4R9UUrDnYQIDAQAB
-AoGABkxrs1r/DEON8aR0PkBL4GWkkX4FRt1GTHIonLXPQR+qB8GSyjkUkmm7H9xc
-AH5UZCVkJI8eqFtyywHyU0EWiTyd3pjkXIuWPcmtydTN3LwY6UZww07g7cAjQNsw
-cSXDXfmpAWNoavJWsjd7EUQ1VnnJMDo8A3Jj8BgvF7mTlZUCQQDdMmmOJNBRmbZP
-i9jfuggupIHNoJEyI8hQM1LQdyDYMojFZ/hz09vzuWzO1J4XpHtCa2Vuxq9hvC5R
-6jKmcTI3AkEAnOQkvv2/2x7T6+7zx53xqFuGjHeNjuaHqTENoT2Gh0oug4IX0HPE
-PTw9yVDqDCQe72jeSZZDLpejdF9tcyNHJwJBAIOkC/PfbucRXtGqfdBwK4xutR2G
-UMMRTpaEZOXR8Aca1BD/1npAfKdpFBtnqAqUBhM6TSyHLDszPjHb+nbZ6TMCQGEM
-Mrq9xd6qDBbmQX+Z8LDepLThAvyBFyuOP0sc/slTFsCcSVTVN29VgzazSYNnGIep
-S88jFr2MaTyEBvTwvoMCQE9ZWyYcmpkHxH5X5j6Bpf+ksY6eLnlH/YSOa9Hw8vZY
-SR2RvvhAa4UovUoyYJ3p0U/pO/h/W0p5TxIA3V+y7CY=
------END RSA PRIVATE KEY-----
-Bag Attributes
- friendlyName: CN=localhost
- localKeyID: 54 69 6D 65 20 31 33 32 36 36 38 34 30 33 32 34 35 31
-subject=/CN=localhost
-issuer=/CN=localhost
------BEGIN CERTIFICATE-----
-MIIBnzCCAQigAwIBAgIETxOXgDANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDEwls
-b2NhbGhvc3QwHhcNMTIwMTE2MDMyMDMyWhcNMjcwMTEyMDMyMDMyWjAUMRIwEAYD
-VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAIeP2Pi+
-iqgx9NW+wBSPGglgLP1xemZHOQ/CjE44/31tz7GcgR4ryM5WuULLRnCvR+v49lPX
-lFfy0DODr2Q/tYuJUGph5btMpn71v4eDFS8N3ppqPUJJV2AfJA+alwEt7YTYAO9t
-4RZgWKqGbmazxB6z8dvtLkK39THhH1RSsOdhAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-gYEANbfXtBVCUIZiQCU5LP/vKoKZMpE5X6s+kDqTJ3vntuczkN0qFWKIi9WABwAa
-/Aq2IffJIu6rZgWchJqhN7+PeVOTfh9xRWE7QFHDrsuBYaicrki7RB1kKCQLtUpD
-aZB5xlm5FhT2Hzkgkawdo5keD/+OcDqKVK2fEK8W6r61Spc=
------END CERTIFICATE-----
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/log4j.xml b/fgcp/src/test/resources/log4j.xml
deleted file mode 100644
index eb276c1..0000000
--- a/fgcp/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!--
- For more configuration infromation and examples see the Apache
- Log4j website: http://logging.apache.org/log4j/
--->
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in A local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="WIREFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="/opt/jclouds-wire.log"/>
- <param name="Append" value="true"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <param name="Threshold" value="TRACE"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
-
- <!--
- The full pattern: Date MS Priority [Category]
- (Thread:NDC) Message\n <param name="ConversionPattern"
- value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
-
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
- <param name="File" value="/opt/fgcp.log"/>
- <param name="Append" value="true"/>
-
- <param name="Threshold" value="TRACE"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-
- </layout>
- </appender>
-
- <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
-
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
- <param name="File" value="/opt/fgcp-ssh.log"/>
- <param name="Append" value="true"/>
-
- <param name="Threshold" value="TRACE"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="DEBUG"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- A time/date based rolling appender -->
- <appender name="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="/opt/jclouds-compute.log"/>
- <param name="Append" value="true"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <param name="Threshold" value="TRACE"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
-
- <!--
- The full pattern: Date MS Priority [Category]
- (Thread:NDC) Message\n <param name="ConversionPattern"
- value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- A time/date based rolling appender -->
- <appender name="GOOGLEINJECTFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="/opt/jclouds-google-inject.log"/>
- <param name="Append" value="true"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <param name="Threshold" value="TRACE"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
-
- </layout>
- </appender>
-
- <appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="COMPUTEFILE"/>
- </appender>
-
- <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="SSHFILE"/>
- </appender>
-
- <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="FILE"/>
- </appender>
-
- <appender name="ASYNCWIRE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="WIREFILE"/>
- </appender>
-
- <appender name="GOOGLEINJECT" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="GOOGLEINJECTFILE"/>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jclouds.logging.internal">
- <priority value="WARN"/>
- </category>
- <category name="org.apache.commons.httpclient">
- <priority value="WARN"/>
- </category>
-
- <category name="org.jclouds">
- <priority value="DEBUG"/>
- <appender-ref ref="ASYNC"/>
- </category>
-
- <category name="jclouds.headers">
- <priority value="DEBUG"/>
- <appender-ref ref="ASYNCWIRE"/>
- </category>
-
- <category name="jclouds.ssh">
- <priority value="DEBUG"/>
- <appender-ref ref="ASYNCSSH"/>
- </category>
- <category name="jclouds.wire">
- <priority value="DEBUG"/>
- <appender-ref ref="ASYNCWIRE"/>
- </category>
- <category name="jclouds.compute">
- <priority value="TRACE"/>
- <appender-ref ref="ASYNCCOMPUTE"/>
- </category>
-
- <category name="com.google.inject">
- <priority value="ALL"/>
- <appender-ref ref="GOOGLEINJECT"/>
- </category>
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <appender-ref ref="FILE"/>
- <appender-ref ref="CONSOLE"/>
- </root>
-
-</log4j:configuration>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/logback.xml b/fgcp/src/test/resources/logback.xml
deleted file mode 100644
index a4a6a3f..0000000
--- a/fgcp/src/test/resources/logback.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<configuration scan="false" >
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-wire.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="COMPUTEFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-compute.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="SSHFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-ssh.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <root>
- <level value="warn" />
- </root>
-
- <logger name="org.jclouds">
- <level value="DEBUG" />
- <appender-ref ref="FILE" />
- </logger>
-
- <logger name="jclouds.wire">
- <level value="DEBUG" />
- <appender-ref ref="WIREFILE" />
- </logger>
-
- <logger name="jclouds.headers">
- <level value="DEBUG" />
- <appender-ref ref="WIREFILE" />
- </logger>
-
- <logger name="jclouds.compute">
- <level value="DEBUG" />
- <appender-ref ref="COMPUTEFILE" />
- </logger>
-
- <logger name="jclouds.ssh">
- <level value="DEBUG" />
- <appender-ref ref="SSHFILE" />
- </logger>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/requests/CreateVSYS-request.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/requests/CreateVSYS-request.xml b/fgcp/src/test/resources/requests/CreateVSYS-request.xml
deleted file mode 100644
index 8dd318b..0000000
--- a/fgcp/src/test/resources/requests/CreateVSYS-request.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OViSSRequest>
- <Action>CreateVSYS</Action>
- <vsysDescriptorId>myDescId</vsysDescriptorId>
- <vsysName>myVSYS</vsysName>
- <Version>2011-01-31</Version>
- <Locale>en</Locale>
- <AccessKeyId>R01ULTA5OjAwJjEyMzQ1Njc4OTAmMS4wJlNIQTF3aXRoUlNB</AccessKeyId>
- <Signature>G2rGfLAkbq0IURQfXIWYxj3BnMGbjRk4KPnZLAze3Lt4SMMRt8lkjqKvR5Cm+nFpDN7J6IprVCCsIrRq5BqPeXT6xtWyb6qMNds2BAr1h/JePGs0UosOh2tgPUMSFlZwLVjgNyrSa2zeHA3AEHjF6H1jqcWXXqfCAD4SOHaNavk=</Signature>
-</OViSSRequest>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/AddAddressRange-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/AddAddressRange-response.xml b/fgcp/src/test/resources/responses/AddAddressRange-response.xml
deleted file mode 100644
index 81265be..0000000
--- a/fgcp/src/test/resources/responses/AddAddressRange-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AddAddressRangeResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</AddAddressRangeResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/AllocatePublicIP-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/AllocatePublicIP-response.xml b/fgcp/src/test/resources/responses/AllocatePublicIP-response.xml
deleted file mode 100644
index 4411beb..0000000
--- a/fgcp/src/test/resources/responses/AllocatePublicIP-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AllocatePublicIPResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</AllocatePublicIPResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/AttachPublicIP-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/AttachPublicIP-response.xml b/fgcp/src/test/resources/responses/AttachPublicIP-response.xml
deleted file mode 100644
index bcc457f..0000000
--- a/fgcp/src/test/resources/responses/AttachPublicIP-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AttachPublicIPResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</AttachPublicIPResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/AttachVDisk-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/AttachVDisk-response.xml b/fgcp/src/test/resources/responses/AttachVDisk-response.xml
deleted file mode 100644
index 0a38583..0000000
--- a/fgcp/src/test/resources/responses/AttachVDisk-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AttachVDiskResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</AttachVDiskResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/Auth_UserNotInSelectData-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/Auth_UserNotInSelectData-response.xml b/fgcp/src/test/resources/responses/Auth_UserNotInSelectData-response.xml
deleted file mode 100644
index 5f1011e..0000000
--- a/fgcp/src/test/resources/responses/Auth_UserNotInSelectData-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>User not found in selectData. searchKey:userid</responseMessage>
- <responseStatus>ERROR</responseStatus>
-</CreateVServerResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/BackupEFM-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/BackupEFM-response.xml b/fgcp/src/test/resources/responses/BackupEFM-response.xml
deleted file mode 100644
index 39e69e3..0000000
--- a/fgcp/src/test/resources/responses/BackupEFM-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BackupEFMResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</BackupEFMResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/BackupVDisk-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/BackupVDisk-response.xml b/fgcp/src/test/resources/responses/BackupVDisk-response.xml
deleted file mode 100644
index 0018289..0000000
--- a/fgcp/src/test/resources/responses/BackupVDisk-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BackupVDiskResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</BackupVDiskResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/CreateAddressPool-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/CreateAddressPool-response.xml b/fgcp/src/test/resources/responses/CreateAddressPool-response.xml
deleted file mode 100644
index 17988f5..0000000
--- a/fgcp/src/test/resources/responses/CreateAddressPool-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateAddressPoolResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</CreateAddressPoolResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/CreateEFM-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/CreateEFM-response.xml b/fgcp/src/test/resources/responses/CreateEFM-response.xml
deleted file mode 100644
index bd20f9a..0000000
--- a/fgcp/src/test/resources/responses/CreateEFM-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateEFMResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <efmId>CONTRACT-EFM00001</efmId>
-</CreateEFMResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/CreateVDisk-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/CreateVDisk-response.xml b/fgcp/src/test/resources/responses/CreateVDisk-response.xml
deleted file mode 100644
index ae7d8a3..0000000
--- a/fgcp/src/test/resources/responses/CreateVDisk-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVDiskResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vdiskId>ABCDEFGH-A123B456CE-S-0006</vdiskId>
-</CreateVDiskResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/CreateVSYS-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/CreateVSYS-response.xml b/fgcp/src/test/resources/responses/CreateVSYS-response.xml
deleted file mode 100644
index 425cbc7..0000000
--- a/fgcp/src/test/resources/responses/CreateVSYS-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVSYSResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vsysId>CONTRACT-VSYS00001</vsysId>
-</CreateVSYSResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/CreateVServer-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/CreateVServer-response.xml b/fgcp/src/test/resources/responses/CreateVServer-response.xml
deleted file mode 100644
index 81c51b9..0000000
--- a/fgcp/src/test/resources/responses/CreateVServer-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vserverId>ABCDEFGH-A123B456CE-S-0007</vserverId>
-</CreateVServerResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/DeleteAddressRange-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DeleteAddressRange-response.xml b/fgcp/src/test/resources/responses/DeleteAddressRange-response.xml
deleted file mode 100644
index e3cdd50..0000000
--- a/fgcp/src/test/resources/responses/DeleteAddressRange-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DeleteAddressRangeResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</DeleteAddressRangeResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/DestroyEFM-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DestroyEFM-response.xml b/fgcp/src/test/resources/responses/DestroyEFM-response.xml
deleted file mode 100644
index aa8e374..0000000
--- a/fgcp/src/test/resources/responses/DestroyEFM-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DestroyEFMResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</DestroyEFMResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/DestroyEFMBackup-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DestroyEFMBackup-response.xml b/fgcp/src/test/resources/responses/DestroyEFMBackup-response.xml
deleted file mode 100644
index a2da3c4..0000000
--- a/fgcp/src/test/resources/responses/DestroyEFMBackup-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DestroyEFMBackupResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</DestroyEFMBackupResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/DestroyVDisk-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DestroyVDisk-response.xml b/fgcp/src/test/resources/responses/DestroyVDisk-response.xml
deleted file mode 100644
index c66a6a9..0000000
--- a/fgcp/src/test/resources/responses/DestroyVDisk-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DestroyVDiskResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</DestroyVDiskResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/DestroyVDiskBackup-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DestroyVDiskBackup-response.xml b/fgcp/src/test/resources/responses/DestroyVDiskBackup-response.xml
deleted file mode 100644
index af0088f..0000000
--- a/fgcp/src/test/resources/responses/DestroyVDiskBackup-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DestroyVDiskBackupResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</DestroyVDiskBackupResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/DestroyVServer-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DestroyVServer-response.xml b/fgcp/src/test/resources/responses/DestroyVServer-response.xml
deleted file mode 100644
index c9fbbd2..0000000
--- a/fgcp/src/test/resources/responses/DestroyVServer-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DestroyVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</DestroyVServerResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/DetachPublicIP-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DetachPublicIP-response.xml b/fgcp/src/test/resources/responses/DetachPublicIP-response.xml
deleted file mode 100644
index ee99b2e..0000000
--- a/fgcp/src/test/resources/responses/DetachPublicIP-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DetachPublicIPResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</DetachPublicIPResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/DetachVDisk-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DetachVDisk-response.xml b/fgcp/src/test/resources/responses/DetachVDisk-response.xml
deleted file mode 100644
index 877cb74..0000000
--- a/fgcp/src/test/resources/responses/DetachVDisk-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DetachVDiskResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</DetachVDiskResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/FreePublicIP-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/FreePublicIP-response.xml b/fgcp/src/test/resources/responses/FreePublicIP-response.xml
deleted file mode 100644
index 7644e11..0000000
--- a/fgcp/src/test/resources/responses/FreePublicIP-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<FreePublicIPResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</FreePublicIPResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetAddressRange-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetAddressRange-response.xml b/fgcp/src/test/resources/responses/GetAddressRange-response.xml
deleted file mode 100644
index 2eb92bd..0000000
--- a/fgcp/src/test/resources/responses/GetAddressRange-response.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetAddressRangeResponse xmlns="http://apioviss.jp.fujitsu.com">
- <addressranges>
- <addressrange>
- <from>192.168.0.0</from>
- <range>MANUAL</range>
- <to>192.168.255.255</to>
- </addressrange>
- </addressranges>
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</GetAddressRangeResponse>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetDiskImageAttributes-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetDiskImageAttributes-response.xml b/fgcp/src/test/resources/responses/GetDiskImageAttributes-response.xml
deleted file mode 100644
index 044d31d..0000000
--- a/fgcp/src/test/resources/responses/GetDiskImageAttributes-response.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetDiskImageAttributesResponse xmlns="http://apioviss.jp.fujitsu.com">
- <diskimage>
- <creatorName>ABCDEFGH</creatorName>
- <description />
- <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
- <diskimageName>CentOS 6.0 64bit(EN)</diskimageName>
- <licenseInfo />
- <osName>CentOS 6.0 64bit (English)</osName>
- <osType>pv</osType>
- <registrant>ABCDEFGH</registrant>
- <size>10.0</size>
- </diskimage>
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</GetDiskImageAttributesResponse>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetEFMAttributes-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetEFMAttributes-response.xml b/fgcp/src/test/resources/responses/GetEFMAttributes-response.xml
deleted file mode 100644
index 02f7bfe..0000000
--- a/fgcp/src/test/resources/responses/GetEFMAttributes-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetEFMAttributesResponse xmlns="http://apioviss.jp.fujitsu.com">
- <efm>
- <creator>CONTRACT-VSYS00001</creator>
- <efmId>CONTRACT-VSYS00001-S-0001</efmId>
- <efmName>Firewall</efmName>
- <efmType>FW</efmType>
- </efm>
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</GetEFMAttributesResponse>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetEFMStatus-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetEFMStatus-response.xml b/fgcp/src/test/resources/responses/GetEFMStatus-response.xml
deleted file mode 100644
index 960d939..0000000
--- a/fgcp/src/test/resources/responses/GetEFMStatus-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetEFMStatusResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <efmStatus>RUNNING</efmStatus>
-</GetEFMStatusResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetEventLog-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetEventLog-response.xml b/fgcp/src/test/resources/responses/GetEventLog-response.xml
deleted file mode 100644
index 6d757f9..0000000
--- a/fgcp/src/test/resources/responses/GetEventLog-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetEventLogResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</GetEventLogResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetPerformanceInformation-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetPerformanceInformation-response.xml b/fgcp/src/test/resources/responses/GetPerformanceInformation-response.xml
deleted file mode 100644
index f34995a..0000000
--- a/fgcp/src/test/resources/responses/GetPerformanceInformation-response.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetPerformanceInformationResponse xmlns="http://apioviss.jp.fujitsu.com">
- <interval>10minute</interval>
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <serverId>CONTRACT-VSYS00001-S-0001</serverId>
- <serverName>my server</serverName>
- <serverType>GENERAL</serverType>
-</GetPerformanceInformationResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetPublicIPAttributes-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetPublicIPAttributes-response.xml b/fgcp/src/test/resources/responses/GetPublicIPAttributes-response.xml
deleted file mode 100644
index c9cc639..0000000
--- a/fgcp/src/test/resources/responses/GetPublicIPAttributes-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetPublicIPAttributesResponse xmlns="http://apioviss.jp.fujitsu.com">
- <publicips>
- <publicip>
- <address>123.45.67.89</address>
- <v4v6Flag>IPv4</v4v6Flag>
- </publicip>
- </publicips>
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</GetPublicIPAttributesResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetPublicIPStatus-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetPublicIPStatus-response.xml b/fgcp/src/test/resources/responses/GetPublicIPStatus-response.xml
deleted file mode 100644
index d8eb549..0000000
--- a/fgcp/src/test/resources/responses/GetPublicIPStatus-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetPublicIPStatusResponse xmlns="http://apioviss.jp.fujitsu.com">
- <publicipStatus>ATTACHED</publicipStatus>
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</GetPublicIPStatusResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetVDiskAttributes-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVDiskAttributes-response.xml b/fgcp/src/test/resources/responses/GetVDiskAttributes-response.xml
deleted file mode 100644
index b0faecc..0000000
--- a/fgcp/src/test/resources/responses/GetVDiskAttributes-response.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVDiskAttributesResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vdisk>
- <attachedTo>CONTRACT-VSYS00001-D-0001</attachedTo>
- <creator>CONTRACT</creator>
- <size>10.0</size>
- <vdiskId>CONTRACT-VSYS00001-S-0006</vdiskId>
- <vdiskName>disk1</vdiskName>
- </vdisk>
-</GetVDiskAttributesResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetVDiskStatus-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVDiskStatus-response.xml b/fgcp/src/test/resources/responses/GetVDiskStatus-response.xml
deleted file mode 100644
index 5a0709a..0000000
--- a/fgcp/src/test/resources/responses/GetVDiskStatus-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVDiskStatusResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vdiskStatus>STOPPED</vdiskStatus>
-</GetVDiskStatusResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetVSYSAttributes-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVSYSAttributes-response.xml b/fgcp/src/test/resources/responses/GetVSYSAttributes-response.xml
deleted file mode 100644
index 8f1044f..0000000
--- a/fgcp/src/test/resources/responses/GetVSYSAttributes-response.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVSYSAttributesResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vsys>
- <baseDescriptor>2-tier Skeleton</baseDescriptor>
- <creator>ABCDEFGH</creator>
- <description>2-tier Skeleton</description>
- <vsysId>ABCDEFGH-I123J456K</vsysId>
- <vsysName>my virtual system</vsysName>
- </vsys>
-</GetVSYSAttributesResponse>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetVSYSConfiguration-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVSYSConfiguration-response.xml b/fgcp/src/test/resources/responses/GetVSYSConfiguration-response.xml
deleted file mode 100644
index 352b46c..0000000
--- a/fgcp/src/test/resources/responses/GetVSYSConfiguration-response.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVSYSConfigurationResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vsys>
- <baseDescriptor>2-tier Skeleton</baseDescriptor>
- <cloudCategory>NONE</cloudCategory>
- <creator>ABCDEFGH</creator>
- <description>2-tier Skeleton</description>
- <vdisks>
- <vdisk>
- <creator>ABCDEFGH</creator>
- <size>10.0</size>
- <vdiskId>ABCDEFGH-I123J456K-D-0001</vdiskId>
- <vdiskName>DISK1</vdiskName>
- </vdisk>
- </vdisks>
- <vnets>
- <vnet>
- <networkId>ABCDEFGH-I123J456K-N-DMZ</networkId>
- </vnet>
- <vnet>
- <networkId>ABCDEFGH-I123J456K-N-SECURE1</networkId>
- </vnet>
- </vnets>
- <vservers>
- <vserver>
- <creator>ABCDEFGH</creator>
- <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
- <vnics>
- <vnic>
- <networkId>ABCDEFGH-I123J456K-N-DMZ</networkId>
- <nicNo>4</nicNo>
- <privateIp>192.168.32.11</privateIp>
- </vnic>
- <vnic>
- <networkId>ABCDEFGH-I123J456K-N-SECURE1</networkId>
- <nicNo>5</nicNo>
- <privateIp>192.168.33.11</privateIp>
- </vnic>
- </vnics>
- <vserverId>ABCDEFGH-I123J456K-S-0001</vserverId>
- <vserverName>Firewall</vserverName>
- <vserverType>firewall</vserverType>
- </vserver>
- <vserver>
- <creator>ABCDEFGH</creator>
- <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
- <vnics>
- <vnic>
- <networkId>ABCDEFGH-I123J456K-N-DMZ</networkId>
- <nicNo>0</nicNo>
- <privateIp>192.168.32.13</privateIp>
- </vnic>
- </vnics>
- <vserverId>ABCDEFGH-I123J456K-S-0003</vserverId>
- <vserverName>CentOS 6.3 32bit(EN)1</vserverName>
- <vserverType>economy</vserverType>
- </vserver>
- <vserver>
- <creator>ABCDEFGH</creator>
- <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
- <vnics>
- <vnic>
- <networkId>ABCDEFGH-I123J456K-N-SECURE1</networkId>
- <nicNo>0</nicNo>
- <privateIp>192.168.33.12</privateIp>
- </vnic>
- </vnics>
- <vserverId>ABCDEFGH-I123J456K-S-0004</vserverId>
- <vserverName>CentOS 6.3 32bit(EN)2</vserverName>
- <vserverType>economy</vserverType>
- </vserver>
- </vservers>
- <vsysId>ABCDEFGH-I123J456K</vsysId>
- <vsysName>system 2</vsysName>
- </vsys>
-</GetVSYSConfigurationResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetVSYSDescriptorConfiguration-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVSYSDescriptorConfiguration-response.xml b/fgcp/src/test/resources/responses/GetVSYSDescriptorConfiguration-response.xml
deleted file mode 100644
index 5fa9adb..0000000
--- a/fgcp/src/test/resources/responses/GetVSYSDescriptorConfiguration-response.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVSYSDescriptorConfigurationResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vsysdescriptor>
- <creatorName>ABCDEFGH</creatorName>
- <description>3-tier Skeleton</description>
- <keyword>3-tier,Skeleton</keyword>
- <registrant>ABCDEFGH</registrant>
- <vservers>
- <vserver>
- <creator>ABCDEFGH</creator>
- <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
- <vserverName>Firewall</vserverName>
- <vserverType>economy</vserverType>
- </vserver>
- </vservers>
- <vsysdescriptorId>3-tier Skeleton</vsysdescriptorId>
- <vsysdescriptorName>3-tier Skeleton</vsysdescriptorName>
- </vsysdescriptor>
-</GetVSYSDescriptorConfigurationResponse>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetVSYSStatus-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVSYSStatus-response.xml b/fgcp/src/test/resources/responses/GetVSYSStatus-response.xml
deleted file mode 100644
index 552d4a2..0000000
--- a/fgcp/src/test/resources/responses/GetVSYSStatus-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVSYSStatusResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vsysStatus>NORMAL</vsysStatus>
-</GetVSYSStatusResponse>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetVServerAttributes-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVServerAttributes-response.xml b/fgcp/src/test/resources/responses/GetVServerAttributes-response.xml
deleted file mode 100644
index a18730e..0000000
--- a/fgcp/src/test/resources/responses/GetVServerAttributes-response.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVServerAttributesResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vserver>
- <creator>CONTRACT</creator>
- <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
- <vserverId>CONTRACT-VSYS00001-S-0001</vserverId>
- <vserverName>my VM</vserverName>
- <vserverType>economy</vserverType>
- </vserver>
-</GetVServerAttributesResponse>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetVServerConfiguration-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVServerConfiguration-response.xml b/fgcp/src/test/resources/responses/GetVServerConfiguration-response.xml
deleted file mode 100644
index 36a8574..0000000
--- a/fgcp/src/test/resources/responses/GetVServerConfiguration-response.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVServerConfigurationResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vserver>
- <creator>CONTRACT</creator>
- <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
- <image>
- <cpuBit>32</cpuBit>
- <id>IMG_A1B2C3_1234567890ABCD</id>
- <numOfMaxDisk>14</numOfMaxDisk>
- <numOfMaxNic>8</numOfMaxNic>
- <serverApplication>AP</serverApplication>
- <serverCategory>GENERAL</serverCategory>
- <softwares>
- <software>
- <category>OS</category>
- <id>SW00000001</id>
- <license />
- <name>CentOS 5.4 32bit (English)</name>
- <officialVersion>5.4</officialVersion>
- <patch />
- <support />
- <version>5.4</version>
- </software>
- </softwares>
- <sysvolSize>10.0</sysvolSize>
- </image>
- <vnics>
- <vnic>
- <networkId>CONTRACT-VSYS00001-N-DMZ</networkId>
- <nicNo>0</nicNo>
- <privateIp>192.168.4.13</privateIp>
- </vnic>
- </vnics>
- <vserverId>CONTRACT-VSYS00001-S-0005</vserverId>
- <vserverName>my VM</vserverName>
- <vserverType>economy</vserverType>
- </vserver>
-</GetVServerConfigurationResponse>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetVServerInitialPassword-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVServerInitialPassword-response.xml b/fgcp/src/test/resources/responses/GetVServerInitialPassword-response.xml
deleted file mode 100644
index c4816ed..0000000
--- a/fgcp/src/test/resources/responses/GetVServerInitialPassword-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVServerInitialPasswordResponse xmlns="http://apioviss.jp.fujitsu.com">
- <initialPassword>mySecretpwd1</initialPassword>
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</GetVServerInitialPasswordResponse>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/GetVServerStatus-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVServerStatus-response.xml b/fgcp/src/test/resources/responses/GetVServerStatus-response.xml
deleted file mode 100644
index d36f0fc..0000000
--- a/fgcp/src/test/resources/responses/GetVServerStatus-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVServerStatusResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
- <vserverStatus>STOPPED</vserverStatus>
-</GetVServerStatusResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/IllegalState_ALREADY_STOPPED-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/IllegalState_ALREADY_STOPPED-response.xml b/fgcp/src/test/resources/responses/IllegalState_ALREADY_STOPPED-response.xml
deleted file mode 100644
index 37370a4..0000000
--- a/fgcp/src/test/resources/responses/IllegalState_ALREADY_STOPPED-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>The status of Instance[ABCDEFGH-A123B456CE-S-0004] is [STOPPED].</responseMessage>
- <responseStatus>ALREADY_STOPPED</responseStatus>
-</CreateVServerResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/IllegalState_RECONFIG_ING-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/IllegalState_RECONFIG_ING-response.xml b/fgcp/src/test/resources/responses/IllegalState_RECONFIG_ING-response.xml
deleted file mode 100644
index 4d34395..0000000
--- a/fgcp/src/test/resources/responses/IllegalState_RECONFIG_ING-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>The status of Instance[ABCDEFGH-A123B456CE] is [RECONFIG_ING].</responseMessage>
- <responseStatus>ILLEGAL_STATE</responseStatus>
-</CreateVServerResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/IllegalState_RUNNING-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/IllegalState_RUNNING-response.xml b/fgcp/src/test/resources/responses/IllegalState_RUNNING-response.xml
deleted file mode 100644
index b263e18..0000000
--- a/fgcp/src/test/resources/responses/IllegalState_RUNNING-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
- <responseMessage>The status of Instance[ABCDEFGH-A123B456CE-S-0004] is [RUNNING].</responseMessage>
- <responseStatus>ALREADY_STARTED</responseStatus>
-</CreateVServerResponse>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/test/resources/responses/ListDiskImage-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/ListDiskImage-response.xml b/fgcp/src/test/resources/responses/ListDiskImage-response.xml
deleted file mode 100644
index 765979a..0000000
--- a/fgcp/src/test/resources/responses/ListDiskImage-response.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ListDiskImageResponse xmlns="http://apioviss.jp.fujitsu.com">
- <diskimages>
- <diskimage>
- <creatorName>ABCDEFGH</creatorName>
- <description />
- <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
- <diskimageName>CentOS 6.0 64bit(EN)</diskimageName>
- <licenseInfo />
- <osName>CentOS 6.0 64bit (English)</osName>
- <osType>pv</osType>
- <registrant>ABCDEFGH</registrant>
- <size>10.0</size>
- </diskimage>
- </diskimages>
- <responseMessage>Processing was completed.</responseMessage>
- <responseStatus>SUCCESS</responseStatus>
-</ListDiskImageResponse>
\ No newline at end of file
[4/8] JCLOUDS-757 Drop FCGP labs provider
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/VirtualSystemApi.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/VirtualSystemApi.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/VirtualSystemApi.java
deleted file mode 100644
index 8b19c4d..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/VirtualSystemApi.java
+++ /dev/null
@@ -1,184 +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.io.Closeable;
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.binders.BindAlsoToSystemId;
-import org.jclouds.fujitsu.fgcp.compute.functions.SingleElementResponseToElement;
-import org.jclouds.fujitsu.fgcp.domain.BuiltinServer;
-import org.jclouds.fujitsu.fgcp.domain.PublicIP;
-import org.jclouds.fujitsu.fgcp.domain.VDisk;
-import org.jclouds.fujitsu.fgcp.domain.VServer;
-import org.jclouds.fujitsu.fgcp.domain.VSystem;
-import org.jclouds.fujitsu.fgcp.domain.VSystemStatus;
-import org.jclouds.fujitsu.fgcp.domain.VSystemWithDetails;
-import org.jclouds.fujitsu.fgcp.filters.RequestAuthenticator;
-import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.PayloadParams;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.Transform;
-
-
-/**
- * API relating to virtual systems.
- */
-@RequestFilters(RequestAuthenticator.class)
-@QueryParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@PayloadParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@Consumes(MediaType.TEXT_XML)
-public interface VirtualSystemApi extends Closeable {
-
- @Named("DestroyVSYS")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "DestroyVSYS")
- void destroy(@QueryParam("vsysId") String id);
-
- @Named("GetVSYSStatus")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetVSYSStatus")
- @Transform(SingleElementResponseToElement.class)
- VSystemStatus getStatus(@QueryParam("vsysId") String id);
-
- @Named("GetVSYSAttributes")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetVSYSAttributes")
- @Transform(SingleElementResponseToElement.class)
- VSystem get(@QueryParam("vsysId") String id);
-
- @Named("GetVSYSConfiguration")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetVSYSConfiguration")
- @Transform(SingleElementResponseToElement.class)
- VSystemWithDetails getDetails(
- @QueryParam("vsysId") String id);
-
- @Named("UpdateVSYSAttribute")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "UpdateVSYSAttribute")
- void update(@QueryParam("vsysId") String id,
- @QueryParam("attributeName") String name,
- @QueryParam("attributeValue") String value);
-
- @Named("UpdateVSYSConfiguration")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "UpdateVSYSConfiguration")
- void updateConfiguration(@QueryParam("vsysId") String id,
- @QueryParam("configurationName") String name,
- @QueryParam("configurationValue") String value);
-
- @Named("CreateVServer")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "CreateVServer")
- @Transform(SingleElementResponseToElement.class)
- String createServer(
- @QueryParam("vserverName") String name,
- @QueryParam("vserverType") String type,
- @QueryParam("diskImageId") String diskImageId,
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("networkId") String networkId);
-
- @Named("ListVServer")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "ListVServer")
- Set<VServer> listServers(@QueryParam("vsysId") String id);
-
- @Named("CreateVDisk")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "CreateVDisk")
- @Transform(SingleElementResponseToElement.class)
- String createDisk(@QueryParam("vsysId") String id,
- @QueryParam("vdiskName") String name, @QueryParam("size") int size);
-
- @Named("ListVDisk")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "ListVDisk")
- Set<VDisk> listDisks(@QueryParam("vsysId") String id);
-
- @Named("AllocatePublicIP")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "AllocatePublicIP")
- void allocatePublicIP(@QueryParam("vsysId") String id);
-
- /**
- *
- * @return
- * @see VirtualDCApi#listPublicIPs()
- */
- @Named("ListPublicIP")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "ListPublicIP")
- @Transform(SingleElementResponseToElement.class)
- Set<PublicIP> listPublicIPs(
- @QueryParam("vsysId") String id);
-
- @Named("CreateEFM")
- @GET
- @JAXBResponseParser
- // SLB is the only built-in server that can currently be created so
- // hard-code it
- @QueryParams(keys = { "Action", "efmType" }, values = { "CreateEFM", "SLB" })
- @Transform(SingleElementResponseToElement.class)
- String createBuiltinServer(
- @QueryParam("efmName") String name,
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("networkId") String networkId);
-
- @Named("ListEFM")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "ListEFM")
- Set<BuiltinServer> listBuiltinServers(
- @QueryParam("vsysId") String id, @QueryParam("efmType") String type);
-
- @Named("StandByConsole")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "StandByConsole")
- @Transform(SingleElementResponseToElement.class)
- String standByConsole(@QueryParam("vsysId") String id,
- @QueryParam("networkId") String networkId);
-
- @Named("RegisterPrivateVSYSDescriptor")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "RegisterPrivateVSYSDescriptor")
- void registerAsPrivateVSYSDescriptor(
- @QueryParam("vsysId") String id,
- @QueryParam("vsysDescriptorXMLFilePath") String vsysDescriptorXMLFilePath);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.java
deleted file mode 100644
index 90b2b54..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.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.suppliers;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.Collection;
-
-import javax.inject.Inject;
-
-import org.jclouds.crypto.Pems;
-import org.jclouds.domain.Credentials;
-import org.jclouds.fujitsu.fgcp.FGCPCredentials;
-import org.jclouds.location.Provider;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
-import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.io.ByteSource;
-import com.google.common.io.CharSource;
-import com.google.common.io.LineProcessor;
-import com.google.common.util.concurrent.UncheckedExecutionException;
-
-/**
- * Loads {@link FGCPCredentials} from a pem file containing certificate and
- * private key.
- */
-public class FGCPCredentialsSupplier implements Supplier<FGCPCredentials> {
- private final Supplier<Credentials> creds;
- private final LoadingCache<Credentials, FGCPCredentials> keyCache;
-
- @Inject
- public FGCPCredentialsSupplier(@Provider Supplier<Credentials> creds, FGCPCredentialsForCredentials loader) {
- this.creds = creds;
- // throw out the private key related to old credentials
- this.keyCache = CacheBuilder.newBuilder().maximumSize(2).build(checkNotNull(loader, "loader"));
- }
-
- /**
- * It is relatively expensive to extract a certificate with private key from
- * a PEM. Cache the relationship between current credentials so that they are
- * only recalculated once.
- */
- @VisibleForTesting
- public static class FGCPCredentialsForCredentials extends CacheLoader<Credentials, FGCPCredentials> {
- @Override
- public FGCPCredentials load(Credentials in) {
- try {
- String identity = in.identity;
- String pem = in.credential;
-
- // extract private key
- KeyFactory keyFactory = KeyFactory.getInstance("RSA");
- PrivateKey privateKey = keyFactory.generatePrivate(Pems.privateKeySpec(ByteSource.wrap(pem.getBytes(Charsets.UTF_8))));
-
- // extract certificate(s)
- Collection<X509Certificate> certs = x509Certificates(pem);
-
- return new FGCPCredentials.Builder().identity(identity).credential(pem)
- .privateKey(privateKey).certificates(certs).build();
- } catch (IOException e) {
- throw Throwables.propagate(e);
- } catch (GeneralSecurityException e) {
- throw new IllegalArgumentException("security exception parsing pem. " + e.getMessage(), e);
- } catch (IllegalArgumentException e) {
- throw new IllegalArgumentException("not a valid pem: cannot parse pk. " + e.getMessage(), e);
- }
- }
-
- /**
- * Returns the collection of X509Certificates that are pem encoded in the
- * input string.<br>
- * Other elements except for pem encoded certificates, e.g. private keys
- * and metadata such as bag attributes are ignored in the pem are ignored.
- *
- * @param pem
- * encoded certificate(s)
- * @return collection of certificates
- * @throws IOException
- * in an I/O error occurs
- * @throws CertificateException
- * on parsing errors
- */
- @SuppressWarnings("unchecked")
- public static Collection<X509Certificate> x509Certificates(String pem) throws IOException, CertificateException {
- // in : pem with Bagattributes metadata and pk
- // out: pem with only certs
- LineProcessor<String> callback = new LineProcessor<String>() {
- static final String CERTIFICATE_X509_END_MARKER = "-----END CERTIFICATE-----";
- StringBuilder result = new StringBuilder();
- boolean insideCert = false;
-
- public boolean processLine(String line) {
- if (line.startsWith(Pems.CERTIFICATE_X509_MARKER)) {
- insideCert = true;
- }
- if (insideCert) {
- result.append(line).append('\n');
- }
- if (line.startsWith(CERTIFICATE_X509_END_MARKER)) {
- insideCert = false;
- }
- return true; // keep going
- }
-
- public String getResult() {
- return result.toString();
- }
- };
- String filteredPem = CharSource.wrap(pem).readLines(callback);
- CertificateFactory fact = CertificateFactory.getInstance("X.509");
- return (Collection<X509Certificate>) fact.generateCertificates(new ByteArrayInputStream(filteredPem
- .getBytes(Charsets.UTF_8)));
- }
- }
-
- @Override
- public FGCPCredentials get() {
- try {
- return keyCache.getUnchecked(checkNotNull(creds.get(), "credential supplier returned null"));
- } catch (UncheckedExecutionException e) {
- throw Throwables.propagate(e.getCause());
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/SSLContextWithKeysSupplier.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/SSLContextWithKeysSupplier.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/SSLContextWithKeysSupplier.java
deleted file mode 100644
index c4be5ce..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/SSLContextWithKeysSupplier.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.fujitsu.fgcp.suppliers;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Throwables.propagate;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.SecureRandom;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.util.Collection;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-
-import org.jclouds.fujitsu.fgcp.FGCPCredentials;
-import org.jclouds.http.HttpUtils;
-import org.jclouds.http.config.SSLModule.TrustAllCerts;
-
-import com.google.common.base.Supplier;
-
-/**
- * Takes PK and chain from credentials to build a SSLContext for HTTPS with
- * client authentication.
- */
-@Singleton
-public class SSLContextWithKeysSupplier implements Supplier<SSLContext> {
- private final Supplier<FGCPCredentials> creds;
- private final TrustManager[] trustManager;
-
- @Inject
- SSLContextWithKeysSupplier(Supplier<FGCPCredentials> creds, HttpUtils utils,
- TrustAllCerts trustAllCerts) {
- this.creds = creds;
- this.trustManager = utils.trustAllCerts() ? new TrustManager[] { trustAllCerts } : null;
- }
-
- @Override
- public SSLContext get() {
- FGCPCredentials currentCreds = checkNotNull(creds.get(), "fgcpcredential supplier returned null");
- PrivateKey privateKey = checkNotNull(currentCreds.privateKey, "fgcpcredential's privateKey is null");
- Collection<X509Certificate> certs = checkNotNull(currentCreds.certificates, "fgcpcredential's certificates returned null");
-
- try {
- KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
- KeyStore keyStore = KeyStore.getInstance("pkcs12");
- keyStore.load(null, null);
- keyStore.setKeyEntry("dummy alias", privateKey, null, (Certificate[]) certs.toArray(new Certificate[0]));
- kmf.init(keyStore, null);
-
- SSLContext sc = SSLContext.getInstance("TLS");
- sc.init(kmf.getKeyManagers(), trustManager, new SecureRandom());
- return sc;
- } catch (GeneralSecurityException e) {
- throw propagate(e);
- } catch (IOException e) {
- throw propagate(e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/BindParamsToXmlPayload.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/BindParamsToXmlPayload.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/BindParamsToXmlPayload.java
deleted file mode 100644
index 3c5075d..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/BindParamsToXmlPayload.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.xml;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.MapBinder;
-import org.jclouds.rest.binders.BindToStringPayload;
-
-import com.google.common.base.Strings;
-
-/**
- * Not currently used but leaving for reference when implementing multipart POST
- * methods.
- */
-public class BindParamsToXmlPayload extends BindToStringPayload implements
- MapBinder {
-
- @SuppressWarnings("unchecked")
- @Override
- public <R extends HttpRequest> R bindToRequest(R request,
- Map<String, Object> mapParams) {
- String action = checkNotNull(
- mapParams.remove(RequestParameters.ACTION),
- RequestParameters.ACTION).toString();
- String version = Strings.nullToEmpty((String) mapParams
- .remove(RequestParameters.VERSION));
-
- StringBuilder xml = new StringBuilder();
- xml.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n");
- xml.append("<OViSSRequest>\r\n");
- xml.append(" <Action>" + action + "</Action>\r\n");
-
- for (Map.Entry<String, Object> entry : mapParams.entrySet()) {
- String key = entry.getKey();
- xml.append(" <" + key + ">" + checkNotNull(mapParams.get(key))
- + "</" + key + ">\r\n");
- }
-
- xml.append(" <Version>" + version + "</Version>\r\n");
- xml.append(" <Locale></Locale>\r\n"); // value inserted in
- // RequestAuthenticator#filter
- xml.append(" <AccessKeyId></AccessKeyId>\r\n"); // value inserted in
- // RequestAuthenticator#filter
- xml.append(" <Signature></Signature>\r\n"); // value inserted in
- // RequestAuthenticator#filter
- xml.append("</OViSSRequest>");
-
- request = super.bindToRequest(request, xml);
- request.getPayload().getContentMetadata()
- .setContentType(MediaType.TEXT_XML);
-
- // remove version query param if set as it was moved to the xml body
- URI uri = request.getEndpoint();
- URI uriWithoutQueryParams;
- try {
- uriWithoutQueryParams = new URI(uri.getScheme(), uri.getUserInfo(),
- uri.getHost(), uri.getPort(), uri.getPath(), null,
- uri.getFragment());
- } catch (URISyntaxException e) {
- // should never happen as we're copying the components from a URI
- uriWithoutQueryParams = uri;
- }
-
- return (R) request.toBuilder().endpoint(uriWithoutQueryParams).build();
- }
-
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object toBind) {
- throw new IllegalArgumentException(
- "BindParamsToXmlPayload needs bind parameters");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/FGCPJAXBParser.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/FGCPJAXBParser.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/FGCPJAXBParser.java
deleted file mode 100644
index 88a94ce..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/FGCPJAXBParser.java
+++ /dev/null
@@ -1,78 +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;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-import javax.inject.Singleton;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
-import org.jclouds.fujitsu.fgcp.domain.VServerWithDetails;
-import org.jclouds.fujitsu.fgcp.xml.internal.ListServerTypeResponse;
-import org.jclouds.xml.XMLParser;
-
-/**
- * Parses XML documents using JAXB.
- *
- * @see org.jclouds.http.functions.ParseXMLWithJAXB
- */
-@Singleton
-public class FGCPJAXBParser implements XMLParser {
- JAXBContext context;
-
- public FGCPJAXBParser() throws JAXBException {
- context = JAXBContext.newInstance(VServerWithDetails.class.getPackage()
- .getName()
- + ":"
- + ListServerTypeResponse.class.getPackage().getName(),
- VServerWithDetails.class.getClassLoader());
- }
-
- @Override
- public String toXML(final Object src) throws IOException {
- return toXML(src, src.getClass());
- }
-
- @Override
- public <T> String toXML(final Object src, final Class<T> type)
- throws IOException {
- throw new UnsupportedOperationException(
- "only marshaling from XML is implemented");
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public <T> T fromXML(final String xml, final Class<T> type)
- throws IOException {
- T response = null;
- try {
- StringReader reader = new StringReader(xml);
-
- Unmarshaller unmarshaller = context.createUnmarshaller();
-
- response = (T) unmarshaller.unmarshal(reader);
- } catch (Exception ex) {
- throw new IOException("Could not unmarshal document", ex);
- }
-
- return response;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateEFMResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateEFMResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateEFMResponse.java
deleted file mode 100644
index a5d3f6b..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateEFMResponse.java
+++ /dev/null
@@ -1,40 +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;
-
-/**
- * Wrapper for CreateEFMResponse.
- */
-@XmlRootElement(name = "CreateEFMResponse")
-public class CreateEFMResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(required = true)
- private String efmId;
-
- @Override
- public String toString() {
- return getElement();
- }
-
- @Override
- public String getElement() {
- return efmId;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateVDiskResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateVDiskResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateVDiskResponse.java
deleted file mode 100644
index b822b9c..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateVDiskResponse.java
+++ /dev/null
@@ -1,40 +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;
-
-/**
- * Wrapper for CreateVDiskResponse.
- */
-@XmlRootElement(name = "CreateVDiskResponse")
-public class CreateVDiskResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(required = true)
- private String vdiskId;
-
- @Override
- public String toString() {
- return getElement();
- }
-
- @Override
- public String getElement() {
- return vdiskId;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateVSYSResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateVSYSResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateVSYSResponse.java
deleted file mode 100644
index d8dd167..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateVSYSResponse.java
+++ /dev/null
@@ -1,40 +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;
-
-/**
- * Wrapper for CreateVSYSResponse.
- */
-@XmlRootElement(name = "CreateVSYSResponse")
-public class CreateVSYSResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(required = true)
- private String vsysId;
-
- @Override
- public String toString() {
- return getElement();
- }
-
- @Override
- public String getElement() {
- return vsysId;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateVServerResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateVServerResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateVServerResponse.java
deleted file mode 100644
index fcb4fb4..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/CreateVServerResponse.java
+++ /dev/null
@@ -1,40 +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;
-
-/**
- * Wrapper for CreateVServerResponse.
- */
-@XmlRootElement(name = "CreateVServerResponse")
-public class CreateVServerResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(required = true)
- private String vserverId;
-
- @Override
- public String toString() {
- return getElement();
- }
-
- @Override
- public String getElement() {
- return vserverId;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetAddressRangeResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetAddressRangeResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetAddressRangeResponse.java
deleted file mode 100644
index e332d2e..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetAddressRangeResponse.java
+++ /dev/null
@@ -1,46 +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 java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.fujitsu.fgcp.domain.AddressRange;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Wrapper for GetAddressRangeResponse.
- */
-@XmlRootElement(name = "GetAddressRangeResponse")
-public class GetAddressRangeResponse extends
- SetWithStatusResponse<AddressRange> {
- @XmlElementWrapper(name = "addressranges")
- @XmlElement(name = "addressrange")
- private Set<AddressRange> ranges = Sets.newLinkedHashSet();
-
- @Override
- protected Set<AddressRange> delegate() {
- return ranges == null ? ImmutableSet.<AddressRange> of() : Collections
- .unmodifiableSet(ranges);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetDiskImageAttributesResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetDiskImageAttributesResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetDiskImageAttributesResponse.java
deleted file mode 100644
index 0d50a50..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetDiskImageAttributesResponse.java
+++ /dev/null
@@ -1,42 +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;
-
-import org.jclouds.fujitsu.fgcp.domain.DiskImage;
-
-/**
- * Wrapper for GetDiskImageAttributesResponse.
- */
-@XmlRootElement(name = "GetDiskImageAttributesResponse")
-public class GetDiskImageAttributesResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(name = "diskimage")
- private DiskImage diskImage;
-
- @Override
- public String toString() {
- return getElement().toString();
- }
-
- @Override
- public DiskImage getElement() {
- return diskImage;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetEFMAttributesResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetEFMAttributesResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetEFMAttributesResponse.java
deleted file mode 100644
index 19ab6cb..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetEFMAttributesResponse.java
+++ /dev/null
@@ -1,42 +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;
-
-import org.jclouds.fujitsu.fgcp.domain.BuiltinServer;
-
-/**
- * Wrapper for GetEFMAttributesResponse.
- */
-@XmlRootElement(name = "GetEFMAttributesResponse")
-public class GetEFMAttributesResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(required = true)
- private BuiltinServer efm;
-
- @Override
- public String toString() {
- return getElement().toString();
- }
-
- @Override
- public Object getElement() {
- return efm;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetEFMStatusResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetEFMStatusResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetEFMStatusResponse.java
deleted file mode 100644
index 7a92094..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetEFMStatusResponse.java
+++ /dev/null
@@ -1,42 +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;
-
-import org.jclouds.fujitsu.fgcp.domain.BuiltinServerStatus;
-
-/**
- * Wrapper for GetEFMStatusResponse.
- */
-@XmlRootElement(name = "GetEFMStatusResponse")
-public class GetEFMStatusResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(required = true)
- private BuiltinServerStatus efmStatus;
-
- @Override
- public String toString() {
- return getElement().toString();
- }
-
- @Override
- public Object getElement() {
- return efmStatus;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetEventLogResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetEventLogResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetEventLogResponse.java
deleted file mode 100644
index 80bb764..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetEventLogResponse.java
+++ /dev/null
@@ -1,45 +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 java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.fujitsu.fgcp.domain.EventLog;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Wrapper for GetEventLogResponse.
- */
-@XmlRootElement(name = "GetEventLogResponse")
-public class GetEventLogResponse extends SetWithStatusResponse<EventLog> {
- @XmlElementWrapper(name = "eventlogs")
- @XmlElement(name = "eventlog")
- private Set<EventLog> logs = Sets.newLinkedHashSet();
-
- @Override
- protected Set<EventLog> delegate() {
- return logs == null ? ImmutableSet.<EventLog> of() : Collections
- .unmodifiableSet(logs);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetPerformanceInformationResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetPerformanceInformationResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetPerformanceInformationResponse.java
deleted file mode 100644
index 4dcbea2..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetPerformanceInformationResponse.java
+++ /dev/null
@@ -1,46 +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 java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.fujitsu.fgcp.domain.PerformanceInfo;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Wrapper for GetPerformanceInformationResponse.
- */
-@XmlRootElement(name = "GetPerformanceInformationResponse")
-public class GetPerformanceInformationResponse extends
- SetWithStatusResponse<PerformanceInfo> {
- @XmlElementWrapper(name = "performanceinfos")
- @XmlElement(name = "performanceinfo")
- private Set<PerformanceInfo> stats = Sets.newLinkedHashSet();
-
- @Override
- protected Set<PerformanceInfo> delegate() {
- return stats == null ? ImmutableSet.<PerformanceInfo> of()
- : Collections.unmodifiableSet(stats);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetPublicIPAttributesResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetPublicIPAttributesResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetPublicIPAttributesResponse.java
deleted file mode 100644
index 3e3da33..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetPublicIPAttributesResponse.java
+++ /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.
- */
-package org.jclouds.fujitsu.fgcp.xml.internal;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.fujitsu.fgcp.domain.PublicIP;
-
-import com.google.common.collect.Iterables;
-
-/**
- * Wrapper for GetPublicIPAttributesResponse.
- */
-@XmlRootElement(name = "GetPublicIPAttributesResponse")
-public class GetPublicIPAttributesResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElementWrapper(name = "publicips")
- @XmlElement(name = "publicip")
- private Set<PublicIP> publicIPs;
-
- @Override
- public String toString() {
- return getElement().toString();
- }
-
- @Override
- public Object getElement() {
- return Iterables.getOnlyElement(publicIPs);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetPublicIPStatusResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetPublicIPStatusResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetPublicIPStatusResponse.java
deleted file mode 100644
index 317f869..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetPublicIPStatusResponse.java
+++ /dev/null
@@ -1,42 +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;
-
-import org.jclouds.fujitsu.fgcp.domain.PublicIPStatus;
-
-/**
- * Wrapper for GetPublicIPStatusResponse.
- */
-@XmlRootElement(name = "GetPublicIPStatusResponse")
-public class GetPublicIPStatusResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(required = true)
- private PublicIPStatus publicipStatus;
-
- @Override
- public String toString() {
- return publicipStatus.toString();
- }
-
- @Override
- public Object getElement() {
- return publicipStatus;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVDiskAttributesResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVDiskAttributesResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVDiskAttributesResponse.java
deleted file mode 100644
index d4ca4e1..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVDiskAttributesResponse.java
+++ /dev/null
@@ -1,42 +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;
-
-import org.jclouds.fujitsu.fgcp.domain.VDisk;
-
-/**
- * Wrapper for GetVDiskAttributesResponse.
- */
-@XmlRootElement(name = "GetVDiskAttributesResponse")
-public class GetVDiskAttributesResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(required = true)
- private VDisk vdisk;
-
- @Override
- public String toString() {
- return getElement().toString();
- }
-
- @Override
- public Object getElement() {
- return vdisk;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSAttributesResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSAttributesResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSAttributesResponse.java
deleted file mode 100644
index 951aa9b..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSAttributesResponse.java
+++ /dev/null
@@ -1,42 +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;
-
-import org.jclouds.fujitsu.fgcp.domain.VSystem;
-
-/**
- * Wrapper for GetVSYSAttributesResponse.
- */
-@XmlRootElement(name = "GetVSYSAttributesResponse")
-public class GetVSYSAttributesResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(name = "vsys")
- private VSystem system;
-
- @Override
- public String toString() {
- return getElement().toString();
- }
-
- @Override
- public Object getElement() {
- return system;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSConfigurationResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSConfigurationResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSConfigurationResponse.java
deleted file mode 100644
index 04925a4..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSConfigurationResponse.java
+++ /dev/null
@@ -1,42 +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;
-
-import org.jclouds.fujitsu.fgcp.domain.VSystemWithDetails;
-
-/**
- * Wrapper for GetVSYSConfigurationResponse.
- */
-@XmlRootElement(name = "GetVSYSConfigurationResponse")
-public class GetVSYSConfigurationResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(name = "vsys")
- private VSystemWithDetails system;
-
- @Override
- public String toString() {
- return getElement().toString();
- }
-
- @Override
- public Object getElement() {
- return system;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSDescriptorConfigurationResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSDescriptorConfigurationResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSDescriptorConfigurationResponse.java
deleted file mode 100644
index 7e7636b..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSDescriptorConfigurationResponse.java
+++ /dev/null
@@ -1,42 +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;
-
-import org.jclouds.fujitsu.fgcp.domain.VSystemDescriptor;
-
-/**
- * Wrapper for GetVSYSDescriptorConfigurationResponse.
- */
-@XmlRootElement(name = "GetVSYSDescriptorConfigurationResponse")
-public class GetVSYSDescriptorConfigurationResponse extends StatusResponse
- implements SingleElementResponse {
- @XmlElement
- private VSystemDescriptor vsysdescriptor;
-
- @Override
- public String toString() {
- return getElement().toString();
- }
-
- @Override
- public Object getElement() {
- return vsysdescriptor;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSStatusResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSStatusResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSStatusResponse.java
deleted file mode 100644
index 349f0ec..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVSYSStatusResponse.java
+++ /dev/null
@@ -1,42 +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;
-
-import org.jclouds.fujitsu.fgcp.domain.VSystemStatus;
-
-/**
- * Wrapper for GetVSYSStatusResponse.
- */
-@XmlRootElement(name = "GetVSYSStatusResponse")
-public class GetVSYSStatusResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(required = true)
- private VSystemStatus vsysStatus;
-
- @Override
- public String toString() {
- return getElement().toString();
- }
-
- @Override
- public Object getElement() {
- return vsysStatus;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerAttributesResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerAttributesResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerAttributesResponse.java
deleted file mode 100644
index 82d37ab..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerAttributesResponse.java
+++ /dev/null
@@ -1,42 +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;
-
-import org.jclouds.fujitsu.fgcp.domain.VServer;
-
-/**
- * Wrapper for GetVServerAttributesResponse.
- */
-@XmlRootElement(name = "GetVServerAttributesResponse")
-public class GetVServerAttributesResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(required = true)
- private VServer vserver;
-
- @Override
- public String toString() {
- return vserver.toString();
- }
-
- @Override
- public Object getElement() {
- return vserver;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerConfigurationResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerConfigurationResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerConfigurationResponse.java
deleted file mode 100644
index 4384277..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerConfigurationResponse.java
+++ /dev/null
@@ -1,42 +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;
-
-import org.jclouds.fujitsu.fgcp.domain.VServerWithDetails;
-
-/**
- * Wrapper for GetVServerConfigurationResponse.
- */
-@XmlRootElement(name = "GetVServerConfigurationResponse")
-public class GetVServerConfigurationResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(required = true)
- private VServerWithDetails vserver;
-
- @Override
- public String toString() {
- return vserver.toString();
- }
-
- @Override
- public Object getElement() {
- return vserver;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerInitialPasswordResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerInitialPasswordResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerInitialPasswordResponse.java
deleted file mode 100644
index 435db60..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerInitialPasswordResponse.java
+++ /dev/null
@@ -1,35 +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;
-
-/**
- * Wrapper for GetVServerInitialPasswordResponse.
- */
-@XmlRootElement(name = "GetVServerInitialPasswordResponse")
-public class GetVServerInitialPasswordResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(required = true)
- private String initialPassword;
-
- @Override
- public Object getElement() {
- return initialPassword;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerStatusResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerStatusResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerStatusResponse.java
deleted file mode 100644
index 1f5c60e..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/GetVServerStatusResponse.java
+++ /dev/null
@@ -1,42 +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;
-
-import org.jclouds.fujitsu.fgcp.domain.VServerStatus;
-
-/**
- * Wrapper for GetVServerStatusResponse.
- */
-@XmlRootElement(name = "GetVServerStatusResponse")
-public class GetVServerStatusResponse extends StatusResponse implements
- SingleElementResponse {
- @XmlElement(required = true)
- private VServerStatus vserverStatus;
-
- @Override
- public String toString() {
- return getElement().toString();
- }
-
- @Override
- public Object getElement() {
- return vserverStatus;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListDiskImageResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListDiskImageResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListDiskImageResponse.java
deleted file mode 100644
index e1e74fe..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListDiskImageResponse.java
+++ /dev/null
@@ -1,45 +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 java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.fujitsu.fgcp.domain.DiskImage;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Wrapper for ListDiskImageResponse.
- */
-@XmlRootElement(name = "ListDiskImageResponse")
-public class ListDiskImageResponse extends SetWithStatusResponse<DiskImage> {
- @XmlElementWrapper(name = "diskimages")
- @XmlElement(name = "diskimage")
- private Set<DiskImage> diskImages = Sets.newLinkedHashSet();
-
- @Override
- protected Set<DiskImage> delegate() {
- return diskImages == null ? ImmutableSet.<DiskImage> of() : Collections
- .unmodifiableSet(diskImages);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListEFMBackupResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListEFMBackupResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListEFMBackupResponse.java
deleted file mode 100644
index 48a183e..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListEFMBackupResponse.java
+++ /dev/null
@@ -1,46 +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 java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.fujitsu.fgcp.domain.BuiltinServerBackup;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Wrapper for ListEFMBackupResponse.
- */
-@XmlRootElement(name = "ListEFMBackupResponse")
-public class ListEFMBackupResponse extends
- SetWithStatusResponse<BuiltinServerBackup> {
- @XmlElementWrapper(name = "backups")
- @XmlElement(name = "backup")
- private Set<BuiltinServerBackup> backup = Sets.newLinkedHashSet();
-
- @Override
- protected Set<BuiltinServerBackup> delegate() {
- return backup == null ? ImmutableSet.<BuiltinServerBackup> of()
- : Collections.unmodifiableSet(backup);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListEFMResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListEFMResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListEFMResponse.java
deleted file mode 100644
index 0105e9c..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListEFMResponse.java
+++ /dev/null
@@ -1,45 +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 java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.fujitsu.fgcp.domain.BuiltinServer;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Wrapper for ListEFMResponse.
- */
-@XmlRootElement(name = "ListEFMResponse")
-public class ListEFMResponse extends SetWithStatusResponse<BuiltinServer> {
- @XmlElementWrapper(name = "efms")
- @XmlElement(name = "efm")
- private Set<BuiltinServer> efm = Sets.newLinkedHashSet();
-
- @Override
- protected Set<BuiltinServer> delegate() {
- return efm == null ? ImmutableSet.<BuiltinServer> of() : Collections
- .unmodifiableSet(efm);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListPublicIPResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListPublicIPResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListPublicIPResponse.java
deleted file mode 100644
index ba6f131..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListPublicIPResponse.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.xml.internal;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.fujitsu.fgcp.domain.PublicIP;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Wrapper for ListPublicIPResponse.
- */
-@XmlRootElement(name = "ListPublicIPResponse")
-public class ListPublicIPResponse extends
- MapWithStatusResponse<PublicIP, String> implements
- SingleElementResponse {
- @XmlElementWrapper(name = "publicips")
- @XmlElement(name = "publicip")
- private Set<PublicIPWithSystemId> ips;
-
- @Override
- public String toString() {
- return getElement().toString();
- }
-
- @Override
- protected Map<PublicIP, String> delegate() {
- Builder<PublicIP, String> returnVal = ImmutableMap.builder();
- if (ips != null) {
-
- for (PublicIPWithSystemId ip : ips) {
- returnVal.put(ip, ip.getVsysId());
- }
- }
- return returnVal.build();
- }
-
- @Override
- public Set<? extends PublicIP> getElement() {
- return ips == null ? ImmutableSet.<PublicIP> of() : Collections
- .unmodifiableSet(ips);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListServerTypeResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListServerTypeResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListServerTypeResponse.java
deleted file mode 100644
index 12d4873..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListServerTypeResponse.java
+++ /dev/null
@@ -1,44 +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 java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.fujitsu.fgcp.domain.ServerType;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Wrapper for ListServerTypeResponse.
- */
-@XmlRootElement(name = "ListServerTypeResponse")
-public class ListServerTypeResponse extends SetWithStatusResponse<ServerType> {
- @XmlElementWrapper(name = "servertypes")
- @XmlElement(name = "servertype")
- private Set<ServerType> serverTypes;
-
- @Override
- protected Set<ServerType> delegate() {
- return serverTypes == null ? ImmutableSet.<ServerType> of()
- : Collections.unmodifiableSet(serverTypes);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListVDiskResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListVDiskResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListVDiskResponse.java
deleted file mode 100644
index d4d0254..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListVDiskResponse.java
+++ /dev/null
@@ -1,45 +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 java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.fujitsu.fgcp.domain.VDisk;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Wrapper for ListVDiskResponse.
- */
-@XmlRootElement(name = "ListVDiskResponse")
-public class ListVDiskResponse extends SetWithStatusResponse<VDisk> {
- @XmlElementWrapper(name = "vdisks")
- @XmlElement(name = "vdisk")
- private Set<VDisk> disks = Sets.newLinkedHashSet();
-
- @Override
- protected Set<VDisk> delegate() {
- return disks == null ? ImmutableSet.<VDisk> of() : Collections
- .unmodifiableSet(disks);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListVSYSResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListVSYSResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListVSYSResponse.java
deleted file mode 100644
index 55b94b5..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListVSYSResponse.java
+++ /dev/null
@@ -1,45 +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 java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.fujitsu.fgcp.domain.VSystem;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Wrapper for ListVSYSResponse.
- */
-@XmlRootElement(name = "ListVSYSResponse")
-public class ListVSYSResponse extends SetWithStatusResponse<VSystem> {
- @XmlElementWrapper(name = "vsyss")
- @XmlElement(name = "vsys")
- private Set<VSystem> systems = Sets.newLinkedHashSet();
-
- @Override
- protected Set<VSystem> delegate() {
- return systems == null ? ImmutableSet.<VSystem> of() : Collections
- .unmodifiableSet(systems);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListVServerResponse.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListVServerResponse.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListVServerResponse.java
deleted file mode 100644
index 526f146..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/ListVServerResponse.java
+++ /dev/null
@@ -1,45 +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 java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.fujitsu.fgcp.domain.VServer;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Wrapper for ListVServerResponse.
- */
-@XmlRootElement(name = "ListVServerResponse")
-public class ListVServerResponse extends SetWithStatusResponse<VServer> {
- @XmlElementWrapper(name = "vservers")
- @XmlElement(name = "vserver")
- private Set<VServer> servers = Sets.newLinkedHashSet();
-
- @Override
- protected Set<VServer> delegate() {
- return servers == null ? ImmutableSet.<VServer> of() : Collections
- .unmodifiableSet(servers);
- }
-}
[5/8] JCLOUDS-757 Drop FCGP labs provider
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystem.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystem.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystem.java
deleted file mode 100644
index c313a55..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystem.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.fujitsu.fgcp.domain;
-
-import javax.xml.bind.annotation.XmlElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Represents a virtual system.
- */
-public class VSystem {
- @XmlElement(name = "vsysId")
- protected String id;
- @XmlElement(name = "vsysName")
- protected String name;
- protected String creator;
- @XmlElement(name = "baseDescriptor")
- protected String template;
- protected String description;
-
- public String getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- public String getCreator() {
- return creator;
- }
-
- public String getTemplate() {
- return template;
- }
-
- public String getDescription() {
- return description;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- VSystem that = VSystem.class.cast(obj);
- return Objects.equal(this.id, that.id);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
- .add("name", name).add("creator", creator)
- .add("template", template).add("description", description)
- .toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemDescriptor.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemDescriptor.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemDescriptor.java
deleted file mode 100644
index 5edb5fd..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemDescriptor.java
+++ /dev/null
@@ -1,100 +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.domain;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Describes a virtual system template.
- */
-@XmlRootElement(name = "vsysdescriptor")
-public class VSystemDescriptor {
- @XmlElement(name = "vsysdescriptorId")
- private String id;
-
- @XmlElement(name = "vsysdescriptorName")
- private String name;
-
- private String creatorName;
-
- private String registrant;
-
- private String description;
-
- private String keyword;
-
- @XmlElementWrapper(name = "vservers")
- @XmlElement(name = "vserver")
- private Set<VServerWithDetails> servers = Sets.newLinkedHashSet();
-
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return the creatorName
- */
- public String getCreatorName() {
- return creatorName;
- }
-
- /**
- * @return the registrant
- */
- public String getRegistrant() {
- return registrant;
- }
-
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * @return the keyword
- */
- public String getKeyword() {
- return keyword;
- }
-
- /**
- * @return the servers
- */
- public Set<VServerWithDetails> getServers() {
- return servers == null ? ImmutableSet.<VServerWithDetails> of()
- : ImmutableSet.copyOf(servers);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemStatus.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemStatus.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemStatus.java
deleted file mode 100644
index bbb648f..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemStatus.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.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.CaseFormat;
-
-/**
- * Possible statuses of a virtual system.
- */
-@XmlRootElement(name = "vsysStatus")
-public enum VSystemStatus {
- NORMAL, RECONFIG_ING, DEPLOYING, ERROR, UNRECOGNIZED;
-
- public String value() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- @Override
- public String toString() {
- return value();
- }
-
- public static VSystemStatus fromValue(String status) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL
- .to(CaseFormat.UPPER_UNDERSCORE,
- checkNotNull(status, "status")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java
deleted file mode 100644
index 0efb873..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java
+++ /dev/null
@@ -1,76 +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.domain;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Represents a virtual system with servers, additional storage, public IP
- * addresses and networks.
- */
-@XmlRootElement(name = "vsys")
-public class VSystemWithDetails extends VSystem {
- @XmlElementWrapper(name = "vservers")
- @XmlElement(name = "vserver")
- private Set<VServerWithVNICs> servers = Sets.newLinkedHashSet();
- @XmlElementWrapper(name = "vdisks")
- @XmlElement(name = "vdisk")
- private Set<VDisk> disks = Sets.newLinkedHashSet();
- @XmlElementWrapper(name = "publicips")
- @XmlElement(name = "publicip")
- private Set<PublicIP> publicips = Sets.newLinkedHashSet();
- @XmlElementWrapper(name = "vnets")
- @XmlElement(name = "vnet")
- private Set<VNet> networks = Sets.newLinkedHashSet();
-
- public Set<VServerWithVNICs> getServers() {
- return servers == null ? ImmutableSet.<VServerWithVNICs> of() : ImmutableSet
- .copyOf(servers);
- }
-
- public Set<VDisk> getDisks() {
- return disks == null ? ImmutableSet.<VDisk> of() : ImmutableSet
- .copyOf(disks);
- }
-
- public Set<PublicIP> getPublicips() {
- return publicips == null ? ImmutableSet.<PublicIP> of() : ImmutableSet
- .copyOf(publicips);
- }
-
- public Set<VNet> getNetworks() {
- return networks == null ? ImmutableSet.<VNet> of() : ImmutableSet
- .copyOf(networks);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
- .add("name", name).add("creator", creator)
- .add("template", template).add("description", description)
- .add("disks", disks).add("networks", networks)
- .add("publicips", publicips).add("servers", servers).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/package-info.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/package-info.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/package-info.java
deleted file mode 100644
index c49a5c7..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/package-info.java
+++ /dev/null
@@ -1,24 +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)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.fujitsu.fgcp.domain;
-
-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/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java
deleted file mode 100644
index 4588f08..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java
+++ /dev/null
@@ -1,205 +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 com.google.common.base.Charsets.UTF_8;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Throwables.propagate;
-import static com.google.common.io.BaseEncoding.base64;
-import static org.jclouds.http.utils.Queries.queryParser;
-
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.Signature;
-import java.security.SignatureException;
-import java.util.Calendar;
-import java.util.Locale;
-import java.util.concurrent.ExecutionException;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Constants;
-import org.jclouds.date.TimeStamp;
-import org.jclouds.fujitsu.fgcp.FGCPCredentials;
-import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
-import org.jclouds.http.HttpException;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpRequest.Builder;
-import org.jclouds.http.HttpRequestFilter;
-import org.jclouds.http.HttpUtils;
-import org.jclouds.http.internal.SignatureWire;
-import org.jclouds.logging.Logger;
-import org.jclouds.rest.RequestSigner;
-import org.jclouds.rest.annotations.ApiVersion;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Supplier;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.Multimap;
-import com.google.common.net.HttpHeaders;
-
-/**
- * Generates and signs the access key id and adds the mandatory http header and
- * request parameters to the request.
- */
-@Singleton
-public class RequestAuthenticator implements HttpRequestFilter, RequestSigner {
-
- @Resource
- @Named(Constants.LOGGER_SIGNATURE)
- private Logger signatureLog = Logger.NULL;
-
- private final Supplier<FGCPCredentials> creds;
- private final LoadingCache<FGCPCredentials, Signature> signerCache;
- private final Provider<Calendar> calendarProvider;
- private final HttpUtils utils;
- private final String apiVersion;
-
- static final String SIGNATURE_VERSION = "1.0";
- static final String SIGNATURE_METHOD = "SHA1withRSA";
-
- @Inject
- public RequestAuthenticator(Supplier<FGCPCredentials> creds,
- SignatureForCredentials loader, @TimeStamp Provider<Calendar> calendarProvider, HttpUtils utils,
- SignatureWire signatureWire, @ApiVersion String apiVersion) {
- this.calendarProvider = checkNotNull(calendarProvider);
- this.creds = checkNotNull(creds, "creds");
- // throw out the signature related to old keys
- this.signerCache = CacheBuilder.newBuilder().maximumSize(2).build(checkNotNull(loader, "loader"));
- this.utils = checkNotNull(utils, "utils");
- this.apiVersion = checkNotNull(apiVersion, "apiVersion");
- }
-
- /**
- * It is relatively expensive to create a new signing key. Cache the
- * relationship between current credentials so that the signer is only
- * recalculated once.
- */
- @VisibleForTesting
- static class SignatureForCredentials extends CacheLoader<FGCPCredentials, Signature> {
-
- @Override
- public Signature load(FGCPCredentials creds) {
- PrivateKey privateKey = checkNotNull(creds.privateKey, "fgcpcredential's privateKey is null");
- try {
- Signature signer = Signature.getInstance(RequestAuthenticator.SIGNATURE_METHOD);
- signer.initSign(privateKey);
- return signer;
- } catch (NoSuchAlgorithmException e) {
- throw propagate(e);
- } catch (InvalidKeyException e) {
- throw propagate(e);
- }
- }
- }
-
- public HttpRequest filter(HttpRequest request) throws HttpException {
- checkNotNull(request, "request must be present");
- utils.logRequest(signatureLog, request, ">>");
-
- // create accesskeyid
- String accessKeyId = createStringToSign(request);
- String signature = sign(accessKeyId);
-
- // only "en" and "ja" are allowed
- String lang = Locale.JAPANESE.getLanguage().equals(Locale.getDefault().getLanguage()) ? Locale.JAPANESE
- .getLanguage() : Locale.ENGLISH.getLanguage();
-
- if (HttpMethod.GET.equals(request.getMethod())) {
- request = addQueryParamsToRequest(request, accessKeyId, signature, lang);
- } else {
-
- String payload = request.getPayload().getRawContent().toString();
- payload = createXmlElementWithValue(payload, RequestParameters.VERSION, apiVersion);
- payload = createXmlElementWithValue(payload, RequestParameters.LOCALE, lang);
- payload = createXmlElementWithValue(payload, RequestParameters.ACCESS_KEY_ID, accessKeyId);
- payload = createXmlElementWithValue(payload, RequestParameters.SIGNATURE, signature);
-
- // ensure there are no other query params left
- request.setPayload(payload);
- request.getPayload().getContentMetadata().setContentType(MediaType.TEXT_XML);
- }
-
- // may need to do this elsewhere (see ConvertToGaeRequest)
- HttpRequest filteredRequest = request.toBuilder().replaceHeader(HttpHeaders.USER_AGENT, "OViSS-API-CLIENT")
- .build();
-
- utils.logRequest(signatureLog, filteredRequest, ">>->");
- return filteredRequest;
- }
-
- @VisibleForTesting
- HttpRequest addQueryParamsToRequest(HttpRequest request, String accessKeyId, String signature, String lang) {
- Multimap<String, String> decodedParams = queryParser().apply(request.getEndpoint().getRawQuery());
- Builder<?> builder = request.toBuilder().endpoint(request.getEndpoint()).method(request.getMethod());
- if (!decodedParams.containsKey("Version")) {
- builder.addQueryParam(RequestParameters.VERSION, apiVersion);
- }
- builder.addQueryParam(RequestParameters.LOCALE, lang).addQueryParam(RequestParameters.ACCESS_KEY_ID, accessKeyId)
- .addQueryParam(RequestParameters.SIGNATURE, signature);
-
- return builder.build();
- }
-
- String createXmlElementWithValue(String payload, String tag, String value) {
- String startTag = String.format("<%s>", tag);
- String endTag = String.format("</%s>", tag);
-
- return payload.replace(startTag + endTag, startTag + value + endTag);
- }
-
- public String sign(String stringToSign) {
- String signed;
- try {
- Signature signer = signerCache.get(checkNotNull(creds.get(), "credential supplier returned null"));
- signer.update(stringToSign.getBytes(UTF_8));
- signed = base64().withSeparator("\n", 61).encode(signer.sign());
- } catch (SignatureException e) {
- throw new HttpException("error signing request", e);
- } catch (ExecutionException e) {
- throw new HttpException("couldn't load key for signing request", e);
- }
- return signed;
- }
-
- @VisibleForTesting
- String generateAccessKeyId() {
- Calendar cal = calendarProvider.get();
- String timezone = cal.getTimeZone().getDisplayName(Locale.ENGLISH);
- String expires = String.valueOf(cal.getTime().getTime());
-
- String signatureData = String.format("%s&%s&%s&%s", timezone, expires, SIGNATURE_VERSION, SIGNATURE_METHOD);
- String accessKeyId = base64().withSeparator("\n", 61).encode(signatureData.getBytes(UTF_8));
-
- return accessKeyId;
- }
-
- @Override
- public String createStringToSign(HttpRequest input) {
- return generateAccessKeyId();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/handlers/FGCPBackoffLimitedRetryHandler.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/handlers/FGCPBackoffLimitedRetryHandler.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/handlers/FGCPBackoffLimitedRetryHandler.java
deleted file mode 100644
index cfd4c34..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/handlers/FGCPBackoffLimitedRetryHandler.java
+++ /dev/null
@@ -1,27 +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.handlers;
-
-import org.jclouds.http.handlers.BackoffLimitedRetryHandler;
-
-public class FGCPBackoffLimitedRetryHandler extends BackoffLimitedRetryHandler {
-
- public void imposeBackoffExponentialDelay(long period, int pow, int failureCount, int max, String commandDescription) {
- imposeBackoffExponentialDelay(period, period * 100l, pow, failureCount, max, commandDescription);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/handlers/FGCPServerErrorRetryHandler.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/handlers/FGCPServerErrorRetryHandler.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/handlers/FGCPServerErrorRetryHandler.java
deleted file mode 100644
index d2933dd..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/handlers/FGCPServerErrorRetryHandler.java
+++ /dev/null
@@ -1,72 +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.handlers;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.jclouds.Constants;
-import org.jclouds.http.HttpCommand;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.HttpRetryHandler;
-import org.jclouds.http.HttpUtils;
-import org.jclouds.logging.Logger;
-
-import com.google.inject.Singleton;
-
-/**
- * Defines which requests should be retried.
- */
-@Singleton
-public class FGCPServerErrorRetryHandler implements HttpRetryHandler {
- private final HttpRetryHandler backoffHandler;
-
- @Inject
- @Named(Constants.PROPERTY_MAX_RETRIES)
- private int retryCountLimit = 10;
- @Resource
- protected Logger logger = Logger.NULL;
-
- @Inject
- public FGCPServerErrorRetryHandler(FGCPBackoffLimitedRetryHandler backoffHandler) {
- this.backoffHandler = backoffHandler;
- }
-
- @Override
- public boolean shouldRetryRequest(HttpCommand command, HttpResponse response) {
- if (command.getFailureCount() > retryCountLimit)
- return false;
-
- if (response.getStatusCode() == 500) {
- byte[] content = HttpUtils.closeClientButKeepContentStream(response);
- if (content != null) {
- String message = new String(content);
-
- if (message.contains("<responseStatus>ILLEGAL_STATE</responseStatus>")
- && message.contains("RECONFIG_ING")) {
- return backoffHandler.shouldRetryRequest(command, response);
- }
- if (message.contains("<responseStatus>VALIDATION_ERROR</responseStatus>")
- && message.contains("verify error")) {
- return backoffHandler.shouldRetryRequest(command, response);
- }
- }
- }
- return false;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/handlers/ResponseNotSuccessHandler.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/handlers/ResponseNotSuccessHandler.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/handlers/ResponseNotSuccessHandler.java
deleted file mode 100644
index 69e7a1a..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/handlers/ResponseNotSuccessHandler.java
+++ /dev/null
@@ -1,100 +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.handlers;
-
-import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream;
-import static org.jclouds.http.HttpUtils.releasePayload;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpCommand;
-import org.jclouds.http.HttpErrorHandler;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.HttpResponseException;
-import org.jclouds.rest.AuthorizationException;
-import org.jclouds.rest.ResourceNotFoundException;
-
-import com.google.common.base.Charsets;
-
-/**
- * This will parse the XML payload and set an appropriate exception on the
- * command object.
- */
-@Singleton
-public class ResponseNotSuccessHandler implements HttpErrorHandler {
- private static final Pattern ERROR_STATUS_PATTERN = Pattern.compile("<responseStatus>(.+)</responseStatus>");
- private static final Pattern ERROR_MESSAGE_PATTERN = Pattern.compile("<responseMessage>(.+)</responseMessage>");
- private static final Pattern SYSTEM_RECONFIGURING_PATTERN = Pattern.compile("ILLEGAL_STATE.+RECONFIG_ING.*");
- private static final Pattern AUTH_PATTERN = Pattern.compile(".*(AuthFailure|User not found in selectData).*");
- private static final Pattern RESOURCE_NOT_FOUND_PATTERN = Pattern.compile(".*RESOURCE_NOT_FOUND.*");
- private static final Pattern NOT_IMPLEMENTED_PATTERN = Pattern.compile(".*NOTFOUND: API to the Version.*");
- private static final Pattern ILLEGAL_STATE_PATTERN = Pattern
- .compile(".*(NEVER_BOOTED|ALREADY_STARTED|ALREADY_STOPPED|ILLEGAL_STATE).*");
- private static final Pattern ILLEGAL_ARGUMENT_PATTERN = Pattern
- .compile(".*(SERVER_NAME_ALREADY_EXISTS|VALIDATION_ERROR).*");
-
- public void handleError(HttpCommand command, HttpResponse response) {
- Exception exception = null;
- try {
- byte[] data = closeClientButKeepContentStream(response);
- String message = data != null ? new String(data, Charsets.UTF_8) : null;
- if (message != null) {
- Matcher ms = ERROR_STATUS_PATTERN.matcher(message);
- Matcher mm = ERROR_MESSAGE_PATTERN.matcher(message);
-
- if (ms.find() && mm.find()) {
- String status = ms.group(1);
- String errorMessage = mm.group(1);
- // revert status code to 200 to match actual server's return status
- response = response.toBuilder().statusCode(200).build();
- exception = refineException(new HttpResponseException(command, response, status + ": " + errorMessage));
- }
- }
- } finally {
- if (exception == null) {
- exception = new HttpResponseException(command, response);
- }
- command.setException(exception);
- releasePayload(response);
- }
- }
-
- private Exception refineException(HttpResponseException exception) {
- Exception refinedException = exception;
- String error = exception.getContent();
-
- // Create custom exception for error messages we know about
- if (SYSTEM_RECONFIGURING_PATTERN.matcher(error).matches()) {
- refinedException = new IllegalStateException(exception);
- } else if (RESOURCE_NOT_FOUND_PATTERN.matcher(error).matches()) {
- refinedException = new ResourceNotFoundException(error, exception);
- } else if (ILLEGAL_STATE_PATTERN.matcher(error).matches()) {
- refinedException = new IllegalStateException(error, exception);
- } else if (ILLEGAL_ARGUMENT_PATTERN.matcher(error).matches()) {
- refinedException = new IllegalArgumentException(error, exception);
- } else if (AUTH_PATTERN.matcher(error).matches()) {
- refinedException = new AuthorizationException(error, exception);
- } else if (NOT_IMPLEMENTED_PATTERN.matcher(error).matches()) {
- refinedException = new UnsupportedOperationException(error, exception);
- }
- return refinedException;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/http/ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/http/ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/http/ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService.java
deleted file mode 100644
index d120c42..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/http/ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService.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.http;
-
-import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.Proxy;
-import java.net.URI;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.HttpUtils;
-import org.jclouds.http.IOExceptionRetryHandler;
-import org.jclouds.http.handlers.DelegatingErrorHandler;
-import org.jclouds.http.handlers.DelegatingRetryHandler;
-import org.jclouds.http.internal.HttpWire;
-import org.jclouds.http.internal.JavaUrlHttpCommandExecutorService;
-import org.jclouds.io.ContentMetadataCodec;
-
-import com.google.common.base.Function;
-import com.google.common.base.Supplier;
-
-/**
- * Changes super class' behaviour to return an HTTP response with status code 500 instead of the 200 returned by
- * the FGCP API endpoint when the XML payload indicates an error with the request.
- */
-@Singleton
-public class ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService extends
- JavaUrlHttpCommandExecutorService {
-
- @Inject
- public ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService(HttpUtils utils,
- ContentMetadataCodec contentMetadataCodec, DelegatingRetryHandler retryHandler,
- IOExceptionRetryHandler ioRetryHandler, DelegatingErrorHandler errorHandler, HttpWire wire,
- HostnameVerifier verifier, Supplier<SSLContext> untrustedSSLContextProvider, Function<URI, Proxy> proxyForURI)
- throws SecurityException, NoSuchFieldException {
- super(utils, contentMetadataCodec, retryHandler, ioRetryHandler, errorHandler, wire, verifier,
- untrustedSSLContextProvider, proxyForURI);
- }
-
- @Override
- protected HttpResponse invoke(HttpURLConnection connection)
- throws IOException, InterruptedException {
- HttpResponse response = super.invoke(connection);
-
- byte[] data = closeClientButKeepContentStream(response);
- if (data != null
- && !new String(data).contains("<responseStatus>SUCCESS</responseStatus>")) {
- response = response.toBuilder().statusCode(500).build();
- }
-
- return response;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/location/SystemAndNetworkSegmentToLocationSupplier.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/location/SystemAndNetworkSegmentToLocationSupplier.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/location/SystemAndNetworkSegmentToLocationSupplier.java
deleted file mode 100644
index 220833d..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/location/SystemAndNetworkSegmentToLocationSupplier.java
+++ /dev/null
@@ -1,91 +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.location;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.domain.Location;
-import org.jclouds.domain.LocationBuilder;
-import org.jclouds.domain.LocationScope;
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.domain.VNet;
-import org.jclouds.fujitsu.fgcp.domain.VSystem;
-import org.jclouds.fujitsu.fgcp.domain.VSystemWithDetails;
-import org.jclouds.location.suppliers.LocationsSupplier;
-import org.jclouds.location.suppliers.all.RegionToProviderOrJustProvider;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
-import com.google.common.collect.Iterables;
-
-/**
- * Builds location hierarchy by querying the back-end for the networks of all
- * virtual systems.
- * <p>
- * Example:
- * <p>
- *
- * <pre>
- * >location provider fgcp(-au)
- * -> location region au/nsw
- * --> location system vsys
- * ---> location network DMZ/SECURE1/SECURE2
- * </pre>
- *
- * Todo: caching - provider/region won't change. if vsys still exists, network
- * won't change
- */
-@Singleton
-public class SystemAndNetworkSegmentToLocationSupplier implements LocationsSupplier {
-
- private final RegionToProviderOrJustProvider regionProvider;
- private FGCPApi api;
-
- @Inject
- SystemAndNetworkSegmentToLocationSupplier(RegionToProviderOrJustProvider regionProvider, FGCPApi api) {
- this.regionProvider = checkNotNull(regionProvider, "regionToProviderOrJustProvider");
- this.api = checkNotNull(api, "api");
- }
-
- @Override
- public Set<Location> get() {
- Builder<Location> locations = ImmutableSet.builder();
-
- for (VSystem system : api.getVirtualDCApi().listVirtualSystems()) {
-
- VSystemWithDetails systemWithDetails = api.getVirtualSystemApi().getDetails(system.getId());
-
- Location systemLocation = new LocationBuilder().scope(LocationScope.SYSTEM)
- .parent(Iterables.getOnlyElement(regionProvider.get())).description(system.getName()).id(system.getId())
- .build();
-
- for (VNet net : systemWithDetails.getNetworks()) {
-
- locations.add(new LocationBuilder().scope(LocationScope.NETWORK).parent(systemLocation)
- .description(net.getNetworkId().replaceFirst(".+-N-", "")).id(net.getNetworkId())
- .build());
- }
- }
-
- return locations.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/reference/RequestParameters.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/reference/RequestParameters.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/reference/RequestParameters.java
deleted file mode 100644
index 6bf9acf..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/reference/RequestParameters.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.fujitsu.fgcp.reference;
-
-/**
- * Configuration parameters and constants used in HTTP requests.
- */
-public final class RequestParameters {
-
- /**
- * Indicates the action to perform. Example: ListVSYS
- */
- public static final String ACTION = "Action";
-
- /**
- * The API version to use. Example: 2011-01-31
- */
- public static final String VERSION = "Version";
-
- /**
- * The locale to use. Example: en
- */
- public static final String LOCALE = "Locale";
-
- /**
- * The Access Key ID for the request sender. This identifies the account
- * which will be charged for usage of the service. The account with which
- * the Access Key ID is associated must be signed up for FGCP, or requests
- * will not be accepted. AKIADQKE4SARGYLE
- */
- public static final String ACCESS_KEY_ID = "AccessKeyId";
-
- /**
- * The date and time at which the request is signed, in the format
- * YYYY-MM-DDThh:mm:ssZ. For more information, go to ISO 8601. Example:
- * 2006-07-07T15:04:56Z
- */
- public static final String TIMESTAMP = "Timestamp";
-
- /**
- * The date and time at which the signer included in the request expires, in
- * the format YYYY-MM-DDThh:mm:ssZ. Example: 2006-07-07T15:04:56Z
- */
- public static final String EXPIRES = "Expires";
-
- /**
- * The request signer. For more information, go to the Amazon Elastic
- * Compute Cloud Developer Guide. Example: Qnpl4Qk/7tINHzfXCiT7VbBatDA=
- */
- public static final String SIGNATURE = "Signature";
-
- /**
- * The hash algorithm you use to create the request signer. Valid value:
- * SHA1withRSA.
- */
- public static final String SIGNATURE_METHOD = "SignatureMethod";
-
- /**
- * The signer version you use to sign the request. Set this value to 1.0.
- *
- */
- public static final String SIGNATURE_VERSION = "SignatureVersion";
-
- private RequestParameters() {
- throw new AssertionError("intentionally unimplemented");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/AdditionalDiskApi.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/AdditionalDiskApi.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/AdditionalDiskApi.java
deleted file mode 100644
index f9e2ec2..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/AdditionalDiskApi.java
+++ /dev/null
@@ -1,113 +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.io.Closeable;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.binders.BindAlsoToSystemId;
-import org.jclouds.fujitsu.fgcp.compute.functions.SingleElementResponseToElement;
-import org.jclouds.fujitsu.fgcp.domain.VDisk;
-import org.jclouds.fujitsu.fgcp.domain.VDiskStatus;
-import org.jclouds.fujitsu.fgcp.filters.RequestAuthenticator;
-import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.PayloadParams;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.Transform;
-
-
-/**
- * API relating to additional storage.
- */
-@RequestFilters(RequestAuthenticator.class)
-@QueryParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@PayloadParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@Consumes(MediaType.TEXT_XML)
-public interface AdditionalDiskApi extends Closeable {
-
- @Named("GetVDiskStatus")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetVDiskStatus")
- @Transform(SingleElementResponseToElement.class)
- VDiskStatus getStatus(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vdiskId") String id);
-
- @Named("GetVDiskAttributes")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetVDiskAttributes")
- @Transform(SingleElementResponseToElement.class)
- VDisk get(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vdiskId") String id);
-
- @Named("UpdateVDiskAttribute")
- @GET
- @QueryParams(keys = "Action", values = "UpdateVDiskAttribute")
- void update(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vdiskId") String id,
- @QueryParam("attributeName") String name,
- @QueryParam("attributeValue") String value);
-
- @Named("BackupVDisk")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "BackupVDisk")
- void backup(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vdiskId") String id);
-
- @Named("RestoreVDisk")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "RestoreVDisk")
- void restore(@QueryParam("vsysId") String systemId,
- @QueryParam("backupId") String backupId);
-
- @Named("DestroyVDisk")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "DestroyVDisk")
- void destroy(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vdiskId") String id);
-
- @Named("DetachVDisk")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "DetachVDisk")
- void detach(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vdiskId") String diskId,
- @QueryParam("vserverId") String serverId);
-
- @Named("DestroyVDiskBackup")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "DestroyVDiskBackup")
- void destroyBackup(@QueryParam("vsysId") String sysId,
- @QueryParam("backupId") String backupId);
-
- // Set<> listBackups(String sysId);
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/BuiltinServerApi.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/BuiltinServerApi.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/BuiltinServerApi.java
deleted file mode 100644
index 3d9debf..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/BuiltinServerApi.java
+++ /dev/null
@@ -1,151 +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.io.Closeable;
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.binders.BindAlsoToSystemId;
-import org.jclouds.fujitsu.fgcp.compute.functions.SingleElementResponseToElement;
-import org.jclouds.fujitsu.fgcp.domain.BuiltinServer;
-import org.jclouds.fujitsu.fgcp.domain.BuiltinServerBackup;
-import org.jclouds.fujitsu.fgcp.domain.BuiltinServerConfiguration;
-import org.jclouds.fujitsu.fgcp.domain.BuiltinServerStatus;
-import org.jclouds.fujitsu.fgcp.filters.RequestAuthenticator;
-import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.PayloadParams;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.Transform;
-
-
-/**
- * API relating to built-in servers, also called extended function
- * module (EFM), such as a firewall or load balancer (SLB).
- */
-@RequestFilters(RequestAuthenticator.class)
-@QueryParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@PayloadParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@Consumes(MediaType.TEXT_XML)
-public interface BuiltinServerApi extends Closeable {
-
- @Named("StartEFM")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "StartEFM")
- void start(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("efmId") String id);
-
- @Named("StopEFM")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "StopEFM")
- void stop(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("efmId") String id);
-
- @Named("DestroyEFM")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "DestroyEFM")
- void destroy(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("efmId") String id);
-
- @Named("BackupEFM")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "BackupEFM")
- void backup(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("efmId") String id);
-
- @Named("RestoreEFM")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "RestoreEFM")
- void restore(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("efmId") String id,
- @QueryParam("backupId") String backupId);
-
- @Named("ListEFMBackup")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "ListEFMBackup")
- Set<BuiltinServerBackup> listBackups(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("efmId") String id);
-
- @Named("DestroyEFMBackup")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "DestroyEFMBackup")
- void destroyBackup(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("efmId") String id,
- @QueryParam("backupId") String backupId);
-
- @Named("GetEFMAttributes")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetEFMAttributes")
- @Transform(SingleElementResponseToElement.class)
- BuiltinServer get(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("efmId") String id);
-
- @Named("UpdateEFMAttribute")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "UpdateEFMAttribute")
- void update(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("efmId") String id,
- @QueryParam("attributeName") String name,
- @QueryParam("attributeValue") String value);
-
- @Named("GetEFMStatus")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetEFMStatus")
- @Transform(SingleElementResponseToElement.class)
- BuiltinServerStatus getStatus(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("efmId") String id);
-
- @Named("GetEFMConfiguration")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetEFMConfiguration")
- @Transform(SingleElementResponseToElement.class)
- BuiltinServer getConfiguration(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("efmId") String id,
- @QueryParam("configurationName") BuiltinServerConfiguration configuration);
-
-// @Named("GetEFMConfiguration")
-// @POST
-// @JAXBResponseParser
-// @QueryParams(keys = "Action", values = "GetEFMConfiguration")
-// @Transform(SingleElementResponseToElement.class)
-// Set<Rule> getUpdateDetails(String id);
-
- // Void
- // updateConfiguration(@BinderParam(BindAlsoToSystemId.class)
- // @QueryParam("efmId") String id, xml?);
-// EFM_UPDATE, getUpdateStatus(String id);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/DiskImageApi.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/DiskImageApi.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/DiskImageApi.java
deleted file mode 100644
index 90a83a3..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/DiskImageApi.java
+++ /dev/null
@@ -1,70 +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.io.Closeable;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.compute.functions.SingleElementResponseToElement;
-import org.jclouds.fujitsu.fgcp.domain.DiskImage;
-import org.jclouds.fujitsu.fgcp.filters.RequestAuthenticator;
-import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.PayloadParams;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.Transform;
-
-
-/**
- * API relating to disk images.
- */
-@RequestFilters(RequestAuthenticator.class)
-@QueryParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@PayloadParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@Consumes(MediaType.TEXT_XML)
-public interface DiskImageApi extends Closeable {
-
- @Named("GetDiskImageAttributes")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetDiskImageAttributes")
- @Transform(SingleElementResponseToElement.class)
- DiskImage get(@QueryParam("diskImageId") String id);
-
- @Named("UpdateDiskImageAttribute")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "UpdateDiskImageAttribute")
- void update(
- @QueryParam("diskImageId") String diskImageId,
- @QueryParam("updateLcId") String localeId,
- @QueryParam("attributeName") String name,
- @QueryParam("attributeValue") String value);
-
- @Named("UnregisterDiskImage")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "UnregisterDiskImage")
- void deregister(@QueryParam("diskImageId") String id);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/FirewallApi.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/FirewallApi.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/FirewallApi.java
deleted file mode 100644
index c8bbbd1..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/FirewallApi.java
+++ /dev/null
@@ -1,65 +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.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.compute.functions.SingleElementResponseToElement;
-import org.jclouds.fujitsu.fgcp.domain.Rule;
-import org.jclouds.fujitsu.fgcp.filters.RequestAuthenticator;
-import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.PayloadParams;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.Transform;
-
-
-/**
- * API relating to a built-in server, also called extended function
- * module (EFM), of type firewall.
- */
-@RequestFilters(RequestAuthenticator.class)
-@QueryParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@PayloadParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@Consumes(MediaType.TEXT_XML)
-public interface FirewallApi extends BuiltinServerApi {
-
- @Named("GetEFMConfiguration")
- @POST
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetEFMConfiguration")
- @Transform(SingleElementResponseToElement.class)
- Set<Rule> getNATConfiguration(String id);
-
- /*
- FW_NAT_RULE, getNATConfiguration(String id)
-
- FW_DNS, getDNSConfiguration(String id)
- FW_POLICY, getPolicyConfiguration(String id)
-
- FW_LOG, getFirewallLogs(String id);
- FW_LIMIT_POLICY,
-
- */
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/LoadBalancerApi.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/LoadBalancerApi.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/LoadBalancerApi.java
deleted file mode 100644
index 1081805..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/LoadBalancerApi.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.services;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.filters.RequestAuthenticator;
-import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
-import org.jclouds.rest.annotations.PayloadParams;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-
-/**
- * API relating to a built-in server, also called extended function
- * module (EFM), of type load balancer (SLB).
- */
-@RequestFilters(RequestAuthenticator.class)
-@QueryParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@PayloadParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@Consumes(MediaType.TEXT_XML)
-public interface LoadBalancerApi extends BuiltinServerApi {
-
- /*
- SLB_RULE, getLBConfiguration(String id)
- SLB_LOAD_STATISTICS, getLoadBalancerStats(String id)
- SLB_ERROR_STATISTICS, getLoadBalancerErrorStats(String id)
- SLB_CERTIFICATE_LIST, getLoadBalancerCerts(String id)
- SLB_CONNECTION, getLoadBalancerConnection(String id)
-
- */
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/PublicIPAddressApi.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/PublicIPAddressApi.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/PublicIPAddressApi.java
deleted file mode 100644
index e0335c7..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/PublicIPAddressApi.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.fujitsu.fgcp.services;
-
-import java.io.Closeable;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.compute.functions.SingleElementResponseToElement;
-import org.jclouds.fujitsu.fgcp.domain.PublicIP;
-import org.jclouds.fujitsu.fgcp.domain.PublicIPStatus;
-import org.jclouds.fujitsu.fgcp.filters.RequestAuthenticator;
-import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.PayloadParams;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.Transform;
-
-
-/**
- * API relating to public IP addresses.
- */
-@RequestFilters(RequestAuthenticator.class)
-@QueryParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@PayloadParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@Consumes(MediaType.TEXT_XML)
-public interface PublicIPAddressApi extends Closeable {
-
- @Named("AttachPublicIP")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "AttachPublicIP")
- void attach(@QueryParam("vsysId") String systemId,
- @QueryParam("publicIp") String ip);
-
- @Named("DetachPublicIP")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "DetachPublicIP")
- void detach(@QueryParam("vsysId") String systemId,
- @QueryParam("publicIp") String ip);
-
- @Named("GetPublicIPStatus")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetPublicIPStatus")
- @Transform(SingleElementResponseToElement.class)
- PublicIPStatus getStatus(
- @QueryParam("publicIp") String ip);
-
- @Named("GetPublicIPAttributes")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetPublicIPAttributes")
- @Transform(SingleElementResponseToElement.class)
- PublicIP get(@QueryParam("publicIp") String ip);
-
- @Named("FreePublicIP")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "FreePublicIP")
- void free(@QueryParam("vsysId") String systemId,
- @QueryParam("publicIp") String ip);
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/SystemTemplateApi.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/SystemTemplateApi.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/SystemTemplateApi.java
deleted file mode 100644
index fb2d696..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/SystemTemplateApi.java
+++ /dev/null
@@ -1,79 +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.io.Closeable;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.compute.functions.SingleElementResponseToElement;
-import org.jclouds.fujitsu.fgcp.domain.VSystemDescriptor;
-import org.jclouds.fujitsu.fgcp.filters.RequestAuthenticator;
-import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.PayloadParams;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.Transform;
-
-
-/**
- * API relating to system templates, also referred to as virtual
- * system descriptors.
- */
-@RequestFilters(RequestAuthenticator.class)
-@QueryParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@PayloadParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@Consumes(MediaType.TEXT_XML)
-public interface SystemTemplateApi extends Closeable {
-
- @Named("GetVSYSDescriptorConfiguration")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetVSYSDescriptorConfiguration")
- @Transform(SingleElementResponseToElement.class)
- VSystemDescriptor get(
- @QueryParam("vsysDescriptorId") String id);
-
- @Named("UpdateVSYSDescriptorAttribute")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "UpdateVSYSDescriptorAttribute")
- void update(@QueryParam("vsysDescriptorId") String id,
- @QueryParam("updateLcId") String localeId,
- @QueryParam("attributeName") String name,
- @QueryParam("attributeValue") String value);
-
- @Named("UnregisterVSYSDescriptor")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "UnregisterVSYSDescriptor")
- void deregister(
- @QueryParam("vsysDescriptorId") String id);
-
- @Named("UnregisterPrivateVSYSDescriptor")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "UnregisterPrivateVSYSDescriptor")
- void deregisterPrivateTemplate(
- @QueryParam("vsysDescriptorId") String id);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApi.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApi.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApi.java
deleted file mode 100644
index 113155e..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApi.java
+++ /dev/null
@@ -1,202 +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.io.Closeable;
-import java.util.Map;
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.compute.functions.SingleElementResponseToElement;
-import org.jclouds.fujitsu.fgcp.domain.AddressRange;
-import org.jclouds.fujitsu.fgcp.domain.DiskImage;
-import org.jclouds.fujitsu.fgcp.domain.EventLog;
-import org.jclouds.fujitsu.fgcp.domain.Information;
-import org.jclouds.fujitsu.fgcp.domain.PublicIP;
-import org.jclouds.fujitsu.fgcp.domain.ServerType;
-import org.jclouds.fujitsu.fgcp.domain.UsageInfo;
-import org.jclouds.fujitsu.fgcp.domain.VSystem;
-import org.jclouds.fujitsu.fgcp.domain.VSystemDescriptor;
-import org.jclouds.fujitsu.fgcp.filters.RequestAuthenticator;
-import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.PayloadParams;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.Transform;
-
-
-/**
- * API relating to the virtual data center.
- */
-@RequestFilters(RequestAuthenticator.class)
-@QueryParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@PayloadParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@Consumes(MediaType.TEXT_XML)
-public interface VirtualDCApi extends Closeable {
-
- @Named("CreateVSYS")
- // @POST
- @GET
- @JAXBResponseParser
- // @XMLResponseParser(VSYSCreateHandler.class)
- @QueryParams(keys = "Action", values = "CreateVSYS")
- @Transform(SingleElementResponseToElement.class)
- // @PayloadParams(keys = "Action", values = "CreateVSYS")
- // @Produces(MediaType.TEXT_XML)
- // @MapBinder(BindParamsToXmlPayload.class)
- // String
- // createVirtualSystem(@PayloadParam("vsysDescriptorId") String
- // vsysDescriptorId, @PayloadParam("vsysName") String vsysName);
- String createVirtualSystem(
- @QueryParam("vsysDescriptorId") String descriptorId,
- @QueryParam("vsysName") String name);
-
- @Named("ListVSYS")
- @GET
- @JAXBResponseParser
- // @XMLResponseParser(VSYSListHandler.class)
- @QueryParams(keys = "Action", values = "ListVSYS")
- Set<VSystem> listVirtualSystems();
-
- @Named("ListServerType")
- @GET
- @JAXBResponseParser
- // according to the manual it takes a 'String diskImageId' but value seems
- // to be ignored
- @QueryParams(keys = { "Action", "diskImageId" }, values = {
- "ListServerType", "dummy" })
- // @XmlJavaTypeAdapter(SetOfServerTypesXMLAdapter.class)
- // @XmlElement(type = ServerType.class)
- Set<ServerType> listServerTypes();
-
- @Named("ListDiskImage")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "ListDiskImage")
- Set<DiskImage> listDiskImages();
-
- @Named("ListDiskImage")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "ListDiskImage")
- Set<DiskImage> listDiskImages(
- @Nullable @QueryParam("serverCategory") String serverCategory,
- @QueryParam("vsysDescriptorId") String vsysDescriptorId);
-
- /**
- *
- * @return
- * @see VirtualSystemApi#listPublicIPs(String)
- */
- @Named("ListPublicIP")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "ListPublicIP")
- Map<PublicIP, String> listPublicIPs();
-
- @Named("AddAddressRange")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "AddAddressRange")
- void addAddressRange(
- @QueryParam("pipFrom") String pipFrom,
- @QueryParam("pipTo") String pipTo);
-
- @Named("CreateAddressPool")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "CreateAddressPool")
- void createAddressPool(
- @QueryParam("pipFrom") String pipFrom,
- @QueryParam("pipTo") String pipTo);
-
- @Named("DeleteAddressRange")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "DeleteAddressRange")
- void deleteAddressRange(
- @QueryParam("pipFrom") String pipFrom,
- @QueryParam("pipTo") String pipTo);
-
- @Named("GetAddressRange")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetAddressRange")
- Set<AddressRange> getAddressRange();
-
- @Named("ListVSYSDescriptor")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "ListVSYSDescriptor")
- Set<VSystemDescriptor> listVSYSDescriptor();
-
- @Named("ListVSYSDescriptor")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "ListVSYSDescriptor")
- Set<VSystemDescriptor> listVSYSDescriptor(
- @QueryParam("keyword") String keyword,
- @QueryParam("estimateFrom") int estimateFrom,
- @QueryParam("estimateTo") int estimateTo);
-
- @Named("GetEventLog")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetEventLog")
- Set<EventLog> getEventLogs();
-
- @Named("GetEventLog")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetEventLog")
- Set<EventLog> getEventLogs(@QueryParam("all") boolean all);
-
- @Named("GetInformation")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetInformation")
- Set<Information> getInformation();
-
- @Named("GetInformation")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetInformation")
- Set<Information> getInformation(
- @QueryParam("all") boolean all);
-
- @Named("GetSystemUsage")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetSystemUsage")
- Set<UsageInfo> getSystemUsage();
-
- @Named("GetSystemUsage")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetSystemUsage")
- Set<UsageInfo> getSystemUsage(
- @QueryParam("systemIds") String systemIds);
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/VirtualServerApi.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/VirtualServerApi.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/VirtualServerApi.java
deleted file mode 100644
index ad6de39..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/services/VirtualServerApi.java
+++ /dev/null
@@ -1,155 +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.io.Closeable;
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.binders.BindAlsoToSystemId;
-import org.jclouds.fujitsu.fgcp.compute.functions.SingleElementResponseToElement;
-import org.jclouds.fujitsu.fgcp.domain.PerformanceInfo;
-import org.jclouds.fujitsu.fgcp.domain.VServer;
-import org.jclouds.fujitsu.fgcp.domain.VServerStatus;
-import org.jclouds.fujitsu.fgcp.domain.VServerWithDetails;
-import org.jclouds.fujitsu.fgcp.filters.RequestAuthenticator;
-import org.jclouds.fujitsu.fgcp.reference.RequestParameters;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.PayloadParams;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.Transform;
-
-
-/**
- * API relating to virtual servers.
- */
-@RequestFilters(RequestAuthenticator.class)
-@QueryParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@PayloadParams(keys = RequestParameters.VERSION, values = FGCPApi.VERSION)
-@Consumes(MediaType.TEXT_XML)
-public interface VirtualServerApi extends Closeable {
-
- @Named("StartVServer")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "StartVServer")
- void start(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vserverId") String id);
-
- @Named("StopVServer")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "StopVServer")
- void stop(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vserverId") String id);
-
- @Named("StopVServer")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = { "Action", "force" }, values = { "StopVServer", "true" })
- void stopForcefully(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vserverId") String id);
-
- @Named("DestroyVServer")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "DestroyVServer")
- void destroy(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vserverId") String id);
-
- @Named("GetVServerAttributes")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetVServerAttributes")
- @Transform(SingleElementResponseToElement.class)
- VServer get(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vserverId") String id);
-
- @Named("GetVServerConfiguration")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetVServerConfiguration")
- @Transform(SingleElementResponseToElement.class)
- VServerWithDetails getDetails(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vserverId") String id);
-
- @Named("UpdateVServerAttribute")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "UpdateVServerAttribute")
- void update(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vserverId") String id,
- @QueryParam("attributeName") String name,
- @QueryParam("attributeValue") String value);
-
- @Named("GetVServerStatus")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetVServerStatus")
- // @Transform(StringToVServerStatus.class)
- @Transform(SingleElementResponseToElement.class)
- VServerStatus getStatus(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vserverId") String id);
-
- @Named("GetVServerInitialPassword")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetVServerInitialPassword")
- @Transform(SingleElementResponseToElement.class)
- String getInitialPassword(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vserverId") String id);
-
- @Named("AttachVDisk")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "AttachVDisk")
- void attachDisk(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("vserverId") String serverId,
- @QueryParam("vdiskId") String diskId);
-
- @Named("GetPerformanceInformation")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetPerformanceInformation")
- Set<PerformanceInfo> getPerformanceInformation(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("serverId") String id,
- @QueryParam("interval") String interval);
-
- @Named("GetPerformanceInformation")
- @GET
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "GetPerformanceInformation")
- Set<PerformanceInfo> getPerformanceInformation(
- @BinderParam(BindAlsoToSystemId.class) @QueryParam("serverId") String id,
- @QueryParam("dataType") String dataType,
- @QueryParam("interval") String interval);
-
- @Named("RegisterPrivateDiskImage")
- @POST
- @JAXBResponseParser
- @QueryParams(keys = "Action", values = "RegisterPrivateDiskImage")
- void registerAsPrivateDiskImage(String xml);
-}
[6/8] JCLOUDS-757 Drop FCGP labs provider
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Group.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Group.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Group.java
deleted file mode 100644
index a71994e..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Group.java
+++ /dev/null
@@ -1,223 +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.domain;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlEnumValue;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Describes attributes of a software load balancer's (SLB) configuration.
- */
-public class Group {
- private int id;
-
- private String protocol;
-
- private int port1;
-
- private int port2;
-
- private String balanceType;
-
- private String uniqueType;
-
- private String monitorType;
-
- private int maxConnection;
-
- private int uniqueRetention;
-
- private int interval;
-
- private int timeout;
-
- private int retryCount;
-
- private int certNum;
-
- private Set<Cause> causes;
-
- private RecoveryAction recoveryAction;
-
- private Set<Target> targets = Sets.newLinkedHashSet();
-
- private String validity;
-
- enum RecoveryAction {
- @XmlEnumValue("switch-back")
- SWITCH_BACK, @XmlEnumValue("maintenance")
- MAINTENANCE
- }
-
- /**
- * @return the id
- */
- public int getId() {
- return id;
- }
-
- /**
- * @return the protocol
- */
- public String getProtocol() {
- return protocol;
- }
-
- /**
- * @return the port1
- */
- public int getPort1() {
- return port1;
- }
-
- /**
- * @return the port2
- */
- public int getPort2() {
- return port2;
- }
-
- /**
- * @return the balanceType
- */
- public String getBalanceType() {
- return balanceType;
- }
-
- /**
- * @return the uniqueType
- */
- public String getUniqueType() {
- return uniqueType;
- }
-
- /**
- * @return the monitorType
- */
- public String getMonitorType() {
- return monitorType;
- }
-
- /**
- * @return the maxConnection
- */
- public int getMaxConnection() {
- return maxConnection;
- }
-
- /**
- * @return the uniqueRetention
- */
- public int getUniqueRetention() {
- return uniqueRetention;
- }
-
- /**
- * @return the interval
- */
- public int getInterval() {
- return interval;
- }
-
- /**
- * @return the timeout
- */
- public int getTimeout() {
- return timeout;
- }
-
- /**
- * @return the retryCount
- */
- public int getRetryCount() {
- return retryCount;
- }
-
- /**
- * @return the certNum
- */
- public int getCertNum() {
- return certNum;
- }
-
- /**
- * @return the causes
- */
- public Set<Cause> getCauses() {
- return causes == null ? ImmutableSet.<Cause> of() : ImmutableSet
- .copyOf(causes);
- }
-
- /**
- * @return the recoveryAction
- */
- public RecoveryAction getRecoveryAction() {
- return recoveryAction;
- }
-
- /**
- * @return the targets
- */
- public Set<Target> getTargets() {
- return targets == null ? ImmutableSet.<Target> of() : ImmutableSet
- .copyOf(targets);
- }
-
- /**
- * @return the validity
- */
- public String getValidity() {
- return validity;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Group that = Group.class.cast(obj);
- return Objects.equal(this.id, that.id);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
- .add("protocol", protocol).add("port1", port1)
- .add("port2", port2).add("balanceType", balanceType)
- .add("uniqueType", uniqueType).add("monitorType", monitorType)
- .add("maxConnection", maxConnection)
- .add("uniqueRetention", uniqueRetention)
- .add("interval", interval).add("timeout", timeout)
- .add("retryCount", retryCount).add("certNum", certNum)
- .add("causes", causes).add("recoveryAction", recoveryAction)
- .add("targets", targets).add("validity", validity).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Image.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Image.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Image.java
deleted file mode 100644
index 1122e45..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Image.java
+++ /dev/null
@@ -1,111 +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.domain;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Holds information on the system disk image of a virtual server, including the
- * OS and software pre-installed on it.
- */
-public class Image {
- private String id;
-
- private String serverCategory;
-
- private String serverApplication;
-
- private String cpuBit;
-
- private float sysvolSize;
-
- private int numOfMaxDisk;
-
- private int numOfMaxNic;
-
- @XmlElementWrapper(name = "softwares")
- @XmlElement(name = "software")
- private Set<Software> software = Sets.newLinkedHashSet();
-
- public String getId() {
- return id;
- }
-
- public String getServerCategory() {
- return serverCategory;
- }
-
- public String getServerApplication() {
- return serverApplication;
- }
-
- public String getCpuBit() {
- return cpuBit;
- }
-
- public float getSysvolSize() {
- return sysvolSize;
- }
-
- public int getNumOfMaxDisk() {
- return numOfMaxDisk;
- }
-
- public int getNumOfMaxNic() {
- return numOfMaxNic;
- }
-
- public Set<Software> getSoftware() {
- return software == null ? ImmutableSet.<Software> of() : ImmutableSet
- .copyOf(software);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Image that = Image.class.cast(obj);
- return Objects.equal(this.id, that.id);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
- .add("serverCategory", serverCategory)
- .add("serverApplication", serverApplication)
- .add("cpuBit", cpuBit).add("sysvolSize", sysvolSize)
- .add("numOfMaxDisk", numOfMaxDisk)
- .add("numOfMaxNic", numOfMaxNic).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Information.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Information.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Information.java
deleted file mode 100644
index 62c1531..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Information.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.fujitsu.fgcp.domain;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Holds information relating to the FGCP service.
- */
-public class Information {
- private int seqno;
- private String title;
- private String message;
- private String startDate;
- private String expiry;
- private String entryDate;
-
- /**
- * @return the seqno
- */
- public int getSeqno() {
- return seqno;
- }
-
- /**
- * @return the title
- */
- public String getTitle() {
- return title;
- }
-
- /**
- * @return the message
- */
- public String getMessage() {
- return message;
- }
-
- /**
- * @return the startDate
- */
- public String getStartDate() {
- return startDate;
- }
-
- /**
- * @return the expiry
- */
- public String getExpiry() {
- return expiry;
- }
-
- /**
- * @return the entryDate
- */
- public String getEntryDate() {
- return entryDate;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(seqno, entryDate, message, title);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Information that = Information.class.cast(obj);
- return Objects.equal(this.seqno, that.seqno)
- && Objects.equal(this.entryDate, that.entryDate)
- && Objects.equal(this.message, that.message)
- && Objects.equal(this.title, that.title);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("seqno", seqno).add("entryDate", entryDate)
- .add("title", title).add("message", message)
- .add("startDate", startDate).add("expiry", expiry).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/IntermediateCACert.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/IntermediateCACert.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/IntermediateCACert.java
deleted file mode 100644
index 9a261c2..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/IntermediateCACert.java
+++ /dev/null
@@ -1,117 +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.domain;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Describes an intermediate CA certificate for use with a load balancer (SLB).
- */
-@XmlRootElement(name = "ccacert")
-public class IntermediateCACert implements Comparable<IntermediateCACert> {
- private int ccacertNum;
-
- private String description;
-
- private String subject;
-
- private String issuer;
-
- private String validity;
-
- private String detail;
-
- /**
- * @return the ccacertNum
- */
- public int getCcacertNum() {
- return ccacertNum;
- }
-
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * @return the subject
- */
- public String getSubject() {
- return subject;
- }
-
- /**
- * @return the issuer
- */
- public String getIssuer() {
- return issuer;
- }
-
- /**
- * @return the validity
- */
- public String getValidity() {
- return validity;
- }
-
- /**
- * @return the detail
- */
- public String getDetail() {
- return detail;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(ccacertNum, issuer, subject, validity);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- IntermediateCACert that = IntermediateCACert.class.cast(obj);
- return Objects.equal(this.ccacertNum, that.ccacertNum)
- && Objects.equal(this.issuer, that.issuer)
- && Objects.equal(this.subject, that.subject)
- && Objects.equal(this.validity, that.validity);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("ccacertNum", ccacertNum).add("issuer", issuer)
- .add("subject", subject).add("validity", validity)
- .add("description", description).add("detail", detail)
- .toString();
- }
-
- @Override
- public int compareTo(IntermediateCACert o) {
- return ccacertNum - o.ccacertNum;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java
deleted file mode 100644
index 499d701..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java
+++ /dev/null
@@ -1,65 +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.domain;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Holds statistics of the load on a load balancer (SLB).
- */
-@XmlRootElement(name = "loadstatistics")
-public class LoadStatistics {
- private Set<Group> groups = Sets.newLinkedHashSet();
-
- /**
- * @return the groups
- */
- public Set<Group> getGroups() {
- return groups == null ? ImmutableSet.<Group> of() : ImmutableSet
- .copyOf(groups);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(groups);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- LoadStatistics that = LoadStatistics.class.cast(obj);
- return Objects.equal(this.groups, that.groups);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("groups", groups).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java
deleted file mode 100644
index 379bdd0..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java
+++ /dev/null
@@ -1,63 +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.domain;
-
-import javax.xml.bind.annotation.XmlElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Represents the memory of a virtual server.
- */
-public class Memory implements Comparable<Memory> {
- @XmlElement(name = "memorySize")
- private double size;
-
- public double getSize() {
- return size;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(size);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Memory that = Memory.class.cast(obj);
- return Objects.equal(this.size, that.size);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("size", size)
- .toString();
- }
-
- @Override
- public int compareTo(Memory o) {
- return Double.compare(size, o.size);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java
deleted file mode 100644
index 70f3d4c..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java
+++ /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.
- */
-package org.jclouds.fujitsu.fgcp.domain;
-
-import java.util.Set;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Holds the network address translation rules of a firewall.
- */
-public class NAT {
- private Set<Rule> rules = Sets.newLinkedHashSet();
-
- /**
- * @return the rules
- */
- public Set<Rule> getRules() {
- return rules == null ? ImmutableSet.<Rule> of() : ImmutableSet
- .copyOf(rules);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(rules);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- NAT that = NAT.class.cast(obj);
- return Objects.equal(this.rules, that.rules);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("rules", rules).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java
deleted file mode 100644
index 42da7a2..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java
+++ /dev/null
@@ -1,146 +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.domain;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Holds the statistics of a virtual server.
- */
-@XmlRootElement(name = "performanceinfo")
-public class PerformanceInfo implements Comparable<PerformanceInfo> {
- private long recordTime;
- private double cpuUtilization;
- private long diskReadRequestCount;
- private long diskWriteRequestCount;
- private long diskReadSector;
- private long diskWriteSector;
- private long nicInputByte;
- private long nicOutputByte;
- private long nicInputPacket;
- private long nicOutputPacket;
-
- /**
- * @return the recordTime
- */
- public long getRecordTime() {
- return recordTime;
- }
-
- /**
- * @return the cpuUtilization
- */
- public double getCpuUtilization() {
- return cpuUtilization;
- }
-
- /**
- * @return the diskReadRequestCount
- */
- public long getDiskReadRequestCount() {
- return diskReadRequestCount;
- }
-
- /**
- * @return the diskWriteRequestCount
- */
- public long getDiskWriteRequestCount() {
- return diskWriteRequestCount;
- }
-
- /**
- * @return the diskReadSector
- */
- public long getDiskReadSector() {
- return diskReadSector;
- }
-
- /**
- * @return the diskWriteSector
- */
- public long getDiskWriteSector() {
- return diskWriteSector;
- }
-
- /**
- * @return the nicInputByte
- */
- public long getNicInputByte() {
- return nicInputByte;
- }
-
- /**
- * @return the nicOutputByte
- */
- public long getNicOutputByte() {
- return nicOutputByte;
- }
-
- /**
- * @return the nicInputPacket
- */
- public long getNicInputPacket() {
- return nicInputPacket;
- }
-
- /**
- * @return the nicOutputPacket
- */
- public long getNicOutputPacket() {
- return nicOutputPacket;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(recordTime);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- PerformanceInfo that = PerformanceInfo.class.cast(obj);
- return Objects.equal(this.recordTime, that.recordTime);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("recordTime", recordTime)
- .add("cpuUtilization", cpuUtilization)
- .add("diskReadRequestCount", diskReadRequestCount)
- .add("diskWriteRequestCount", diskWriteRequestCount)
- .add("diskReadSector", diskReadSector)
- .add("diskWriteSector", diskWriteSector)
- .add("nicInputByte", nicInputByte)
- .add("nicOutputByte", nicOutputByte)
- .add("nicInputPacket", nicInputPacket)
- .add("nicOutputPacket", nicOutputPacket).toString();
- }
-
- @Override
- public int compareTo(PerformanceInfo o) {
- return (int) (recordTime - o.recordTime);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Period.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Period.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Period.java
deleted file mode 100644
index aaacd72..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Period.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.domain;
-
-/**
- * Describes the period over which error statistics of a load balancer (SLB) are
- * kept.
- */
-public class Period {
- private String current;
- private String before;
- private String today;
- private String yesterday;
-
- /**
- * @return the current
- */
- public String getCurrent() {
- return current;
- }
-
- /**
- * @return the before
- */
- public String getBefore() {
- return before;
- }
-
- /**
- * @return the today
- */
- public String getToday() {
- return today;
- }
-
- /**
- * @return the yesterday
- */
- public String getYesterday() {
- return yesterday;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java
deleted file mode 100644
index e92c479..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java
+++ /dev/null
@@ -1,192 +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.domain;
-
-import javax.xml.bind.annotation.XmlEnumValue;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Describes a firewall rule in detail.
- */
-public class Policy implements Comparable<Policy> {
- private int id;
-
- private String src;
-
- private PolicyType srcType;
-
- private String srcPort;
-
- private Service dstService;
-
- private String dst;
-
- private PolicyType dstType;
-
- private String dstPort;
-
- private Protocol protocol;
-
- private Action action;
-
- private Log log;
-
- enum Service {
- NONE, WSUS, DNS, NTP, @XmlEnumValue("yum")
- YUM, KMS, @XmlEnumValue("Symantec")
- SYMANTEC, RHUI
- }
-
- enum PolicyType {IP, FQDN, FQDNF}
-
- enum Protocol {
- @XmlEnumValue("tcp")
- TCP, @XmlEnumValue("udp")
- UDP, @XmlEnumValue("tcp-udp")
- TCP_UDP, @XmlEnumValue("icmp")
- ICMP
- }
-
- enum Action {
- @XmlEnumValue("Accept")
- ACCEPT, @XmlEnumValue("Deny")
- DENY
- }
-
- enum Log {
- @XmlEnumValue("On")
- ON, @XmlEnumValue("Off")
- OFF
- }
-
- /**
- * @return the id
- */
- public int getId() {
- return id;
- }
-
- /**
- * @return the src
- */
- public String getSrc() {
- return src;
- }
-
- /**
- * @return the srcType
- */
- public PolicyType getSrcType() {
- return srcType;
- }
-
- /**
- * @return the srcPort
- */
- public String getSrcPort() {
- return srcPort;
- }
-
- /**
- * @return the dstService
- */
- public Service getDstService() {
- return dstService;
- }
-
- /**
- * @return the dst
- */
- public String getDst() {
- return dst;
- }
-
- /**
- * @return the dstType
- */
- public PolicyType getDstType() {
- return dstType;
- }
-
- /**
- * @return the dstPort
- */
- public String getDstPort() {
- return dstPort;
- }
-
- /**
- * @return the protocol
- */
- public Protocol getProtocol() {
- return protocol;
- }
-
- /**
- * @return the action
- */
- public Action getAction() {
- return action;
- }
-
- /**
- * @return the log
- */
- public Log getLog() {
- return log;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Policy that = Policy.class.cast(obj);
- return Objects.equal(this.id, that.id);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("id", id)
- .add("src", src)
- .add("srcType", srcType)
- .add("srcPort", srcPort)
- .add("dstService", dstService)
- .add("dst", dst)
- .add("dstType", dstType)
- .add("dstPort", dstPort)
- .add("protocol", protocol)
- .add("action", action)
- .add("log", log).toString();
- }
-
- @Override
- public int compareTo(Policy o) {
- return id - o.id;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Product.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Product.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Product.java
deleted file mode 100644
index b48364a..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Product.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.fujitsu.fgcp.domain;
-
-import javax.xml.bind.annotation.XmlElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Represents a product for which usage information can be queried.
- */
-public class Product {
- @XmlElement(name = "productName")
- private String name;
-
- private String unitName;
-
- private String usedPoints;
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return the unitName
- */
- public String getUnitName() {
- return unitName;
- }
-
- /**
- * @return the usedPoints
- */
- public String getUsedPoints() {
- return usedPoints;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(name, unitName, usedPoints);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Product that = Product.class.cast(obj);
- return Objects.equal(this.name, that.name)
- && Objects.equal(this.unitName, that.unitName)
- && Objects.equal(this.usedPoints, that.usedPoints);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("name", name)
- .add("unitName", unitName).add("usedPoints", usedPoints)
- .toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java
deleted file mode 100644
index d9d47da..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java
+++ /dev/null
@@ -1,91 +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.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.xml.bind.annotation.XmlElement;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Represents a public IP address.
- * <p>
- * A public IP address can be allocated to a virtual system, then needs to be
- * enabled/attached before it can be mapped to a virtual server by configuring
- * the NAT settings of virtual system's firewall.
- */
-public class PublicIP {
-
- public static enum Version {
- IPv4, IPv6, UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL,
- name());
- }
-
- public static Version fromValue(String version) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL.to(
- CaseFormat.UPPER_UNDERSCORE,
- checkNotNull(version, "version")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-
- }
-
- protected String address;
- @XmlElement(name = "v4v6Flag")
- protected Version version;
-
- public String getAddress() {
- return address;
- }
-
- public Version getVersion() {
- return version;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(address);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- PublicIP that = PublicIP.class.cast(obj);
- return Objects.equal(this.address, that.address);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("address", address).add("version", version).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIPStatus.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIPStatus.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIPStatus.java
deleted file mode 100644
index 021d552..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIPStatus.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.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.CaseFormat;
-
-/**
- * Possible statuses of a public IP address.
- * <p>
- * An attached public IP address is enabled for a particular virtual system and
- * or may not be mapped to a virtual server.
- */
-@XmlRootElement(name = "publicipStatus")
-public enum PublicIPStatus {
- ATTACHED, ATTACHING, DETACHING, DETACHED, UNRECOGNIZED;
-
- public String value() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- @Override
- public String toString() {
- return value();
- }
-
- public static PublicIPStatus fromValue(String status) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL
- .to(CaseFormat.UPPER_UNDERSCORE,
- checkNotNull(status, "status")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java
deleted file mode 100644
index d06cf01..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.fujitsu.fgcp.domain;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Represents a network address translation or network address port translation
- * rule.
- * <p>
- * A rule either maps a public IP address to the NIC of a virtual server for
- * incoming network traffic, or specifies the public IP address used as source
- * address for traffic from all servers in the virtual system.
- */
-public class Rule {
- private String publicIp;
- private String privateIp;
- private boolean snapt;
-
- /**
- * @return the publicIp
- */
- public String getPublicIp() {
- return publicIp;
- }
-
- /**
- * @return the privateIp
- */
- public String getPrivateIp() {
- return privateIp;
- }
-
- /**
- * @return the snapt
- */
- public boolean isSnapt() {
- return snapt;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(privateIp, publicIp, snapt);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Rule that = Rule.class.cast(obj);
- return Objects.equal(this.privateIp, that.privateIp)
- && Objects.equal(this.publicIp, that.publicIp)
- && Objects.equal(this.snapt, that.snapt);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("privateIp", privateIp).add("publicIp", publicIp)
- .add("snapt", snapt).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/SLB.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/SLB.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/SLB.java
deleted file mode 100644
index 75e9e4e..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/SLB.java
+++ /dev/null
@@ -1,196 +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.domain;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Represents a software load balancer.
- */
-@XmlRootElement(name = "slb")
-public class SLB extends BuiltinServer {
- private String ipAddress;
-
- private Set<IntermediateCACert> ccacerts = Sets.newLinkedHashSet();
-
- private Set<ServerCert> servercerts = Sets.newLinkedHashSet();
-
- private Set<Group> groups;
-
- private String srcType;
-
- private String srcPort;
-
- private String status;
-
- private ErrorStatistics errorStatistics;
-
- private LoadStatistics loadStatistics;
-
- private String category;
-
- private String latestVersion;
-
- private String comment;
-
- private boolean firmUpdateExist;
-
- private boolean configUpdateExist;
-
- private boolean backout;
-
- private String updateDate;
-
- private String currentVersion;
-
- private String webAccelerator;
-
- /**
- * @return the ipAddress
- */
- public String getIpAddress() {
- return ipAddress;
- }
-
- /**
- * @return the ccacerts
- */
- public Set<IntermediateCACert> getCcacerts() {
- return ccacerts == null ? ImmutableSet.<IntermediateCACert> of()
- : ImmutableSet.copyOf(ccacerts);
- }
-
- /**
- * @return the servercerts
- */
- public Set<ServerCert> getServercerts() {
- return servercerts == null ? ImmutableSet.<ServerCert> of()
- : ImmutableSet.copyOf(servercerts);
- }
-
- /**
- * @return the groups
- */
- public Set<Group> getGroups() {
- return groups == null ? ImmutableSet.<Group> of() : ImmutableSet
- .copyOf(groups);
- }
-
- /**
- * @return the srcType
- */
- public String getSrcType() {
- return srcType;
- }
-
- /**
- * @return the srcPort
- */
- public String getSrcPort() {
- return srcPort;
- }
-
- /**
- * @return the status
- */
- public String getStatus() {
- return status;
- }
-
- /**
- * @return the errorStatistics
- */
- public ErrorStatistics getErrorStatistics() {
- return errorStatistics;
- }
-
- /**
- * @return the loadStatistics
- */
- public LoadStatistics getLoadStatistics() {
- return loadStatistics;
- }
-
- /**
- * @return the category
- */
- public String getCategory() {
- return category;
- }
-
- /**
- * @return the latestVersion
- */
- public String getLatestVersion() {
- return latestVersion;
- }
-
- /**
- * @return the comment
- */
- public String getComment() {
- return comment;
- }
-
- /**
- * @return the firmUpdateExist
- */
- public boolean getFirmUpdateExist() {
- return firmUpdateExist;
- }
-
- /**
- * @return the configUpdateExist
- */
- public boolean getConfigUpdateExist() {
- return configUpdateExist;
- }
-
- /**
- * @return the backout
- */
- public boolean getBackout() {
- return backout;
- }
-
- /**
- * @return the updateDate
- */
- public String getUpdateDate() {
- return updateDate;
- }
-
- /**
- * @return the currentVersion
- */
- public String getCurrentVersion() {
- return currentVersion;
- }
-
- /**
- * @return the webAccelerator
- */
- public String getWebAccelerator() {
- return webAccelerator;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java
deleted file mode 100644
index 7fdef2a..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java
+++ /dev/null
@@ -1,118 +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.domain;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Describes a server certificate for use with a load balancer (SLB).
- */
-@XmlRootElement(name = "servercert")
-public class ServerCert implements Comparable<ServerCert> {
- private int certNum;
-
- private String subject;
-
- private String issuer;
-
- private String validity;
-
- private int groupId;
-
- private String detail;
-
- /**
- * @return the certNum
- */
- public int getCertNum() {
- return certNum;
- }
-
- /**
- * @return the subject
- */
- public String getSubject() {
- return subject;
- }
-
- /**
- * @return the issuer
- */
- public String getIssuer() {
- return issuer;
- }
-
- /**
- * @return the validity
- */
- public String getValidity() {
- return validity;
- }
-
- /**
- * @return the groupId
- */
- public int getGroupId() {
- return groupId;
- }
-
- /**
- * @return the detail
- */
- public String getDetail() {
- return detail;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(certNum, groupId, issuer, subject, validity);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- ServerCert that = ServerCert.class.cast(obj);
- return Objects.equal(this.certNum, that.certNum)
- && Objects.equal(this.groupId, that.groupId)
- && Objects.equal(this.issuer, that.issuer)
- && Objects.equal(this.subject, that.subject)
- && Objects.equal(this.validity, that.validity);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("certNum", certNum).add("issuer", issuer)
- .add("subject", subject).add("validity", validity)
- .add("groupId", groupId).add("detail", detail).toString();
- }
-
- @Override
- public int compareTo(ServerCert o) {
- return (certNum - o.certNum) == 0 ? (groupId - o.groupId)
- : (certNum - o.certNum);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerType.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerType.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerType.java
deleted file mode 100644
index dd61424..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerType.java
+++ /dev/null
@@ -1,142 +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.domain;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Describes the hardware of a virtual server.
- */
-@XmlRootElement(name = "servertype")
-public class ServerType implements Comparable<ServerType> {
- private String id;
-
- private String name;
-
- private String label;
-
- private String comment;
-
- private String productId;
-
- private String productName;
-
- private String price;
-
- private String chargeType;
-
- private String expectedUsage;
-
- private CPU cpu;
-
- private Memory memory;
-
- @XmlElementWrapper(name = "disks")
- @XmlElement(name = "disk")
- private Set<Disk> disks = Sets.newLinkedHashSet();
-
- public String getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- public String getLabel() {
- return label;
- }
-
- public String getComment() {
- return comment;
- }
-
- public String getProductId() {
- return productId;
- }
-
- public String getProductName() {
- return productName;
- }
-
- public String getPrice() {
- return price;
- }
-
- public String getChargeType() {
- return chargeType;
- }
-
- public String getExpectedUsage() {
- return expectedUsage;
- }
-
- public CPU getCpu() {
- return cpu;
- }
-
- public Memory getMemory() {
- return memory;
- }
-
- public Set<Disk> getDisks() {
- return disks == null ? ImmutableSet.<Disk> of() : ImmutableSet
- .copyOf(disks);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- ServerType that = ServerType.class.cast(obj);
- return Objects.equal(this.id, that.id);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
- .add("name", name).add("label", label).add("comment", comment)
- .add("productId", productId).add("productName", productName)
- .add("price", price).add("chargeType", chargeType)
- .add("expectedUsage", expectedUsage).add("cpu", cpu)
- .add("memory", memory).add("disks", disks).toString();
- }
-
- @Override
- public int compareTo(ServerType o) {
- return memory == null ? -1 : memory.compareTo(o.memory);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Software.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Software.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Software.java
deleted file mode 100644
index b9fa1a3..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Software.java
+++ /dev/null
@@ -1,100 +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.domain;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Represents the software installed on a disk.
- */
-public class Software {
- private String name;
-
- private String id;
-
- private String category;
-
- private String version;
-
- private String officialVersion;
-
- private String patch;
-
- private String license;
-
- private String support;
-
- public String getName() {
- return name;
- }
-
- public String getId() {
- return id;
- }
-
- public String getCategory() {
- return category;
- }
-
- public String getVersion() {
- return version;
- }
-
- public String getOfficialVersion() {
- return officialVersion;
- }
-
- public String getPatch() {
- return patch;
- }
-
- public String getLicense() {
- return license;
- }
-
- public String getSupport() {
- return support;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Software that = Software.class.cast(obj);
- return Objects.equal(this.id, that.id);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
- .add("name", name).add("category", category)
- .add("version", version)
- .add("officialVersion", officialVersion)
- .add("support", support).add("patch", patch)
- .add("license", license).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Target.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Target.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Target.java
deleted file mode 100644
index 2f043a7..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Target.java
+++ /dev/null
@@ -1,123 +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.domain;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Describes the target server of a load balancer.
- */
-public class Target {
- private String serverId;
-
- private String serverName;
-
- private String ipAddress;
-
- private String port1;
-
- private String port2;
-
- private String status;
-
- private String now;
-
- private String peak;
-
- /**
- * @return the serverId
- */
- public String getServerId() {
- return serverId;
- }
-
- /**
- * @return the serverName
- */
- public String getServerName() {
- return serverName;
- }
-
- /**
- * @return the ipAddress
- */
- public String getIpAddress() {
- return ipAddress;
- }
-
- /**
- * @return the port1
- */
- public String getPort1() {
- return port1;
- }
-
- /**
- * @return the port2
- */
- public String getPort2() {
- return port2;
- }
-
- /**
- * @return the status
- */
- public String getStatus() {
- return status;
- }
-
- /**
- * @return the now
- */
- public String getNow() {
- return now;
- }
-
- /**
- * @return the peak
- */
- public String getPeak() {
- return peak;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(serverId);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Target that = Target.class.cast(obj);
- return Objects.equal(this.serverId, that.serverId);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("serverId", serverId).add("serverName", serverName)
- .add("ipAddress", ipAddress).add("port1", port1)
- .add("port2", port2).add("status", status).add("now", now)
- .add("peak", peak).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java
deleted file mode 100644
index afb40f2..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java
+++ /dev/null
@@ -1,91 +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.domain;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Describes the usage by a virtual system.
- */
-@XmlRootElement(name = "usageinfo")
-public class UsageInfo {
- @XmlElement(name = "vsysId")
- private String systemId;
- @XmlElement(name = "vsysName")
- private String systemName;
-
- @XmlElementWrapper(name = "products")
- @XmlElement(name = "product")
- private Set<Product> products = Sets.newLinkedHashSet();
-
- /**
- * @return the systemId
- */
- public String getSystemId() {
- return systemId;
- }
-
- /**
- * @return the systemName
- */
- public String getSystemName() {
- return systemName;
- }
-
- /**
- * @return the products
- */
- public Set<Product> getProducts() {
- return products == null ? ImmutableSet.<Product> of() : ImmutableSet
- .copyOf(products);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(systemId, systemName, products);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- UsageInfo that = UsageInfo.class.cast(obj);
- return Objects.equal(this.systemId, that.systemId)
- && Objects.equal(this.systemName, that.systemName)
- && Objects.equal(this.products, that.products);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("systemId", systemId).add("systemName", systemName)
- .add("products", products).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java
deleted file mode 100644
index c5cf4e3..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java
+++ /dev/null
@@ -1,83 +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.domain;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Represents attachable storage in the form of a virtual disk.
- */
-@XmlRootElement(name = "vdisk")
-public class VDisk {
- @XmlElement(name = "diskId")
- private String id;
- @XmlElement(name = "diskName")
- private String name;
- @XmlElement(name = "attachedTo")
- private String attachedServer;
- private String creator;
- private double size;
-
- public String getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- public String getAttachedServer() {
- return attachedServer;
- }
-
- public String getCreator() {
- return creator;
- }
-
- public double getSize() {
- return size;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- VDisk that = VDisk.class.cast(obj);
- return Objects.equal(this.id, that.id);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
- .add("name", name).add("attachedServer", attachedServer)
- .add("creator", creator).add("size", size).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDiskStatus.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDiskStatus.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDiskStatus.java
deleted file mode 100644
index 45c1474..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDiskStatus.java
+++ /dev/null
@@ -1,51 +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.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.CaseFormat;
-
-/**
- * Possible statuses of an attachable virtual disk.
- */
-@XmlRootElement(name = "vdiskStatus")
-public enum VDiskStatus {
-
- NORMAL, BACKUP_ING, DEPLOYING, DETACHING, ATTACHING, RESTORING, ERROR, UNRECOGNIZED;
-
- public String value() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- @Override
- public String toString() {
- return value();
- }
-
- public static VDiskStatus fromValue(String status) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL
- .to(CaseFormat.UPPER_UNDERSCORE,
- checkNotNull(status, "status")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java
deleted file mode 100644
index 9c10056..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java
+++ /dev/null
@@ -1,70 +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.domain;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Represents a virtual network interface card (NIC).
- */
-@XmlRootElement(name = "vnic")
-public class VNIC {
- private String networkId;
-
- private String privateIp;
-
- private int nicNo;
-
- public String getNetworkId() {
- return networkId;
- }
-
- public String getPrivateIp() {
- return privateIp;
- }
-
- public int getNicNo() {
- return nicNo;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(networkId);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- VNIC that = VNIC.class.cast(obj);
- return Objects.equal(this.networkId, that.networkId);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("networkId", networkId).add("privateIp", privateIp)
- .add("nicNo", nicNo).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java
deleted file mode 100644
index b20285a..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java
+++ /dev/null
@@ -1,58 +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.domain;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Represents a virtual network.
- */
-@XmlRootElement(name = "vnet")
-public class VNet {
-
- private String networkId;
-
- public String getNetworkId() {
- return networkId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(networkId);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- VNet that = VNet.class.cast(obj);
- return Objects.equal(this.networkId, that.networkId);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).add("networkId", networkId)
- .toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServer.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServer.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServer.java
deleted file mode 100644
index 1c0b049..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServer.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.fujitsu.fgcp.domain;
-
-import javax.xml.bind.annotation.XmlElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Represents a virtual server.
- */
-public class VServer {
- @XmlElement(name = "vserverId")
- protected String id;
- @XmlElement(name = "vserverName")
- protected String name;
- @XmlElement(name = "vserverType")
- protected String type;
- protected String diskimageId;
- protected String creator;
-
- public String getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- public String getType() {
- return type;
- }
-
- public String getDiskimageId() {
- return diskimageId;
- }
-
- public String getCreator() {
- return creator;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- VServer that = VServer.class.cast(obj);
- return Objects.equal(this.id, that.id);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
- .add("name", name).add("type", type).add("creator", creator)
- .add("diskimageId", diskimageId).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerStatus.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerStatus.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerStatus.java
deleted file mode 100644
index e0ce56b..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerStatus.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.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.CaseFormat;
-
-/**
- * Possible statuses of a virtual server.
- */
-@XmlRootElement(name = "vserverStatus")
-public enum VServerStatus {
- DEPLOYING, RUNNING, STOPPING, STOPPED, STARTING, FAILOVER, UNEXPECTED_STOP, RESTORING, BACKUP_ING, ERROR, START_ERROR, STOP_ERROR, CHANGE_TYPE, REGISTERING, UNRECOGNIZED;
-
- public String value() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- @Override
- public String toString() {
- return value();
- }
-
- public static VServerStatus fromValue(String status) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL
- .to(CaseFormat.UPPER_UNDERSCORE,
- checkNotNull(status, "status")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithDetails.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithDetails.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithDetails.java
deleted file mode 100644
index 234eb3c..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithDetails.java
+++ /dev/null
@@ -1,55 +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.domain;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Represents a virtual server with virtual storage and NICs.
- */
-@XmlRootElement(name = "vserver")
-public class VServerWithDetails extends VServerWithVNICs {
- @XmlElementWrapper(name = "vdisks")
- @XmlElement(name = "vdisk")
- protected Set<VDisk> vdisks = Sets.newLinkedHashSet();
- protected Image image;
-
- public Set<VDisk> getVdisks() {
- return vdisks == null ? ImmutableSet.<VDisk> of() : ImmutableSet
- .copyOf(vdisks);
- }
-
- public Image getImage() {
- return image;
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
- .add("name", name).add("type", type).add("creator", creator)
- .add("diskimageId", diskimageId).add("vdisks", vdisks)
- .add("vnics", vnics).add("image", image).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java
deleted file mode 100644
index 7e120c9..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java
+++ /dev/null
@@ -1,45 +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.domain;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-public class VServerWithVNICs extends VServer {
-
- @XmlElementWrapper(name = "vnics")
- @XmlElement(name = "vnic")
- protected Set<VNIC> vnics = Sets.newLinkedHashSet();
-
- public Set<VNIC> getVnics() {
- return vnics == null ? ImmutableSet.<VNIC> of() : ImmutableSet
- .copyOf(vnics);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
- .add("name", name).add("type", type).add("creator", creator)
- .add("diskimageId", diskimageId).add("vnics", vnics).toString();
- }
-}
[7/8] JCLOUDS-757 Drop FCGP labs provider
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/ResourceIdToSystemId.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/ResourceIdToSystemId.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/ResourceIdToSystemId.java
deleted file mode 100644
index 12c3918..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/ResourceIdToSystemId.java
+++ /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.
- */
-package org.jclouds.fujitsu.fgcp.compute.functions;
-
-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 com.google.common.base.Function;
-
-/**
- * Determines the id of the virtual system that a server, load balancer or disk
- * is part of.
- */
-@Singleton
-public class ResourceIdToSystemId implements Function<String, String> {
-
- @Override
- public String apply(String id) {
- checkNotNull(id, "resource id");
-
- Pattern pattern = Pattern.compile("^(\\w+-\\w+)\\b.*");
- Matcher matcher = pattern.matcher((String) id);
-
- checkArgument(matcher.find(),
- "no valid resource id found: " + id.toString());
-
- return matcher.group(1);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/ServerTypeToHardware.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/ServerTypeToHardware.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/ServerTypeToHardware.java
deleted file mode 100644
index 9f2e327..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/ServerTypeToHardware.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.Hardware;
-import org.jclouds.compute.domain.HardwareBuilder;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.fujitsu.fgcp.domain.ServerType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Iterables;
-
-/**
- * Created by IntelliJ IDEA.
- */
-@Singleton
-public class ServerTypeToHardware implements Function<ServerType, Hardware> {
- private final CPUToProcessor cpuToProcessor;
- private final DiskToVolume diskToVolume;
-
- @Inject
- public ServerTypeToHardware(CPUToProcessor cpuToProcessor,
- DiskToVolume diskToVolume) {
- this.cpuToProcessor = checkNotNull(cpuToProcessor);
- this.diskToVolume = checkNotNull(diskToVolume);
- }
-
- @Override
- public Hardware apply(ServerType from) {
- checkNotNull(from, "ServerType");
- HardwareBuilder builder = new HardwareBuilder();
-
- builder.ids(from.getId());
- builder.name(from.getName());
- builder.ram((int) (1000d * Double.valueOf(from.getMemory().getSize())));
- builder.processor(cpuToProcessor.apply(from.getCpu()));
- builder.supportsImage(Predicates.<Image> alwaysTrue());
- // all servers are 64bit. The OS however may be 32 bit.
- builder.is64Bit(true);
- builder.volumes(Iterables.transform(from.getDisks(), diskToVolume));
-
- 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/SingleElementResponseToElement.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/SingleElementResponseToElement.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/SingleElementResponseToElement.java
deleted file mode 100644
index a2e9872..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/SingleElementResponseToElement.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.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.jclouds.fujitsu.fgcp.xml.internal.SingleElementResponse;
-
-import com.google.common.base.Function;
-
-public class SingleElementResponseToElement implements
- Function<SingleElementResponse, Object> {
-
- @Override
- public Object apply(SingleElementResponse r) {
- return checkNotNull(r, "response").getElement();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/VServerMetadataToNodeMetadata.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/VServerMetadataToNodeMetadata.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/VServerMetadataToNodeMetadata.java
deleted file mode 100644
index cd06717..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/functions/VServerMetadataToNodeMetadata.java
+++ /dev/null
@@ -1,240 +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.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.collect.Memoized;
-import org.jclouds.compute.domain.Hardware;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.NodeMetadata.Status;
-import org.jclouds.compute.domain.NodeMetadataBuilder;
-import org.jclouds.compute.functions.GroupNamingConvention;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.domain.Location;
-import org.jclouds.domain.LoginCredentials;
-import org.jclouds.fujitsu.fgcp.compute.strategy.VServerMetadata;
-import org.jclouds.fujitsu.fgcp.domain.VServer;
-import org.jclouds.fujitsu.fgcp.domain.VServerStatus;
-import org.jclouds.fujitsu.fgcp.domain.VServerWithVNICs;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-
-@Singleton
-public class VServerMetadataToNodeMetadata implements
- Function<VServerMetadata, NodeMetadata> {
-
- public static final Map<VServerStatus, Status> vServerToStatus = ImmutableMap
- .<VServerStatus, Status> builder()
- .put(VServerStatus.DEPLOYING, Status.PENDING)
- .put(VServerStatus.RUNNING, Status.RUNNING)
- .put(VServerStatus.STOPPING, Status.PENDING)
- .put(VServerStatus.STOPPED, Status.SUSPENDED)
- .put(VServerStatus.STARTING, Status.PENDING)
- .put(VServerStatus.FAILOVER, Status.RUNNING)
- .put(VServerStatus.UNEXPECTED_STOP, Status.SUSPENDED)
- .put(VServerStatus.RESTORING, Status.PENDING)
- .put(VServerStatus.BACKUP_ING, Status.PENDING)
- .put(VServerStatus.ERROR, Status.ERROR)
- .put(VServerStatus.START_ERROR, Status.ERROR)
- .put(VServerStatus.STOP_ERROR, Status.ERROR)
- .put(VServerStatus.CHANGE_TYPE, Status.PENDING)
- .put(VServerStatus.REGISTERING, Status.PENDING)
- .put(VServerStatus.UNRECOGNIZED, Status.UNRECOGNIZED).build();
-
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
-
- protected final Supplier<Set<? extends Location>> locations;
- protected final Supplier<Set<? extends Image>> images;
- protected final Supplier<Set<? extends Hardware>> hardwares;
- protected final GroupNamingConvention nodeNamingConvention;
-
- private static class FindImageForVServer implements Predicate<Image> {
- private final VServer server;
-
- private FindImageForVServer(VServer server) {
- this.server = server;
- }
-
- @Override
- public boolean apply(Image input) {
- return input.getId().equals(server.getDiskimageId());
- }
- }
-
- protected Image parseImage(VServer from) {
- try {
- return Iterables.find(images.get(), new FindImageForVServer(from));
- } catch (NoSuchElementException e) {
- logger.warn("could not find a matching image for server %s", from);
- }
- return null;
- }
-
- private static class FindHardwareForServerType implements
- Predicate<Hardware> {
- private final String type;
-
- private FindHardwareForServerType(String type) {
- this.type = type;
- }
-
- @Override
- public boolean apply(Hardware input) {
- return input.getName().equals(type);
- }
- }
-
- protected Hardware parseHardware(String from) {
- try {
- return Iterables.find(hardwares.get(),
- new FindHardwareForServerType(from));
- } catch (NoSuchElementException e) {
- logger.warn(
- "could not find a matching hardware for server type %s",
- from);
- }
- return null;
- }
-
- private static class FindLocationForVServer implements Predicate<Location> {
- private final VServerWithVNICs server;
-
- private FindLocationForVServer(VServerWithVNICs server) {
- this.server = server;
- }
-
- @Override
- public boolean apply(Location input) {
- return input.getId().equals(
- Iterables.getLast(server.getVnics()).getNetworkId());
- }
- }
-
- protected Location parseLocation(VServerWithVNICs from) {
- try {
- return Iterables.find(locations.get(), new FindLocationForVServer(
- from));
- } catch (NoSuchElementException e) {
- logger.warn("could not find a matching realm for server %s", from);
- }
- return null;
- }
-
- @Inject
- VServerMetadataToNodeMetadata(
- @Memoized Supplier<Set<? extends Location>> locations,
- @Memoized Supplier<Set<? extends Image>> images,
- @Memoized Supplier<Set<? extends Hardware>> hardwares,
- GroupNamingConvention.Factory namingConvention) {
- this.images = checkNotNull(images, "images");
- this.locations = checkNotNull(locations, "locations");
- this.hardwares = checkNotNull(hardwares, "hardwares");
- this.nodeNamingConvention = checkNotNull(namingConvention,
- "namingConvention").createWithoutPrefix();
- }
-
- @Override
- public NodeMetadata apply(VServerMetadata from) {
- NodeMetadataBuilder builder = new NodeMetadataBuilder();
-
- builder.ids(from.getId());
- builder.name(from.getName());
- builder.group(nodeNamingConvention.groupInUniqueNameOrNull(from
- .getName()));
- if (from.getStatus() == null)
- System.out.println("status null for: " + from.getId() + ": "
- + from.getName());
-
- builder.status(vServerToStatus.get(from.getStatus()));
- builder.privateAddresses(ImmutableSet.<String> of());
- builder.publicAddresses(ImmutableSet.<String> of());
-
- //
- // if (from.getIps() != null) {
- //
- // builder.publicAddresses(Collections2.transform(from.getIps(),
- // new Function<PublicIP, String>() {
- //
- // @Override
- // public String apply(PublicIP input) {
- // return input.getAddress();
- // }
- //
- // }));
- // }
-
- if (from.getServer() != null) {
-
- builder.imageId(from.getServer().getDiskimageId());
- builder.hardware(parseHardware(from.getServer().getType()));
-
- LoginCredentials.Builder credentialsBuilder = LoginCredentials
- .builder().password(from.getInitialPassword());
-
- Image image = parseImage(from.getServer());
- // image will not be found if server was created a while back and
- // the image has since been destroyed or discontinued (like an old
- // CentOS version)
- if (image != null) {
-
- builder.operatingSystem(image.getOperatingSystem());
- String user = image.getDefaultCredentials().getUser();
- credentialsBuilder.identity(user);
- }
-
- builder.credentials(credentialsBuilder.build());
-
- if (from.getServer() instanceof VServerWithVNICs) {
-
- VServerWithVNICs server = (VServerWithVNICs) from.getServer();
- builder.location(parseLocation(server));
- List<String> ips = Lists.newArrayList();
- if (server.getVnics() != null && server.getVnics().iterator().next().getPrivateIp() != null) {
- ips.add(server.getVnics().iterator().next().getPrivateIp());
- }
- builder.privateAddresses(ips);
- }
- }
- if (from.getTemplate() != null) {
- // when creating a new node
- builder.location(from.getTemplate().getLocation());
- }
-
- return builder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/options/FGCPTemplateOptions.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/options/FGCPTemplateOptions.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/options/FGCPTemplateOptions.java
deleted file mode 100644
index 61d7e9b..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/options/FGCPTemplateOptions.java
+++ /dev/null
@@ -1,23 +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.options;
-
-import org.jclouds.compute.options.TemplateOptions;
-
-public class FGCPTemplateOptions extends TemplateOptions {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/predicates/ServerStarted.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/predicates/ServerStarted.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/predicates/ServerStarted.java
deleted file mode 100644
index e0afeb2..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/predicates/ServerStarted.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.compute.predicates;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.domain.VServerStatus;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Predicate;
-
-@Singleton
-public class ServerStarted implements Predicate<String> {
-
- private final FGCPApi api;
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- @Inject
- public ServerStarted(FGCPApi api) {
- this.api = api;
- }
-
- public boolean apply(String serverId) {
- logger.trace("looking for status on server %s", serverId);
-
- VServerStatus status = api.getVirtualServerApi().getStatus(serverId);
- logger.trace("looking for status on server %s: currently: %s",
- serverId, status);
-
- if (status == VServerStatus.ERROR || status == VServerStatus.START_ERROR)
- throw new IllegalStateException("server in error: " + status);
- return status == VServerStatus.RUNNING;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/predicates/ServerStopped.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/predicates/ServerStopped.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/predicates/ServerStopped.java
deleted file mode 100644
index ba1bf3e..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/predicates/ServerStopped.java
+++ /dev/null
@@ -1,55 +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.predicates;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.domain.VServerStatus;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Predicate;
-
-@Singleton
-public class ServerStopped implements Predicate<String> {
-
- private final FGCPApi api;
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- @Inject
- public ServerStopped(FGCPApi api) {
- this.api = api;
- }
-
- public boolean apply(String serverId) {
- logger.trace("looking for status on server %s", serverId);
-
- VServerStatus status = api.getVirtualServerApi().getStatus(serverId);
- logger.trace("looking for status on server %s: currently: %s",
- serverId, status);
-
- if (status == VServerStatus.ERROR || status == VServerStatus.STOP_ERROR)
- throw new IllegalStateException("server not around or in error: "
- + status);
- return status == VServerStatus.STOPPED;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/predicates/SystemStatusNormal.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/predicates/SystemStatusNormal.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/predicates/SystemStatusNormal.java
deleted file mode 100644
index 2c9ac74..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/predicates/SystemStatusNormal.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.compute.predicates;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.domain.VSystemStatus;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Predicate;
-
-@Singleton
-public class SystemStatusNormal implements Predicate<String> {
-
- private final FGCPApi api;
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- @Inject
- public SystemStatusNormal(FGCPApi api) {
- this.api = api;
- }
-
- public boolean apply(String systemId) {
- logger.trace("looking for status on system %s", systemId);
-
- VSystemStatus status = api.getVirtualSystemApi().getStatus(systemId);
- logger.trace("looking for status on system %s: currently: %s",
- systemId, status);
-
- if (status == VSystemStatus.ERROR)
- throw new IllegalStateException("system in error: " + status);
- return status == VSystemStatus.NORMAL;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/strategy/FGCPComputeServiceAdapter.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/strategy/FGCPComputeServiceAdapter.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/strategy/FGCPComputeServiceAdapter.java
deleted file mode 100644
index ef3698b..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/strategy/FGCPComputeServiceAdapter.java
+++ /dev/null
@@ -1,289 +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.strategy;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Iterables.contains;
-import static com.google.common.collect.Iterables.filter;
-import static org.jclouds.util.Predicates2.retry;
-
-import java.util.Set;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.compute.ComputeServiceAdapter;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.compute.domain.Template;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.compute.reference.ComputeServiceConstants.Timeouts;
-import org.jclouds.domain.Location;
-import org.jclouds.domain.LoginCredentials;
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.compute.functions.ResourceIdToFirewallId;
-import org.jclouds.fujitsu.fgcp.compute.functions.ResourceIdToSystemId;
-import org.jclouds.fujitsu.fgcp.compute.predicates.ServerStarted;
-import org.jclouds.fujitsu.fgcp.compute.predicates.ServerStopped;
-import org.jclouds.fujitsu.fgcp.compute.strategy.VServerMetadata.Builder;
-import org.jclouds.fujitsu.fgcp.domain.DiskImage;
-import org.jclouds.fujitsu.fgcp.domain.ServerType;
-import org.jclouds.fujitsu.fgcp.domain.VServer;
-import org.jclouds.fujitsu.fgcp.domain.VServerStatus;
-import org.jclouds.fujitsu.fgcp.domain.VServerWithDetails;
-import org.jclouds.fujitsu.fgcp.domain.VServerWithVNICs;
-import org.jclouds.fujitsu.fgcp.domain.VSystem;
-import org.jclouds.fujitsu.fgcp.domain.VSystemWithDetails;
-import org.jclouds.logging.Logger;
-import org.jclouds.rest.ResourceNotFoundException;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Defines the connection between the {@link org.jclouds.fujitsu.fgcp.FGCPApi}
- * implementation and the jclouds {@link org.jclouds.compute.ComputeService}.
- */
-@Singleton
-public class FGCPComputeServiceAdapter implements
- ComputeServiceAdapter<VServerMetadata, ServerType, DiskImage, Location> {
-
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
-
- private final FGCPApi api;
- protected Predicate<String> serverStopped = null;
- protected Predicate<String> serverStarted = null;
- protected Predicate<String> serverCreated = null;
- protected ResourceIdToFirewallId toFirewallId = null;
- protected ResourceIdToSystemId toSystemId = null;
-
- @Inject
- public FGCPComputeServiceAdapter(FGCPApi api, ServerStopped serverStopped,
- ServerStarted serverStarted, Timeouts timeouts,
- ResourceIdToFirewallId toFirewallId,
- ResourceIdToSystemId toSystemId) {
- this.api = checkNotNull(api, "api");
- this.serverStopped = retry(checkNotNull(serverStopped), timeouts.nodeSuspended);
- this.serverStarted = retry(checkNotNull(serverStarted), timeouts.nodeRunning);
- this.serverCreated = retry(checkNotNull(serverStopped), timeouts.nodeRunning);
- this.toFirewallId = checkNotNull(toFirewallId, "ResourceIdToFirewallId");
- this.toSystemId = checkNotNull(toSystemId, "ResourceIdToSystemId");
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public NodeAndInitialCredentials<VServerMetadata> createNodeWithGroupEncodedIntoName(
- String group, String name, Template template) {
- String id = api.getVirtualSystemApi().createServer(name,
- template.getHardware().getName(), template.getImage().getId(),
- template.getLocation().getId());
-
- // wait until fully created (i.e. transitions to stopped status)
- checkState(serverCreated.apply(id), "node %s not reaching STOPPED state after creation", id);
- resumeNode(id);
- // don't wait until fully started, template "optionToNotBlock" takes care of that
- VServerMetadata server = getNode(id);
-
- // do we need this?
- server.setTemplate(template);
- String user = template.getImage().getOperatingSystem().getFamily() == OsFamily.WINDOWS ? "Administrator" : "root";
-
- return new NodeAndInitialCredentials<VServerMetadata>(server, id, LoginCredentials.builder().identity(user)
- .password(server.getInitialPassword()).build());
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Iterable<ServerType> listHardwareProfiles() {
- return api.getVirtualDCApi().listServerTypes();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Iterable<DiskImage> listImages() {
- return api.getVirtualDCApi().listDiskImages();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public DiskImage getImage(String id) {
- return api.getDiskImageApi().get(id);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Iterable<Location> listLocations() {
- // Not using the adapter to determine locations
- // see SystemAndNetworkSegmentToLocationSupplier
- return ImmutableSet.<Location> of();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public VServerMetadata getNode(String id) {
- Builder builder = VServerMetadata.builder();
- builder.id(id);
-
- try {
- VServerWithDetails server = api.getVirtualServerApi().getDetails(id);
- // skip FWs and SLBs
- if (isFWorSLB(server)) {
- return null;
- }
- VServerStatus status = api.getVirtualServerApi().getStatus(id);
- logger.trace("Node %s [%s] - %s", id, status, server);
- builder.serverWithDetails(server);
- builder.status(status);
- builder.initialPassword(api.getVirtualServerApi().getInitialPassword(id));
-
- // mapped public ips?
-// String fwId = toFirewallId.apply(id);
- // futures.add(asyncApi.getBuiltinServerApi().getConfiguration(fwId,
- // BuiltinServerConfiguration.FW_RULE));
- } catch (ResourceNotFoundException e) {
- return null;
- }
-
- return builder.build();
- }
-
- private boolean isFWorSLB(VServer server) {
- String serverType = server.getType();
- return "firewall".equals(serverType) || "slb".equals(serverType);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Iterable<VServerMetadata> listNodes() {
- ImmutableSet.Builder<VServerMetadata> servers = ImmutableSet.<VServerMetadata> builder();
-
- Set<VSystem> systems = api.getVirtualDCApi().listVirtualSystems();
- for (VSystem system : systems) {
-
- VSystemWithDetails systemDetails = api.getVirtualSystemApi().getDetails(system.getId());
-
- for (VServerWithVNICs server : systemDetails.getServers()) {
-
- // skip FWs and SLBs
- if (!isFWorSLB(server)) {
- servers.add(getNode(server.getId()));
- }
- }
- }
-
- return servers.build();
- }
-
- @Override
- public Iterable<VServerMetadata> listNodesByIds(final Iterable<String> ids) {
- return filter(listNodes(), new Predicate<VServerMetadata>() {
-
- @Override
- public boolean apply(VServerMetadata server) {
- return contains(ids, server.getId());
- }
- });
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void destroyNode(String id) {
- // ensure it is stopped first
- suspendNode(id);
- checkState(serverStopped.apply(id), "could not stop %s before destroying it", id);
- api.getVirtualServerApi().destroy(id);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void rebootNode(String id) {
- suspendNode(id);
- checkState(serverStopped.apply(id), "could not stop %s before restarting it", id);
- resumeNode(id);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void resumeNode(String id) {
- try {
- api.getVirtualServerApi().start(id);
- } catch (IllegalStateException ise) {
- if (!(ise.getMessage().contains("ALREADY_STARTED") || ise.getMessage().contains("STARTING"))) {
- throw ise;
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void suspendNode(String id) {
- try {
- api.getVirtualServerApi().stop(id);
- } catch (IllegalStateException ise) {
- if (ise.getMessage().contains("ALREADY_STOPPED") || ise.getMessage().contains("STOPPING")) {
- logger.trace("suspendNode({0}) - {1}", id, ise.getMessage());
- // ignore as it has/will reach the desired destination state
- } else if (ise.getMessage().contains("STARTING")) {
- // wait till running, then try to stop again
- logger.trace("suspendNode({0}) - {1} - waiting to reach RUNNING state", id, ise.getMessage());
- checkState(serverStarted.apply(id), "starting %s didn't reach RUNNING state", id);
- logger.trace("suspendNode({0}) - now RUNNING, trying to stop again", id);
- try {
- api.getVirtualServerApi().stop(id);
- } catch (IllegalStateException e) {
- if (e.getMessage().contains("ALREADY_STOPPED") || e.getMessage().contains("STOPPING")) {
- logger.trace("suspendNode({0}) - {1}", id, e.getMessage());
- // ignore as it has/will reach the desired destination state
- } else {
- throw e;
- }
- }
- } else {
- throw ise;
- }
- } catch (RuntimeException e) {
- logger.error(e, "suspendNode({0}) - exception occurred!", id);
- throw e;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/strategy/VServerMetadata.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/strategy/VServerMetadata.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/strategy/VServerMetadata.java
deleted file mode 100644
index 359be62..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/compute/strategy/VServerMetadata.java
+++ /dev/null
@@ -1,174 +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.strategy;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import org.jclouds.compute.domain.Template;
-import org.jclouds.fujitsu.fgcp.domain.DiskImage;
-import org.jclouds.fujitsu.fgcp.domain.PublicIP;
-import org.jclouds.fujitsu.fgcp.domain.VServer;
-import org.jclouds.fujitsu.fgcp.domain.VServerStatus;
-import org.jclouds.fujitsu.fgcp.domain.VServerWithVNICs;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Holds metadata on a virtual server, both static (name, id, type, etc.) and
- * dynamic (status, mapped public IPs, etc.).
- */
-public class VServerMetadata {
-
- protected VServer server;
- protected String id;
- protected String name;
- protected Template template;
- protected String initialPassword;
- protected VServerStatus status = VServerStatus.UNRECOGNIZED;
- protected Set<PublicIP> ips;
- protected DiskImage image;
-
- public VServerMetadata(VServer server, String initialPassword,
- VServerStatus status, DiskImage image, Set<PublicIP> publicIps) {
- this.server = checkNotNull(server, "server");
- this.initialPassword = initialPassword;
- this.status = status;
- this.image = image;
- this.ips = publicIps;
- id = server.getId();
- name = server.getName();
- }
-
- public VServerMetadata(String id, String name, Template template,
- VServerStatus status) {
- this.id = checkNotNull(id, "id");
- this.name = checkNotNull(name, "name");
- this.template = checkNotNull(template, "template");
- this.status = checkNotNull(status, "status");
- }
-
- public VServer getServer() {
- return server;
- }
-
- public String getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- public Template getTemplate() {
- return template;
- }
-
- public void setTemplate(Template template) {
- this.template = template;
- }
-
- public String getInitialPassword() {
- return initialPassword;
- }
-
- public VServerStatus getStatus() {
- return status;
- }
-
- public Set<PublicIP> getIps() {
- return ips;
- }
-
- public static Builder builder() {
- return new Builder();
- }
-
- public static class Builder {
- private VServer server;
- private VServerWithVNICs serverWithDetails;
- private String id;
- private String name;
- private Template template;
- private String initialPassword;
- private VServerStatus status = VServerStatus.UNRECOGNIZED;
- private Set<PublicIP> publicIps = ImmutableSet.of();
- private DiskImage image;
-
- public Builder id(String id) {
- this.id = id;
- return this;
- }
-
- public Builder name(String name) {
- this.name = name;
- return this;
- }
-
- public Builder template(Template template) {
- this.template = template;
- return this;
- }
-
-// public Builder server(VServer server) {
-// this.server = server;
-// return this;
-// }
-
- public Builder serverWithDetails(VServerWithVNICs serverWithDetails) {
- this.serverWithDetails = serverWithDetails;
- return this;
- }
-
- public Builder initialPassword(String password) {
- this.initialPassword = password;
- return this;
- }
-
- public Builder status(VServerStatus status) {
- this.status = status;
- return this;
- }
-
- public Builder image(DiskImage image) {
- this.image = image;
- return this;
- }
-
- public Builder publicIps(Set<PublicIP> publicIps) {
- this.publicIps = publicIps;
- return this;
- }
-
- public VServerMetadata build() {
- if (initialPassword == null) initialPassword = "";
- if (server != null) {
- return new VServerMetadata(server, initialPassword, status,
- image, publicIps);
- } else if (serverWithDetails != null) {
- return new VServerMetadata(serverWithDetails, initialPassword,
- status, image, publicIps);
- } else {
- // sometimes these fields are null because the server is returning a verify error
- if (id == null) id = "dummy-id";
- if (name == null) name = "dummy-name";
- return new VServerMetadata(id, name, template, status);
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/config/FGCPHttpApiModule.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/config/FGCPHttpApiModule.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/config/FGCPHttpApiModule.java
deleted file mode 100644
index 06e076f..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/config/FGCPHttpApiModule.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.config;
-
-
-import java.util.Calendar;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-
-import org.jclouds.date.TimeStamp;
-import org.jclouds.fujitsu.fgcp.FGCPApi;
-import org.jclouds.fujitsu.fgcp.FGCPCredentials;
-import org.jclouds.fujitsu.fgcp.handlers.FGCPServerErrorRetryHandler;
-import org.jclouds.fujitsu.fgcp.handlers.ResponseNotSuccessHandler;
-import org.jclouds.fujitsu.fgcp.http.ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService;
-import org.jclouds.fujitsu.fgcp.location.SystemAndNetworkSegmentToLocationSupplier;
-import org.jclouds.fujitsu.fgcp.suppliers.FGCPCredentialsSupplier;
-import org.jclouds.fujitsu.fgcp.suppliers.SSLContextWithKeysSupplier;
-import org.jclouds.fujitsu.fgcp.xml.FGCPJAXBParser;
-import org.jclouds.http.HttpErrorHandler;
-import org.jclouds.http.HttpRetryHandler;
-import org.jclouds.http.annotation.ClientError;
-import org.jclouds.http.annotation.Redirection;
-import org.jclouds.http.annotation.ServerError;
-import org.jclouds.http.config.SSLModule.LogToMapHostnameVerifier;
-import org.jclouds.http.internal.JavaUrlHttpCommandExecutorService;
-import org.jclouds.location.suppliers.ImplicitLocationSupplier;
-import org.jclouds.location.suppliers.LocationsSupplier;
-import org.jclouds.location.suppliers.implicit.FirstNetwork;
-import org.jclouds.rest.ConfiguresHttpApi;
-import org.jclouds.rest.config.HttpApiModule;
-import org.jclouds.xml.XMLParser;
-
-import com.google.common.base.Supplier;
-import com.google.inject.Provides;
-import com.google.inject.Scopes;
-import com.google.inject.TypeLiteral;
-
-
-/**
- * Configures the connection to the FGCP endpoint.
- */
-@ConfiguresHttpApi
-public class FGCPHttpApiModule extends HttpApiModule<FGCPApi> {
-
- public FGCPHttpApiModule() {
- super();
- }
-
- protected FGCPHttpApiModule(Class<FGCPApi> api) {
- super(api);
- }
-
- @Override
- protected void bindErrorHandlers() {
- bind(HttpErrorHandler.class).annotatedWith(Redirection.class).to(ResponseNotSuccessHandler.class);
- bind(HttpErrorHandler.class).annotatedWith(ClientError.class).to(ResponseNotSuccessHandler.class);
- bind(HttpErrorHandler.class).annotatedWith(ServerError.class).to(ResponseNotSuccessHandler.class);
- }
-
- @Override
- protected void bindRetryHandlers() {
- bind(HttpRetryHandler.class).annotatedWith(ClientError.class).to(
- FGCPServerErrorRetryHandler.class);
- bind(HttpRetryHandler.class).annotatedWith(ServerError.class).to(
- FGCPServerErrorRetryHandler.class);
- }
-
- @Override
- protected void configure() {
- super.configure();
- bind(XMLParser.class).to(FGCPJAXBParser.class);
- bind(new TypeLiteral<Supplier<FGCPCredentials>>() {}).to(FGCPCredentialsSupplier.class);
- bind(new TypeLiteral<Supplier<SSLContext>>() {
- }).to(new TypeLiteral<SSLContextWithKeysSupplier>() {
- });
- bind(HostnameVerifier.class).to(LogToMapHostnameVerifier.class);
- bind(JavaUrlHttpCommandExecutorService.class).to(ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService.class);
- }
-
- @Override
- protected void installLocations() {
- super.installLocations();
- bind(ImplicitLocationSupplier.class).to(FirstNetwork.class).in(Scopes.SINGLETON);
- bind(LocationsSupplier.class).to(SystemAndNetworkSegmentToLocationSupplier.class).in(Scopes.SINGLETON);
- }
-
- @Provides
- @TimeStamp
- protected Calendar provideCalendar() {
- return Calendar.getInstance();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/AddressRange.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/AddressRange.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/AddressRange.java
deleted file mode 100644
index a829758..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/AddressRange.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.domain;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * Describes the address range pool in a contract used for allocating private IP
- * address network segments for virtual systems.
- */
-@XmlRootElement(name = "addressrange")
-public class AddressRange {
- private String range;
-
- private String from;
-
- private String to;
-
- /**
- * @return the range
- */
- public String getRange() {
- return range;
- }
-
- /**
- * @return the from
- */
- public String getFrom() {
- return from;
- }
-
- /**
- * @return the to
- */
- public String getTo() {
- return to;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServer.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServer.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServer.java
deleted file mode 100644
index 705d9c4..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.fujitsu.fgcp.domain;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * Represents a built-in server, also called extended function module (EFM),
- * such as a firewall or load balancer (SLB).
- */
-@XmlRootElement(name = "efm")
-public class BuiltinServer {
- @XmlElement(name = "efmId")
- private String id;
- @XmlElement(name = "efmType")
- private BuiltinServerType builtinServerType;
- @XmlElement(name = "efmName")
- private String name;
- private String creator;
- private String slbVip;
- private Firewall firewall;
- private SLB loadbalancer;
-
- public enum BuiltinServerType {FW, SLB}
-
- public String getId() {
- return id;
- }
-
- public BuiltinServerType getType() {
- return builtinServerType;
- }
-
- public String getName() {
- return name;
- }
-
- public String getCreator() {
- return creator;
- }
-
- public String getSlbVip() {
- return slbVip;
- }
-
- public Firewall getFirewall() {
- return firewall;
- }
-
- public SLB getLoadbalancer() {
- return loadbalancer;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java
deleted file mode 100644
index 5bae70d..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java
+++ /dev/null
@@ -1,72 +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.domain;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Holds information on a backup of a built-in server, such as a firewall or
- * load balancer (SLB).
- */
-@XmlRootElement(name = "backup")
-public class BuiltinServerBackup {
- @XmlElement(name = "backupId")
- private String id;
- @XmlElement(name = "backupTime")
- private String time;
-
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
-
- /**
- * @return the time
- */
- public String getTime() {
- return time;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- BuiltinServerBackup that = BuiltinServerBackup.class.cast(obj);
- return Objects.equal(this.id, that.id);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
- .add("time", time).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerConfiguration.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerConfiguration.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerConfiguration.java
deleted file mode 100644
index 5df69ed..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerConfiguration.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.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.base.CaseFormat;
-
-/**
- * Possible statuses of a built-in server, also called extended function module
- * (EFM), such as a firewall or load balancer (SLB).
- * <p>
- * In addition to statuses that apply to regular virtual servers, it includes
- * statuses relevant to the upgrade process for functionality of the built-in
- * server.
- */
-public enum BuiltinServerConfiguration {
- FW_NAT_RULE,
- FW_DNS,
- FW_POLICY,
- FW_LOG,
- FW_LIMIT_POLICY,
- SLB_RULE,
- SLB_LOAD_STATISTICS,
- SLB_ERROR_STATISTICS,
- SLB_CERTIFICATE_LIST,
- EFM_UPDATE,
- SLB_CONNECTION,
- UNRECOGNIZED;
-
- public String value() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- @Override
- public String toString() {
- return value();
- }
-
- public static BuiltinServerConfiguration fromValue(String configuration) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL
- .to(CaseFormat.UPPER_UNDERSCORE,
- checkNotNull(configuration, "configuration")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerStatus.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerStatus.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerStatus.java
deleted file mode 100644
index fa84432..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerStatus.java
+++ /dev/null
@@ -1,56 +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.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.CaseFormat;
-
-/**
- * Possible statuses of a built-in server, also called extended function module
- * (EFM), such as a firewall or load balancer (SLB).
- * <p>
- * In addition to statuses that apply to regular virtual servers, it includes
- * statuses relevant to the upgrade process for functionality of the built-in
- * server.
- */
-@XmlRootElement(name = "efmStatus")
-public enum BuiltinServerStatus {
- DEPLOYING, RUNNING, STOPPING, STOPPED, STARTING, FAILOVER, UNEXPECTED_STOP, RESTORING, BACKUP_ING, ERROR, EXECUTE_NETWORK_SERVER, START_ERROR, STOP_ERROR, UPDATE, BACKOUT, UNRECOGNIZED;
-
- public String value() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- @Override
- public String toString() {
- return value();
- }
-
- public static BuiltinServerStatus fromValue(String status) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL
- .to(CaseFormat.UPPER_UNDERSCORE,
- checkNotNull(status, "status")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java
deleted file mode 100644
index 33f3931..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/CPU.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.domain;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Describes the virtual CPU of a server.
- */
-@XmlRootElement(name = "cpu")
-public class CPU {
- @XmlElement(name = "cpuArch")
- private String arch;
- @XmlElement(name = "cpuPerf")
- private double speedPerCore;
- @XmlElement(name = "numOfCpu")
- private double cores;
-
- public String getArch() {
- return arch;
- }
-
- public double getSpeedPerCore() {
- return speedPerCore;
- }
-
- public double getCores() {
- return cores;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(cores, speedPerCore, arch);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- CPU that = CPU.class.cast(obj);
- return Objects.equal(this.cores, that.cores)
- && Objects.equal(this.speedPerCore, that.speedPerCore)
- && Objects.equal(this.arch, that.arch);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("cores", cores).add("speedPerCore", speedPerCore)
- .add("arch", arch).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Cause.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Cause.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Cause.java
deleted file mode 100644
index 4720f96..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Cause.java
+++ /dev/null
@@ -1,96 +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.domain;
-
-
-/**
- * Represents a load balancer (SLB) log entry.
- */
-public class Cause {
- private String cat;
-
- private String status;
-
- private String filePath;
-
- private String current;
-
- private String before;
-
- private String today;
-
- private String yesterday;
-
- private String total;
-
- /**
- * @return category
- */
- public String getCat() {
- return cat;
- }
-
- /**
- * @return the status
- */
- public String getStatus() {
- return status;
- }
-
- /**
- * @return the filePath
- */
- public String getFilePath() {
- return filePath;
- }
-
- /**
- * @return the current
- */
- public String getCurrent() {
- return current;
- }
-
- /**
- * @return the before
- */
- public String getBefore() {
- return before;
- }
-
- /**
- * @return the today
- */
- public String getToday() {
- return today;
- }
-
- /**
- * @return the yesterday
- */
- public String getYesterday() {
- return yesterday;
- }
-
- /**
- * @return the total
- */
- public String getTotal() {
- return total;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Direction.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Direction.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Direction.java
deleted file mode 100644
index b3ac788..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Direction.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.domain;
-
-import java.util.Set;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Grouping of firewall rules pertaining to a particular direction in network
- * traffic, e.g. from the Internet to a server in the DMZ zone, or from a server
- * in the SECURE2 zone to the SECURE1 zone, etc.
- */
-public class Direction {
- private String from;
- private String to;
- private Set<Policy> policies = Sets.newLinkedHashSet();
- private Acceptable acceptable;
- private Prefix prefix;
- private int maxPolicyNum;
-
- enum Acceptable {OK, NG}
- enum Prefix {free, src, dst, proto, srcport, dstport, action, rule, tab}
-
- /**
- * @return the from
- */
- public String getFrom() {
- return from;
- }
-
- /**
- * @return the to
- */
- public String getTo() {
- return to;
- }
-
- /**
- * @return the policies
- */
- public Set<Policy> getPolicies() {
- return policies == null ? ImmutableSet.<Policy> of() : ImmutableSet
- .copyOf(policies);
- }
-
- /**
- * @return the acceptable
- */
- public Acceptable getAcceptable() {
- return acceptable;
- }
-
- /**
- * @return the prefix
- */
- public Prefix getPrefix() {
- return prefix;
- }
-
- /**
- * @return the maxPolicyNum
- */
- public int getMaxPolicyNum() {
- return maxPolicyNum;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(from, to);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Direction that = Direction.class.cast(obj);
- return Objects.equal(this.from, that.from)
- && Objects.equal(this.to, that.to);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("from", from)
- .add("to", to).add("prefix", prefix).add("policies", policies)
- .add("maxPolicyNum", maxPolicyNum)
- .add("acceptable", acceptable).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Disk.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Disk.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Disk.java
deleted file mode 100644
index ddb31c4..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Disk.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.fujitsu.fgcp.domain;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * Describes a disk as part of the description of hardware represented by a
- * virtual server.
- */
-@XmlRootElement
-public class Disk {
- @XmlElement(name = "diskSize")
- private String size;
-
- @XmlElement(name = "diskUsage")
- private String usage;
-
- @XmlElement(name = "diskType")
- private String type;
-
- public String getSize() {
- return size;
- }
-
- public String getUsage() {
- return usage;
- }
-
- public String getType() {
- return type;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (!(o instanceof Disk))
- return false;
-
- Disk disk = (Disk) o;
-
- if (size != null ? !size.equals(disk.size) : disk.size != null)
- return false;
- if (type != null ? !type.equals(disk.type) : disk.type != null)
- return false;
- if (usage != null ? !usage.equals(disk.usage) : disk.usage != null)
- return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = size != null ? size.hashCode() : 0;
- result = 31 * result + (usage != null ? usage.hashCode() : 0);
- result = 31 * result + (type != null ? type.hashCode() : 0);
- return result;
- }
-
- @Override
- public String toString() {
- return "Disk{" + "size='" + size + '\'' + ", usage='" + usage + '\''
- + ", type='" + type + '\'' + '}';
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java
deleted file mode 100644
index 3d2c0c0..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java
+++ /dev/null
@@ -1,197 +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.domain;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Represents a disk image with pre-installed OS and/or software.
- * <p>
- * It is used as base for the system disk of a virtual server.
- */
-@XmlRootElement(name = "diskimage")
-public class DiskImage {
- @XmlElement(name = "diskimageId")
- private String id;
-
- @XmlElement(name = "diskimageName")
- private String name;
-
- private int size;
-
- private String osName;
-
- private String osType;
-
- private String creatorName;
-
- private String registrant;
-
- private String licenseInfo;
-
- private String description;
-
- @XmlElementWrapper(name = "softwares")
- @XmlElement(name = "software")
- private Set<Software> software = Sets.newLinkedHashSet();
-
- public String getId() {
- return id;
- }
-
- public int getSize() {
- return size;
- }
-
- public String getOsName() {
- return osName;
- }
-
- public String getOsType() {
- return osType;
- }
-
- public String getCreatorName() {
- return creatorName;
- }
-
- public String getRegistrant() {
- return registrant;
- }
-
- public String getLicenseInfo() {
- return licenseInfo;
- }
-
- public String getDescription() {
- return description;
- }
-
- public String getName() {
- return name;
- }
-
- public Set<Software> getSoftware() {
- return software == null ? ImmutableSet.<Software> of() : ImmutableSet
- .copyOf(software);
- }
-
- public static Builder builder() {
- return new Builder();
- }
-
- public static class Builder {
- private String id;
- private String name;
- private int size;
- private String osName;
- private String osType;
- private String creatorName;
- private String registrant;
- private String licenseInfo;
- private String description;
- private Set<Software> software;
-
- public Builder id(String id) {
- this.id = id;
- return this;
- }
-
- public Builder name(String name) {
- this.name = name;
- return this;
- }
-
- public Builder osName(String osName) {
- this.osName = osName;
- return this;
- }
-
- public Builder osType(String osType) {
- this.osType = osType;
- return this;
- }
-
- public Builder creatorName(String creatorName) {
- this.creatorName = creatorName;
- return this;
- }
-
- public Builder registrant(String registrant) {
- this.registrant = registrant;
- return this;
- }
-
- public Builder description(String description) {
- this.description = description;
- return this;
- }
-
- public DiskImage build() {
- DiskImage image = new DiskImage();
-
- image.id = id;
- image.name = name;
- image.size = size;
- image.osName = osName;
- image.osType = osType;
- image.creatorName = creatorName;
- image.registrant = registrant;
- image.licenseInfo = licenseInfo;
- image.description = description;
- image.software = software;
-
- return image;
- }
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- DiskImage that = DiskImage.class.cast(obj);
- return Objects.equal(this.id, that.id);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
- .add("name", name).add("osName", osName).add("osType", osType)
- .add("size", size).add("creatorName", creatorName)
- .add("description", description)
- .add("licenseInfo", licenseInfo).add("registrant", registrant)
- .add("software", software).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ErrorStatistics.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ErrorStatistics.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ErrorStatistics.java
deleted file mode 100644
index 8322387..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ErrorStatistics.java
+++ /dev/null
@@ -1,49 +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.domain;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Holds statistics of errors reported by a load balancer (SLB).
- */
-@XmlRootElement(name = "errorstatistics")
-public class ErrorStatistics {
- private Period period;
- private Set<Group> groups = Sets.newLinkedHashSet();
-
- /**
- * @return the period
- */
- public Period getPeriod() {
- return period;
- }
-
- /**
- * @return the groups
- */
- public Set<Group> getGroups() {
- return groups == null ? ImmutableSet.<Group> of() : ImmutableSet
- .copyOf(groups);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/EventLog.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/EventLog.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/EventLog.java
deleted file mode 100644
index a5578c8..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/EventLog.java
+++ /dev/null
@@ -1,96 +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.domain;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Represents an entry in the event log.
- */
-@XmlRootElement(name = "errorlog")
-public class EventLog {
- private String title;
- private String message;
- private String startDate;
- private String expiry;
- private String entryDate;
-
- /**
- * @return the title
- */
- public String getTitle() {
- return title;
- }
-
- /**
- * @return the message
- */
- public String getMessage() {
- return message;
- }
-
- /**
- * @return the startDate
- */
- public String getStartDate() {
- return startDate;
- }
-
- /**
- * @return the expiry
- */
- public String getExpiry() {
- return expiry;
- }
-
- /**
- * @return the entryDate
- */
- public String getEntryDate() {
- return entryDate;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(entryDate, message, title);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- EventLog that = EventLog.class.cast(obj);
- return Objects.equal(this.entryDate, that.entryDate)
- && Objects.equal(this.message, that.message)
- && Objects.equal(this.title, that.title);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("entryDate", entryDate).add("title", title)
- .add("message", message).add("startDate", startDate)
- .add("expiry", expiry).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Firewall.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Firewall.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Firewall.java
deleted file mode 100644
index 9db9f52..0000000
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Firewall.java
+++ /dev/null
@@ -1,129 +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.domain;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Represents a firewall (FW).
- */
-@XmlRootElement(name = "fw")
-public class Firewall {
- private NAT nat;
- private Set<Direction> directions = Sets.newLinkedHashSet();
- private String log;
- private String status;
- private String category;
- private String latestVersion;
- private String comment;
- private boolean firmUpdateExist;
- private boolean configUpdateExist;
- private String backout;
- private String updateDate;
- private String currentVersion;
-
- /**
- * @return the nat
- */
- public NAT getNat() {
- return nat;
- }
-
- /**
- * @return the directions
- */
- public Set<Direction> getDirections() {
- return directions == null ? ImmutableSet.<Direction> of()
- : ImmutableSet.copyOf(directions);
- }
-
- /**
- * @return the log
- */
- public String getLog() {
- return log;
- }
-
- /**
- * @return the status
- */
- public String getStatus() {
- return status;
- }
-
- /**
- * @return the category
- */
- public String getCategory() {
- return category;
- }
-
- /**
- * @return the latestVersion
- */
- public String getLatestVersion() {
- return latestVersion;
- }
-
- /**
- * @return the comment
- */
- public String getComment() {
- return comment;
- }
-
- /**
- * @return the firmUpdateExist
- */
- public boolean getFirmUpdateExist() {
- return firmUpdateExist;
- }
-
- /**
- * @return the configUpdateExist
- */
- public boolean getConfigUpdateExist() {
- return configUpdateExist;
- }
-
- /**
- * @return the backout
- */
- public String getBackout() {
- return backout;
- }
-
- /**
- * @return the updateDate
- */
- public String getUpdateDate() {
- return updateDate;
- }
-
- /**
- * @return the currentVersion
- */
- public String getCurrentVersion() {
- return currentVersion;
- }
-
-}
[8/8] git commit: JCLOUDS-757 Drop FCGP labs provider
Posted by ad...@apache.org.
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";
- }
-}
[3/8] JCLOUDS-757 Drop FCGP labs provider
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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/5d23c2be/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);
- }
-
-}