You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/11/17 17:19:22 UTC
[06/19] jclouds git commit: JCLOUDS-780 Remove vcloud.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VAppHandlerTest.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VAppHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VAppHandlerTest.java
deleted file mode 100644
index 992e343..0000000
--- a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VAppHandlerTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.xml;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.URI;
-
-import org.jclouds.cim.xml.ResourceAllocationSettingDataHandler;
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.http.functions.ParseSax.Factory;
-import org.jclouds.http.functions.config.SaxParserModule;
-import org.jclouds.vcloud.VCloudMediaType;
-import org.jclouds.vcloud.domain.Status;
-import org.jclouds.vcloud.domain.VApp;
-import org.jclouds.vcloud.domain.Vm;
-import org.jclouds.vcloud.domain.internal.ReferenceTypeImpl;
-import org.jclouds.vcloud.xml.ovf.VCloudResourceAllocationSettingDataHandler;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code VAppHandler}
- */
-@Test(groups = "unit")
-public class VAppHandlerTest {
-
- public void testRhelOffStatic() {
- InputStream is = getClass().getResourceAsStream("/vapp-rhel-off-static.xml");
- Injector injector = Guice.createInjector(new SaxParserModule() {
-
- @Override
- protected void configure() {
- super.configure();
- bind(ResourceAllocationSettingDataHandler.class).to(VCloudResourceAllocationSettingDataHandler.class);
- }
- });
- Factory factory = injector.getInstance(ParseSax.Factory.class);
- VApp result = factory.create(injector.getInstance(VAppHandler.class)).parse(is);
- assertEquals(result.getName(), "vApp_acole_2");
- assertEquals(result.getDescription(), "foo");
- assertEquals(result.getHref(), URI.create("https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320"));
- assertEquals(result.getType(), "application/vnd.vmware.vcloud.vApp+xml");
- assertEquals(result.getStatus(), Status.OFF);
- assertEquals(
- result.getVDC(),
- new ReferenceTypeImpl(null, VCloudMediaType.VDC_XML, URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439")));
- assertEquals(result.getTasks(), ImmutableList.of());
- assert result.isOvfDescriptorUploaded();
- assert result.getNetworkSection() != null;
- Vm vm = Iterables.getOnlyElement(result.getChildren());
- VmHandlerTest.checkVm(vm);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VAppTemplateHandlerTest.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VAppTemplateHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VAppTemplateHandlerTest.java
deleted file mode 100644
index c0cc110..0000000
--- a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VAppTemplateHandlerTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.xml;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.URI;
-
-import org.jclouds.date.DateService;
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.http.functions.ParseSax.Factory;
-import org.jclouds.http.functions.config.SaxParserModule;
-import org.jclouds.ovf.Network;
-import org.jclouds.vcloud.VCloudMediaType;
-import org.jclouds.vcloud.domain.GuestCustomizationSection;
-import org.jclouds.vcloud.domain.Status;
-import org.jclouds.vcloud.domain.TaskStatus;
-import org.jclouds.vcloud.domain.VAppTemplate;
-import org.jclouds.vcloud.domain.Vm;
-import org.jclouds.vcloud.domain.internal.ReferenceTypeImpl;
-import org.jclouds.vcloud.domain.internal.TaskImpl;
-import org.jclouds.vcloud.domain.ovf.VCloudNetworkSection;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code VAppTemplateHandler}
- */
-@Test(groups = "unit")
-public class VAppTemplateHandlerTest {
-
- public void testUbuntuTemplate() {
- VAppTemplate result = parseTemplate();
- assertEquals(result.getName(), "Ubuntu Template");
- assertEquals(result.getHref(), URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921"));
- assertEquals(result.getType(), "application/vnd.vmware.vcloud.vAppTemplate+xml");
- assertEquals(result.getStatus(), Status.OFF);
- assertEquals(result.getVDC(), new ReferenceTypeImpl(null, VCloudMediaType.VDC_XML, URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439")));
- assertEquals(result.getDescription(), null);
- assertEquals(result.getTasks(), ImmutableList.of());
- assertEquals(result.getVAppScopedLocalId(), null);
- assert result.isOvfDescriptorUploaded();
- Vm vm = Iterables.getOnlyElement(result.getChildren());
- assertEquals(vm.getName(), "Ubuntu1004");
- assertEquals(vm.getHref(), URI.create("https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vm-172837194"));
- // NOTE this is vAppTemplate not VM!
- assertEquals(vm.getType(), "application/vnd.vmware.vcloud.vAppTemplate+xml");
- assertEquals(vm.getStatus(), null);
- assertEquals(vm.getParent(), new ReferenceTypeImpl(null, VCloudMediaType.VAPPTEMPLATE_XML, URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921")));
- assertEquals(vm.getDescription(), null);
- assertEquals(vm.getTasks(), ImmutableList.of());
- assertEquals(vm.getVAppScopedLocalId(), "02_ubuntu_template");
-
- GuestCustomizationSection guestC = vm.getGuestCustomizationSection();
-
- assertEquals(guestC.getType(), VCloudMediaType.GUESTCUSTOMIZATIONSECTION_XML);
- assertEquals(
- guestC.getHref(),
- URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vm-172837194/guestCustomizationSection/"));
- assertEquals(guestC.getInfo(), "Specifies Guest OS Customization Settings");
- assertEquals(guestC.isEnabled(), Boolean.TRUE);
- assertEquals(guestC.shouldChangeSid(), Boolean.FALSE);
- assertEquals(guestC.getVirtualMachineId(), "172837194");
- assertEquals(guestC.isJoinDomainEnabled(), Boolean.FALSE);
- assertEquals(guestC.useOrgSettings(), Boolean.FALSE);
- assertEquals(guestC.getDomainName(), null);
- assertEquals(guestC.getDomainUserName(), null);
- assertEquals(guestC.getDomainUserPassword(), null);
- assertEquals(guestC.isAdminPasswordEnabled(), Boolean.TRUE);
- assertEquals(guestC.isAdminPasswordAuto(), Boolean.TRUE);
- assertEquals(guestC.getAdminPassword(), "%3eD%gmF");
- assertEquals(guestC.isResetPasswordRequired(), Boolean.FALSE);
- assertEquals(
- guestC.getCustomizationScript(),
- "#!/bin/bash if [ \"$1\" = \"postcustomization\" ]; then echo \"post customization\" touch /root/.postcustomization sleep 30 #regenerate keys /bin/rm /etc/ssh/ssh_host_* /usr/sbin/dpkg-reconfigure openssh-server echo \"completed\" fi");
- assertEquals(guestC.getComputerName(), "Ubuntu1004");
- assertEquals(guestC.getEdit(), null);
-
- VCloudNetworkSection network = result.getNetworkSection();
- assertEquals(
- network.getHref(),
- URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921/networkSection/"));
- assertEquals(network.getType(), VCloudMediaType.NETWORKSECTION_XML);
- assertEquals(network.getInfo(), "The list of logical networks");
- assertEquals(network.getNetworks(), ImmutableSet.of(new Network("vAppNet-vApp Internal", null)));
-
- }
-
- public static VAppTemplate parseTemplate() {
- InputStream is = VAppTemplateHandlerTest.class.getResourceAsStream("/vAppTemplate.xml");
- Injector injector = Guice.createInjector(new SaxParserModule());
- Factory factory = injector.getInstance(ParseSax.Factory.class);
- VAppTemplate result = factory.create(injector.getInstance(VAppTemplateHandler.class)).parse(is);
- return result;
- }
-
- public void testCopyingTemplate() {
- InputStream is = getClass().getResourceAsStream("/vAppTemplate-copying.xml");
- Injector injector = Guice.createInjector(new SaxParserModule());
- Factory factory = injector.getInstance(ParseSax.Factory.class);
- DateService dateService = injector.getInstance(DateService.class);
-
- VAppTemplate result = factory.create(injector.getInstance(VAppTemplateHandler.class)).parse(is);
- assertEquals(result.getName(), "Ubuntu10.04_v2");
- assertEquals(result.getHref(), URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-699683881"));
- assertEquals(result.getType(), "application/vnd.vmware.vcloud.vAppTemplate+xml");
- assertEquals(result.getStatus(), Status.UNRESOLVED);
- assertEquals(result.getVDC(), new ReferenceTypeImpl(null, VCloudMediaType.VDC_XML, URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vdc/105186609")));
- assertEquals(result.getDescription(), null);
- assertEquals(result.getTasks(), ImmutableList.of(new TaskImpl(URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/task/q62gxhi32xgd9yrqvr"),
- "Copying Virtual Application Template Ubuntu10.04_v2(699683881)", TaskStatus.RUNNING, dateService
- .iso8601DateParse("2010-09-17T23:20:46.039-04:00"), dateService
- .iso8601DateParse("9999-12-31T23:59:59.999-05:00"), dateService
- .iso8601DateParse("2010-12-16T23:20:46.039-05:00"), new ReferenceTypeImpl("Ubuntu10.04_v2",
- "application/vnd.vmware.vcloud.vAppTemplate+xml",
- URI.create("https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-699683881")),
- null)));
- assertEquals(result.getVAppScopedLocalId(), null);
- assert result.isOvfDescriptorUploaded();
- assertEquals(result.getChildren(), ImmutableList.of());
- assertEquals(result.getNetworkSection(), null);
-
- }
-
- public void testVAppTemplateWithNewlinesAndNamespacedElements() {
- InputStream is = getClass().getResourceAsStream("/vAppTemplate1.0-vcd15_withNewlines.xml");
- Injector injector = Guice.createInjector(new SaxParserModule());
- Factory factory = injector.getInstance(ParseSax.Factory.class);
-
- factory.create(injector.getInstance(VAppTemplateHandler.class)).parse(is);
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VDCHandlerTest.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VDCHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VDCHandlerTest.java
deleted file mode 100644
index d5cc9da..0000000
--- a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VDCHandlerTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.xml;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.URI;
-
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.http.functions.ParseSax.Factory;
-import org.jclouds.http.functions.config.SaxParserModule;
-import org.jclouds.vcloud.VCloudMediaType;
-import org.jclouds.vcloud.domain.AllocationModel;
-import org.jclouds.vcloud.domain.Capacity;
-import org.jclouds.vcloud.domain.ReferenceType;
-import org.jclouds.vcloud.domain.VDC;
-import org.jclouds.vcloud.domain.VDCStatus;
-import org.jclouds.vcloud.domain.internal.ReferenceTypeImpl;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code VDCHandler}
- */
-@Test(groups = "unit")
-public class VDCHandlerTest {
- public void testVCloud1_0() {
- InputStream is = getClass().getResourceAsStream("/vdc-1.0.xml");
- Injector injector = Guice.createInjector(new SaxParserModule());
- Factory factory = injector.getInstance(ParseSax.Factory.class);
- VDC result = factory.create(injector.getInstance(VDCHandler.class)).parse(is);
- assertEquals(result.getName(), "Jclouds-Commit-compG1xstorA01");
- assertEquals(result.getHref(), URI.create("https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439"));
- assertEquals(result.getType(), "application/vnd.vmware.vcloud.vdc+xml");
- assertEquals(result.getStatus(), VDCStatus.READY);
- assertEquals(result.getOrg(), new ReferenceTypeImpl(null, VCloudMediaType.ORG_XML, URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/org/9566014")));
- assertEquals(result.getDescription(), null);
- assertEquals(result.getTasks(), ImmutableList.of());
- assertEquals(result.getAllocationModel(), AllocationModel.ALLOCATION_POOL);
- assertEquals(result.getStorageCapacity(), new Capacity("MB", 1024000, 1024000, 0, 0));
- assertEquals(result.getCpuCapacity(), new Capacity("MHz", 20000, 20000, 0, 0));
- assertEquals(result.getMemoryCapacity(), new Capacity("MB", 30720, 30720, 0, 0));
- assertEquals(result.getResourceEntities(), ImmutableMap.<String, ReferenceType> of());
- assertEquals(result.getAvailableNetworks(), ImmutableMap.of("isolation01", new ReferenceTypeImpl("isolation01",
- "application/vnd.vmware.vcloud.network+xml", URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/network/990419644")), "internet01",
- new ReferenceTypeImpl("internet01", "application/vnd.vmware.vcloud.network+xml", URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/network/758634723"))));
- assertEquals(result.getNicQuota(), 0);
- assertEquals(result.getNetworkQuota(), 100);
- assertEquals(result.getVmQuota(), 50);
- assert result.isEnabled();
- }
-
- public void testTerremark() {
- InputStream is = getClass().getResourceAsStream("/vdc.xml");
- Injector injector = Guice.createInjector(new SaxParserModule());
- Factory factory = injector.getInstance(ParseSax.Factory.class);
- VDC result = factory.create(injector.getInstance(VDCHandler.class)).parse(is);
- assertEquals(result.getName(), "Miami Environment 1");
- assertEquals(result.getHref(), URI.create("https://services.vcloudexpress.terremark.com/api/v0.8/vdc/32"));
- assertEquals(result.getDescription(), null);
- assertEquals(result.getStorageCapacity(), new Capacity("bytes * 10^9", 100, 0, 8, 0));
- assertEquals(result.getCpuCapacity(), new Capacity("hz * 10^6", 5000, 0, 0, 0));
- assertEquals(result.getMemoryCapacity(), new Capacity("bytes * 2^20", 10240, 0, 0, 0));
- assertEquals(result.getVmQuota(), 0);
- assertEquals(result.getResourceEntities(), ImmutableMap.<String, ReferenceType> of("adriantest",
- new ReferenceTypeImpl("adriantest", VCloudMediaType.VAPP_XML, URI
- .create("https://services.vcloudexpress.terremark.com/api/v0.8/vapp/15124")), "centos-53",
- new ReferenceTypeImpl("centos-53", VCloudMediaType.VAPP_XML, URI
- .create("https://services.vcloudexpress.terremark.com/api/v0.8/vapp/15120"))));
- assertEquals(result.getAvailableNetworks(), ImmutableMap.of("10.114.34.128/26", new ReferenceTypeImpl(
- "10.114.34.128/26", "application/vnd.vmware.vcloud.network+xml", URI
- .create("https://services.vcloudexpress.terremark.com/api/v0.8/network/1708"))));
- }
-
- public void testHostingDotCom() {
- InputStream is = getClass().getResourceAsStream("/vdc-hosting.xml");
- Injector injector = Guice.createInjector(new SaxParserModule());
- Factory factory = injector.getInstance(ParseSax.Factory.class);
- VDC result = factory.create(injector.getInstance(VDCHandler.class)).parse(is);
- assertEquals(result.getName(), "vDC Name");
- assertEquals(result.getHref(), URI.create("https://vcloud.safesecureweb.com/api/v0.8/vdc/188849"));
- assertEquals(result.getDescription(), "vDC Name");
- assertEquals(result.getStorageCapacity(), new Capacity("bytes * 10^9", 0, 0, 40960, 0));
- assertEquals(result.getCpuCapacity(), new Capacity("hz * 10^6", 0, 0, 2400, 0));
- assertEquals(result.getMemoryCapacity(), new Capacity("bytes * 10^9", 0, 0, 2, 0));
- assertEquals(result.getVmQuota(), 0);
- assertEquals(result.getResourceEntities(), new ImmutableMap.Builder<String, ReferenceType>().put(
- "Plesk (Linux) 64-bit Template",
- new ReferenceTypeImpl("Plesk (Linux) 64-bit Template", "application/vnd.vmware.vcloud.vAppTemplate+xml",
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/vAppTemplate/1"))).put(
-
- "Windows 2008 Datacenter 64 Bit Template",
- new ReferenceTypeImpl("Windows 2008 Datacenter 64 Bit Template",
- "application/vnd.vmware.vcloud.vAppTemplate+xml", URI
- .create("https://vcloud.safesecureweb.com/api/v0.8/vAppTemplate/2"))).put(
- "Cent OS 64 Bit Template",
- new ReferenceTypeImpl("Cent OS 64 Bit Template", "application/vnd.vmware.vcloud.vAppTemplate+xml", URI
- .create("https://vcloud.safesecureweb.com/api/v0.8/vAppTemplate/3"))).put(
- "cPanel (Linux) 64 Bit Template",
- new ReferenceTypeImpl("cPanel (Linux) 64 Bit Template",
- "application/vnd.vmware.vcloud.vAppTemplate+xml", URI
- .create("https://vcloud.safesecureweb.com/api/v0.8/vAppTemplate/4"))).put(
- "188849-1",
- new ReferenceTypeImpl("188849-1", "application/vnd.vmware.vcloud.vApp+xml", URI
- .create("https://vcloud.safesecureweb.com/api/v0.8/vApp/188849-1"))).put(
- "188849-2",
- new ReferenceTypeImpl("188849-2", "application/vnd.vmware.vcloud.vApp+xml", URI
- .create("https://vcloud.safesecureweb.com/api/v0.8/vApp/188849-2"))).build());
-
- assertEquals(result.getAvailableNetworks(), ImmutableMap.<String, ReferenceType> of());
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VmHandlerTest.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VmHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VmHandlerTest.java
deleted file mode 100644
index 342b04a..0000000
--- a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VmHandlerTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.xml;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.URI;
-
-import org.jclouds.cim.xml.ResourceAllocationSettingDataHandler;
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.http.functions.ParseSax.Factory;
-import org.jclouds.http.functions.config.SaxParserModule;
-import org.jclouds.vcloud.VCloudMediaType;
-import org.jclouds.vcloud.domain.Status;
-import org.jclouds.vcloud.domain.Vm;
-import org.jclouds.vcloud.domain.internal.ReferenceTypeImpl;
-import org.jclouds.vcloud.xml.ovf.VCloudOperatingSystemSectionHandlerTest;
-import org.jclouds.vcloud.xml.ovf.VCloudResourceAllocationSettingDataHandler;
-import org.jclouds.vcloud.xml.ovf.VCloudVirtualHardwareSectionHandlerTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code VmHandler}
- */
-@Test(groups = "unit")
-public class VmHandlerTest {
- public void testVCloud1_0() {
- InputStream is = getClass().getResourceAsStream("/vm-rhel-off-static.xml");
- Injector injector = Guice.createInjector(new SaxParserModule() {
-
- @Override
- protected void configure() {
- super.configure();
- bind(ResourceAllocationSettingDataHandler.class).to(VCloudResourceAllocationSettingDataHandler.class);
- }
- });
- Factory factory = injector.getInstance(ParseSax.Factory.class);
- Vm result = factory.create(injector.getInstance(VmHandler.class)).parse(is);
- checkVm(result);
- }
-
- static void checkVm(Vm result) {
- assertEquals(result.getName(), "RHEL5");
- assertEquals(result.getHref(), URI.create("https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248"));
- assertEquals(result.getType(), "application/vnd.vmware.vcloud.vm+xml");
- assertEquals(result.getStatus(), Status.OFF);
- assertEquals(result.getParent(), new ReferenceTypeImpl(null, VCloudMediaType.VAPP_XML, URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320")));
- assertEquals(result.getDescription(), null);
- assertEquals(result.getTasks(), ImmutableList.of());
- assertEquals(result.getVAppScopedLocalId(), "10_rhel_template");
- VCloudVirtualHardwareSectionHandlerTest.checkHardware(result.getVirtualHardwareSection());
- VCloudOperatingSystemSectionHandlerTest.checkOs(result.getOperatingSystemSection());
- NetworkConnectionSectionHandlerTest.checkNetworkConnectionSection(result.getNetworkConnectionSection());
- GuestCustomizationSectionHandlerTest.checkGuestCustomization(result.getGuestCustomizationSection());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemSectionHandlerTest.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemSectionHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemSectionHandlerTest.java
deleted file mode 100644
index 307b3f1..0000000
--- a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemSectionHandlerTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.xml.ovf;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.URI;
-import java.net.UnknownHostException;
-
-import org.jclouds.http.functions.BaseHandlerTest;
-import org.jclouds.vcloud.domain.internal.ReferenceTypeImpl;
-import org.jclouds.vcloud.domain.ovf.VCloudOperatingSystemSection;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code VCloudOperatingSystemSectionHandler}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire
-@Test(groups = "unit", testName = "VCloudOperatingSystemSectionHandlerTest")
-public class VCloudOperatingSystemSectionHandlerTest extends BaseHandlerTest {
-
- public void testDefault() throws UnknownHostException {
- InputStream is = getClass().getResourceAsStream("/os.xml");
-
- VCloudOperatingSystemSection result = factory.create(injector.getInstance(VCloudOperatingSystemHandler.class)).parse(is);
-
- checkOs(result);
-
- }
-
- @Test(enabled = false)
- public static void checkOs(VCloudOperatingSystemSection result) {
- assertEquals(result.getHref(), URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/operatingSystemSection/"));
- assertEquals(result.getDescription(), "Red Hat Enterprise Linux 5 (64-bit)");
- assertEquals(result.getEdit(), new ReferenceTypeImpl(null,
- "application/vnd.vmware.vcloud.operatingSystemSection+xml",
- URI.create("https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/operatingSystemSection/")));
- assertEquals(result.getId(), Integer.valueOf(80));
- assertEquals(result.getVmwOsType(), "rhel5_64Guest");
- assertEquals(result.getType(), "application/vnd.vmware.vcloud.operatingSystemSection+xml");
- assertEquals(result.getInfo(), "Specifies the operating system installed");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java
deleted file mode 100644
index 8e480de..0000000
--- a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.xml.ovf;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.URI;
-import java.net.UnknownHostException;
-
-import org.jclouds.cim.ResourceAllocationSettingData;
-import org.jclouds.cim.ResourceAllocationSettingData.ResourceType;
-import org.jclouds.cim.VirtualSystemSettingData;
-import org.jclouds.cim.xml.ResourceAllocationSettingDataHandler;
-import org.jclouds.http.functions.BaseHandlerTest;
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.http.functions.config.SaxParserModule;
-import org.jclouds.vcloud.domain.internal.ReferenceTypeImpl;
-import org.jclouds.vcloud.domain.ovf.EditableResourceAllocationSettingData;
-import org.jclouds.vcloud.domain.ovf.VCloudHardDisk;
-import org.jclouds.vcloud.domain.ovf.VCloudNetworkAdapter;
-import org.jclouds.vcloud.domain.ovf.VCloudVirtualHardwareSection;
-import org.jclouds.vcloud.xml.VCloudVirtualHardwareHandler;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.Iterables;
-import com.google.inject.Guice;
-
-/**
- * Tests behavior of {@code VCloudVirtualHardwareSectionHandler}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire
-@Test(groups = "unit", testName = "VCloudVirtualHardwareSectionHandlerTest")
-public class VCloudVirtualHardwareSectionHandlerTest extends BaseHandlerTest {
- @BeforeTest
- @Override
- protected void setUpInjector() {
- injector = Guice.createInjector(new SaxParserModule() {
- public void configure() {
- super.configure();
- bind(ResourceAllocationSettingDataHandler.class).to(VCloudResourceAllocationSettingDataHandler.class);
- }
- });
- factory = injector.getInstance(ParseSax.Factory.class);
- assert factory != null;
- }
-
- public void testDefault() throws UnknownHostException {
- InputStream is = getClass().getResourceAsStream("/virtualhardwaresection.xml");
-
- VCloudVirtualHardwareSection result = factory.create(injector.getInstance(VCloudVirtualHardwareHandler.class))
- .parse(is);
-
- checkHardware(result);
-
- }
-
- @Test(enabled = false)
- public static void checkHardware(VCloudVirtualHardwareSection result) {
- VirtualSystemSettingData system = VirtualSystemSettingData.builder().instanceID("0").elementName(
- "Virtual Hardware Family").virtualSystemIdentifier("RHEL5").virtualSystemType("vmx-07").build();
-
- assertEquals(result.getHref(), URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/"));
- assertEquals(result.getType(), "application/vnd.vmware.vcloud.virtualHardwareSection+xml");
- assertEquals(result.getSystem().toString(), system.toString());
- assertEquals(result.getInfo(), "Virtual hardware requirements");
-
- assertEquals(Iterables.get(result.getItems(), 0).toString(), VCloudNetworkAdapter.builder()
- .instanceID("1").elementName("Network adapter 0").description("PCNet32 ethernet adapter").resourceType(
- ResourceType.ETHERNET_ADAPTER).resourceSubType("PCNet32").automaticAllocation(true).connection(
- "internet01").address("00:50:56:01:01:f2").addressOnParent("0").ipAddress("174.47.101.164")
- .primaryNetworkConnection(true).ipAddressingMode("POOL").build().toString());
-
- assertEquals(Iterables.get(result.getItems(), 1).toString(), ResourceAllocationSettingData
- .builder().instanceID("2").elementName("SCSI Controller 0").description("SCSI Controller").resourceType(
- ResourceType.PARALLEL_SCSI_HBA).resourceSubType("lsilogic").address("0").build().toString());
-
- assertEquals(Iterables.get(result.getItems(), 2).toString(), VCloudHardDisk.builder().instanceID(
- "2000").elementName("Hard disk 1").description("Hard disk").resourceType(ResourceType.DISK_DRIVE)
- .addressOnParent("0").parent("2").capacity(30720).busType(6).busSubType("lsilogic").build().toString());
-
- assertEquals(Iterables.get(result.getItems(), 3).toString(), ResourceAllocationSettingData
- .builder().instanceID("3").elementName("IDE Controller 0").description("IDE Controller").resourceType(
- ResourceType.IDE_CONTROLLER).address("0").build().toString());
-
- assertEquals(Iterables.get(result.getItems(), 4).toString(), ResourceAllocationSettingData
- .builder().instanceID("3002").elementName("CD/DVD Drive 1").description("CD/DVD Drive").resourceType(
- ResourceType.CD_DRIVE).addressOnParent("0").automaticAllocation(false).parent("3").build()
- .toString());
-
- assertEquals(Iterables.get(result.getItems(), 5).toString(), ResourceAllocationSettingData
- .builder().instanceID("8000").elementName("Floppy Drive 1").description("Floppy Drive").resourceType(
- ResourceType.FLOPPY_DRIVE).addressOnParent("0").automaticAllocation(false).build().toString());
-
- assertEquals(
- Iterables.get(result.getItems(), 6).toString(),
- EditableResourceAllocationSettingData
- .builder()
- .instanceID("4")
- .elementName("1 virtual CPU(s)")
- .description("Number of Virtual CPUs")
- .resourceType(ResourceType.PROCESSOR)
- .virtualQuantity(1l)
- .allocationUnits("hertz * 10^6")
- .reservation(0l)
- .weight(0)
- .edit(
- new ReferenceTypeImpl(
- null,
- "application/vnd.vmware.vcloud.rasdItem+xml",
- URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/cpu")))
- .build().toString());
-
- assertEquals(
- Iterables.get(result.getItems(), 7).toString(),
- EditableResourceAllocationSettingData
- .builder()
- .instanceID("5")
- .elementName("384 MB of memory")
- .description("Memory Size")
- .resourceType(ResourceType.MEMORY)
- .virtualQuantity(384l)
- .allocationUnits("byte * 2^20")
- .reservation(0l)
- .weight(0)
- .edit(
- new ReferenceTypeImpl(
- null,
- "application/vnd.vmware.vcloud.rasdItem+xml",
- URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/memory")))
- .build().toString());
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/captureVApp-default.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/captureVApp-default.xml b/apis/vcloud/src/test/resources/captureVApp-default.xml
deleted file mode 100644
index 0570872..0000000
--- a/apis/vcloud/src/test/resources/captureVApp-default.xml
+++ /dev/null
@@ -1 +0,0 @@
-<CaptureVAppParams xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="my-template" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Source href="https://vcenterprise.bluelock.com/api/v1.0/vapp/4181" type="application/vnd.vmware.vcloud.vApp+xml"/></CaptureVAppParams>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/captureVApp.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/captureVApp.xml b/apis/vcloud/src/test/resources/captureVApp.xml
deleted file mode 100644
index 35e62d0..0000000
--- a/apis/vcloud/src/test/resources/captureVApp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<CaptureVAppParams xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="my-template" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Description>The description of the new vApp Template</Description><Source href="https://vcenterprise.bluelock.com/api/v1.0/vapp/201" type="application/vnd.vmware.vcloud.vApp+xml"/></CaptureVAppParams>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/catalog-blank.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/catalog-blank.xml b/apis/vcloud/src/test/resources/catalog-blank.xml
deleted file mode 100644
index 6bc4038..0000000
--- a/apis/vcloud/src/test/resources/catalog-blank.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Catalog xmlns="http://www.vmware.com/vcloud/v1" name="Jclouds-private" type="application/vnd.vmware.vcloud.catalog+xml" href="https://vcenterprise.bluelock.com/api/v1.0/catalog/921222081" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://vcenterprise.bluelock.com/api/v1.0/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" href="https://vcenterprise.bluelock.com/api/v1.0/org/9566014"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://vcenterprise.bluelock.com/api/v1.0/catalog/921222081/catalogItems"/>
- <CatalogItems/>
- <IsPublished>false</IsPublished>
-</Catalog>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/catalog-hosting.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/catalog-hosting.xml b/apis/vcloud/src/test/resources/catalog-hosting.xml
deleted file mode 100644
index be510a9..0000000
--- a/apis/vcloud/src/test/resources/catalog-hosting.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Catalog href="https://vcloud.safesecureweb.com/api/v0.8/catalog/1"
- name="HMSCatalog" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8/catalog.xsd"
- xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <Description>HMS Shared Catalog</Description>
-
- <Link rel="add"
- href="https://vcloud.safesecureweb.com/api/v0.8/catalog/1/catalogItems"
- type="application/vnd.vmware.vcloud.catalogItem+xml" />
-
- <CatalogItems>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml"
- href="https://vcloud.safesecureweb.com/api/v0.8/catalogItem/1"
- name="Plesk (Linux) 64-bit Template" />
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml"
- href="https://vcloud.safesecureweb.com/api/v0.8/catalogItem/2"
- name="Windows 2008 Datacenter 64 Bit Template" />
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml"
- href="https://vcloud.safesecureweb.com/api/v0.8/catalogItem/3"
- name="Cent OS 64 Bit Template" />
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml"
- href="https://vcloud.safesecureweb.com/api/v0.8/catalogItem/4"
- name="cPanel (Linux) 64 Bit Template" />
- </CatalogItems>
-</Catalog>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/catalog.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/catalog.xml b/apis/vcloud/src/test/resources/catalog.xml
deleted file mode 100644
index f2d5eaa..0000000
--- a/apis/vcloud/src/test/resources/catalog.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Catalog href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/32/catalog" type="application/vnd.vmware.vcloud.catalog+xml" name="Miami Environment 1" xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <CatalogItems>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/5" type="application/vnd.vmware.vcloud.catalogItem+xml" name="CentOS 5.3 (32-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/6" type="application/vnd.vmware.vcloud.catalogItem+xml" name="CentOS 5.3 (64-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/7" type="application/vnd.vmware.vcloud.catalogItem+xml" name="RHEL 5.3 (32-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/8" type="application/vnd.vmware.vcloud.catalogItem+xml" name="RHEL 5.3 (64-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/11" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Ubuntu JeOS 9.04 (32-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/12" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Ubuntu JeOS 9.04 (64-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/9" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Ubuntu Server 9.04 (32-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/10" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Ubuntu Server 9.04 (64-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/1" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows 2003 Enterprise R2 (32-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/2" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows 2003 Enterprise R2 (64-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/3" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows 2003 Standard R2 (32-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/4" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows 2003 Standard R2 (64-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/23" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows 2003 Standard R2 w.SQL 2008 Web (64-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/13" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows Server 2008 Enterprise (32-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/15" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows Server 2008 Enterprise (64-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/16" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows Server 2008 Enterprise R2 (64-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/17" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows Server 2008 Standard (32-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/18" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows Server 2008 Standard (64-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/19" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows Server 2008 Standard R2 (64-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/14" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows Server 2008 Standard w.SQL 2008 Web (64-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/20" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows Web Server 2008 (32-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/21" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows Web Server 2008 (64-bit)"/>
- <CatalogItem href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/22" type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows Web Server 2008 R2 (64-bit)"/>
- </CatalogItems>
-</Catalog>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/catalog1.0-vcd15.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/catalog1.0-vcd15.xml b/apis/vcloud/src/test/resources/catalog1.0-vcd15.xml
deleted file mode 100644
index 0208e59..0000000
--- a/apis/vcloud/src/test/resources/catalog1.0-vcd15.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Catalog xmlns="http://www.vmware.com/vcloud/v1" name="jclouds" type="application/vnd.vmware.vcloud.catalog+xml" href="https://zone.myvcloud.com/api/v1.0/catalog/3155f393-1e1d-4572-8c9c-d76f72ddb658" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 https://zone.myvcloud.com/api/v1.0/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" href="https://zone.myvcloud.com/api/v1.0/org/c076f90a-397a-49fa-89b8-b294c1599cd0"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://zone.myvcloud.com/api/v1.0/catalog/3155f393-1e1d-4572-8c9c-d76f72ddb658/catalogItems"/>
- <CatalogItems>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="UbuntuServer-x64-2GB" href="https://zone.myvcloud.com/api/v1.0/catalogItem/ceb369f7-1d07-4e32-9dbd-ebb5aa6ca55c"/>
- </CatalogItems>
- <IsPublished>false</IsPublished>
-</Catalog>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/catalogItem-carrenza-with-default-namespace.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/catalogItem-carrenza-with-default-namespace.xml b/apis/vcloud/src/test/resources/catalogItem-carrenza-with-default-namespace.xml
deleted file mode 100644
index 88fec20..0000000
--- a/apis/vcloud/src/test/resources/catalogItem-carrenza-with-default-namespace.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CatalogItem xmlns="http://www.vmware.com/vcloud/v1" name="ubuntu10.10x64" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://myvdc.carrenza.net/api/v1.0/catalogItem/ecd4d3a0-0d12-4195-a6d2-14cdf9f925a3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://myvdc.carrenza.net/api/v1.0/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.catalog+xml" href="https://myvdc.carrenza.net/api/v1.0/catalog/5d2c147a-d26d-487a-9a05-577ee175186b"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://myvdc.carrenza.net/api/v1.0/catalogItem/ecd4d3a0-0d12-4195-a6d2-14cdf9f925a3"/>
- <Link rel="remove" href="https://myvdc.carrenza.net/api/v1.0/catalogItem/ecd4d3a0-0d12-4195-a6d2-14cdf9f925a3"/>
- <Description> </Description>
- <Entity type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="ubuntu10.10x64" href="https://myvdc.carrenza.net/api/v1.0/vAppTemplate/vappTemplate-123766ea-2b55-482c-8adf-735ab1952834"/>
-</CatalogItem>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/catalogItem-carrenza-with-vcloud-namespace.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/catalogItem-carrenza-with-vcloud-namespace.xml b/apis/vcloud/src/test/resources/catalogItem-carrenza-with-vcloud-namespace.xml
deleted file mode 100644
index 917c143..0000000
--- a/apis/vcloud/src/test/resources/catalogItem-carrenza-with-vcloud-namespace.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vcloud:CatalogItem xmlns:vcloud="http://www.vmware.com/vcloud/v1" name="ubuntu10.10x64" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://myvdc.carrenza.net/api/v1.0/catalogItem/ecd4d3a0-0d12-4195-a6d2-14cdf9f925a3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://myvdc.carrenza.net/api/v1.0/schema/master.xsd">
- <vcloud:Link rel="up" type="application/vnd.vmware.vcloud.catalog+xml" href="https://myvdc.carrenza.net/api/v1.0/catalog/5d2c147a-d26d-487a-9a05-577ee175186b"/>
- <vcloud:Link rel="edit" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://myvdc.carrenza.net/api/v1.0/catalogItem/ecd4d3a0-0d12-4195-a6d2-14cdf9f925a3"/>
- <vcloud:Link rel="remove" href="https://myvdc.carrenza.net/api/v1.0/catalogItem/ecd4d3a0-0d12-4195-a6d2-14cdf9f925a3"/>
- <vcloud:Description> </vcloud:Description>
- <vcloud:Entity type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="ubuntu10.10x64" href="https://myvdc.carrenza.net/api/v1.0/vAppTemplate/vappTemplate-123766ea-2b55-482c-8adf-735ab1952834"/>
-</vcloud:CatalogItem>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/catalogItem-hosting.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/catalogItem-hosting.xml b/apis/vcloud/src/test/resources/catalogItem-hosting.xml
deleted file mode 100644
index 6f88d04..0000000
--- a/apis/vcloud/src/test/resources/catalogItem-hosting.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CatalogItem
- href="https://vcloud.safesecureweb.com/api/v0.8/catalogItem/2"
- name="Windows 2008 Datacenter 64 Bit"
- xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 catalogItem.xsd"
- xmlns="http://www.vmware.com/vcloud/v0.8"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <Description>Windows 2008 Datacenter 64 Bit</Description>
- <Entity href="https://vcloud.safesecureweb.com/api/v0.8/vAppTemplate/2"
- type="application/vnd.vmware.vcloud.vAppTemplate+xml"
- name="Windows 2008 Datacenter 64 Bit" />
- <Property key="Foo">Bar</Property>
- <Property key="Hello">World</Property>
-</CatalogItem>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/catalogItem-terremark.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/catalogItem-terremark.xml b/apis/vcloud/src/test/resources/catalogItem-terremark.xml
deleted file mode 100644
index feb8b82..0000000
--- a/apis/vcloud/src/test/resources/catalogItem-terremark.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<CatalogItem
- href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/22"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows Web Server 2008 R2 (64-bit)"
- xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <Link rel="down"
- href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/22/options/compute"
- type="application/xml" name="Compute Options" />
- <Link rel="down"
- href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/22/options/customization"
- type="application/xml" name="Customization Options" />
- <Entity
- href="https://services.vcloudexpress.terremark.com/api/v0.8/vAppTemplate/22"
- type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows Web Server 2008 R2 (64-bit)" />
- <Property key="LicensingCost">0</Property>
-</CatalogItem>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/catalogItem1.0-vcd15.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/catalogItem1.0-vcd15.xml b/apis/vcloud/src/test/resources/catalogItem1.0-vcd15.xml
deleted file mode 100644
index b344071..0000000
--- a/apis/vcloud/src/test/resources/catalogItem1.0-vcd15.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CatalogItem xmlns="http://www.vmware.com/vcloud/v1" name="UbuntuServer-x64-2GB" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://zone.myvcloud.com/api/v1.0/catalogItem/ceb369f7-1d07-4e32-9dbd-ebb5aa6ca55c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 https://zone.myvcloud.com/api/v1.0/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.catalog+xml" href="https://zone.myvcloud.com/api/v1.0/catalog/3155f393-1e1d-4572-8c9c-d76f72ddb658"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://zone.myvcloud.com/api/v1.0/catalogItem/ceb369f7-1d07-4e32-9dbd-ebb5aa6ca55c"/>
- <Link rel="remove" href="https://zone.myvcloud.com/api/v1.0/catalogItem/ceb369f7-1d07-4e32-9dbd-ebb5aa6ca55c"/>
- <Description> </Description>
- <Entity type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="UbuntuServer-x64-2GB" href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728"/>
-</CatalogItem>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/copyVApp-default.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/copyVApp-default.xml b/apis/vcloud/src/test/resources/copyVApp-default.xml
deleted file mode 100644
index 0e8ba8d..0000000
--- a/apis/vcloud/src/test/resources/copyVApp-default.xml
+++ /dev/null
@@ -1 +0,0 @@
-<CloneVAppParams xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" deploy="false" name="my-vapp" powerOn="false" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Source href="https://vcenterprise.bluelock.com/api/v1.0/vapp/4181" type="application/vnd.vmware.vcloud.vApp+xml"/></CloneVAppParams>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/copyVApp.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/copyVApp.xml b/apis/vcloud/src/test/resources/copyVApp.xml
deleted file mode 100644
index b6cd733..0000000
--- a/apis/vcloud/src/test/resources/copyVApp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<CloneVAppParams xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" deploy="true" name="new-linux-server" powerOn="true" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Description>The description of the new vApp</Description><Source href="https://vcenterprise.bluelock.com/api/v1.0/vapp/201" type="application/vnd.vmware.vcloud.vApp+xml"/></CloneVAppParams>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/copyVAppTemplate-default.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/copyVAppTemplate-default.xml b/apis/vcloud/src/test/resources/copyVAppTemplate-default.xml
deleted file mode 100644
index 00b11e7..0000000
--- a/apis/vcloud/src/test/resources/copyVAppTemplate-default.xml
+++ /dev/null
@@ -1 +0,0 @@
-<CloneVAppTemplateParams xmlns="http://vcloud.safesecureweb.com/ns/vcloud.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="my-vapptemplate" xsi:schemaLocation="http://vcloud.safesecureweb.com/ns/vcloud.xsd http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Source href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/4181" type="application/vnd.vmware.vcloud.vAppTemplate+xml"/></CloneVAppTemplateParams>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/copyVAppTemplate.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/copyVAppTemplate.xml b/apis/vcloud/src/test/resources/copyVAppTemplate.xml
deleted file mode 100644
index e612b98..0000000
--- a/apis/vcloud/src/test/resources/copyVAppTemplate.xml
+++ /dev/null
@@ -1 +0,0 @@
-<CloneVAppTemplateParams xmlns="http://vcloud.safesecureweb.com/ns/vcloud.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="new-linux-server" xsi:schemaLocation="http://vcloud.safesecureweb.com/ns/vcloud.xsd http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Description>The description of the new vAppTemplate</Description><Source href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/201" type="application/vnd.vmware.vcloud.vAppTemplate+xml"/></CloneVAppTemplateParams>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/cpuItem.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/cpuItem.xml b/apis/vcloud/src/test/resources/cpuItem.xml
deleted file mode 100644
index d5e437b..0000000
--- a/apis/vcloud/src/test/resources/cpuItem.xml
+++ /dev/null
@@ -1 +0,0 @@
-<Item xmlns="http://www.vmware.com/vcloud/v1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"><rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits><rasd:Description>Number of Virtual CPUs</rasd:Description><rasd:ElementName>2 virtual CPU(s)</rasd:ElementName><rasd:InstanceID>4</rasd:InstanceID><rasd:ResourceType>3</rasd:ResourceType><rasd:VirtualQuantity>2</rasd:VirtualQuantity><rasd:Weight>0</rasd:Weight></Item>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/guestCustomization.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/guestCustomization.xml b/apis/vcloud/src/test/resources/guestCustomization.xml
deleted file mode 100644
index 644720f..0000000
--- a/apis/vcloud/src/test/resources/guestCustomization.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GuestCustomizationSection
- type="application/vnd.vmware.vcloud.guestCustomizationSection+xml"
- href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/guestCustomizationSection/"
- ovf:required="false">
- <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
- <Enabled>true</Enabled>
- <ChangeSid>false</ChangeSid>
- <VirtualMachineId>2087535248</VirtualMachineId>
- <JoinDomainEnabled>false</JoinDomainEnabled>
- <UseOrgSettings>false</UseOrgSettings>
- <AdminPasswordEnabled>true</AdminPasswordEnabled>
- <AdminPasswordAuto>true</AdminPasswordAuto>
- <ResetPasswordRequired>false</ResetPasswordRequired>
- <CustomizationScript>cat > /root/foo.txt<<EOF
-I '"love"' {asc|!}*&
-EOF
-</CustomizationScript>
- <ComputerName>RHEL5</ComputerName>
- <Link rel="edit"
- type="application/vnd.vmware.vcloud.guestCustomizationSection+xml"
- href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/guestCustomizationSection/" />
-</GuestCustomizationSection>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/guestCustomizationSection.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/guestCustomizationSection.xml b/apis/vcloud/src/test/resources/guestCustomizationSection.xml
deleted file mode 100644
index 2fadb53..0000000
--- a/apis/vcloud/src/test/resources/guestCustomizationSection.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<GuestCustomizationSection xmlns="http://www.vmware.com/vcloud/v1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" href="http://vcloud.example.com/api/v1.0/vApp/vm-12/guestCustomizationSection" ovf:required="false" type="application/vnd.vmware.vcloud.guestCustomizationSection+xml"><ovf:Info>Specifies Guest OS Customization Settings</ovf:Info><CustomizationScript>cat > /tmp/foo.txt<<EOF
-I love candy
-EOF</CustomizationScript></GuestCustomizationSection>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/instantiatedvapp.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/instantiatedvapp.xml b/apis/vcloud/src/test/resources/instantiatedvapp.xml
deleted file mode 100644
index 9d98c2d..0000000
--- a/apis/vcloud/src/test/resources/instantiatedvapp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VApp xmlns="http://www.vmware.com/vcloud/v1" deployed="false" status="0" name="vcds-a47" type="application/vnd.vmware.vcloud.vApp+xml" href="https://zone01.bluelock.com/api/v1.0/vApp/vapp-dba20113-1a4a-4ec9-a5ad-52dc69ee0825" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://zone01.bluelock.com/api/v1.0/schema/master.xsd">
- <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://zone01.bluelock.com/api/v1.0/vApp/vapp-dba20113-1a4a-4ec9-a5ad-52dc69ee0825/controlAccess/"/>
- <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://zone01.bluelock.com/api/v1.0/vdc/9db4ee77-33e7-4b83-96be-eee9925eaa9b"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" href="https://zone01.bluelock.com/api/v1.0/vApp/vapp-dba20113-1a4a-4ec9-a5ad-52dc69ee0825/owner"/>
- <Description>OS-Ubuntu10.04_x64</Description>
- <Tasks>
- <Task status="running" startTime="2012-07-11T20:37:49.521-04:00" operation="Creating Virtual Application vcds-a47(dba20113-1a4a-4ec9-a5ad-52dc69ee0825)" expiryTime="2012-08-25T20:37:49.521-04:00" type="application/vnd.vmware.vcloud.task+xml" href="https://zone01.bluelock.com/api/v1.0/task/fee48ffc-8ba2-452e-a57f-ada0cd2eda31">
- <Link rel="task:cancel" href="https://zone01.bluelock.com/api/v1.0/task/fee48ffc-8ba2-452e-a57f-ada0cd2eda31/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.vApp+xml" name="vcds-a47" href="https://zone01.bluelock.com/api/v1.0/vApp/vapp-dba20113-1a4a-4ec9-a5ad-52dc69ee0825"/>
- </Task>
- </Tasks>
-</VApp>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/instantiationparams-description.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/instantiationparams-description.xml b/apis/vcloud/src/test/resources/instantiationparams-description.xml
deleted file mode 100644
index 6728290..0000000
--- a/apis/vcloud/src/test/resources/instantiationparams-description.xml
+++ /dev/null
@@ -1 +0,0 @@
-<InstantiateVAppTemplateParams xmlns="http://www.vmware.com/vcloud/v1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" deploy="true" name="my-vapp" powerOn="true"><Description>my foo</Description><InstantiationParams><NetworkConfigSection><ovf:Info>Configuration parameters for logical networks</ovf:Info><NetworkConfig networkName="vAppNet-vApp Internal"><Configuration><ParentNetwork href="https://vcenterprise.bluelock.com/api/v1.0/network/1990"/><FenceMode>bridged</FenceMode></Configuration></NetworkConfig></NetworkConfigSection></InstantiationParams><Source href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/3"/><AllEULAsAccepted>true</AllEULAsAccepted></InstantiateVAppTemplateParams>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/instantiationparams-network.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/instantiationparams-network.xml b/apis/vcloud/src/test/resources/instantiationparams-network.xml
deleted file mode 100644
index e3bcb58..0000000
--- a/apis/vcloud/src/test/resources/instantiationparams-network.xml
+++ /dev/null
@@ -1 +0,0 @@
-<InstantiateVAppTemplateParams xmlns="http://www.vmware.com/vcloud/v1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" deploy="true" name="my-vapp" powerOn="true"><InstantiationParams><NetworkConfigSection><ovf:Info>Configuration parameters for logical networks</ovf:Info><NetworkConfig networkName="aloha"><Configuration><ParentNetwork href="https://vcenterprise.bluelock.com/api/v1.0/network/1991"/><FenceMode>natRouted</FenceMode></Configuration></NetworkConfig></NetworkConfigSection></InstantiationParams><Source href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/3"/><AllEULAsAccepted>true</AllEULAsAccepted></InstantiateVAppTemplateParams>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/instantiationparams.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/instantiationparams.xml b/apis/vcloud/src/test/resources/instantiationparams.xml
deleted file mode 100644
index 9df9961..0000000
--- a/apis/vcloud/src/test/resources/instantiationparams.xml
+++ /dev/null
@@ -1 +0,0 @@
-<InstantiateVAppTemplateParams xmlns="http://www.vmware.com/vcloud/v1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" deploy="true" name="my-vapp" powerOn="true"><InstantiationParams><NetworkConfigSection><ovf:Info>Configuration parameters for logical networks</ovf:Info><NetworkConfig networkName="vAppNet-vApp Internal"><Configuration><ParentNetwork href="https://vcenterprise.bluelock.com/api/v1.0/network/1990"/><FenceMode>bridged</FenceMode></Configuration></NetworkConfig></NetworkConfigSection></InstantiationParams><Source href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/3"/><AllEULAsAccepted>true</AllEULAsAccepted></InstantiateVAppTemplateParams>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/log4j.xml b/apis/vcloud/src/test/resources/log4j.xml
deleted file mode 100644
index 63810d3..0000000
--- a/apis/vcloud/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
- <!--
- For more configuration infromation and examples see the Apache
- Log4j website: http://logging.apache.org/log4j/
- -->
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
- debug="false">
-
- <!-- A time/date based rolling appender -->
- <appender name="WIREFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-wire.log" />
- <param name="Append" value="true" />
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
- <param name="Threshold" value="TRACE" />
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
- <!--
- The full pattern: Date MS Priority [Category]
- (Thread:NDC) Message\n <param name="ConversionPattern"
- value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds.log" />
- <param name="Append" value="true" />
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
- <param name="Threshold" value="TRACE" />
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
- <!--
- The full pattern: Date MS Priority [Category]
- (Thread:NDC) Message\n <param name="ConversionPattern"
- value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- A time/date based rolling appender -->
- <appender name="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-compute.log" />
- <param name="Append" value="true" />
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
- <param name="Threshold" value="TRACE" />
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
- <!--
- The full pattern: Date MS Priority [Category]
- (Thread:NDC) Message\n <param name="ConversionPattern"
- value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- A time/date based rolling appender -->
- <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-ssh.log" />
- <param name="Append" value="true" />
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
- <param name="Threshold" value="TRACE" />
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
- <!--
- The full pattern: Date MS Priority [Category]
- (Thread:NDC) Message\n <param name="ConversionPattern"
- value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="COMPUTEFILE" />
- </appender>
-
- <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="SSHFILE" />
- </appender>
-
- <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="FILE" />
- </appender>
-
- <appender name="ASYNCWIRE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="WIREFILE" />
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jclouds">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNC" />
- </category>
-
- <category name="jclouds.headers">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCWIRE" />
- </category>
-
- <category name="jclouds.ssh">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCSSH" />
- </category>
-
- <category name="jclouds.wire">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCWIRE" />
- </category>
-
- <category name="jclouds.compute">
- <priority value="TRACE" />
- <appender-ref ref="ASYNCCOMPUTE" />
- </category>
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <priority value="WARN" />
- </root>
-
-</log4j:configuration>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/memoryItem.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/memoryItem.xml b/apis/vcloud/src/test/resources/memoryItem.xml
deleted file mode 100644
index df35b83..0000000
--- a/apis/vcloud/src/test/resources/memoryItem.xml
+++ /dev/null
@@ -1 +0,0 @@
-<Item xmlns="http://www.vmware.com/vcloud/v1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"><rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits><rasd:Description>Memory Size</rasd:Description><rasd:ElementName>512 MB of memory</rasd:ElementName><rasd:InstanceID>5</rasd:InstanceID><rasd:Reservation>0</rasd:Reservation><rasd:ResourceType>4</rasd:ResourceType><rasd:VirtualQuantity>512</rasd:VirtualQuantity><rasd:Weight>0</rasd:Weight></Item>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/moveVApp.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/moveVApp.xml b/apis/vcloud/src/test/resources/moveVApp.xml
deleted file mode 100644
index 919d136..0000000
--- a/apis/vcloud/src/test/resources/moveVApp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<CloneVAppParams xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" deploy="true" name="new-linux-server" powerOn="true" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Description>The description of the new vApp</Description><Source href="https://vcenterprise.bluelock.com/api/v1.0/vapp/201" type="application/vnd.vmware.vcloud.vApp+xml"/><IsSourceDelete>true</IsSourceDelete></CloneVAppParams>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/moveVAppTemplate.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/moveVAppTemplate.xml b/apis/vcloud/src/test/resources/moveVAppTemplate.xml
deleted file mode 100644
index 2f72f2b..0000000
--- a/apis/vcloud/src/test/resources/moveVAppTemplate.xml
+++ /dev/null
@@ -1 +0,0 @@
-<CloneVAppTemplateParams xmlns="http://vcloud.safesecureweb.com/ns/vcloud.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="new-linux-server" xsi:schemaLocation="http://vcloud.safesecureweb.com/ns/vcloud.xsd http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Description>The description of the new vAppTemplate</Description><Source href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/201" type="application/vnd.vmware.vcloud.vAppTemplate+xml"/><IsSourceDelete>true</IsSourceDelete></CloneVAppTemplateParams>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/networkconnection.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/networkconnection.xml b/apis/vcloud/src/test/resources/networkconnection.xml
deleted file mode 100644
index 5400fc7..0000000
--- a/apis/vcloud/src/test/resources/networkconnection.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<NetworkConnection network="internet01">
- <NetworkConnectionIndex>0</NetworkConnectionIndex>
- <IpAddress>174.47.101.164</IpAddress>
- <IsConnected>true</IsConnected>
- <MACAddress>00:50:56:01:01:f2</MACAddress>
- <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
-</NetworkConnection>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/networkconnectionsection.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/networkconnectionsection.xml b/apis/vcloud/src/test/resources/networkconnectionsection.xml
deleted file mode 100644
index 9550ef6..0000000
--- a/apis/vcloud/src/test/resources/networkconnectionsection.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<NetworkConnectionSection
- type="application/vnd.vmware.vcloud.networkConnectionSection+xml"
- href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/networkConnectionSection/"
- ovf:required="false">
- <ovf:Info>Specifies the available VM network connections</ovf:Info>
- <PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
- <NetworkConnection network="internet01">
- <NetworkConnectionIndex>0</NetworkConnectionIndex>
- <IpAddress>174.47.101.164</IpAddress>
- <IsConnected>true</IsConnected>
- <MACAddress>00:50:56:01:01:f2</MACAddress>
- <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
- </NetworkConnection>
- <Link rel="edit"
- type="application/vnd.vmware.vcloud.networkConnectionSection+xml"
- href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/networkConnectionSection/" />
-</NetworkConnectionSection>
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/org-1.0.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/org-1.0.xml b/apis/vcloud/src/test/resources/org-1.0.xml
deleted file mode 100644
index af9803f..0000000
--- a/apis/vcloud/src/test/resources/org-1.0.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Org name="ExampleOrg" type="application/vnd.vmware.vcloud.org+xml"
- href="http://vcloud.example.com/api/v1.0/org/5" >
- <Link type="application/vnd.vmware.vcloud.catalog+xml" rel="down"
- href="http://vcloud.example.com/api/v1.0/catalog/32" name="Main Catalog" />
- <Link type="application/vnd.vmware.vcloud.controlAccess+xml" rel="down"
- href="http://vcloud.example.com/api/v1.0/catalog/32/controlAccess" />
- <Link type="application/vnd.vmware.vcloud.controlAccess+xml" rel="controlAccess"
- href="http://vcloud.example.com/api/v1.0/catalog/32/action/controlAccess" />
- <Link type="application/vnd.vmware.vcloud.catalog+xml" rel="down"
- href="http://vcloud.example.com/api/v1.0/catalog/37" name="Shared Catalog" />
- <Link type="application/vnd.vmware.vcloud.controlAccess+xml" rel="down"
- href="http://vcloud.example.com/api/v1.0/catalog/37/controlAccess" />
- <Link type="application/vnd.vmware.vcloud.controlAccess+xml" rel="controlAccess"
- href="http://vcloud.example.com/api/v1.0/catalog/37/action/controlAccess" />
- <Link type="application/vnd.vmware.vcloud.vdc+xml" rel="down"
- href="http://vcloud.example.com/api/v1.0/vdc/5" name="ExampleVdc01" />
- <Link type="application/vnd.vmware.vcloud.tasksList+xml" rel="down"
- href="http://vcloud.example.com/api/v1.0/tasksList/5" />
- <Link type="application/vnd.vmware.vcloud.network+xml" rel="down"
- href="http://vcloud.example.com/api/v1.0/network/14" name="TestNetwork" />
- <Link type="application/vnd.vmware.vcloud.network+xml" rel="down"
- href="http://vcloud.example.com/api/v1.0/network/54" name="ProductionNetwork" />
- <Description>Example Corp's Primary Organization.</Description>
-</Org>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/org-hosting.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/org-hosting.xml b/apis/vcloud/src/test/resources/org-hosting.xml
deleted file mode 100644
index 3bd9842..0000000
--- a/apis/vcloud/src/test/resources/org-hosting.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Org href="https://vcloud.safesecureweb.com/api/v0.8/org/188849"
- name="Customer 188849" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8/organization.xsd"
- xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <Link rel="down" href="https://vcloud.safesecureweb.com/api/v0.8/catalog/1"
- type="application/vnd.vmware.vcloud.catalog+xml" name="HMS Shared Catalog" />
- <Link rel="down"
- href="https://vcloud.safesecureweb.com/api/v0.8/vdc/188849"
- type="application/vnd.vmware.vcloud.vdc+xml" name="188849 Virtual DataCenter" />
- <Link rel="down"
- href="https://vcloud.safesecureweb.com/api/v0.8/tasksList/188849"
- type="application/vnd.vmware.vcloud.tasksList+xml" name="188849 Task List" />
-</Org>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/org-savvis.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/org-savvis.xml b/apis/vcloud/src/test/resources/org-savvis.xml
deleted file mode 100644
index c2517c7..0000000
--- a/apis/vcloud/src/test/resources/org-savvis.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vApp:Org xmlns:vApp="http://www.vmware.com/vcloud/v0.8"
- 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:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
- name="607968.0">
- <vApp:Link
- href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/607968.0/vdc/2826"
- name="GravDataCenter1(Saved)" rel="down"
- type="application/vnd.vmware.vcloud.vdc+xml" />
- <vApp:Description>Gravitant Inc</vApp:Description>
-</vApp:Org>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/org.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/org.xml b/apis/vcloud/src/test/resources/org.xml
deleted file mode 100644
index 1728721..0000000
--- a/apis/vcloud/src/test/resources/org.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<Org href="https://services.vcloudexpress.terremark.com/api/v0.8/org/48" name="adrian@jclouds.org" xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <Link rel="down" href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/32" type="application/vnd.vmware.vcloud.vdc+xml" name="Miami Environment 1"/>
- <Link rel="down" href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/32/catalog" type="application/vnd.vmware.vcloud.catalog+xml" name="Miami Environment 1 Catalog"/>
- <Link rel="down" href="https://services.vcloudexpress.terremark.com/api/v0.8/tasksList/32" type="application/vnd.vmware.vcloud.tasksList+xml" name="Miami Environment 1 Tasks List"/>
-</Org>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/org1.0-vcd15.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/org1.0-vcd15.xml b/apis/vcloud/src/test/resources/org1.0-vcd15.xml
deleted file mode 100644
index d0ca5b7..0000000
--- a/apis/vcloud/src/test/resources/org1.0-vcd15.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Org xmlns="http://www.vmware.com/vcloud/v1" name="jclouds" type="application/vnd.vmware.vcloud.org+xml" href="https://zone.myvcloud.com/api/v1.0/org/c076f90a-397a-49fa-89b8-b294c1599cd0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 https://zone.myvcloud.com/api/v1.0/schema/master.xsd">
- <Link rel="down" type="application/vnd.vmware.vcloud.vdc+xml" name="orgVDC-jclouds-Tier1-PAYG" href="https://zone.myvcloud.com/api/v1.0/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.tasksList+xml" href="https://zone.myvcloud.com/api/v1.0/tasksList/c076f90a-397a-49fa-89b8-b294c1599cd0"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.catalog+xml" name="jclouds" href="https://zone.myvcloud.com/api/v1.0/catalog/3155f393-1e1d-4572-8c9c-d76f72ddb658"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://zone.myvcloud.com/api/v1.0/org/c076f90a-397a-49fa-89b8-b294c1599cd0/catalog/3155f393-1e1d-4572-8c9c-d76f72ddb658/controlAccess/"/>
- <Link rel="controlAccess" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://zone.myvcloud.com/api/v1.0/org/c076f90a-397a-49fa-89b8-b294c1599cd0/catalog/3155f393-1e1d-4572-8c9c-d76f72ddb658/action/controlAccess"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.network+xml" name="orgNet-jclouds-External" href="https://zone.myvcloud.com/api/v1.0/network/b466c0c5-8a5c-4335-b703-a2e2e6b5f3e1"/>
- <Description>Customer jclouds</Description>
- <FullName>jclouds</FullName>
-</Org>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/orgList1.0-vcd15.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/orgList1.0-vcd15.xml b/apis/vcloud/src/test/resources/orgList1.0-vcd15.xml
deleted file mode 100644
index 40f3cbe..0000000
--- a/apis/vcloud/src/test/resources/orgList1.0-vcd15.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OrgList xmlns="http://www.vmware.com/vcloud/v1" type="application/vnd.vmware.vcloud.orgList+xml" href="https://zone.myvcloud.com/api/v1.0/org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 https://zone.myvcloud.com/api/v1.0/schema/master.xsd">
- <Org type="application/vnd.vmware.vcloud.org+xml" name="jclouds" href="https://zone.myvcloud.com/api/v1.0/org/c076f90a-397a-49fa-89b8-b294c1599cd0"/>
-</OrgList>
\ No newline at end of file