FGCP: fix location description (was showing '1') and other minor cleanups.
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/commit/65a99a50 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/tree/65a99a50 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/diff/65a99a50 Branch: refs/heads/master Commit: 65a99a50c879d93781137bf329e05298e3cba8db Parents: 449c095 Author: Dies Koper <[email protected]> Authored: Wed May 22 15:24:16 2013 +1000 Committer: Andrew Gaul <[email protected]> Committed: Thu May 23 16:21:51 2013 -0700 ---------------------------------------------------------------------- .../SystemAndNetworkSegmentToLocationSupplier.java | 2 +- .../responses/GetVSYSConfiguration-response.xml | 2 +- .../IllegalState_RECONFIG_ING-response.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/65a99a50/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 index 47bbf7b..7ee2314 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/location/SystemAndNetworkSegmentToLocationSupplier.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/location/SystemAndNetworkSegmentToLocationSupplier.java @@ -83,7 +83,7 @@ public class SystemAndNetworkSegmentToLocationSupplier implements LocationsSuppl for (VNet net : systemWithDetails.getNetworks()) { locations.add(new LocationBuilder().scope(LocationScope.NETWORK).parent(systemLocation) - .description(net.getNetworkId().replaceFirst(".+(DMZ|SECURE.)", "\\1")).id(net.getNetworkId()) + .description(net.getNetworkId().replaceFirst(".+-N-", "")).id(net.getNetworkId()) .build()); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/65a99a50/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 index ca01590..352b46c 100644 --- a/fgcp/src/test/resources/responses/GetVSYSConfiguration-response.xml +++ b/fgcp/src/test/resources/responses/GetVSYSConfiguration-response.xml @@ -41,7 +41,7 @@ </vnics> <vserverId>ABCDEFGH-I123J456K-S-0001</vserverId> <vserverName>Firewall</vserverName> - <vserverType>economy</vserverType> + <vserverType>firewall</vserverType> </vserver> <vserver> <creator>ABCDEFGH</creator> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/65a99a50/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 index 145bdd0..4d34395 100644 --- a/fgcp/src/test/resources/responses/IllegalState_RECONFIG_ING-response.xml +++ b/fgcp/src/test/resources/responses/IllegalState_RECONFIG_ING-response.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <CreateVServerResponse xmlns="http://apioviss.jp.fujitsu.com";> - <responseMessage>The status of Instance[UZXC0GRT-ZG8ZJCJ07] is [RECONFIG_ING].</responseMessage> + <responseMessage>The status of Instance[ABCDEFGH-A123B456CE] is [RECONFIG_ING].</responseMessage> <responseStatus>ILLEGAL_STATE</responseStatus> </CreateVServerResponse> \ No newline at end of file
