From d50d70a39763ef54c606d2e040ea87a20553bdf7 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Mon, 5 Mar 2012 16:36:37 -0800
Subject: [PATCH] corrected urls for savvis

---
 providers/savvis-symphonyvpdc/pom.xml         | 18 +----
 .../SavvisSymphonyVPDCProviderMetadata.java   |  2 +-
 .../jclouds/savvis/vpdc/VPDCAsyncClient.java  |  4 +-
 .../org/jclouds/savvis/vpdc/VPDCClient.java   |  4 +-
 .../savvis/vpdc/VPDCPropertiesBuilder.java    |  4 +-
 .../BindCaptureVAppTemplateToXmlPayload.java  |  2 +-
 .../vpdc/binders/BindCloneVMToXmlPayload.java |  2 +-
 .../binders/BindFirewallRuleToXmlPayload.java |  2 +-
 .../vpdc/config/VPDCRestClientModule.java     | 73 +++++++++++--------
 .../org/jclouds/savvis/vpdc/domain/Task.java  |  2 +-
 .../vpdc/features/BrowsingAsyncClient.java    |  2 +-
 .../savvis/vpdc/features/BrowsingClient.java  |  2 +-
 .../vpdc/features/FirewallAsyncClient.java    |  2 +-
 .../savvis/vpdc/features/FirewallClient.java  |  2 +-
 .../ServiceManagementAsyncClient.java         |  2 +-
 .../features/ServiceManagementClient.java     |  2 +-
 .../savvis/vpdc/features/VMAsyncClient.java   |  2 +-
 .../savvis/vpdc/features/VMClient.java        |  2 +-
 .../vpdc/filters/SetVCloudTokenCookie.java    |  7 +-
 .../vpdc/functions/DefaultOrgIfNull.java      |  6 +-
 .../savvis/vpdc/internal/LoginClient.java     | 37 ++++++++++
 .../savvis/vpdc/options/GetVMOptions.java     |  2 +-
 ...ndCaptureVAppTemplateToXmlPayloadTest.java |  2 +-
 .../BindCloneVAppToXmlPayloadTest.java        |  2 +-
 .../features/BaseVPDCAsyncClientTest.java     |  6 +-
 .../features/BrowsingAsyncClientTest.java     | 26 +++----
 .../features/FirewallAsyncClientTest.java     |  4 +-
 .../ServiceManagementAsyncClientTest.java     | 12 +--
 .../vpdc/features/VMAsyncClientTest.java      | 34 ++++-----
 .../filters/SetVCloudTokenCookieTest.java     |  5 +-
 .../savvis/vpdc/xml/OrgHandlerTest.java       |  2 +-
 .../savvis/vpdc/xml/OrgListHandlerTest.java   |  2 +-
 .../savvis/vpdc/xml/TaskHandlerTest.java      | 32 ++++----
 .../savvis/vpdc/xml/VDCHandlerTest.java       | 36 ++++-----
 .../savvis/vpdc/xml/VMHandlerTest.java        |  2 +-
 .../capture-vapp-template-default.xml         |  2 +-
 .../src/test/resources/cloneVApp-default.xml  |  2 +-
 .../resources/firewallService-default.xml     |  2 +-
 .../src/test/resources/firewallService.xml    |  2 +-
 .../src/test/resources/org.xml                |  2 +-
 .../src/test/resources/orglist.xml            |  2 +-
 .../src/test/resources/task-failed.xml        |  6 +-
 .../src/test/resources/task-queued.xml        |  6 +-
 .../src/test/resources/task-running.xml       |  6 +-
 .../src/test/resources/task-unsupported.xml   |  2 +-
 .../src/test/resources/task-vapp.xml          |  6 +-
 .../src/test/resources/task-vmdk.xml          |  6 +-
 .../src/test/resources/vdc-1net.xml           | 10 +--
 .../src/test/resources/vdc-failed.xml         |  4 +-
 .../src/test/resources/vdc-saved.xml          | 10 +--
 .../src/test/resources/vdc.xml                | 10 +--
 .../src/test/resources/vm.xml                 |  6 +-
 52 files changed, 235 insertions(+), 195 deletions(-)
 create mode 100644 providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/internal/LoginClient.java

diff --git a/providers/savvis-symphonyvpdc/pom.xml b/providers/savvis-symphonyvpdc/pom.xml
index 660054b1ad..312eb29c78 100644
--- a/providers/savvis-symphonyvpdc/pom.xml
+++ b/providers/savvis-symphonyvpdc/pom.xml
@@ -33,24 +33,10 @@
     <description>jclouds components to access Savvis Symphony VPDC</description>
     <packaging>bundle</packaging>
     
-    <!-- bootstrapping: need to fetch the project POM -->
-    <repositories>
-        <repository>
-            <id>jclouds-sonatype-snapshots-nexus</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>    
-    </repositories>
-    
     <properties>
-        <test.savvis-symphonyvpdc.endpoint>https://api.symphonyvpdc.savvis.net/vpdc</test.savvis-symphonyvpdc.endpoint>
+        <test.savvis-symphonyvpdc.endpoint>https://api.savvis.net/vpdc</test.savvis-symphonyvpdc.endpoint>
         <test.savvis-symphonyvpdc.api-version>1.0</test.savvis-symphonyvpdc.api-version>
-        <test.savvis-symphonyvpdc.build-version></test.savvis-symphonyvpdc.build-version>
+        <test.savvis-symphonyvpdc.build-version>2.3</test.savvis-symphonyvpdc.build-version>
         <test.savvis-symphonyvpdc.identity>FIXME</test.savvis-symphonyvpdc.identity>
         <test.savvis-symphonyvpdc.credential>FIXME</test.savvis-symphonyvpdc.credential>
         <test.savvis-symphonyvpdc.image-id></test.savvis-symphonyvpdc.image-id>
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/SavvisSymphonyVPDCProviderMetadata.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/SavvisSymphonyVPDCProviderMetadata.java
index 49aab43422..b651672560 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/SavvisSymphonyVPDCProviderMetadata.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/SavvisSymphonyVPDCProviderMetadata.java
@@ -94,7 +94,7 @@ public class SavvisSymphonyVPDCProviderMetadata extends BaseProviderMetadata {
     */
    @Override
    public URI getApiDocumentation() {
-      return URI.create("https://api.symphonyvpdc.savvis.net/doc/spec/api/index.html");
+      return URI.create("https://api.savvis.net/doc/spec/api/index.html");
    }
 
    /**
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCAsyncClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCAsyncClient.java
index 480fb5f38b..0954265a28 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCAsyncClient.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCAsyncClient.java
@@ -36,7 +36,7 @@ import com.google.inject.Provides;
  * <p/>
  * 
  * @see VPDCClient
- * @see <a href="https://api.sandbox.symphonyvpdc.savvis.net/doc/spec/api/index.html" />
+ * @see <a href="https://api.sandbox.savvis.net/doc/spec/api/index.html" />
  * @author Adrian Cole
  */
 public interface VPDCAsyncClient {
@@ -78,7 +78,7 @@ public interface VPDCAsyncClient {
     * /savvis-symphonyvpdc/predefined_operatingsystems.json}
     * 
     * @return the operating systems that are predefined in the provider
-    * @see <a href="https://api.sandbox.symphonyvpdc.savvis.net/doc/spec/api/addSingleVM.html" />
+    * @see <a href="https://api.sandbox.savvis.net/doc/spec/api/addSingleVM.html" />
     */
    @Provides
    Set<CIMOperatingSystem> listPredefinedOperatingSystems();
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCClient.java
index 3998196f7c..f167a38a8e 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCClient.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCClient.java
@@ -35,7 +35,7 @@ import org.jclouds.savvis.vpdc.features.VMClient;
  * <p/>
  * 
  * @see VPDCAsyncClient
- * @see <a href="https://api.sandbox.symphonyvpdc.savvis.net/doc/spec/api/index.html" />
+ * @see <a href="https://api.sandbox.savvis.net/doc/spec/api/index.html" />
  * @author Adrian Cole
  */
 @Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
@@ -76,7 +76,7 @@ public interface VPDCClient {
     * /savvis-symphonyvpdc/predefined_operatingsystems.json}
     * 
     * @return the operating systems that are predefined in the provider
-    * @see <a href="https://api.sandbox.symphonyvpdc.savvis.net/doc/spec/api/addSingleVM.html" />
+    * @see <a href="https://api.sandbox.savvis.net/doc/spec/api/addSingleVM.html" />
     */
    Set<CIMOperatingSystem> listPredefinedOperatingSystems();
 }
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCPropertiesBuilder.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCPropertiesBuilder.java
index 8132b28d6e..d2a678d286 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCPropertiesBuilder.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCPropertiesBuilder.java
@@ -19,6 +19,7 @@
 package org.jclouds.savvis.vpdc;
 
 import static org.jclouds.Constants.PROPERTY_API_VERSION;
+import static org.jclouds.Constants.PROPERTY_BUILD_VERSION;
 import static org.jclouds.Constants.PROPERTY_ENDPOINT;
 import static org.jclouds.savvis.vpdc.reference.VPDCConstants.PROPERTY_VPDC_TIMEOUT_TASK_COMPLETED;
 
@@ -36,7 +37,8 @@ public class VPDCPropertiesBuilder extends PropertiesBuilder {
    protected Properties defaultProperties() {
       Properties properties = super.defaultProperties();
       properties.setProperty(PROPERTY_API_VERSION, "1.0");
-      properties.setProperty(PROPERTY_ENDPOINT, "https://api.symphonyvpdc.savvis.net/vpdc");
+      properties.setProperty(PROPERTY_BUILD_VERSION, "2.3");
+      properties.setProperty(PROPERTY_ENDPOINT, "https://api.savvis.net/vpdc");
       properties.setProperty(PROPERTY_VPDC_TIMEOUT_TASK_COMPLETED, 600l * 1000l + "");
       return properties;
    }
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindCaptureVAppTemplateToXmlPayload.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindCaptureVAppTemplateToXmlPayload.java
index 2b693440a9..6387b0e4be 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindCaptureVAppTemplateToXmlPayload.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindCaptureVAppTemplateToXmlPayload.java
@@ -97,7 +97,7 @@ public class BindCaptureVAppTemplateToXmlPayload extends BindToStringPayload imp
 
    protected XMLBuilder buildRoot() throws ParserConfigurationException, FactoryConfigurationError {
       XMLBuilder rootBuilder = XMLBuilder.create("CaptureVAppParams")
-            .a("xmlns", "http://schemas.api.sandbox.symphonyVPDC.savvis.net/vpdci")
+            .a("xmlns", "http://schemas.api.sandbox.savvis.net/vpdci")
             .a("name", "CaptureTemplate");
       return rootBuilder;
    }
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindCloneVMToXmlPayload.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindCloneVMToXmlPayload.java
index f6138d1230..69e5b5d912 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindCloneVMToXmlPayload.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindCloneVMToXmlPayload.java
@@ -106,7 +106,7 @@ public class BindCloneVMToXmlPayload extends BindToStringPayload implements MapB
 	      		.a("name", newVAppName)
 	      		.a("deploy" , "true")
 	      		.a("powerOn" , "true")
-	            .a("xsi:schemaLocation", "http://www.vmware.com/vcloud/v0.8 https://api.symphonyvpdc.savvis.net/ns/vcloud.xsd");
+	            .a("xsi:schemaLocation", "http://www.vmware.com/vcloud/v0.8 https://api.savvis.net/ns/vcloud.xsd");
 	      return rootBuilder;
 	   }
 
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindFirewallRuleToXmlPayload.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindFirewallRuleToXmlPayload.java
index f3d8610fdc..803bcfe70b 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindFirewallRuleToXmlPayload.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindFirewallRuleToXmlPayload.java
@@ -110,7 +110,7 @@ public class BindFirewallRuleToXmlPayload extends BindToStringPayload implements
             .a("xmlns:rasd", "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData")
             .a("xmlns:vssd", "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData")
             .a("xmlns:ovf", "http://schemas.dmtf.org/ovf/envelope/1")
-            .a("xmlns:svvs", "http://schemas.api.sandbox.symphonyVPDC.savvis.net/vpdci");
+            .a("xmlns:svvs", "http://schemas.api.sandbox.savvis.net/vpdci");
       return rootBuilder;
    }
 
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/config/VPDCRestClientModule.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/config/VPDCRestClientModule.java
index 3a949a033e..68a0778e4f 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/config/VPDCRestClientModule.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/config/VPDCRestClientModule.java
@@ -20,16 +20,14 @@ package org.jclouds.savvis.vpdc.config;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.base.Throwables.propagate;
 import static org.jclouds.Constants.PROPERTY_IDENTITY;
 import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
