Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 112: changes for terremark upgrade 

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2619 3d8758e0-26b5-11de-8745-db77d3ebf521
This commit is contained in:
adrian.f.cole 2010-01-08 23:26:32 +00:00
parent 4cf75310c5
commit 947d00ac5e
10 changed files with 61 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/binders/BindVAppConfigurationToXmlPayload.java
View File

@ -100,7 +100,7 @@ public class BindVAppConfigurationToXmlPayload implements MapBinder {
XMLBuilder rootBuilder = buildRoot(vApp, name);
XMLBuilder sectionBuilder = rootBuilder.e("Section").a("xsi:type",
"q2:VirtualHardwareSection_Type").a("xmlns",
"VirtualHardwareSection_Type").a("xmlns",
"http://schemas.dmtf.org/ovf/envelope/1").a("xmlns:q2",
"http://www.vmware.com/vcloud/v1");
sectionBuilder.e("Info").t("Virtual Hardware");
@ -148,7 +148,7 @@ public class BindVAppConfigurationToXmlPayload implements MapBinder {
private XMLBuilder addResourceWithQuantity(XMLBuilder sectionBuilder,
ResourceAllocation resource, long quantity) {
XMLBuilder itemBuilder = sectionBuilder.e("q2:Item");
XMLBuilder itemBuilder = sectionBuilder.e("Item");
addCommonElements(itemBuilder, resource, quantity);
return itemBuilder;
}
@ -161,7 +161,7 @@ public class BindVAppConfigurationToXmlPayload implements MapBinder {
}
private XMLBuilder addDiskWithQuantity(XMLBuilder sectionBuilder, ResourceAllocation disk) {
XMLBuilder itemBuilder = sectionBuilder.e("q2:Item");
XMLBuilder itemBuilder = sectionBuilder.e("Item");
itemBuilder.e("AddressOnParent").a("xmlns", RESOURCE_ALLOCATION_NS).t(
disk.getAddressOnParent() + "");
itemBuilder.e("HostResource").a("xmlns", RESOURCE_ALLOCATION_NS).t(disk.getHostResource());

2
vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandler.java
View File

@ -103,7 +103,7 @@ public class ResourceAllocationHandler extends ParseSax.HandlerWithResult<Resour
virtualQuantity = Long.parseLong(quantity);
} else if (qName.equals("VirtualQuantityUnits")) {
virtualQuantityUnits = currentText.toString().trim();
} else if (qName.equals("q2:Item")) {
} else if (qName.equals("Item")) {
item = new ResourceAllocation(instanceID, elementName, description, resourceType,
resourceSubType, hostResource, address, addressOnParent, parent, null, virtualQuantity,
allocationUnits != null ? allocationUnits : virtualQuantityUnits);

4
vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandler.java
View File

@ -113,10 +113,10 @@ public class TerremarkVAppHandler extends ParseSax.HandlerWithResult<TerremarkVA
operatingSystemDescription = currentText.toString().trim();
} else if (qName.equals("q1:IpAddress")) {
networkToAddresses.put(networkName, parseInetAddress(currentText.toString().trim()));
} else if (qName.equals("q2:System")) {
} else if (qName.equals("System")) {
systemHandler.endElement(uri, localName, qName);
system = systemHandler.getResult();
} else if (qName.equals("q2:Item")) {
} else if (qName.equals("Item")) {
allocationHandler.endElement(uri, localName, qName);
allocations.add(allocationHandler.getResult());
} else if (!skip) {

2
vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandler.java
View File

@ -128,7 +128,7 @@ public class VirtualSystemHandler extends
this.virtualSystemIdentifier = currentText.toString().trim();
} else if (qName.equals("VirtualSystemType")) {
this.virtualSystemType = currentText.toString().trim();
} else if (qName.equals("q2:System")) {
} else if (qName.equals("System")) {
this.system = new org.jclouds.vcloud.terremark.domain.TerremarkVirtualSystem(
automaticRecoveryAction, automaticShutdownAction, automaticStartupAction,
automaticStartupActionDelay, automaticStartupActionSequenceNumber, caption,

21
vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandlerTest.java
View File

@ -101,24 +101,23 @@ public class TerremarkVAppHandlerTest extends BaseHandlerTest {
TerremarkVApp result = (TerremarkVApp) factory.create(
injector.getInstance(TerremarkVAppHandler.class)).parse(is);
assertEquals(result.getId(), 13850 + "");
assertEquals(result.getId(), 16161 + "");
assertEquals(result.getName(), "adriantest1");
assertEquals(result.getStatus(), VAppStatus.OFF);
assertEquals(result.getName(), "centos-53");
assertEquals(result.getStatus(), VAppStatus.ON);
assertEquals(result.getSize().longValue(), 4194304l);
assertEquals(result.getOperatingSystemDescription(), "Ubuntu Linux (32-bit)");
assertEquals(result.getSize().longValue(), 10485760);
assertEquals(result.getOperatingSystemDescription(), "Red Hat Enterprise Linux 5 (64-bit)");
assertEquals(result.getLocation(), URI
.create("https://services.vcloudexpress.terremark.com/api/v0.8/vapp/13850"));
.create("https://services.vcloudexpress.terremark.com/api/v0.8/vapp/16161"));
assertEquals(result.getVDC(), new NamedResourceImpl("32", null, VCloudMediaType.VDC_XML, URI
.create("https://services.vcloudexpress.terremark.com/api/v0.8/vdc/32")));
assertEquals(result.getSystem(), new TerremarkVirtualSystem(null, null, null, null, null,
null, null, null, null, null, null, "Virtual Hardware Family", 0, null, null, null,
null, null, "adriantest1", "vmx-07"));
assertEquals(result.getNetworkToAddresses().get("Internal"), ImmutableList.of(InetAddress
.getByName("10.114.34.132")));
null, null, "centos-53", "vmx-07"));
assertEquals(result.getNetworkToAddresses().get("Internal"), ImmutableList.<InetAddress>of());
ResourceAllocation cpu = new ResourceAllocation(1, "1 virtual CPU(s)",
"Number of Virtual CPUs", ResourceType.PROCESSOR, null, null, null, null, null,
@ -130,7 +129,7 @@ public class TerremarkVAppHandlerTest extends BaseHandlerTest {
ResourceAllocation memory = new ResourceAllocation(2, "512MB of memory", "Memory Size",
ResourceType.MEMORY, null, null, null, null, null, null, 512, "byte * 2^20");
ResourceAllocation disk = new ResourceAllocation(9, "Hard Disk 1", null,
ResourceType.DISK_DRIVE, null, "4194304", null, 0, 3, null, 4194304, null);
ResourceType.DISK_DRIVE, null, "10485760", null, 0, 3, null, 10485760, null);
assertEquals(result.getResourceAllocations(), ImmutableSortedSet.of(cpu, controller, memory,
disk));
assertEquals(Iterables.getOnlyElement(
@ -144,7 +143,7 @@ public class TerremarkVAppHandlerTest extends BaseHandlerTest {
512);
assertEquals(Iterables.getOnlyElement(
result.getResourceAllocationByType().get(ResourceType.DISK_DRIVE))
.getVirtualQuantity(), 4194304);
.getVirtualQuantity(), 10485760);
assertEquals(result.getSize().longValue(), Iterables.getOnlyElement(
result.getResourceAllocationByType().get(ResourceType.DISK_DRIVE))
.getVirtualQuantity());

2
vcloud/terremark/src/test/resources/terremark/configureVApp.xml
View File

@ -1 +1 @@
<VApp xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="eduardo" size="4194304" status="2" type="application/vnd.vmware.vcloud.vApp+xml" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Section xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:q2="http://www.vmware.com/vcloud/v1" xsi:type="q2:VirtualHardwareSection_Type"><Info>Virtual Hardware</Info><q2:Item><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</VirtualQuantity></q2:Item><q2:Item><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1024</VirtualQuantity></q2:Item><q2:Item><AddressOnParent xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</AddressOnParent><HostResource xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1048576</HostResource><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">209152</VirtualQuantity></q2:Item></Section></VApp>
<VApp xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="eduardo" size="4194304" status="2" type="application/vnd.vmware.vcloud.vApp+xml" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Section xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:q2="http://www.vmware.com/vcloud/v1" xsi:type="VirtualHardwareSection_Type"><Info>Virtual Hardware</Info><Item><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</VirtualQuantity></Item><Item><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1024</VirtualQuantity></Item><Item><AddressOnParent xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</AddressOnParent><HostResource xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1048576</HostResource><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">209152</VirtualQuantity></Item></Section></VApp>

55
vcloud/terremark/src/test/resources/terremark/get_vapp.xml
View File

@ -1,31 +1,28 @@
<VApp href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/13850"
type="application/vnd.vmware.vcloud.vApp+xml" name="adriantest1"
status="2" size="4194304" xmlns="http://www.vmware.com/vcloud/v1"
<VApp href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/16161"
type="application/vnd.vmware.vcloud.vApp+xml" name="centos-53"
status="4" size="10485760" xmlns="http://www.vmware.com/vcloud/v0.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Link rel="up"
href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/32"
type="application/vnd.vmware.vcloud.vdc+xml" />
<Link rel="down"
href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/13850/options/compute"
href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/16161/options/compute"
type="application/xml" name="Compute Options" />
<Link rel="down"
href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/13850/options/customization"
href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/16161/options/customization"
type="application/xml" name="Customization Options" />
<Section xsi:type="q1:NetworkConnectionSectionType" xmlns="http://schemas.dmtf.org/ovf/envelope/1"
xmlns:q1="http://www.vmware.com/vcloud/v1">
<q1:NetworkConnection Network="Internal">
<q1:IpAddress>10.114.34.132</q1:IpAddress>
</q1:NetworkConnection>
</Section>
<OperatingSystemSection d2p1:id="45"
<NetworkConnectionSection xmlns="http://schemas.dmtf.org/ovf/envelope/1">
<NetworkConnection Network="Internal"
xmlns="http://www.vmware.com/vcloud/v0.8" />
</NetworkConnectionSection>
<OperatingSystemSection d2p1:id="26"
xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:d2p1="http://schemas.dmtf.org/ovf/envelope/1">
<Info>The kind of installed guest operating system</Info>
<Description>Ubuntu Linux (32-bit)</Description>
<Description>Red Hat Enterprise Linux 5 (64-bit)</Description>
</OperatingSystemSection>
<Section xsi:type="q2:VirtualHardwareSection_Type" xmlns="http://schemas.dmtf.org/ovf/envelope/1"
xmlns:q2="http://www.vmware.com/vcloud/v1">
<VirtualHardwareSection xmlns="http://schemas.dmtf.org/ovf/envelope/1">
<Info>Virtual Hardware</Info>
<q2:System>
<System>
<AutomaticRecoveryAction xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
<AutomaticShutdownAction xsi:nil="true"
@ -65,11 +62,11 @@
<SwapFileDataRoot xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
<VirtualSystemIdentifier
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">adriantest1</VirtualSystemIdentifier>
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">centos-53</VirtualSystemIdentifier>
<VirtualSystemType
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">vmx-07</VirtualSystemType>
</q2:System>
<q2:Item>
</System>
<Item>
<Address xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
<AddressOnParent xsi:nil="true"
@ -112,8 +109,8 @@
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">count</VirtualQuantityUnits>
<Weight xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
</q2:Item>
<q2:Item>
</Item>
<Item>
<Address xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
<AddressOnParent xsi:nil="true"
@ -156,8 +153,8 @@
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">byte * 2^20</VirtualQuantityUnits>
<Weight xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
</q2:Item>
<q2:Item>
</Item>
<Item>
<Address
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</Address>
<AddressOnParent xsi:nil="true"
@ -200,8 +197,8 @@
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
<Weight xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
</q2:Item>
<q2:Item>
</Item>
<Item>
<Address xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
<AddressOnParent
@ -221,7 +218,7 @@
<ElementName
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">Hard Disk 1</ElementName>
<HostResource
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4194304</HostResource>
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">10485760</HostResource>
<InstanceID
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID>
<Limit xsi:nil="true"
@ -241,11 +238,11 @@
<ResourceType
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType>
<VirtualQuantity
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4194304</VirtualQuantity>
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">10485760</VirtualQuantity>
<VirtualQuantityUnits xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
<Weight xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
</q2:Item>
</Section>
</Item>
</VirtualHardwareSection>
</VApp>

26
vcloud/terremark/src/test/resources/terremark/get_vapp2disks.xml
View File

@ -22,10 +22,10 @@
<Info>The kind of installed guest operating system</Info>
<Description>Ubuntu Linux (32-bit)</Description>
</OperatingSystemSection>
<Section xsi:type="q2:VirtualHardwareSection_Type" xmlns="http://schemas.dmtf.org/ovf/envelope/1"
<Section xsi:type="VirtualHardwareSection_Type" xmlns="http://schemas.dmtf.org/ovf/envelope/1"
xmlns:q2="http://www.vmware.com/vcloud/v1">
<Info>Virtual Hardware</Info>
<q2:System>
<System>
<AutomaticRecoveryAction xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
<AutomaticShutdownAction xsi:nil="true"
@ -68,8 +68,8 @@
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">eduardo</VirtualSystemIdentifier>
<VirtualSystemType
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">vmx-07</VirtualSystemType>
</q2:System>
<q2:Item>
</System>
<Item>
<Address xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
<AddressOnParent xsi:nil="true"
@ -112,8 +112,8 @@
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">count</VirtualQuantityUnits>
<Weight xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
</q2:Item>
<q2:Item>
</Item>
<Item>
<Address xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
<AddressOnParent xsi:nil="true"
@ -156,8 +156,8 @@
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">byte * 2^20</VirtualQuantityUnits>
<Weight xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
</q2:Item>
<q2:Item>
</Item>
<Item>
<Address
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</Address>
<AddressOnParent xsi:nil="true"
@ -200,8 +200,8 @@
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
<Weight xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
</q2:Item>
<q2:Item>
</Item>
<Item>
<Address xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
<AddressOnParent
@ -246,8 +246,8 @@
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
<Weight xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
</q2:Item>
<q2:Item>
</Item>
<Item>
<Address xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
<AddressOnParent
@ -292,6 +292,6 @@
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
<Weight xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
</q2:Item>
</Item>
</Section>
</VApp>

4
vcloud/terremark/src/test/resources/terremark/item.xml
View File

@ -1,5 +1,5 @@
<q2:Item>
<Item>
<Address
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</Address>
<AddressOnParent xsi:nil="true"
@ -42,4 +42,4 @@
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
<Weight xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
</q2:Item>
</Item>

4
vcloud/terremark/src/test/resources/terremark/system.xml
View File

@ -1,4 +1,4 @@
<q2:System>
<System>
<AutomaticRecoveryAction xsi:nil="true"
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
<AutomaticShutdownAction xsi:nil="true"
@ -40,4 +40,4 @@
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">adriantest1</VirtualSystemIdentifier>
<VirtualSystemType
xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">vmx-07</VirtualSystemType>
</q2:System>
</System>