+import static org.jclouds.rest.config.BinderUtils.bindClientAndAsyncClient;
 import static org.jclouds.savvis.vpdc.reference.VPDCConstants.PROPERTY_VPDC_TIMEOUT_TASK_COMPLETED;
 
 import java.io.IOException;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
 
 import javax.inject.Named;
 import javax.inject.Singleton;
@@ -43,13 +41,10 @@ import org.jclouds.json.Json;
 import org.jclouds.location.Provider;
 import org.jclouds.location.suppliers.ImplicitLocationSupplier;
 import org.jclouds.predicates.RetryablePredicate;
-import org.jclouds.rest.AsyncClientFactory;
-import org.jclouds.rest.AuthorizationException;
 import org.jclouds.rest.config.RestClientModule;
 import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
 import org.jclouds.savvis.vpdc.VPDCAsyncClient;
 import org.jclouds.savvis.vpdc.VPDCClient;
-import org.jclouds.savvis.vpdc.domain.Resource;
 import org.jclouds.savvis.vpdc.domain.internal.VCloudSession;
 import org.jclouds.savvis.vpdc.features.BrowsingAsyncClient;
 import org.jclouds.savvis.vpdc.features.BrowsingClient;
@@ -61,13 +56,16 @@ import org.jclouds.savvis.vpdc.features.VMAsyncClient;
 import org.jclouds.savvis.vpdc.features.VMClient;
 import org.jclouds.savvis.vpdc.handlers.VPDCErrorHandler;
 import org.jclouds.savvis.vpdc.internal.LoginAsyncClient;
+import org.jclouds.savvis.vpdc.internal.LoginClient;
 import org.jclouds.savvis.vpdc.internal.VCloudToken;
 import org.jclouds.savvis.vpdc.location.FirstNetwork;
 import org.jclouds.savvis.vpdc.predicates.TaskSuccess;
 import org.jclouds.util.Strings2;
 
+import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.inject.Injector;
@@ -81,36 +79,56 @@ import com.google.inject.TypeLiteral;
  * 
  */
 public class VPDCRestClientModule extends RestClientModule<VPDCClient, VPDCAsyncClient> {
-   @Provides
-   @Singleton
-   protected LoginAsyncClient provideVCloudVersions(AsyncClientFactory factory) {
-      return factory.create(LoginAsyncClient.class);
+   @Override
+   protected void configure() {
+      super.configure();
+      bindClientAndAsyncClient(binder(), LoginClient.class, LoginAsyncClient.class);
    }
 
    @VCloudToken
    @Provides
-   String provideVCloudToken(Supplier<VCloudSession> cache) {
-      return checkNotNull(cache.get().getVCloudToken(), "No token present in session");
+   @Singleton
+   protected Supplier<String> provideVCloudToken(Supplier<VCloudSession> cache) {
+      return Suppliers.compose(new Function<VCloudSession, String>() {
+
+         @Override
+         public String apply(VCloudSession input) {
+            return checkNotNull(input.getVCloudToken(), "No token present in session");
+         }
+
+      }, cache);
    }
 
    @Provides
    @org.jclouds.savvis.vpdc.internal.Org
    @Singleton
-   protected Set<org.jclouds.savvis.vpdc.domain.Resource> provideOrgs(Supplier<VCloudSession> cache,
-            @Named(PROPERTY_IDENTITY) String user) {
-      VCloudSession discovery = cache.get();
-      checkState(discovery.getOrgs().size() > 0, "No orgs present for user: " + user);
-      return discovery.getOrgs();
+   protected Supplier<Set<org.jclouds.savvis.vpdc.domain.Resource>> provideOrgs(Supplier<VCloudSession> cache,
+            @Named(PROPERTY_IDENTITY) final String user) {
+      return Suppliers.compose(new Function<VCloudSession, Set<org.jclouds.savvis.vpdc.domain.Resource>>() {
+
+         @Override
+         public Set<org.jclouds.savvis.vpdc.domain.Resource> apply(VCloudSession input) {
+            checkState(input.getOrgs().size() > 0, "No orgs present for user: " + user);
+            return input.getOrgs();
+         }
+
+      }, cache);
    }
 
    @Provides
    @org.jclouds.savvis.vpdc.internal.Org
    @Singleton
-   protected String provideDefaultOrgId(@org.jclouds.savvis.vpdc.internal.Org Set<Resource> orgs) {
-      return Iterables.get(orgs, 0).getId();
-   }
+   protected Supplier<String> provideDefaultOrgId(
+            @org.jclouds.savvis.vpdc.internal.Org Supplier<Set<org.jclouds.savvis.vpdc.domain.Resource>> orgs) {
+      return Suppliers.compose(new Function<Set<org.jclouds.savvis.vpdc.domain.Resource>, String>() {
 
-   protected AtomicReference<AuthorizationException> authException = new AtomicReference<AuthorizationException>();
+         @Override
+         public String apply(Set<org.jclouds.savvis.vpdc.domain.Resource> input) {
+            return Iterables.get(input, 0).getId();
+         }
+
+      }, orgs);
+   }
 
    @Provides
    @Singleton
@@ -142,19 +160,13 @@ public class VPDCRestClientModule extends RestClientModule<VPDCClient, VPDCAsync
    @Provides
    @Singleton
    protected Supplier<VCloudSession> provideVCloudTokenCache(@Named(PROPERTY_SESSION_INTERVAL) long seconds,
-            final LoginAsyncClient login) {
+            final LoginClient login) {
       return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<VCloudSession>(authException, seconds,
                new Supplier<VCloudSession>() {
 
                   @Override
                   public VCloudSession get() {
-                     try {
-                        return login.login().get();
-                     } catch (Exception e) {
-                        propagate(e);
-                        assert false : e;
-                        return null;
-                     }
+                     return login.login();
                   }
 
                });
@@ -166,10 +178,11 @@ public class VPDCRestClientModule extends RestClientModule<VPDCClient, VPDCAsync
       bind(HttpErrorHandler.class).annotatedWith(ClientError.class).to(VPDCErrorHandler.class);
       bind(HttpErrorHandler.class).annotatedWith(ServerError.class).to(VPDCErrorHandler.class);
    }
-   
+
    @Override
    protected void installLocations() {
       super.installLocations();
       bind(ImplicitLocationSupplier.class).to(FirstNetwork.class).in(Scopes.SINGLETON);
    }
+
 }
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Task.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Task.java
index 6cc07413b4..f7db6ce771 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Task.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Task.java
@@ -30,7 +30,7 @@ import org.jclouds.javax.annotation.Nullable;
  * and returns its URL to the client. The client can use this URL in a subsequent GET request to
  * obtain the current status of the task.
  * 
- * @see <a href="https://api.sandbox.symphonyvpdc.savvis.net/doc/spec/api/getTask.html" />
+ * @see <a href="https://api.sandbox.savvis.net/doc/spec/api/getTask.html" />
  */
 public class Task extends ResourceImpl {
    public static Builder builder() {
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingAsyncClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingAsyncClient.java
index a3322abfe9..9b01b1e830 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingAsyncClient.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingAsyncClient.java
@@ -55,7 +55,7 @@ import com.google.common.util.concurrent.ListenableFuture;
  * Provides access to Symphony VPDC resources via their REST API.
  * <p/>
  * 
- * @see <a href="https://api.sandbox.symphonyvpdc.savvis.net/doc/spec/api/index.html" />
+ * @see <a href="https://api.sandbox.savvis.net/doc/spec/api/index.html" />
  * @author Adrian Cole
  */
 @RequestFilters(SetVCloudTokenCookie.class)
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingClient.java
index 311be9970d..a73567488a 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingClient.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingClient.java
@@ -36,7 +36,7 @@ import org.jclouds.savvis.vpdc.options.GetVMOptions;
  * Provides access to Symphony VPDC resources via their REST API.
  * <p/>
  * 
- * @see <a href="https://api.sandbox.symphonyvpdc.savvis.net/doc/spec/api/" />
+ * @see <a href="https://api.sandbox.savvis.net/doc/spec/api/" />
  * @author Adrian Cole
  */
 @Timeout(duration = 300, timeUnit = TimeUnit.SECONDS)
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClient.java
index b8842574dd..5e06bb3c3b 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClient.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClient.java
@@ -44,7 +44,7 @@ import com.google.common.util.concurrent.ListenableFuture;
  * Provides access to Symphony VPDC resources via their REST API.
  * <p/>
  * 
- * @see <a href="https://api.sandbox.symphonyvpdc.savvis.net/doc/spec/api/index.html" />
+ * @see <a href="https://api.sandbox.savvis.net/doc/spec/api/index.html" />
  * @author Adrian Cole
  */
 @RequestFilters(SetVCloudTokenCookie.class)
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/FirewallClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/FirewallClient.java
index 1b37314e75..11d099b81f 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/FirewallClient.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/FirewallClient.java
@@ -28,7 +28,7 @@ import org.jclouds.savvis.vpdc.domain.Task;
  * Provides access to Symphony VPDC resources via their REST API.
  * <p/>
  * 
- * @see <a href="https://api.sandbox.symphonyvpdc.savvis.net/doc/spec/api/" />
+ * @see <a href="https://api.sandbox.savvis.net/doc/spec/api/" />
  * @author Adrian Cole
  */
 @Timeout(duration = 300, timeUnit = TimeUnit.SECONDS)
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/ServiceManagementAsyncClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/ServiceManagementAsyncClient.java
index b741b510a8..94664bba69 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/ServiceManagementAsyncClient.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/ServiceManagementAsyncClient.java
@@ -40,7 +40,7 @@ import com.google.common.util.concurrent.ListenableFuture;
  * Provides access to Symphony VPDC resources via their REST API.
  * <p/>
  * 
- * @see <a href="https://api.sandbox.symphonyvpdc.savvis.net/doc/spec/api/index.html" />
+ * @see <a href="https://api.sandbox.savvis.net/doc/spec/api/index.html" />
  * @author Adrian Cole
  */
 @RequestFilters(SetVCloudTokenCookie.class)
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/ServiceManagementClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/ServiceManagementClient.java
index 530189ddcb..b3452eceea 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/ServiceManagementClient.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/ServiceManagementClient.java
@@ -28,7 +28,7 @@ import org.jclouds.savvis.vpdc.domain.Task;
  * Provides access to Symphony VPDC resources via their REST API.
  * <p/>
  * 
- * @see <a href="https://api.sandbox.symphonyvpdc.savvis.net/doc/spec/api/" />
+ * @see <a href="https://api.sandbox.savvis.net/doc/spec/api/" />
  * @author Adrian Cole
  */
 @Timeout(duration = 300, timeUnit = TimeUnit.SECONDS)
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMAsyncClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMAsyncClient.java
index 1abd499c62..d43448a592 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMAsyncClient.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMAsyncClient.java
@@ -53,7 +53,7 @@ import com.google.common.util.concurrent.ListenableFuture;
  * Provides access to Symphony VPDC resources via their REST API.
  * <p/>
  * 
- * @see <a href="https://api.sandbox.symphonyvpdc.savvis.net/doc/spec/api/index.html" />
+ * @see <a href="https://api.sandbox.savvis.net/doc/spec/api/index.html" />
  * @author Adrian Cole
  */
 @RequestFilters(SetVCloudTokenCookie.class)
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMClient.java
index 7d4077dd68..ec95a15050 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMClient.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMClient.java
@@ -30,7 +30,7 @@ import org.jclouds.savvis.vpdc.domain.VMSpec;
  * Provides access to Symphony VPDC resources via their REST API.
  * <p/>
  * 
- * @see <a href="https://api.sandbox.symphonyvpdc.savvis.net/doc/spec/api/" />
+ * @see <a href="https://api.sandbox.savvis.net/doc/spec/api/" />
  * @author Adrian Cole
  */
 @Timeout(duration = 300, timeUnit = TimeUnit.SECONDS)
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/filters/SetVCloudTokenCookie.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/filters/SetVCloudTokenCookie.java
index 856314a869..2b8f3097a5 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/filters/SetVCloudTokenCookie.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/filters/SetVCloudTokenCookie.java
@@ -19,7 +19,6 @@
 package org.jclouds.savvis.vpdc.filters;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.inject.Singleton;
 import javax.ws.rs.core.HttpHeaders;
 
@@ -29,6 +28,8 @@ import org.jclouds.http.HttpRequestFilter;
 import org.jclouds.http.utils.ModifyRequest;
 import org.jclouds.savvis.vpdc.internal.VCloudToken;
 
+import com.google.common.base.Supplier;
+
 /**
  * Adds the VCloud Token to the request as a cookie
  * 
@@ -37,10 +38,10 @@ import org.jclouds.savvis.vpdc.internal.VCloudToken;
  */
 @Singleton
 public class SetVCloudTokenCookie implements HttpRequestFilter {
-   private Provider<String> vcloudTokenProvider;
+   private Supplier<String> vcloudTokenProvider;
 
    @Inject
-   public SetVCloudTokenCookie(@VCloudToken Provider<String> authTokenProvider) {
+   public SetVCloudTokenCookie(@VCloudToken Supplier<String> authTokenProvider) {
       this.vcloudTokenProvider = authTokenProvider;
    }
 
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/functions/DefaultOrgIfNull.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/functions/DefaultOrgIfNull.java
index e833714732..09766f25f9 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/functions/DefaultOrgIfNull.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/functions/DefaultOrgIfNull.java
@@ -21,11 +21,11 @@ package org.jclouds.savvis.vpdc.functions;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 
 import org.jclouds.savvis.vpdc.internal.Org;
 
 import com.google.common.base.Function;
+import com.google.common.base.Supplier;
 
 /**
  * 
@@ -33,10 +33,10 @@ import com.google.common.base.Function;
  */
 public class DefaultOrgIfNull implements Function<Object, String> {
 
-   private Provider<String> defaultOrg;
+   private final Supplier<String> defaultOrg;
 
    @Inject
-   public DefaultOrgIfNull(@Org Provider<String> defaultOrg) {
+   public DefaultOrgIfNull(@Org Supplier<String> defaultOrg) {
       this.defaultOrg = checkNotNull(defaultOrg, "defaultOrg");
    }
 
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/internal/LoginClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/internal/LoginClient.java
new file mode 100644
index 0000000000..58ec7cfd64
--- /dev/null
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/internal/LoginClient.java
@@ -0,0 +1,37 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.savvis.vpdc.internal;
+
+import java.util.concurrent.TimeUnit;
+
+import org.jclouds.concurrent.Timeout;
+import org.jclouds.savvis.vpdc.domain.internal.VCloudSession;
+
+/**
+ * @author Adrian Cole
+ */
+@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
+public interface LoginClient {
+
+   /**
+    * This request returns a token to use in subsequent requests. After 30 minutes of inactivity,
+    * the token expires and you have to request a new token with this call.
+    */
+   VCloudSession login();
+}
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/options/GetVMOptions.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/options/GetVMOptions.java
index bb68bbf7e6..14685796f5 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/options/GetVMOptions.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/options/GetVMOptions.java
@@ -33,7 +33,7 @@ package org.jclouds.savvis.vpdc.options;
  * <code>
  * 
  * @author Adrian Cole
- * @see <a href= "https://api.sandbox.symphonyvpdc.savvis.net/doc/spec/api/getVAppPowerState.html"
+ * @see <a href= "https://api.sandbox.savvis.net/doc/spec/api/getVAppPowerState.html"
  *      />
  */
 public class GetVMOptions {
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/binders/BindCaptureVAppTemplateToXmlPayloadTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/binders/BindCaptureVAppTemplateToXmlPayloadTest.java
index 6dc78b9315..bef4da2f36 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/binders/BindCaptureVAppTemplateToXmlPayloadTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/binders/BindCaptureVAppTemplateToXmlPayloadTest.java
@@ -37,7 +37,7 @@ public class BindCaptureVAppTemplateToXmlPayloadTest {
    public void test() throws IOException {
       String expected = Strings2.toStringAndClose(getClass().getResourceAsStream("/capture-vapp-template-default.xml"));
       
-      URI vAppURI = URI.create("https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/1001");
+      URI vAppURI = URI.create("https://api.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/1001");
       String xml = new BindCaptureVAppTemplateToXmlPayload().generateXml(vAppURI);
       System.out.println(xml);
       
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/binders/BindCloneVAppToXmlPayloadTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/binders/BindCloneVAppToXmlPayloadTest.java
index 0af7397acd..17d41d6f63 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/binders/BindCloneVAppToXmlPayloadTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/binders/BindCloneVAppToXmlPayloadTest.java
@@ -36,7 +36,7 @@ public class BindCloneVAppToXmlPayloadTest {
 
    public void test() throws IOException {
       String expected = Strings2.toStringAndClose(getClass().getResourceAsStream("/cloneVApp-default.xml"));
-      URI vAppURI = URI.create("https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/1001");
+      URI vAppURI = URI.create("https://api.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/1001");
       
       String xml = new BindCloneVMToXmlPayload().generateXml(vAppURI, "clonedvm", "VM Tier01");
       System.out.println(xml);
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/BaseVPDCAsyncClientTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/BaseVPDCAsyncClientTest.java
index 34b3fca624..1e5c6c75b6 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/BaseVPDCAsyncClientTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/BaseVPDCAsyncClientTest.java
@@ -40,7 +40,7 @@ import org.jclouds.savvis.vpdc.domain.Resource;
 import org.jclouds.savvis.vpdc.domain.ResourceImpl;
 import org.jclouds.savvis.vpdc.domain.internal.VCloudSession;
 import org.jclouds.savvis.vpdc.filters.SetVCloudTokenCookie;
-import org.jclouds.savvis.vpdc.internal.LoginAsyncClient;
+import org.jclouds.savvis.vpdc.internal.LoginClient;
 import org.jclouds.savvis.vpdc.reference.VCloudMediaType;
 import org.jclouds.savvis.vpdc.reference.VPDCConstants;
 
@@ -77,13 +77,13 @@ public abstract class BaseVPDCAsyncClientTest<T> extends RestClientTest<T> {
 
       @Override
       protected Supplier<VCloudSession> provideVCloudTokenCache(@Named(PROPERTY_SESSION_INTERVAL) long seconds,
-               final LoginAsyncClient login) {
+               final LoginClient login) {
          return Suppliers.<VCloudSession> ofInstance(new VCloudSession() {
 
             @Override
             public Set<Resource> getOrgs() {
                return ImmutableSet.<Resource> of(new ResourceImpl("1", "org", VCloudMediaType.ORG_XML, URI
-                        .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/1")));
+                        .create("https://api.savvis.net/rest/api/v0.8/org/1")));
             }
 
             @Override
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/BrowsingAsyncClientTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/BrowsingAsyncClientTest.java
index e1a451b646..a8507a7ce3 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/BrowsingAsyncClientTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/BrowsingAsyncClientTest.java
@@ -49,7 +49,7 @@ public class BrowsingAsyncClientTest extends BaseVPDCAsyncClientTest<BrowsingAsy
       Method method = BrowsingAsyncClient.class.getMethod("getOrg", String.class);
       HttpRequest request = processor.createRequest(method, "11");
 
-      assertRequestLineEquals(request, "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11 HTTP/1.1");
+      assertRequestLineEquals(request, "GET https://api.savvis.net/vpdc/v1.0/org/11 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -64,7 +64,7 @@ public class BrowsingAsyncClientTest extends BaseVPDCAsyncClientTest<BrowsingAsy
       Method method = BrowsingAsyncClient.class.getMethod("getOrg", String.class);
       HttpRequest request = processor.createRequest(method, (String) null);
 
-      assertRequestLineEquals(request, "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/1 HTTP/1.1");
+      assertRequestLineEquals(request, "GET https://api.savvis.net/vpdc/v1.0/org/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -79,7 +79,7 @@ public class BrowsingAsyncClientTest extends BaseVPDCAsyncClientTest<BrowsingAsy
       Method method = BrowsingAsyncClient.class.getMethod("getVDCInOrg", String.class, String.class);
       HttpRequest request = processor.createRequest(method, "11", "22");
 
-      assertRequestLineEquals(request, "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22 HTTP/1.1");
+      assertRequestLineEquals(request, "GET https://api.savvis.net/vpdc/v1.0/org/11/vdc/22 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -94,7 +94,7 @@ public class BrowsingAsyncClientTest extends BaseVPDCAsyncClientTest<BrowsingAsy
       Method method = BrowsingAsyncClient.class.getMethod("getVDCInOrg", String.class, String.class);
       HttpRequest request = processor.createRequest(method, (String) null, "22");
 
-      assertRequestLineEquals(request, "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/1/vdc/22 HTTP/1.1");
+      assertRequestLineEquals(request, "GET https://api.savvis.net/vpdc/v1.0/org/1/vdc/22 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -110,7 +110,7 @@ public class BrowsingAsyncClientTest extends BaseVPDCAsyncClientTest<BrowsingAsy
       HttpRequest request = processor.createRequest(method, "11", "22", "VM-Tier01");
 
       assertRequestLineEquals(request,
-               "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/network/VM-Tier01 HTTP/1.1");
+               "GET https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/network/VM-Tier01 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -126,7 +126,7 @@ public class BrowsingAsyncClientTest extends BaseVPDCAsyncClientTest<BrowsingAsy
       HttpRequest request = processor.createRequest(method, (String) null, "22", "VM-Tier01");
 
       assertRequestLineEquals(request,
-               "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/1/vdc/22/network/VM-Tier01 HTTP/1.1");
+               "GET https://api.savvis.net/vpdc/v1.0/org/1/vdc/22/network/VM-Tier01 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -143,7 +143,7 @@ public class BrowsingAsyncClientTest extends BaseVPDCAsyncClientTest<BrowsingAsy
       HttpRequest request = processor.createRequest(method, "11", "22", "33");
 
       assertRequestLineEquals(request,
-               "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33 HTTP/1.1");
+               "GET https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -157,10 +157,10 @@ public class BrowsingAsyncClientTest extends BaseVPDCAsyncClientTest<BrowsingAsy
    public void testVM() throws SecurityException, NoSuchMethodException, IOException {
       Method method = BrowsingAsyncClient.class.getMethod("getVM", URI.class, GetVMOptions[].class);
       HttpRequest request = processor.createRequest(method, URI
-               .create("https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33"));
+               .create("https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33"));
 
       assertRequestLineEquals(request,
-               "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33 HTTP/1.1");
+               "GET https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -178,7 +178,7 @@ public class BrowsingAsyncClientTest extends BaseVPDCAsyncClientTest<BrowsingAsy
                .withPowerState());
 
       assertRequestLineEquals(request,
-               "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/VM-Tier01/withpowerstate HTTP/1.1");
+               "GET https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/VM-Tier01/withpowerstate HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -195,7 +195,7 @@ public class BrowsingAsyncClientTest extends BaseVPDCAsyncClientTest<BrowsingAsy
       HttpRequest request = processor.createRequest(method, (String) null, "22", "VM-Tier01");
 
       assertRequestLineEquals(request,
-               "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/1/vdc/22/vApp/VM-Tier01 HTTP/1.1");
+               "GET https://api.savvis.net/vpdc/v1.0/org/1/vdc/22/vApp/VM-Tier01 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -210,7 +210,7 @@ public class BrowsingAsyncClientTest extends BaseVPDCAsyncClientTest<BrowsingAsy
       Method method = BrowsingAsyncClient.class.getMethod("getTask", String.class);
       HttpRequest request = processor.createRequest(method, "1");
 
-      assertRequestLineEquals(request, "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/task/1 HTTP/1.1");
+      assertRequestLineEquals(request, "GET https://api.savvis.net/vpdc/v1.0/task/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -226,7 +226,7 @@ public class BrowsingAsyncClientTest extends BaseVPDCAsyncClientTest<BrowsingAsy
       HttpRequest request = processor.createRequest(method, "11", "22");
 
       assertRequestLineEquals(request,
-               "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/FirewallService HTTP/1.1");
+               "GET https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/FirewallService HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClientTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClientTest.java
index 2678ccb4b0..c3f41f88b5 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClientTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClientTest.java
@@ -48,7 +48,7 @@ public class FirewallAsyncClientTest extends BaseVPDCAsyncClientTest<FirewallAsy
                "Tcp").policy("allow").description("Server Tier Firewall Rule").isLogged(false).build());
 
       assertRequestLineEquals(request,
-               "PUT https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/FirewallService HTTP/1.1");
+               "PUT https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/FirewallService HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream(
                "/firewallService-default.xml")), "application/xml", false);
@@ -67,7 +67,7 @@ public class FirewallAsyncClientTest extends BaseVPDCAsyncClientTest<FirewallAsy
                "Tcp").policy("allow").description("Server Tier Firewall Rule").isLogged(false).build());
 
       assertRequestLineEquals(request,
-               "DELETE https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/FirewallService HTTP/1.1");
+               "DELETE https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/FirewallService HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream(
                "/firewallService-default.xml")), "application/xml", false);
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/ServiceManagementAsyncClientTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/ServiceManagementAsyncClientTest.java
index 7d23eb8fa9..f3289357ee 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/ServiceManagementAsyncClientTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/ServiceManagementAsyncClientTest.java
@@ -51,7 +51,7 @@ public class ServiceManagementAsyncClientTest extends BaseVPDCAsyncClientTest<Se
       HttpRequest request = processor.createRequest(method, "11", "22", "33");
 
       assertRequestLineEquals(request,
-               "POST https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33/action/powerOn HTTP/1.1");
+               "POST https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33/action/powerOn HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -65,10 +65,10 @@ public class ServiceManagementAsyncClientTest extends BaseVPDCAsyncClientTest<Se
    public void testPowerOnVM() throws SecurityException, NoSuchMethodException, IOException {
       Method method = ServiceManagementAsyncClient.class.getMethod("powerOnVM", URI.class);
       HttpRequest request = processor.createRequest(method, URI
-               .create("https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33"));
+               .create("https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33"));
 
       assertRequestLineEquals(request,
-               "POST https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33/action/powerOn HTTP/1.1");
+               "POST https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33/action/powerOn HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -85,7 +85,7 @@ public class ServiceManagementAsyncClientTest extends BaseVPDCAsyncClientTest<Se
       HttpRequest request = processor.createRequest(method, "11", "22", "33");
 
       assertRequestLineEquals(request,
-               "POST https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33/action/powerOff HTTP/1.1");
+               "POST https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33/action/powerOff HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -99,10 +99,10 @@ public class ServiceManagementAsyncClientTest extends BaseVPDCAsyncClientTest<Se
    public void testPowerOffVM() throws SecurityException, NoSuchMethodException, IOException {
       Method method = ServiceManagementAsyncClient.class.getMethod("powerOffVM", URI.class);
       HttpRequest request = processor.createRequest(method, URI
-               .create("https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33"));
+               .create("https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33"));
 
       assertRequestLineEquals(request,
-               "POST https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33/action/powerOff HTTP/1.1");
+               "POST https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33/action/powerOff HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMAsyncClientTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMAsyncClientTest.java
index 85f7cd1c7e..80d0fc3961 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMAsyncClientTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMAsyncClientTest.java
@@ -64,11 +64,11 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
       });
 
       HttpRequest request = processor.createRequest(method, URI
-               .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22"), VMSpec.builder().name(
+               .create("https://api.savvis.net/rest/api/v0.8/org/11/vdc/22"), VMSpec.builder().name(
                "DemoHost-1").networkTierName("VM Tier01").operatingSystem(os).build());
 
       assertRequestLineEquals(request,
-               "GET https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/ HTTP/1.1");
+               "GET https://api.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/ HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream("/vm-default.xml")),
                "application/xml", false);
@@ -96,7 +96,7 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
       HttpRequest request = processor.createRequest(method, "11", "22", VMSpec.builder().operatingSystem(os).name(
                "DemoHost-1").networkTierName("VM Tier01").build());
 
-      assertRequestLineEquals(request, "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/ HTTP/1.1");
+      assertRequestLineEquals(request, "GET https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/ HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream("/vm-default.xml")),
                "application/xml", false);
@@ -110,10 +110,10 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
    
    public void testCaptureVApp() throws SecurityException, NoSuchMethodException, IOException {
       Method method = VMAsyncClient.class.getMethod("captureVApp", String.class, String.class, URI.class);
-      HttpRequest request = processor.createRequest(method, "100000.0", "2736", URI.create("https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/1001"));
+      HttpRequest request = processor.createRequest(method, "100000.0", "2736", URI.create("https://api.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/1001"));
 
       assertRequestLineEquals(request,
-               "POST https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/action/captureVApp HTTP/1.1");
+               "POST https://api.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/action/captureVApp HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream("/capture-vapp-template-default.xml")),
               "application/xml", false);
@@ -126,10 +126,10 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
    
    public void testCloneVApp() throws SecurityException, NoSuchMethodException, IOException {
       Method method = VMAsyncClient.class.getMethod("cloneVApp", URI.class, String.class, String.class);
-      HttpRequest request = processor.createRequest(method, URI.create("https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/1001"), "clonedvm", "VM Tier01");
+      HttpRequest request = processor.createRequest(method, URI.create("https://api.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/1001"), "clonedvm", "VM Tier01");
 
       assertRequestLineEquals(request,
-               "POST https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/1001/action/cloneVApp HTTP/1.1");
+               "POST https://api.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/1001/action/cloneVApp HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream("/cloneVApp-default.xml")),
               "application/xml", false);
@@ -154,11 +154,11 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
       });
 
       HttpRequest request = processor.createRequest(method, URI
-               .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22"), ImmutableSet.of(VMSpec
+               .create("https://api.savvis.net/rest/api/v0.8/org/11/vdc/22"), ImmutableSet.of(VMSpec
                .builder().name("Test VM").networkTierName("VM Tier01").operatingSystem(os).build()));
 
       assertRequestLineEquals(request,
-               "GET https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/ HTTP/1.1");
+               "GET https://api.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/ HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream("/vm-multiple-default.xml")),
                "application/xml", false);
@@ -187,7 +187,7 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
       HttpRequest request = processor.createRequest(method, "11", "22", ImmutableSet.of(VMSpec.builder()
                .operatingSystem(os).name("Test VM").networkTierName("VM Tier01").build()));
 
-      assertRequestLineEquals(request, "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/ HTTP/1.1");
+      assertRequestLineEquals(request, "GET https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/ HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream("/vm-multiple-default.xml")),
                "application/xml", false);
@@ -204,7 +204,7 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
       HttpRequest request = processor.createRequest(method, "11", "22", "33");
 
       assertRequestLineEquals(request,
-               "DELETE https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33 HTTP/1.1");
+               "DELETE https://api.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/33 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -218,10 +218,10 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
    public void testRemoveVM() throws SecurityException, NoSuchMethodException, IOException {
       Method method = VMAsyncClient.class.getMethod("removeVM", URI.class);
       HttpRequest request = processor.createRequest(method, URI
-               .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33"));
+               .create("https://api.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33"));
 
       assertRequestLineEquals(request,
-               "DELETE https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33 HTTP/1.1");
+               "DELETE https://api.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -235,10 +235,10 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
    public void testPowerOffVM() throws SecurityException, NoSuchMethodException, IOException {
       Method method = VMAsyncClient.class.getMethod("powerOffVM", URI.class);
       HttpRequest request = processor.createRequest(method, URI
-               .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33"));
+               .create("https://api.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33"));
 
       assertRequestLineEquals(request,
-               "POST https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33/action/powerOff HTTP/1.1");
+               "POST https://api.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33/action/powerOff HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
@@ -252,10 +252,10 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
    public void testPowerOnVM() throws SecurityException, NoSuchMethodException, IOException {
       Method method = VMAsyncClient.class.getMethod("powerOnVM", URI.class);
       HttpRequest request = processor.createRequest(method, URI
-               .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33"));
+               .create("https://api.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33"));
 
       assertRequestLineEquals(request,
-               "POST https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33/action/powerOn HTTP/1.1");
+               "POST https://api.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33/action/powerOn HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, null, null, false);
 
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/filters/SetVCloudTokenCookieTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/filters/SetVCloudTokenCookieTest.java
index 489390aecf..a4f855e814 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/filters/SetVCloudTokenCookieTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/filters/SetVCloudTokenCookieTest.java
@@ -22,13 +22,14 @@ import static org.testng.Assert.assertEquals;
 
 import java.net.URI;
 
-import javax.inject.Provider;
 import javax.ws.rs.core.HttpHeaders;
 
 import org.jclouds.http.HttpRequest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.google.common.base.Supplier;
+
 /**
  * @author Adrian Cole
  */
@@ -39,7 +40,7 @@ public class SetVCloudTokenCookieTest {
 
    @BeforeTest
    void setUp() {
-      filter = new SetVCloudTokenCookie(new Provider<String>() {
+      filter = new SetVCloudTokenCookie(new Supplier<String>() {
          public String get() {
             return "token";
          }
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgHandlerTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgHandlerTest.java
index e5f21c56ce..e9a06443ba 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgHandlerTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgHandlerTest.java
@@ -52,7 +52,7 @@ public class OrgHandlerTest {
                   .name("100000.0")
                   .description("SAVVISStation Integration Testing")
                   .vDC(new Link("2736", "demo_vpdcname", "application/vnd.vmware.vcloud.vdc+xml", URI
-                        .create("https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"),
+                        .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"),
                         "down")).build().toString());
 
    }
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgListHandlerTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgListHandlerTest.java
index 01ba455bd6..89202ef4ff 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgListHandlerTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgListHandlerTest.java
@@ -50,7 +50,7 @@ public class OrgListHandlerTest {
       Set<Resource> result = factory.create(injector.getInstance(OrgListHandler.class)).parse(is);
       assertEquals(result, ImmutableSet.of(new ResourceImpl("100000.0", "SAVVISStation Integration Testing",
             "application/vnd.vmware.vcloud.org+xml", URI
-                  .create("https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0"))));
+                  .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0"))));
 
    }
 }
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/TaskHandlerTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/TaskHandlerTest.java
index 9a43c518d0..7a40127908 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/TaskHandlerTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/TaskHandlerTest.java
@@ -60,7 +60,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
             .startTime(dateService.iso8601DateParse("2010-05-26T08:08:08.000+08:00"))
             .status(Task.Status.SUCCESS)
             .type("application/vnd.vmware.vcloud.task+xml")
-            .href(URI.create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/task/21-1002"))
+            .href(URI.create("https://api.savvis.net/rest/api/v0.8/task/21-1002"))
             .owner(
                   ResourceImpl
                         .builder()
@@ -68,7 +68,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
                         .name("mockVpdc8")
                         .type("application/vnd.vmware.vcloud.vdc+xml")
                         .href(URI
-                              .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"))
+                              .create("https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"))
                         .build())
             .result(
                      ResourceImpl
@@ -77,7 +77,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
                         .name("mock_vpdc_item_007")
                         .type("application/vnd.vmware.vcloud.vApp+xml")
                         .href(URI
-                              .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"))
+                              .create("https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"))
                         .build()).build();
       assertEquals(result.toString(), expects.toString());
 
@@ -94,7 +94,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
             .startTime(dateService.iso8601DateParse("2010-05-26T08:08:08.000+08:00"))
             .status(Task.Status.SUCCESS)
             .type("application/vnd.vmware.vcloud.task+xml")
-            .href(URI.create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/task/21-1002"))
+            .href(URI.create("https://api.savvis.net/rest/api/v0.8/task/21-1002"))
             .owner(
                   ResourceImpl
                         .builder()
@@ -102,7 +102,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
                         .name("mockVpdc8")
                         .type("application/vnd.vmware.vcloud.vdc+xml")
                         .href(URI
-                              .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"))
+                              .create("https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"))
                         .build())
             .result(
                   ResourceImpl
@@ -111,7 +111,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
                         .name("mock_vpdc_item_008")
                         .type("application/vnd.vmware.vcloud.vApp+xml")
                         .href(URI
-                              .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/vdc/2736/vmdk/1234567"))
+                              .create("https://api.savvis.net/rest/api/v0.8/vdc/2736/vmdk/1234567"))
                         .build()).build();
       assertEquals(result.toString(), expects.toString());
 
@@ -127,7 +127,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
             .startTime(dateService.iso8601DateParse("2010-05-26T08:08:08.000+08:00"))
             .status(Task.Status.RUNNING)
             .type("application/vnd.vmware.vcloud.task+xml")
-            .href(URI.create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/task/6904"))
+            .href(URI.create("https://api.savvis.net/rest/api/v0.8/task/6904"))
             .owner(
                   ResourceImpl
                         .builder()
@@ -135,7 +135,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
                         .name("mockVpdc8")
                         .type("application/vnd.vmware.vcloud.vdc+xml")
                         .href(URI
-                              .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"))
+                              .create("https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"))
                         .build())
             .result(
                   ResourceImpl
@@ -144,7 +144,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
                         .name("mock_vpdc_item_007")
                         .type("application/vnd.vmware.vcloud.catalogItem+xml")
                         .href(URI
-                              .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"))
+                              .create("https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"))
                         .build()).build();
 
       assertEquals(result.toString(), expects.toString());
@@ -160,7 +160,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
             .id("113927-1005")
             .startTime(dateService.iso8601DateParse("2011-03-24T20:37:34.000Z"))
             .status(Task.Status.QUEUED)
-            .href(URI.create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/task/113927-1005"))
+            .href(URI.create("https://api.savvis.net/rest/api/v0.8/task/113927-1005"))
             .owner(
                   ResourceImpl
                         .builder()
@@ -168,7 +168,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
                         .name("Foo")
                         .type("application/vnd.vmware.vcloud.vdc+xml")
                         .href(URI
-                              .create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/4253"))
+                              .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/4253"))
                         .build())
             .result(
                   ResourceImpl
@@ -177,7 +177,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
                         .name("adriancole")
                         .type("application/vnd.vmware.vcloud.vApp+xml")
                         .href(URI
-                              .create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/4253/vApp/1005"))
+                              .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/4253/vApp/1005"))
                         .build()).build();
       assertEquals(result.toString(), expects.toString());
       assertEquals(result.getError(), null);
@@ -195,7 +195,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
             .endTime(dateService.iso8601DateParse("2010-05-26T08:09:09.000+08:00"))
             .status(Task.Status.ERROR)
             .type("application/vnd.vmware.vcloud.task+xml")
-            .href(URI.create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/task/6904-123"))
+            .href(URI.create("https://api.savvis.net/rest/api/v0.8/task/6904-123"))
             .owner(
                   ResourceImpl
                         .builder()
@@ -203,7 +203,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
                         .name("mockVpdc8")
                         .type("application/vnd.vmware.vcloud.vdc+xml")
                         .href(URI
-                              .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"))
+                              .create("https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"))
                         .build())
             .result(
                   ResourceImpl
@@ -212,7 +212,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
                         .name("mock_vpdc_item_007")
                         .type("application/vnd.vmware.vcloud.vApp+xml")
                         .href(URI
-                              .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"))
+                              .create("https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"))
                         .build()).build();
       assertEquals(result.toString(), expects.toString());
 
@@ -251,7 +251,7 @@ public class TaskHandlerTest extends BaseHandlerTest {
             .endTime(dateService.iso8601DateParse("2010-05-26T08:09:09.000+08:00"))
             .status(Task.Status.NONE)
             .type("application/vnd.vmware.vcloud.task+xml")
-            .href(URI.create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/task/3904-1002"))
+            .href(URI.create("https://api.savvis.net/rest/api/v0.8/task/3904-1002"))
             .error(
                   TaskError
                         .builder()
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VDCHandlerTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VDCHandlerTest.java
index 665e9379a9..873249c105 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VDCHandlerTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VDCHandlerTest.java
@@ -63,31 +63,31 @@ public class VDCHandlerTest {
                                           "DemoHost-1",
                                           VCloudMediaType.VAPP_XML,
                                           URI
-                                                   .create("https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1001")),
+                                                   .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1001")),
                                  new ResourceImpl(
                                           "1002",
                                           "DemoHost-2",
                                           VCloudMediaType.VAPP_XML,
                                           URI
-                                                   .create("https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002")),
+                                                   .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002")),
                                  new ResourceImpl(
                                           "1003",
                                           "DemoHost-3",
                                           VCloudMediaType.VAPP_XML,
                                           URI
-                                                   .create("https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1003")),
+                                                   .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1003")),
                                  new ResourceImpl(
                                           "1234",
                                           "CustomerTemplateName",
                                           VCloudMediaType.VAPPTEMPLATE_XML,
                                           URI
-                                                   .create("https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vAppTemplate/1234")),
+                                                   .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vAppTemplate/1234")),
                                  new ResourceImpl(
                                           "FirewallService",
                                           "firewall",
-                                          "api.symphonyvpdc.savvis.net+xml",
+                                          "api.savvis.net+xml",
                                           URI
-                                                   .create("https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/FirewallService"))));
+                                                   .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/FirewallService"))));
       assertEquals(result.getAvailableNetworks(), ImmutableSet.of());
    }
 
@@ -102,16 +102,16 @@ public class VDCHandlerTest {
       assertEquals(result.getStatus(), Status.DEPLOYED);
       assertEquals(result.getResourceEntities(), ImmutableSet.of(new ResourceImpl("1001", "Host1",
                VCloudMediaType.VAPP_XML, URI
-                        .create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1001")),
+                        .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1001")),
                new ResourceImpl("1002", "Host2", VCloudMediaType.VAPP_XML, URI
-                        .create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1002")),
+                        .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1002")),
                new ResourceImpl("1003", "Host3", VCloudMediaType.VAPP_XML, URI
-                        .create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1003")),
+                        .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1003")),
                new ResourceImpl("1004", "Host4", VCloudMediaType.VAPP_XML, URI
-                        .create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1004"))));
+                        .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1004"))));
       assertEquals(result.getAvailableNetworks(), ImmutableSet.of(ResourceImpl.builder().id("VM-Tier01").name(
                "VM Tier01").type(VCloudMediaType.NETWORK_XML).href(
-               URI.create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/network/VM-Tier01"))
+               URI.create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/network/VM-Tier01"))
                .build()));
 
    }
@@ -127,10 +127,10 @@ public class VDCHandlerTest {
       assertEquals(result.getStatus(), Status.FAILED);
       assertEquals(result.getResourceEntities(), ImmutableSet.of(new ResourceImpl("1001", "Host1",
                VCloudMediaType.VAPP_XML, URI
-                        .create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/1641/vApp/1001"))));
+                        .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1641/vApp/1001"))));
       assertEquals(result.getAvailableNetworks(), ImmutableSet.of(ResourceImpl.builder().id("VM-Tier01").name(
                "VM Tier01").type(VCloudMediaType.NETWORK_XML).href(
-               URI.create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/1641/network/VM-Tier01"))
+               URI.create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1641/network/VM-Tier01"))
                .build()));
 
    }
@@ -155,7 +155,7 @@ public class VDCHandlerTest {
                                           .id("1001")
                                           .href(
                                                    URI
-                                                            .create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1001"))
+                                                            .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1001"))
                                           .build(),
                                  ResourceImpl
                                           .builder()
@@ -164,7 +164,7 @@ public class VDCHandlerTest {
                                           .id("1037")
                                           .href(
                                                    URI
-                                                            .create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1037"))
+                                                            .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1037"))
                                           .build(),
                                  ResourceImpl
                                           .builder()
@@ -173,7 +173,7 @@ public class VDCHandlerTest {
                                           .id("1038")
                                           .href(
                                                    URI
-                                                            .create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1038"))
+                                                            .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1038"))
                                           .build(),
                                  ResourceImpl
                                           .builder()
@@ -182,11 +182,11 @@ public class VDCHandlerTest {
                                           .id("1039")
                                           .href(
                                                    URI
-                                                            .create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1039"))
+                                                            .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1039"))
                                           .build()));
       assertEquals(result.getAvailableNetworks(), ImmutableSet.of(ResourceImpl.builder().id("VM-Tier01").name(
                "VM Tier01").type(VCloudMediaType.NETWORK_XML).href(
-               URI.create("https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/network/VM-Tier01"))
+               URI.create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/network/VM-Tier01"))
                .build()));
 
    }
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VMHandlerTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VMHandlerTest.java
index 93cc24e5dd..979203cae1 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VMHandlerTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VMHandlerTest.java
@@ -62,7 +62,7 @@ public class VMHandlerTest {
                .type("application/vnd.vmware.vcloud.vApp+xml")
                .href(
                         URI
-                                 .create("https://api.sandbox.symphonyVPDC.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1001"))
+                                 .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1001"))
                .networkConfigSection(
                         NetworkConfigSection.builder().network("VM Tier01").gateway("0.0.0.0").netmask("0.0.0.0").info(
                                  "MAC=00:00:00:00:00:00").fenceMode("allowInOut").dhcp(true).internalToExternalNATRule(
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/capture-vapp-template-default.xml b/providers/savvis-symphonyvpdc/src/test/resources/capture-vapp-template-default.xml
index 28b5076d7c..ffc4ebbdc1 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/capture-vapp-template-default.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/capture-vapp-template-default.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><CaptureVAppParams xmlns="http://schemas.api.sandbox.symphonyVPDC.savvis.net/vpdci" name="CaptureTemplate"><Description>Save Template</Description><Source href="https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/1001"/></CaptureVAppParams>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><CaptureVAppParams xmlns="http://schemas.api.sandbox.savvis.net/vpdci" name="CaptureTemplate"><Description>Save Template</Description><Source href="https://api.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/1001"/></CaptureVAppParams>
\ No newline at end of file
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/cloneVApp-default.xml b/providers/savvis-symphonyvpdc/src/test/resources/cloneVApp-default.xml
index a60db84ebd..e9cc88e418 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/cloneVApp-default.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/cloneVApp-default.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><CloneVAppParams xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" deploy="true" name="clonedvm" powerOn="true" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 https://api.symphonyvpdc.savvis.net/ns/vcloud.xsd"><Description>VM Tier01</Description><VApp href="https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/" type="application/vnd.vmware.vcloud.vApp+xml"/></CloneVAppParams>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><CloneVAppParams xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" deploy="true" name="clonedvm" powerOn="true" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 https://api.savvis.net/ns/vcloud.xsd"><Description>VM Tier01</Description><VApp href="https://api.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/" type="application/vnd.vmware.vcloud.vApp+xml"/></CloneVAppParams>
\ No newline at end of file
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/firewallService-default.xml b/providers/savvis-symphonyvpdc/src/test/resources/firewallService-default.xml
index 5a0e642ced..9f837a24d5 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/firewallService-default.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/firewallService-default.xml
@@ -1 +1 @@
-<svvs:FirewallService xmlns:svvs="http://schemas.api.sandbox.symphonyVPDC.savvis.net/vpdci" xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"><svvs:FirewallRule><svvs:IsEnabled>true</svvs:IsEnabled><svvs:Description>Server Tier Firewall Rule</svvs:Description><svvs:Type>SERVER_TIER_FIREWALL</svvs:Type><svvs:Log>no</svvs:Log><svvs:Policy>allow</svvs:Policy><svvs:Protocols><svvs:Tcp>true</svvs:Tcp></svvs:Protocols><svvs:Port>22</svvs:Port><svvs:Destination>VM Tier01</svvs:Destination><svvs:Source>internet</svvs:Source></svvs:FirewallRule></svvs:FirewallService>
\ No newline at end of file
+<svvs:FirewallService xmlns:svvs="http://schemas.api.sandbox.savvis.net/vpdci" xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"><svvs:FirewallRule><svvs:IsEnabled>true</svvs:IsEnabled><svvs:Description>Server Tier Firewall Rule</svvs:Description><svvs:Type>SERVER_TIER_FIREWALL</svvs:Type><svvs:Log>no</svvs:Log><svvs:Policy>allow</svvs:Policy><svvs:Protocols><svvs:Tcp>true</svvs:Tcp></svvs:Protocols><svvs:Port>22</svvs:Port><svvs:Destination>VM Tier01</svvs:Destination><svvs:Source>internet</svvs:Source></svvs:FirewallRule></svvs:FirewallService>
\ No newline at end of file
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/firewallService.xml b/providers/savvis-symphonyvpdc/src/test/resources/firewallService.xml
index e11d724da2..4b4ae3375d 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/firewallService.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/firewallService.xml
@@ -4,7 +4,7 @@
                       xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
                       xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
                       xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
-                      xmlns:svvs="http://schemas.api.sandbox.symphonyVPDC.savvis.net/vpdci">
+                      xmlns:svvs="http://schemas.api.sandbox.savvis.net/vpdci">
     <svvs:IsEnabled>false</svvs:IsEnabled>
     <svvs:FirewallRule>
         <svvs:IsEnabled>true</svvs:IsEnabled>
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/org.xml b/providers/savvis-symphonyvpdc/src/test/resources/org.xml
index 22f18b1b1f..090c0439c7 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/org.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/org.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <vApp:Org xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" name="100000.0">
-  <vApp:Link name="demo_vpdcname" type="application/vnd.vmware.vcloud.vdc+xml" href="https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736" rel="down"/>
+  <vApp:Link name="demo_vpdcname" type="application/vnd.vmware.vcloud.vdc+xml" href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736" rel="down"/>
   <vApp:Description>SAVVISStation Integration Testing</vApp:Description>
 </vApp:Org>
\ No newline at end of file
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/orglist.xml b/providers/savvis-symphonyvpdc/src/test/resources/orglist.xml
index 24367a5bdc..10834ac1c2 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/orglist.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/orglist.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <vApp:OrgList xmlns:vApp="http://www.vmware.com/vcloud/v0.8">
-  <vApp:Org name="SAVVISStation Integration Testing" type="application/vnd.vmware.vcloud.org+xml" href="https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0"/>
+  <vApp:Org name="SAVVISStation Integration Testing" type="application/vnd.vmware.vcloud.org+xml" href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0"/>
 </vApp:OrgList>
\ No newline at end of file
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/task-failed.xml b/providers/savvis-symphonyvpdc/src/test/resources/task-failed.xml
index d14ef3f814..8e277794ee 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/task-failed.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/task-failed.xml
@@ -5,10 +5,10 @@
                 xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
                 xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
     <vApp:Task endTime="2010-05-26T08:09:09.000+08:00" startTime="2010-05-26T08:08:08.000+08:00" status="error"
-               type="application/vnd.vmware.vcloud.task+xml" href="https://api.symphonyvpdc.savvis.net/rest/api/v0.8/task/6904-123">
+               type="application/vnd.vmware.vcloud.task+xml" href="https://api.savvis.net/rest/api/v0.8/task/6904-123">
         <vApp:Owner name="mockVpdc8" type="application/vnd.vmware.vcloud.vdc+xml"
-                    href="https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"/>
+                    href="https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"/>
         <vApp:Result name="mock_vpdc_item_007" type="application/vnd.vmware.vcloud.vApp+xml"
-                    href="https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"/>
+                    href="https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"/>
     </vApp:Task>
 </vApp:TasksList>
\ No newline at end of file
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/task-queued.xml b/providers/savvis-symphonyvpdc/src/test/resources/task-queued.xml
index e7d71d3893..c37e1db243 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/task-queued.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/task-queued.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <vApp:TasksList xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
-  <vApp:Task startTime="2011-03-24T20:37:34.000Z" status="queued" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/task/113927-1005">
-    <vApp:Owner name="Foo" type="application/vnd.vmware.vcloud.vdc+xml" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/4253"/>
-    <vApp:Result name="adriancole" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/4253/vApp/1005"/>
+  <vApp:Task startTime="2011-03-24T20:37:34.000Z" status="queued" href="https://api.savvis.net/rest/api/v0.8/task/113927-1005">
+    <vApp:Owner name="Foo" type="application/vnd.vmware.vcloud.vdc+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/4253"/>
+    <vApp:Result name="adriancole" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/4253/vApp/1005"/>
   </vApp:Task>
 </vApp:TasksList>
\ No newline at end of file
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/task-running.xml b/providers/savvis-symphonyvpdc/src/test/resources/task-running.xml
index 1b42f0052f..7150acc2dd 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/task-running.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/task-running.xml
@@ -6,10 +6,10 @@
                 xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
                 <!--If Task status is running, Savvis is not displaying endTime.-->
     <vApp:Task startTime="2010-05-26T08:08:08.000+08:00" status="running" type="application/vnd.vmware.vcloud.task+xml"
-               href="https://api.symphonyvpdc.savvis.net/rest/api/v0.8/task/6904">
+               href="https://api.savvis.net/rest/api/v0.8/task/6904">
         <vApp:Owner name="mockVpdc8" type="application/vnd.vmware.vcloud.vdc+xml"
-                    href="https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"/>
+                    href="https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"/>
         <vApp:Result name="mock_vpdc_item_007" type="application/vnd.vmware.vcloud.catalogItem+xml"
-                    href="https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"/>
+                    href="https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"/>
     </vApp:Task>
 </vApp:TasksList>
\ No newline at end of file
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/task-unsupported.xml b/providers/savvis-symphonyvpdc/src/test/resources/task-unsupported.xml
index 60a56580c6..9987b40b2f 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/task-unsupported.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/task-unsupported.xml
@@ -5,7 +5,7 @@
                 xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
                 xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
     <vApp:Task endTime="2010-05-26T08:09:09.000+08:00" startTime="2010-05-26T08:08:08.000+08:00" status="None"
-               type="application/vnd.vmware.vcloud.task+xml" href="https://api.symphonyvpdc.savvis.net/rest/api/v0.8/task/3904-1002">
+               type="application/vnd.vmware.vcloud.task+xml" href="https://api.savvis.net/rest/api/v0.8/task/3904-1002">
         <vApp:Error vendorSpecificErrorCode="3000" minorErrorCode="-1" majorErrorCode="500"
                     message="your requested task id is not found. Please contact Savvis Administrator for further assistance/clarification "/>
     </vApp:Task>
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/task-vapp.xml b/providers/savvis-symphonyvpdc/src/test/resources/task-vapp.xml
index 8a8a3520c1..0cd66dfef6 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/task-vapp.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/task-vapp.xml
@@ -5,10 +5,10 @@
                 xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
                 xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
     <vApp:Task endTime="2010-05-26T08:09:09.000+08:00" startTime="2010-05-26T08:08:08.000+08:00" status="success"
-               type="application/vnd.vmware.vcloud.task+xml" href="https://api.symphonyvpdc.savvis.net/rest/api/v0.8/task/21-1002">
+               type="application/vnd.vmware.vcloud.task+xml" href="https://api.savvis.net/rest/api/v0.8/task/21-1002">
         <vApp:Owner name="mockVpdc8" type="application/vnd.vmware.vcloud.vdc+xml"
-                    href="https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"/>
+                    href="https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"/>
         <vApp:Result name="mock_vpdc_item_007" type="application/vnd.vmware.vcloud.vApp+xml"
-                     href="https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"/>
+                     href="https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"/>
     </vApp:Task>
 </vApp:TasksList>
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/task-vmdk.xml b/providers/savvis-symphonyvpdc/src/test/resources/task-vmdk.xml
index f3368dec3c..b687c78b85 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/task-vmdk.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/task-vmdk.xml
@@ -5,10 +5,10 @@
                 xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
                 xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
     <vApp:Task endTime="2010-05-26T08:09:09.000+08:00" startTime="2010-05-26T08:08:08.000+08:00" status="success"
-               type="application/vnd.vmware.vcloud.task+xml" href="https://api.symphonyvpdc.savvis.net/rest/api/v0.8/task/21-1002">
+               type="application/vnd.vmware.vcloud.task+xml" href="https://api.savvis.net/rest/api/v0.8/task/21-1002">
         <vApp:Owner name="mockVpdc8" type="application/vnd.vmware.vcloud.vdc+xml"
-                    href="https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"/>
+                    href="https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"/>
         <vApp:Result name="mock_vpdc_item_008" type="application/vnd.vmware.vcloud.vApp+xml"
-                     href="https://api.symphonyvpdc.savvis.net/rest/api/v0.8/vdc/2736/vmdk/1234567"/>
+                     href="https://api.savvis.net/rest/api/v0.8/vdc/2736/vmdk/1234567"/>
      </vApp:Task>
 </vApp:TasksList>
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/vdc-1net.xml b/providers/savvis-symphonyvpdc/src/test/resources/vdc-1net.xml
index 52a387acd4..5d1857976d 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/vdc-1net.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/vdc-1net.xml
@@ -3,12 +3,12 @@
   <vApp:Description>ServiceProfileName = Essential; ServiceLocation = US_WEST; Email = red@chair.com;</vApp:Description>
   <vApp:OfferingTag>Deployed</vApp:OfferingTag>
   <vApp:ResourceEntities>
-    <vApp:ResourceEntity name="Host1" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1001"/>
-    <vApp:ResourceEntity name="Host2" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1002"/>
-    <vApp:ResourceEntity name="Host3" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1003"/>
-    <vApp:ResourceEntity name="Host4" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1004"/>
+    <vApp:ResourceEntity name="Host1" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1001"/>
+    <vApp:ResourceEntity name="Host2" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1002"/>
+    <vApp:ResourceEntity name="Host3" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1003"/>
+    <vApp:ResourceEntity name="Host4" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1004"/>
   </vApp:ResourceEntities>
   <vApp:AvailableNetworks>
-    <vApp:Network name="VM Tier01" type="application/vnd.vmware.vcloud.network+xml" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/network/VM-Tier01"/>
+    <vApp:Network name="VM Tier01" type="application/vnd.vmware.vcloud.network+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/network/VM-Tier01"/>
   </vApp:AvailableNetworks>
 </vApp:Vdc>
\ No newline at end of file
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/vdc-failed.xml b/providers/savvis-symphonyvpdc/src/test/resources/vdc-failed.xml
index 16a8e932b5..a995dbe259 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/vdc-failed.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/vdc-failed.xml
@@ -3,9 +3,9 @@
   <vApp:Description>ServiceProfileName = Essential; ServiceLocation = US_WEST; Email = red@chair.com;</vApp:Description>
   <vApp:OfferingTag>Failed</vApp:OfferingTag>
   <vApp:ResourceEntities>
-    <vApp:ResourceEntity name="Host1" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/1641/vApp/1001"/>
+    <vApp:ResourceEntity name="Host1" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1641/vApp/1001"/>
   </vApp:ResourceEntities>
   <vApp:AvailableNetworks>
-    <vApp:Network name="VM Tier01" type="application/vnd.vmware.vcloud.network+xml" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/1641/network/VM-Tier01"/>
+    <vApp:Network name="VM Tier01" type="application/vnd.vmware.vcloud.network+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1641/network/VM-Tier01"/>
   </vApp:AvailableNetworks>
 </vApp:Vdc>
\ No newline at end of file
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/vdc-saved.xml b/providers/savvis-symphonyvpdc/src/test/resources/vdc-saved.xml
index 3dccdf3dfb..990e384c34 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/vdc-saved.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/vdc-saved.xml
@@ -3,12 +3,12 @@
   <vApp:Description>ServiceProfileName = Essential; ServiceLocation = US_WEST; Email = me@my.com;</vApp:Description>
   <vApp:OfferingTag>Saved</vApp:OfferingTag>
   <vApp:ResourceEntities>
-    <vApp:ResourceEntity name="templateHost" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1001"/>
-    <vApp:ResourceEntity name="host-c501" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1037"/>
-    <vApp:ResourceEntity name="host-c501" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1038"/>
-    <vApp:ResourceEntity name="host-c601" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1039"/>
+    <vApp:ResourceEntity name="templateHost" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1001"/>
+    <vApp:ResourceEntity name="host-c501" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1037"/>
+    <vApp:ResourceEntity name="host-c501" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1038"/>
+    <vApp:ResourceEntity name="host-c601" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1039"/>
   </vApp:ResourceEntities>
   <vApp:AvailableNetworks>
-    <vApp:Network name="VM Tier01" type="application/vnd.vmware.vcloud.network+xml" href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/network/VM-Tier01"/>
+    <vApp:Network name="VM Tier01" type="application/vnd.vmware.vcloud.network+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/network/VM-Tier01"/>
   </vApp:AvailableNetworks>
 </vApp:Vdc>
\ No newline at end of file
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/vdc.xml b/providers/savvis-symphonyvpdc/src/test/resources/vdc.xml
index d52b555094..fc74367bac 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/vdc.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/vdc.xml
@@ -3,11 +3,11 @@
   <vApp:Description>ServiceProfileName = Balanced; ServiceLocation = North America; Email = jim@company.com;</vApp:Description>
   <vApp:OfferingTag>Deployed</vApp:OfferingTag>
   <vApp:ResourceEntities>
-    <vApp:ResourceEntity name="DemoHost-1" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1001"/>
-    <vApp:ResourceEntity name="DemoHost-2" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"/>
-    <vApp:ResourceEntity name="DemoHost-3" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1003"/>
-    <vApp:ResourceEntity name="CustomerTemplateName" type="application/vnd.vmware.vcloud.vAppTemplate+xml" href="https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vAppTemplate/1234"/>
-    <vApp:ResourceEntity name="firewall" type="api.symphonyvpdc.savvis.net+xml" href="https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/FirewallService"/>
+    <vApp:ResourceEntity name="DemoHost-1" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1001"/>
+    <vApp:ResourceEntity name="DemoHost-2" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"/>
+    <vApp:ResourceEntity name="DemoHost-3" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1003"/>
+    <vApp:ResourceEntity name="CustomerTemplateName" type="application/vnd.vmware.vcloud.vAppTemplate+xml" href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vAppTemplate/1234"/>
+    <vApp:ResourceEntity name="firewall" type="api.savvis.net+xml" href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/FirewallService"/>
   </vApp:ResourceEntities>
   <vApp:AvailableNetworks/>
 </vApp:Vdc>
\ No newline at end of file
diff --git a/providers/savvis-symphonyvpdc/src/test/resources/vm.xml b/providers/savvis-symphonyvpdc/src/test/resources/vm.xml
index 7b974677f2..1258be822c 100644
--- a/providers/savvis-symphonyvpdc/src/test/resources/vm.xml
+++ b/providers/savvis-symphonyvpdc/src/test/resources/vm.xml
@@ -1,11 +1,11 @@
 <vApp:VApp xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8"
            xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-           xmlns:vApps="http://schemas.api.sandbox.symphonyVPDC.savvis.net/vpdci"
+           xmlns:vApps="http://schemas.api.sandbox.savvis.net/vpdci"
            xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
            xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
-           xmlns:svvs="http://schemas.api.sandbox.symphonyVPDC.savvis.net/vpdci" status="4" name="znHost2"
+           xmlns:svvs="http://schemas.api.sandbox.savvis.net/vpdci" status="4" name="znHost2"
            type="application/vnd.vmware.vcloud.vApp+xml"
-           href="https://api.sandbox.symphonyVPDC.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1001">
+           href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1001">
     <ovf:NetworkSection>
         <ovf:Info>The list of logical networks</ovf:Info>
         <ovf:Network ovf:name="VM Tier01">