Revision 1e6fab60
b/Makefile.am | ||
---|---|---|
81 | 81 |
qa \ |
82 | 82 |
test \ |
83 | 83 |
test/data \ |
84 |
test/data/ovfdata \ |
|
84 | 85 |
tools |
85 | 86 |
|
86 | 87 |
BUILDTIME_DIR_AUTOCREATE = \ |
... | ... | |
640 | 641 |
test/data/proc_drbd83_sync.txt \ |
641 | 642 |
test/data/proc_drbd83_sync_krnl2.6.39.txt \ |
642 | 643 |
test/data/sys_drbd_usermode_helper.txt \ |
644 |
test/data/ovfdata/compr_disk.vmdk.gz \ |
|
645 |
test/data/ovfdata/corrupted_resources.ovf \ |
|
646 |
test/data/ovfdata/empty.ovf \ |
|
647 |
test/data/ovfdata/ganeti.mf \ |
|
648 |
test/data/ovfdata/ganeti.ovf \ |
|
649 |
test/data/ovfdata/gzip_disk.ovf \ |
|
650 |
test/data/ovfdata/new_disk.vmdk \ |
|
651 |
test/data/ovfdata/no_disk_in_ref.ovf \ |
|
652 |
test/data/ovfdata/no_ovf.ova \ |
|
653 |
test/data/ovfdata/ova.ova \ |
|
654 |
test/data/ovfdata/second_disk.vmdk \ |
|
655 |
test/data/ovfdata/virtualbox.ovf \ |
|
656 |
test/data/ovfdata/wrong_extension.ovd \ |
|
657 |
test/data/ovfdata/wrong_manifest.mf \ |
|
658 |
test/data/ovfdata/wrong_manifest.ovf \ |
|
659 |
test/data/ovfdata/wrong_ova.ova \ |
|
660 |
test/data/ovfdata/wrong_xml.ovf \ |
|
643 | 661 |
test/import-export_unittest-helper |
644 | 662 |
|
645 | 663 |
python_tests = \ |
... | ... | |
674 | 692 |
test/ganeti.netutils_unittest.py \ |
675 | 693 |
test/ganeti.objects_unittest.py \ |
676 | 694 |
test/ganeti.opcodes_unittest.py \ |
695 |
test/ganeti.ovf_unittest.py \ |
|
677 | 696 |
test/ganeti.qlang_unittest.py \ |
678 | 697 |
test/ganeti.query_unittest.py \ |
679 | 698 |
test/ganeti.rapi.baserlib_unittest.py \ |
b/test/data/ovfdata/corrupted_resources.ovf | ||
---|---|---|
1 |
<?xml version="1.0" encoding="UTF-8"?> |
|
2 |
<!--Generated by VMware ovftool 2.0.1 (build-260188), User: , UTC time: 2011-08-17T15:12:11.715742Z--> |
|
3 |
<Envelope vmw:buildId="build-260188" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:cim="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:vmw="http://www.vmware.com/schema/ovf" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
|
4 |
<References> |
|
5 |
<File ovf:href="other_disk.vmdk" ovf:id="file1" ovf:size="761627136"/> |
|
6 |
</References> |
|
7 |
<DiskSection> |
|
8 |
<Info>Virtual disk information</Info> |
|
9 |
<Disk ovf:capacity="16514" ovf:capacityAllocationUnits="byte * 2^20" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize="2042953728"/> |
|
10 |
</DiskSection> |
|
11 |
<NetworkSection> |
|
12 |
<Info>The list of logical networks</Info> |
|
13 |
<Network ovf:name="bridged"> |
|
14 |
<Description>The bridged network</Description> |
|
15 |
</Network> |
|
16 |
</NetworkSection> |
|
17 |
<VirtualSystem ovf:id="vm"> |
|
18 |
<Info>A virtual machine</Info> |
|
19 |
<Name>AyertiennaSUSE.x86_64-0.0.2</Name> |
|
20 |
<OperatingSystemSection ovf:id="83" vmw:osType="suse64Guest"> |
|
21 |
<Info>The kind of installed guest operating system</Info> |
|
22 |
</OperatingSystemSection> |
|
23 |
<VirtualHardwareSection> |
|
24 |
<Info>Virtual hardware requirements</Info> |
|
25 |
<System> |
|
26 |
<vssd:ElementName>Virtual Hardware Family</vssd:ElementName> |
|
27 |
<vssd:InstanceID>0</vssd:InstanceID> |
|
28 |
<vssd:VirtualSystemIdentifier>AyertiennaSUSE.x86_64-0.0.2</vssd:VirtualSystemIdentifier> |
|
29 |
<vssd:VirtualSystemType>vmx-04</vssd:VirtualSystemType> |
|
30 |
</System> |
|
31 |
<Item> |
|
32 |
<rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits> |
|
33 |
<rasd:Description>Number of Virtual CPUs</rasd:Description> |
|
34 |
<rasd:ElementName>1 virtual CPU(s)</rasd:ElementName> |
|
35 |
<rasd:InstanceID>1</rasd:InstanceID> |
|
36 |
<rasd:ResourceType>3</rasd:ResourceType> |
|
37 |
<rasd:VirtualQuantity>1</rasd:VirtualQuantity> |
|
38 |
</Item> |
|
39 |
<Item> |
|
40 |
<rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits> |
|
41 |
<rasd:Description>Memory Size</rasd:Description> |
|
42 |
<rasd:ElementName>512MB of memory</rasd:ElementName> |
|
43 |
<rasd:InstanceID>2</rasd:InstanceID> |
|
44 |
<rasd:ResourceType>4</rasd:ResourceType> |
|
45 |
<rasd:VirtualQuantity>512</rasd:VirtualQuantity> |
|
46 |
</Item> |
|
47 |
<Item> |
|
48 |
<rasd:Address>0</rasd:Address> |
|
49 |
<rasd:Description>SCSI Controller</rasd:Description> |
|
50 |
<rasd:ElementName>scsiController0</rasd:ElementName> |
|
51 |
<rasd:InstanceID>4</rasd:InstanceID> |
|
52 |
<rasd:ResourceSubType>lsilogic</rasd:ResourceSubType> |
|
53 |
<rasd:ResourceType>6</rasd:ResourceType> |
|
54 |
</Item> |
|
55 |
<Item> |
|
56 |
<rasd:Address>0</rasd:Address> |
|
57 |
<rasd:Description>IDE Controller</rasd:Description> |
|
58 |
<rasd:ElementName>ideController0</rasd:ElementName> |
|
59 |
<rasd:InstanceID>5</rasd:InstanceID> |
|
60 |
<rasd:ResourceType>5</rasd:ResourceType> |
|
61 |
</Item> |
|
62 |
<Item> |
|
63 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
64 |
<rasd:ElementName>disk1</rasd:ElementName> |
|
65 |
<rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource> |
|
66 |
<rasd:InstanceID>8</rasd:InstanceID> |
|
67 |
<rasd:Parent>4</rasd:Parent> |
|
68 |
<rasd:ResourceType>17</rasd:ResourceType> |
|
69 |
</Item> |
|
70 |
<Item> |
|
71 |
<rasd:AddressOnParent>2</rasd:AddressOnParent> |
|
72 |
<rasd:AutomaticAllocation>true</rasd:AutomaticAllocation> |
|
73 |
<rasd:Connection>bridged</rasd:Connection> |
|
74 |
<rasd:Description>E1000 ethernet adapter on "bridged"</rasd:Description> |
|
75 |
<rasd:ElementName>ethernet0</rasd:ElementName> |
|
76 |
<rasd:InstanceID>9</rasd:InstanceID> |
|
77 |
<rasd:ResourceSubType>E1000</rasd:ResourceSubType> |
|
78 |
<rasd:ResourceType>10</rasd:ResourceType> |
|
79 |
</Item> |
|
80 |
</VirtualHardwareSection> |
|
81 |
</VirtualSystem> |
|
82 |
</Envelope> |
|
83 |
|
b/test/data/ovfdata/empty.ovf | ||
---|---|---|
1 |
<?xml version="1.0"?> |
|
2 |
<Envelope ovf:version="1.0" xml:lang="en-US" xmlns="http://schemas.dmtf.org/ovf/envelope/1" 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
|
3 |
<References> |
|
4 |
</References> |
|
5 |
<DiskSection> |
|
6 |
</DiskSection> |
|
7 |
<NetworkSection> |
|
8 |
</NetworkSection> |
|
9 |
<VirtualSystem> |
|
10 |
<Info>A virtual machine</Info> |
|
11 |
<OperatingSystemSection> |
|
12 |
</OperatingSystemSection> |
|
13 |
<VirtualHardwareSection> |
|
14 |
</VirtualHardwareSection> |
|
15 |
</VirtualSystem> |
|
16 |
</Envelope> |
b/test/data/ovfdata/ganeti.mf | ||
---|---|---|
1 |
SHA1(ganeti.ovf)= d298200d9044c54b0fde13efaa90e564badc5961 |
|
2 |
SHA1(new_disk.vmdk)= 711c48f14c934228b8e117d036c913cdb9d63305 |
b/test/data/ovfdata/ganeti.ovf | ||
---|---|---|
1 |
<?xml version="1.0"?> |
|
2 |
<Envelope ovf:version="1.0" xml:lang="en-US" xmlns="http://schemas.dmtf.org/ovf/envelope/1" 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gnt="http://ganeti"> |
|
3 |
<References> |
|
4 |
<File ovf:href="new_disk.vmdk" ovf:id="file1"/> |
|
5 |
</References> |
|
6 |
<DiskSection> |
|
7 |
<Info>List of the virtual disks used in the package</Info> |
|
8 |
<Disk ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/specifications/vmdk.html#sparse"/> |
|
9 |
</DiskSection> |
|
10 |
<gnt:GanetiSection> |
|
11 |
<gnt:Version>0</gnt:Version> |
|
12 |
<gnt:AutoBalance>False</gnt:AutoBalance> |
|
13 |
<gnt:Tags></gnt:Tags> |
|
14 |
<gnt:DiskTemplate>plain</gnt:DiskTemplate> |
|
15 |
<gnt:OperatingSystem> |
|
16 |
<gnt:Name>lenny-image</gnt:Name> |
|
17 |
</gnt:OperatingSystem> |
|
18 |
<gnt:Network> |
|
19 |
<gnt:Nic ovf:name="routed"> |
|
20 |
<gnt:Mode>bridged</gnt:Mode> |
|
21 |
<gnt:MACAddress>aa:00:00:d8:2c:1e</gnt:MACAddress> |
|
22 |
<gnt:IPAddress>none</gnt:IPAddress> |
|
23 |
<gnt:Link>xen-br0</gnt:Link> |
|
24 |
</gnt:Nic> |
|
25 |
</gnt:Network> |
|
26 |
<gnt:Hypervisor> |
|
27 |
<gnt:Name>xen-pvm</gnt:Name> |
|
28 |
<gnt:Parameters> |
|
29 |
<gnt:root-path>/dev/sda</gnt:root-path> |
|
30 |
<gnt:kernel_args>ro</gnt:kernel_args> |
|
31 |
</gnt:Parameters> |
|
32 |
</gnt:Hypervisor> |
|
33 |
</gnt:GanetiSection> |
|
34 |
<NetworkSection> |
|
35 |
<Info>Logical networks used in the package</Info> |
|
36 |
<Network ovf:name="routed"> |
|
37 |
<Description>Logical network used by this appliance.</Description> |
|
38 |
</Network> |
|
39 |
</NetworkSection> |
|
40 |
<VirtualSystem ovf:id="New-shiny-instance"> |
|
41 |
<Info>A virtual machine</Info> |
|
42 |
<Name>ganeti-test-xen</Name> |
|
43 |
<OperatingSystemSection ovf:id="93"> |
|
44 |
<Info>The kind of installed guest operating system</Info> |
|
45 |
<Description>Ubuntu</Description> |
|
46 |
</OperatingSystemSection> |
|
47 |
<VirtualHardwareSection> |
|
48 |
<Info>Virtual hardware requirements for a virtual machine</Info> |
|
49 |
<System> |
|
50 |
<vssd:ElementName>Virtual Hardware Family</vssd:ElementName> |
|
51 |
<vssd:InstanceID>0</vssd:InstanceID> |
|
52 |
<vssd:VirtualSystemIdentifier>Ubuntu-freshly-created</vssd:VirtualSystemIdentifier> |
|
53 |
<vssd:VirtualSystemType>virtualbox-2.2</vssd:VirtualSystemType> |
|
54 |
</System> |
|
55 |
<Item> |
|
56 |
<rasd:Caption>1 virtual CPU</rasd:Caption> |
|
57 |
<rasd:ElementName>1 virtual CPU</rasd:ElementName> |
|
58 |
<rasd:Description>Number of virtual CPUs</rasd:Description> |
|
59 |
<rasd:InstanceID>1</rasd:InstanceID> |
|
60 |
<rasd:ResourceType>3</rasd:ResourceType> |
|
61 |
<rasd:VirtualQuantity>1</rasd:VirtualQuantity> |
|
62 |
</Item> |
|
63 |
<Item> |
|
64 |
<rasd:Caption>2048 MB of memory</rasd:Caption> |
|
65 |
<rasd:ElementName>2048 MB of memory</rasd:ElementName> |
|
66 |
<rasd:Description>Memory Size</rasd:Description> |
|
67 |
<rasd:InstanceID>2</rasd:InstanceID> |
|
68 |
<rasd:ResourceType>4</rasd:ResourceType> |
|
69 |
<rasd:AllocationUnits>MegaBytes</rasd:AllocationUnits> |
|
70 |
<rasd:VirtualQuantity>2048</rasd:VirtualQuantity> |
|
71 |
</Item> |
|
72 |
<Item> |
|
73 |
<rasd:Caption>Ethernet adapter on 'NAT'</rasd:Caption> |
|
74 |
<rasd:ElementName>Ethernet adapter on 'NAT'</rasd:ElementName> |
|
75 |
<rasd:InstanceID>5</rasd:InstanceID> |
|
76 |
<rasd:ResourceType>10</rasd:ResourceType> |
|
77 |
<rasd:ResourceSubType>PCNet32</rasd:ResourceSubType> |
|
78 |
<rasd:AutomaticAllocation>true</rasd:AutomaticAllocation> |
|
79 |
<rasd:Connection></rasd:Connection> |
|
80 |
</Item> |
|
81 |
<Item> |
|
82 |
<rasd:Caption>disk1</rasd:Caption> |
|
83 |
<rasd:ElementName>disk1</rasd:ElementName> |
|
84 |
<rasd:Description>Disk Image</rasd:Description> |
|
85 |
<rasd:InstanceID>7</rasd:InstanceID> |
|
86 |
<rasd:ResourceType>17</rasd:ResourceType> |
|
87 |
<rasd:HostResource>/disk/vmdisk1</rasd:HostResource> |
|
88 |
<rasd:Parent>3</rasd:Parent> |
|
89 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
90 |
</Item> |
|
91 |
</VirtualHardwareSection> |
|
92 |
</VirtualSystem> |
|
93 |
</Envelope> |
b/test/data/ovfdata/gzip_disk.ovf | ||
---|---|---|
1 |
<?xml version="1.0"?> |
|
2 |
<Envelope ovf:version="1.0" xml:lang="en-US" xmlns="http://schemas.dmtf.org/ovf/envelope/1" 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gnt="http://ganeti"> |
|
3 |
<References> |
|
4 |
<File ovf:href="compr_disk.vmdk.gz" ovf:compression="gzip" ovf:id="file1"/> |
|
5 |
</References> |
|
6 |
<DiskSection> |
|
7 |
<Info>List of the virtual disks used in the package</Info> |
|
8 |
<Disk ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/specifications/vmdk.html#sparse"/> |
|
9 |
</DiskSection> |
|
10 |
<gnt:GanetiSection> |
|
11 |
<gnt:Version>0</gnt:Version> |
|
12 |
<gnt:AutoBalance>False</gnt:AutoBalance> |
|
13 |
<gnt:Tags></gnt:Tags> |
|
14 |
<gnt:DiskTemplate>plain</gnt:DiskTemplate> |
|
15 |
<gnt:OperatingSystem> |
|
16 |
<gnt:Name>lenny-image</gnt:Name> |
|
17 |
</gnt:OperatingSystem> |
|
18 |
<gnt:Network> |
|
19 |
<gnt:Nic ovf:name="routed"> |
|
20 |
<gnt:Mode>bridged</gnt:Mode> |
|
21 |
<gnt:MACAddress>aa:00:00:d8:2c:1e</gnt:MACAddress> |
|
22 |
<gnt:IPAddress>none</gnt:IPAddress> |
|
23 |
<gnt:Link>xen-br0</gnt:Link> |
|
24 |
</gnt:Nic> |
|
25 |
</gnt:Network> |
|
26 |
<gnt:Hypervisor> |
|
27 |
<gnt:Name>xen-pvm</gnt:Name> |
|
28 |
<gnt:Parameters> |
|
29 |
<gnt:root-path>/dev/sda</gnt:root-path> |
|
30 |
<gnt:kernel_args>ro</gnt:kernel_args> |
|
31 |
</gnt:Parameters> |
|
32 |
</gnt:Hypervisor> |
|
33 |
</gnt:GanetiSection> |
|
34 |
<NetworkSection> |
|
35 |
<Info>Logical networks used in the package</Info> |
|
36 |
<Network ovf:name="routed"> |
|
37 |
<Description>Logical network used by this appliance.</Description> |
|
38 |
</Network> |
|
39 |
</NetworkSection> |
|
40 |
<VirtualSystem ovf:id="New-shiny-instance"> |
|
41 |
<Info>A virtual machine</Info> |
|
42 |
<Name>ganeti-test-xen</Name> |
|
43 |
<OperatingSystemSection ovf:id="93"> |
|
44 |
<Info>The kind of installed guest operating system</Info> |
|
45 |
<Description>Ubuntu</Description> |
|
46 |
</OperatingSystemSection> |
|
47 |
<VirtualHardwareSection> |
|
48 |
<Info>Virtual hardware requirements for a virtual machine</Info> |
|
49 |
<System> |
|
50 |
<vssd:ElementName>Virtual Hardware Family</vssd:ElementName> |
|
51 |
<vssd:InstanceID>0</vssd:InstanceID> |
|
52 |
<vssd:VirtualSystemIdentifier>Ubuntu-freshly-created</vssd:VirtualSystemIdentifier> |
|
53 |
<vssd:VirtualSystemType>virtualbox-2.2</vssd:VirtualSystemType> |
|
54 |
</System> |
|
55 |
<Item> |
|
56 |
<rasd:Caption>1 virtual CPU</rasd:Caption> |
|
57 |
<rasd:ElementName>1 virtual CPU</rasd:ElementName> |
|
58 |
<rasd:Description>Number of virtual CPUs</rasd:Description> |
|
59 |
<rasd:InstanceID>1</rasd:InstanceID> |
|
60 |
<rasd:ResourceType>3</rasd:ResourceType> |
|
61 |
<rasd:VirtualQuantity>1</rasd:VirtualQuantity> |
|
62 |
</Item> |
|
63 |
<Item> |
|
64 |
<rasd:Caption>2048 MB of memory</rasd:Caption> |
|
65 |
<rasd:ElementName>2048 MB of memory</rasd:ElementName> |
|
66 |
<rasd:Description>Memory Size</rasd:Description> |
|
67 |
<rasd:InstanceID>2</rasd:InstanceID> |
|
68 |
<rasd:ResourceType>4</rasd:ResourceType> |
|
69 |
<rasd:AllocationUnits>MegaBytes</rasd:AllocationUnits> |
|
70 |
<rasd:VirtualQuantity>2048</rasd:VirtualQuantity> |
|
71 |
</Item> |
|
72 |
<Item> |
|
73 |
<rasd:Caption>Ethernet adapter on 'NAT'</rasd:Caption> |
|
74 |
<rasd:ElementName>Ethernet adapter on 'NAT'</rasd:ElementName> |
|
75 |
<rasd:InstanceID>5</rasd:InstanceID> |
|
76 |
<rasd:ResourceType>10</rasd:ResourceType> |
|
77 |
<rasd:ResourceSubType>PCNet32</rasd:ResourceSubType> |
|
78 |
<rasd:AutomaticAllocation>true</rasd:AutomaticAllocation> |
|
79 |
<rasd:Connection></rasd:Connection> |
|
80 |
</Item> |
|
81 |
<Item> |
|
82 |
<rasd:Caption>disk1</rasd:Caption> |
|
83 |
<rasd:ElementName>disk1</rasd:ElementName> |
|
84 |
<rasd:Description>Disk Image</rasd:Description> |
|
85 |
<rasd:InstanceID>7</rasd:InstanceID> |
|
86 |
<rasd:ResourceType>17</rasd:ResourceType> |
|
87 |
<rasd:HostResource>/disk/vmdisk1</rasd:HostResource> |
|
88 |
<rasd:Parent>3</rasd:Parent> |
|
89 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
90 |
</Item> |
|
91 |
</VirtualHardwareSection> |
|
92 |
</VirtualSystem> |
|
93 |
</Envelope> |
b/test/data/ovfdata/no_disk_in_ref.ovf | ||
---|---|---|
1 |
<?xml version="1.0"?> |
|
2 |
<Envelope ovf:version="1.0" xml:lang="en-US" xmlns="http://schemas.dmtf.org/ovf/envelope/1" 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
|
3 |
<References> |
|
4 |
<File ovf:href="second_disk.vmdk" ovf:id="file2"/> |
|
5 |
</References> |
|
6 |
<DiskSection> |
|
7 |
<Info>List of the virtual disks used in the package</Info> |
|
8 |
<Disk ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/specifications/vmdk.html#sparse"/> |
|
9 |
<Disk ovf:diskId="vmdisk2" ovf:fileRef="file2" ovf:format="http://www.vmware.com/specifications/vmdk.html#sparse"/> |
|
10 |
</DiskSection> |
|
11 |
<NetworkSection> |
|
12 |
<Info>Logical networks used in the package</Info> |
|
13 |
<Network ovf:name="NAT"> |
|
14 |
<Description>Logical network used by this appliance.</Description> |
|
15 |
</Network> |
|
16 |
</NetworkSection> |
|
17 |
<VirtualSystem ovf:id="Ubuntu-freshly-created"> |
|
18 |
<Info>A virtual machine</Info> |
|
19 |
<OperatingSystemSection ovf:id="93"> |
|
20 |
<Info>The kind of installed guest operating system</Info> |
|
21 |
<Description>Ubuntu</Description> |
|
22 |
</OperatingSystemSection> |
|
23 |
<VirtualHardwareSection> |
|
24 |
<Info>Virtual hardware requirements for a virtual machine</Info> |
|
25 |
<System> |
|
26 |
<vssd:ElementName>Virtual Hardware Family</vssd:ElementName> |
|
27 |
<vssd:InstanceID>0</vssd:InstanceID> |
|
28 |
<vssd:VirtualSystemIdentifier>Ubuntu-freshly-created</vssd:VirtualSystemIdentifier> |
|
29 |
<vssd:VirtualSystemType>virtualbox-2.2</vssd:VirtualSystemType> |
|
30 |
</System> |
|
31 |
<Item> |
|
32 |
<rasd:Caption>1 virtual CPU</rasd:Caption> |
|
33 |
<rasd:ElementName>1 virtual CPU</rasd:ElementName> |
|
34 |
<rasd:Description>Number of virtual CPUs</rasd:Description> |
|
35 |
<rasd:InstanceID>1</rasd:InstanceID> |
|
36 |
<rasd:ResourceType>3</rasd:ResourceType> |
|
37 |
<rasd:VirtualQuantity>1</rasd:VirtualQuantity> |
|
38 |
</Item> |
|
39 |
<Item> |
|
40 |
<rasd:Caption>2048 MB of memory</rasd:Caption> |
|
41 |
<rasd:ElementName>2048 MB of memory</rasd:ElementName> |
|
42 |
<rasd:Description>Memory Size</rasd:Description> |
|
43 |
<rasd:InstanceID>2</rasd:InstanceID> |
|
44 |
<rasd:ResourceType>4</rasd:ResourceType> |
|
45 |
<rasd:AllocationUnits>MegaBytes</rasd:AllocationUnits> |
|
46 |
<rasd:VirtualQuantity>2048</rasd:VirtualQuantity> |
|
47 |
</Item> |
|
48 |
<Item> |
|
49 |
<rasd:Caption>ideController0</rasd:Caption> |
|
50 |
<rasd:ElementName>ideController0</rasd:ElementName> |
|
51 |
<rasd:Description>IDE Controller</rasd:Description> |
|
52 |
<rasd:InstanceID>3</rasd:InstanceID> |
|
53 |
<rasd:ResourceType>5</rasd:ResourceType> |
|
54 |
<rasd:ResourceSubType>PIIX4</rasd:ResourceSubType> |
|
55 |
<rasd:Address>1</rasd:Address> |
|
56 |
</Item> |
|
57 |
<Item> |
|
58 |
<rasd:Caption>Ethernet adapter on 'NAT'</rasd:Caption> |
|
59 |
<rasd:ElementName>Ethernet adapter on 'NAT'</rasd:ElementName> |
|
60 |
<rasd:InstanceID>5</rasd:InstanceID> |
|
61 |
<rasd:ResourceType>10</rasd:ResourceType> |
|
62 |
<rasd:ResourceSubType>PCNet32</rasd:ResourceSubType> |
|
63 |
<rasd:AutomaticAllocation>true</rasd:AutomaticAllocation> |
|
64 |
<rasd:Connection>NAT</rasd:Connection> |
|
65 |
</Item> |
|
66 |
<Item> |
|
67 |
<rasd:Caption>disk1</rasd:Caption> |
|
68 |
<rasd:ElementName>disk1</rasd:ElementName> |
|
69 |
<rasd:Description>Disk Image</rasd:Description> |
|
70 |
<rasd:InstanceID>7</rasd:InstanceID> |
|
71 |
<rasd:ResourceType>17</rasd:ResourceType> |
|
72 |
<rasd:HostResource>/disk/vmdisk1</rasd:HostResource> |
|
73 |
<rasd:Parent>3</rasd:Parent> |
|
74 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
75 |
</Item> |
|
76 |
<Item> |
|
77 |
<rasd:Caption>disk1</rasd:Caption> |
|
78 |
<rasd:ElementName>disk1</rasd:ElementName> |
|
79 |
<rasd:Description>Disk Image</rasd:Description> |
|
80 |
<rasd:InstanceID>9</rasd:InstanceID> |
|
81 |
<rasd:ResourceType>17</rasd:ResourceType> |
|
82 |
<rasd:HostResource>/disk/vmdisk1</rasd:HostResource> |
|
83 |
<rasd:Parent>3</rasd:Parent> |
|
84 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
85 |
</Item> |
|
86 |
</VirtualHardwareSection> |
|
87 |
</VirtualSystem> |
|
88 |
</Envelope> |
b/test/data/ovfdata/virtualbox.ovf | ||
---|---|---|
1 |
<?xml version="1.0"?> |
|
2 |
<Envelope ovf:version="1.0" xml:lang="en-US" xmlns="http://schemas.dmtf.org/ovf/envelope/1" 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
|
3 |
<References> |
|
4 |
<File ovf:href="new_disk.vmdk" ovf:id="file1"/> |
|
5 |
<File ovf:href="second_disk.vmdk" ovf:id="file2"/> |
|
6 |
</References> |
|
7 |
<DiskSection> |
|
8 |
<Info>List of the virtual disks used in the package</Info> |
|
9 |
<Disk ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/specifications/vmdk.html#sparse"/> |
|
10 |
<Disk ovf:diskId="vmdisk2" ovf:fileRef="file2" ovf:format="http://www.vmware.com/specifications/vmdk.html#sparse"/> |
|
11 |
</DiskSection> |
|
12 |
<NetworkSection> |
|
13 |
<Info>Logical networks used in the package</Info> |
|
14 |
<Network ovf:name="bridged"> |
|
15 |
<Description>Logical network used by this appliance.</Description> |
|
16 |
</Network> |
|
17 |
</NetworkSection> |
|
18 |
<VirtualSystem ovf:id="Ubuntu-freshly-created"> |
|
19 |
<Info>A virtual machine</Info> |
|
20 |
<OperatingSystemSection ovf:id="93"> |
|
21 |
<Info>The kind of installed guest operating system</Info> |
|
22 |
<Description>Ubuntu</Description> |
|
23 |
</OperatingSystemSection> |
|
24 |
<VirtualHardwareSection> |
|
25 |
<Info>Virtual hardware requirements for a virtual machine</Info> |
|
26 |
<System> |
|
27 |
<vssd:ElementName>Virtual Hardware Family</vssd:ElementName> |
|
28 |
<vssd:InstanceID>0</vssd:InstanceID> |
|
29 |
<vssd:VirtualSystemIdentifier>Ubuntu-freshly-created</vssd:VirtualSystemIdentifier> |
|
30 |
<vssd:VirtualSystemType>virtualbox-2.2</vssd:VirtualSystemType> |
|
31 |
</System> |
|
32 |
<Item> |
|
33 |
<rasd:Caption>1 virtual CPU</rasd:Caption> |
|
34 |
<rasd:ElementName>1 virtual CPU</rasd:ElementName> |
|
35 |
<rasd:Description>Number of virtual CPUs</rasd:Description> |
|
36 |
<rasd:InstanceID>1</rasd:InstanceID> |
|
37 |
<rasd:ResourceType>3</rasd:ResourceType> |
|
38 |
<rasd:VirtualQuantity>1</rasd:VirtualQuantity> |
|
39 |
</Item> |
|
40 |
<Item> |
|
41 |
<rasd:Caption>2048 MB of memory</rasd:Caption> |
|
42 |
<rasd:ElementName>2048 MB of memory</rasd:ElementName> |
|
43 |
<rasd:Description>Memory Size</rasd:Description> |
|
44 |
<rasd:InstanceID>2</rasd:InstanceID> |
|
45 |
<rasd:ResourceType>4</rasd:ResourceType> |
|
46 |
<rasd:AllocationUnits>MegaBytes</rasd:AllocationUnits> |
|
47 |
<rasd:VirtualQuantity>2048</rasd:VirtualQuantity> |
|
48 |
</Item> |
|
49 |
<Item> |
|
50 |
<rasd:Caption>ideController0</rasd:Caption> |
|
51 |
<rasd:ElementName>ideController0</rasd:ElementName> |
|
52 |
<rasd:Description>IDE Controller</rasd:Description> |
|
53 |
<rasd:InstanceID>3</rasd:InstanceID> |
|
54 |
<rasd:ResourceType>5</rasd:ResourceType> |
|
55 |
<rasd:ResourceSubType>PIIX4</rasd:ResourceSubType> |
|
56 |
<rasd:Address>1</rasd:Address> |
|
57 |
</Item> |
|
58 |
<Item> |
|
59 |
<rasd:Caption>Ethernet adapter on 'NAT'</rasd:Caption> |
|
60 |
<rasd:ElementName>Ethernet adapter on 'NAT'</rasd:ElementName> |
|
61 |
<rasd:InstanceID>5</rasd:InstanceID> |
|
62 |
<rasd:ResourceType>10</rasd:ResourceType> |
|
63 |
<rasd:ResourceSubType>PCNet32</rasd:ResourceSubType> |
|
64 |
<rasd:AutomaticAllocation>true</rasd:AutomaticAllocation> |
|
65 |
<rasd:Connection>bridged</rasd:Connection> |
|
66 |
</Item> |
|
67 |
<Item> |
|
68 |
<rasd:Caption>disk1</rasd:Caption> |
|
69 |
<rasd:ElementName>disk1</rasd:ElementName> |
|
70 |
<rasd:Description>Disk Image</rasd:Description> |
|
71 |
<rasd:InstanceID>7</rasd:InstanceID> |
|
72 |
<rasd:ResourceType>17</rasd:ResourceType> |
|
73 |
<rasd:HostResource>/disk/vmdisk1</rasd:HostResource> |
|
74 |
<rasd:Parent>3</rasd:Parent> |
|
75 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
76 |
</Item> |
|
77 |
<Item> |
|
78 |
<rasd:Caption>disk1</rasd:Caption> |
|
79 |
<rasd:ElementName>disk1</rasd:ElementName> |
|
80 |
<rasd:Description>Disk Image</rasd:Description> |
|
81 |
<rasd:InstanceID>9</rasd:InstanceID> |
|
82 |
<rasd:ResourceType>17</rasd:ResourceType> |
|
83 |
<rasd:HostResource>/disk/vmdisk1</rasd:HostResource> |
|
84 |
<rasd:Parent>3</rasd:Parent> |
|
85 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
86 |
</Item> |
|
87 |
</VirtualHardwareSection> |
|
88 |
</VirtualSystem> |
|
89 |
</Envelope> |
b/test/data/ovfdata/wrong_extension.ovd | ||
---|---|---|
1 |
<?xml version="1.0" encoding="UTF-8"?> |
|
2 |
<!--Generated by VMware ovftool 2.0.1 (build-260188), User: , UTC time: 2011-08-17T15:12:11.715742Z--> |
|
3 |
<Envelope vmw:buildId="build-260188" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:cim="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:vmw="http://www.vmware.com/schema/ovf" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
|
4 |
<References> |
|
5 |
<File ovf:href="AyertiennaSUSE.x86_64-0.0.2-disk1.vmdk" ovf:id="file1" ovf:size="761627136"/> |
|
6 |
</References> |
|
7 |
<DiskSection> |
|
8 |
<Info>Virtual disk information</Info> |
|
9 |
<Disk ovf:capacity="16514" ovf:capacityAllocationUnits="byte * 2^20" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize="2042953728"/> |
|
10 |
</DiskSection> |
|
11 |
<NetworkSection> |
|
12 |
<Info>The list of logical networks</Info> |
|
13 |
<Network ovf:name="bridged"> |
|
14 |
<Description>The bridged network</Description> |
|
15 |
</Network> |
|
16 |
</NetworkSection> |
|
17 |
<VirtualSystem ovf:id="vm"> |
|
18 |
<Info>A virtual machine</Info> |
|
19 |
<Name>AyertiennaSUSE.x86_64-0.0.2</Name> |
|
20 |
<OperatingSystemSection ovf:id="83" vmw:osType="suse64Guest"> |
|
21 |
<Info>The kind of installed guest operating system</Info> |
|
22 |
</OperatingSystemSection> |
|
23 |
<VirtualHardwareSection> |
|
24 |
<Info>Virtual hardware requirements</Info> |
|
25 |
<System> |
|
26 |
<vssd:ElementName>Virtual Hardware Family</vssd:ElementName> |
|
27 |
<vssd:InstanceID>0</vssd:InstanceID> |
|
28 |
<vssd:VirtualSystemIdentifier>AyertiennaSUSE.x86_64-0.0.2</vssd:VirtualSystemIdentifier> |
|
29 |
<vssd:VirtualSystemType>vmx-04</vssd:VirtualSystemType> |
|
30 |
</System> |
|
31 |
<Item> |
|
32 |
<rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits> |
|
33 |
<rasd:Description>Number of Virtual CPUs</rasd:Description> |
|
34 |
<rasd:ElementName>1 virtual CPU(s)</rasd:ElementName> |
|
35 |
<rasd:InstanceID>1</rasd:InstanceID> |
|
36 |
<rasd:ResourceType>3</rasd:ResourceType> |
|
37 |
<rasd:VirtualQuantity>1</rasd:VirtualQuantity> |
|
38 |
</Item> |
|
39 |
<Item> |
|
40 |
<rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits> |
|
41 |
<rasd:Description>Memory Size</rasd:Description> |
|
42 |
<rasd:ElementName>512MB of memory</rasd:ElementName> |
|
43 |
<rasd:InstanceID>2</rasd:InstanceID> |
|
44 |
<rasd:ResourceType>4</rasd:ResourceType> |
|
45 |
<rasd:VirtualQuantity>512</rasd:VirtualQuantity> |
|
46 |
</Item> |
|
47 |
<Item ovf:required="false"> |
|
48 |
<rasd:Address>0</rasd:Address> |
|
49 |
<rasd:Description>USB Controller</rasd:Description> |
|
50 |
<rasd:ElementName>usb</rasd:ElementName> |
|
51 |
<rasd:InstanceID>3</rasd:InstanceID> |
|
52 |
<rasd:ResourceType>23</rasd:ResourceType> |
|
53 |
</Item> |
|
54 |
<Item> |
|
55 |
<rasd:Address>0</rasd:Address> |
|
56 |
<rasd:Description>SCSI Controller</rasd:Description> |
|
57 |
<rasd:ElementName>scsiController0</rasd:ElementName> |
|
58 |
<rasd:InstanceID>4</rasd:InstanceID> |
|
59 |
<rasd:ResourceSubType>lsilogic</rasd:ResourceSubType> |
|
60 |
<rasd:ResourceType>6</rasd:ResourceType> |
|
61 |
</Item> |
|
62 |
<Item> |
|
63 |
<rasd:Address>0</rasd:Address> |
|
64 |
<rasd:Description>IDE Controller</rasd:Description> |
|
65 |
<rasd:ElementName>ideController0</rasd:ElementName> |
|
66 |
<rasd:InstanceID>5</rasd:InstanceID> |
|
67 |
<rasd:ResourceType>5</rasd:ResourceType> |
|
68 |
</Item> |
|
69 |
<Item ovf:required="false"> |
|
70 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
71 |
<rasd:AutomaticAllocation>false</rasd:AutomaticAllocation> |
|
72 |
<rasd:Description>Floppy Drive</rasd:Description> |
|
73 |
<rasd:ElementName>floppy0</rasd:ElementName> |
|
74 |
<rasd:InstanceID>6</rasd:InstanceID> |
|
75 |
<rasd:ResourceType>14</rasd:ResourceType> |
|
76 |
</Item> |
|
77 |
<Item ovf:required="false"> |
|
78 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
79 |
<rasd:AutomaticAllocation>false</rasd:AutomaticAllocation> |
|
80 |
<rasd:ElementName>cdrom1</rasd:ElementName> |
|
81 |
<rasd:InstanceID>7</rasd:InstanceID> |
|
82 |
<rasd:Parent>5</rasd:Parent> |
|
83 |
<rasd:ResourceType>15</rasd:ResourceType> |
|
84 |
</Item> |
|
85 |
<Item> |
|
86 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
87 |
<rasd:ElementName>disk1</rasd:ElementName> |
|
88 |
<rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource> |
|
89 |
<rasd:InstanceID>8</rasd:InstanceID> |
|
90 |
<rasd:Parent>4</rasd:Parent> |
|
91 |
<rasd:ResourceType>17</rasd:ResourceType> |
|
92 |
</Item> |
|
93 |
<Item> |
|
94 |
<rasd:AddressOnParent>2</rasd:AddressOnParent> |
|
95 |
<rasd:AutomaticAllocation>true</rasd:AutomaticAllocation> |
|
96 |
<rasd:Connection>bridged</rasd:Connection> |
|
97 |
<rasd:Description>E1000 ethernet adapter on "bridged"</rasd:Description> |
|
98 |
<rasd:ElementName>ethernet0</rasd:ElementName> |
|
99 |
<rasd:InstanceID>9</rasd:InstanceID> |
|
100 |
<rasd:ResourceSubType>E1000</rasd:ResourceSubType> |
|
101 |
<rasd:ResourceType>10</rasd:ResourceType> |
|
102 |
</Item> |
|
103 |
</VirtualHardwareSection> |
|
104 |
</VirtualSystem> |
|
105 |
</Envelope> |
b/test/data/ovfdata/wrong_manifest.mf | ||
---|---|---|
1 |
SHA1(new_disk.vmdk)= 0500304662fb8a6a7925b5a43bc0e05d6a03720d |
|
2 |
SHA1(wrong_manifest.ovf)= 0500304662fb8a6a7965b5a43bc0e05d6a03720d |
b/test/data/ovfdata/wrong_manifest.ovf | ||
---|---|---|
1 |
<?xml version="1.0"?> |
|
2 |
<Envelope ovf:version="1.0" xml:lang="en-US" xmlns="http://schemas.dmtf.org/ovf/envelope/1" 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gnt="http://ganeti"> |
|
3 |
<References> |
|
4 |
<File ovf:href="new_disk.vmdk" ovf:id="file1"/> |
|
5 |
</References> |
|
6 |
<DiskSection> |
|
7 |
<Info>List of the virtual disks used in the package</Info> |
|
8 |
<Disk ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/specifications/vmdk.html#sparse"/> |
|
9 |
</DiskSection> |
|
10 |
<gnt:GanetiSection> |
|
11 |
<gnt:VersionId>0</gnt:VersionId> |
|
12 |
<gnt:AutoBalance>False</gnt:AutoBalance> |
|
13 |
<gnt:Tags></gnt:Tags> |
|
14 |
<gnt:OS> |
|
15 |
<gnt:Name>lenny-image</gnt:Name> |
|
16 |
</gnt:OS> |
|
17 |
<gnt:Network> |
|
18 |
<gnt:Mode>bridged</gnt:Mode> |
|
19 |
<gnt:MACAddress>aa:00:00:d8:2c:1e</gnt:MACAddress> |
|
20 |
<gnt:IPAddress>None</gnt:IPAddress> |
|
21 |
<gnt:Link>xen-br0</gnt:Link> |
|
22 |
</gnt:Network> |
|
23 |
<gnt:Hypervisor> |
|
24 |
<gnt:Name>xen-pvm</gnt:Name> |
|
25 |
<gnt:Parameters> |
|
26 |
<gnt:root-path>/dev/sda</gnt:root-path> |
|
27 |
<gnt:kernel_args>ro</gnt:kernel_args> |
|
28 |
</gnt:Parameters> |
|
29 |
</gnt:Hypervisor> |
|
30 |
</gnt:GanetiSection> |
|
31 |
<NetworkSection> |
|
32 |
<Info>Logical networks used in the package</Info> |
|
33 |
<Network ovf:name="bridged network"> |
|
34 |
<Description>Logical network used by this appliance.</Description> |
|
35 |
</Network> |
|
36 |
</NetworkSection> |
|
37 |
<VirtualSystem ovf:id="New-shiny-instance"> |
|
38 |
<Info>A virtual machine</Info> |
|
39 |
<OperatingSystemSection ovf:id="93"> |
|
40 |
<Info>The kind of installed guest operating system</Info> |
|
41 |
<Description>Ubuntu</Description> |
|
42 |
</OperatingSystemSection> |
|
43 |
<VirtualHardwareSection> |
|
44 |
<Info>Virtual hardware requirements for a virtual machine</Info> |
|
45 |
<System> |
|
46 |
<vssd:ElementName>Virtual Hardware Family</vssd:ElementName> |
|
47 |
<vssd:InstanceID>0</vssd:InstanceID> |
|
48 |
<vssd:VirtualSystemIdentifier>Ubuntu-freshly-created</vssd:VirtualSystemIdentifier> |
|
49 |
<vssd:VirtualSystemType>virtualbox-2.2</vssd:VirtualSystemType> |
|
50 |
</System> |
|
51 |
<Item> |
|
52 |
<rasd:Caption>1 virtual CPU</rasd:Caption> |
|
53 |
<rasd:ElementName>1 virtual CPU</rasd:ElementName> |
|
54 |
<rasd:Description>Number of virtual CPUs</rasd:Description> |
|
55 |
<rasd:InstanceID>1</rasd:InstanceID> |
|
56 |
<rasd:ResourceType>3</rasd:ResourceType> |
|
57 |
<rasd:VirtualQuantity>1</rasd:VirtualQuantity> |
|
58 |
</Item> |
|
59 |
<Item> |
|
60 |
<rasd:Caption>2048 MB of memory</rasd:Caption> |
|
61 |
<rasd:ElementName>2048 MB of memory</rasd:ElementName> |
|
62 |
<rasd:Description>Memory Size</rasd:Description> |
|
63 |
<rasd:InstanceID>2</rasd:InstanceID> |
|
64 |
<rasd:ResourceType>4</rasd:ResourceType> |
|
65 |
<rasd:AllocationUnits>MegaBytes</rasd:AllocationUnits> |
|
66 |
<rasd:VirtualQuantity>2048</rasd:VirtualQuantity> |
|
67 |
</Item> |
|
68 |
<Item> |
|
69 |
<rasd:Caption>ideController0</rasd:Caption> |
|
70 |
<rasd:ElementName>ideController0</rasd:ElementName> |
|
71 |
<rasd:Description>IDE Controller</rasd:Description> |
|
72 |
<rasd:InstanceID>3</rasd:InstanceID> |
|
73 |
<rasd:ResourceType>5</rasd:ResourceType> |
|
74 |
<rasd:ResourceSubType>PIIX4</rasd:ResourceSubType> |
|
75 |
<rasd:Address>1</rasd:Address> |
|
76 |
</Item> |
|
77 |
<Item> |
|
78 |
<rasd:Caption>Ethernet adapter on 'NAT'</rasd:Caption> |
|
79 |
<rasd:ElementName>Ethernet adapter on 'NAT'</rasd:ElementName> |
|
80 |
<rasd:InstanceID>5</rasd:InstanceID> |
|
81 |
<rasd:ResourceType>10</rasd:ResourceType> |
|
82 |
<rasd:ResourceSubType>PCNet32</rasd:ResourceSubType> |
|
83 |
<rasd:AutomaticAllocation>true</rasd:AutomaticAllocation> |
|
84 |
<rasd:Connection>bridged network</rasd:Connection> |
|
85 |
</Item> |
|
86 |
<Item> |
|
87 |
<rasd:Caption>disk1</rasd:Caption> |
|
88 |
<rasd:ElementName>disk1</rasd:ElementName> |
|
89 |
<rasd:Description>Disk Image</rasd:Description> |
|
90 |
<rasd:InstanceID>7</rasd:InstanceID> |
|
91 |
<rasd:ResourceType>17</rasd:ResourceType> |
|
92 |
<rasd:HostResource>/disk/vmdisk1</rasd:HostResource> |
|
93 |
<rasd:Parent>3</rasd:Parent> |
|
94 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
95 |
</Item> |
|
96 |
</VirtualHardwareSection> |
|
97 |
</VirtualSystem> |
|
98 |
</Envelope> |
b/test/data/ovfdata/wrong_ova.ova | ||
---|---|---|
1 |
<?xml version="1.0" encoding="UTF-8"?> |
|
2 |
<!--Generated by VMware ovftool 2.0.1 (build-260188), User: , UTC time: 2011-08-17T15:12:11.715742Z--> |
|
3 |
<Envelope vmw:buildId="build-260188" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:cim="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:vmw="http://www.vmware.com/schema/ovf" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
|
4 |
<References> |
|
5 |
<File ovf:href="AyertiennaSUSE.x86_64-0.0.2-disk1.vmdk" ovf:id="file1" ovf:size="761627136"/> |
|
6 |
</References> |
|
7 |
<DiskSection> |
|
8 |
<Info>Virtual disk information</Info> |
|
9 |
<Disk ovf:capacity="16514" ovf:capacityAllocationUnits="byte * 2^20" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize="2042953728"/> |
|
10 |
</DiskSection> |
|
11 |
<NetworkSection> |
|
12 |
<Info>The list of logical networks</Info> |
|
13 |
<Network ovf:name="bridged"> |
|
14 |
<Description>The bridged network</Description> |
|
15 |
</Network> |
|
16 |
</NetworkSection> |
|
17 |
<VirtualSystem ovf:id="vm"> |
|
18 |
<Info>A virtual machine</Info> |
|
19 |
<Name>AyertiennaSUSE.x86_64-0.0.2</Name> |
|
20 |
<OperatingSystemSection ovf:id="83" vmw:osType="suse64Guest"> |
|
21 |
<Info>The kind of installed guest operating system</Info> |
|
22 |
</OperatingSystemSection> |
|
23 |
<VirtualHardwareSection> |
|
24 |
<Info>Virtual hardware requirements</Info> |
|
25 |
<System> |
|
26 |
<vssd:ElementName>Virtual Hardware Family</vssd:ElementName> |
|
27 |
<vssd:InstanceID>0</vssd:InstanceID> |
|
28 |
<vssd:VirtualSystemIdentifier>AyertiennaSUSE.x86_64-0.0.2</vssd:VirtualSystemIdentifier> |
|
29 |
<vssd:VirtualSystemType>vmx-04</vssd:VirtualSystemType> |
|
30 |
</System> |
|
31 |
<Item> |
|
32 |
<rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits> |
|
33 |
<rasd:Description>Number of Virtual CPUs</rasd:Description> |
|
34 |
<rasd:ElementName>1 virtual CPU(s)</rasd:ElementName> |
|
35 |
<rasd:InstanceID>1</rasd:InstanceID> |
|
36 |
<rasd:ResourceType>3</rasd:ResourceType> |
|
37 |
<rasd:VirtualQuantity>1</rasd:VirtualQuantity> |
|
38 |
</Item> |
|
39 |
<Item> |
|
40 |
<rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits> |
|
41 |
<rasd:Description>Memory Size</rasd:Description> |
|
42 |
<rasd:ElementName>512MB of memory</rasd:ElementName> |
|
43 |
<rasd:InstanceID>2</rasd:InstanceID> |
|
44 |
<rasd:ResourceType>4</rasd:ResourceType> |
|
45 |
<rasd:VirtualQuantity>512</rasd:VirtualQuantity> |
|
46 |
</Item> |
|
47 |
<Item ovf:required="false"> |
|
48 |
<rasd:Address>0</rasd:Address> |
|
49 |
<rasd:Description>USB Controller</rasd:Description> |
|
50 |
<rasd:ElementName>usb</rasd:ElementName> |
|
51 |
<rasd:InstanceID>3</rasd:InstanceID> |
|
52 |
<rasd:ResourceType>23</rasd:ResourceType> |
|
53 |
</Item> |
|
54 |
<Item> |
|
55 |
<rasd:Address>0</rasd:Address> |
|
56 |
<rasd:Description>SCSI Controller</rasd:Description> |
|
57 |
<rasd:ElementName>scsiController0</rasd:ElementName> |
|
58 |
<rasd:InstanceID>4</rasd:InstanceID> |
|
59 |
<rasd:ResourceSubType>lsilogic</rasd:ResourceSubType> |
|
60 |
<rasd:ResourceType>6</rasd:ResourceType> |
|
61 |
</Item> |
|
62 |
<Item> |
|
63 |
<rasd:Address>0</rasd:Address> |
|
64 |
<rasd:Description>IDE Controller</rasd:Description> |
|
65 |
<rasd:ElementName>ideController0</rasd:ElementName> |
|
66 |
<rasd:InstanceID>5</rasd:InstanceID> |
|
67 |
<rasd:ResourceType>5</rasd:ResourceType> |
|
68 |
</Item> |
|
69 |
<Item ovf:required="false"> |
|
70 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
71 |
<rasd:AutomaticAllocation>false</rasd:AutomaticAllocation> |
|
72 |
<rasd:Description>Floppy Drive</rasd:Description> |
|
73 |
<rasd:ElementName>floppy0</rasd:ElementName> |
|
74 |
<rasd:InstanceID>6</rasd:InstanceID> |
|
75 |
<rasd:ResourceType>14</rasd:ResourceType> |
|
76 |
</Item> |
|
77 |
<Item ovf:required="false"> |
|
78 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
79 |
<rasd:AutomaticAllocation>false</rasd:AutomaticAllocation> |
|
80 |
<rasd:ElementName>cdrom1</rasd:ElementName> |
|
81 |
<rasd:InstanceID>7</rasd:InstanceID> |
|
82 |
<rasd:Parent>5</rasd:Parent> |
|
83 |
<rasd:ResourceType>15</rasd:ResourceType> |
|
84 |
</Item> |
|
85 |
<Item> |
|
86 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
87 |
<rasd:ElementName>disk1</rasd:ElementName> |
|
88 |
<rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource> |
|
89 |
<rasd:InstanceID>8</rasd:InstanceID> |
|
90 |
<rasd:Parent>4</rasd:Parent> |
|
91 |
<rasd:ResourceType>17</rasd:ResourceType> |
|
92 |
</Item> |
|
93 |
<Item> |
|
94 |
<rasd:AddressOnParent>2</rasd:AddressOnParent> |
|
95 |
<rasd:AutomaticAllocation>true</rasd:AutomaticAllocation> |
|
96 |
<rasd:Connection>bridged</rasd:Connection> |
|
97 |
<rasd:Description>E1000 ethernet adapter on "bridged"</rasd:Description> |
|
98 |
<rasd:ElementName>ethernet0</rasd:ElementName> |
|
99 |
<rasd:InstanceID>9</rasd:InstanceID> |
|
100 |
<rasd:ResourceSubType>E1000</rasd:ResourceSubType> |
|
101 |
<rasd:ResourceType>10</rasd:ResourceType> |
|
102 |
</Item> |
|
103 |
</VirtualHardwareSection> |
|
104 |
</VirtualSystem> |
|
105 |
</Envelope> |
b/test/data/ovfdata/wrong_xml.ovf | ||
---|---|---|
1 |
<?xml version="1.0" encoding="UTF-8"?> |
|
2 |
<!--Generated by VMware ovftool 2.0.1 (build-260188), User: , UTC time: 2011-08-17T15:12:11.715742Z--> |
|
3 |
<Envelope vmw:buildId="build-260188" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:cim="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:vmw="http://www.vmware.com/schema/ovf" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
|
4 |
<References> |
|
5 |
<File ovf:href="AyertiennaSUSE.x86_64-0.0.2-disk1.vmdk" ovf:id="file1" ovf:size="761627136"/> |
|
6 |
</References> |
|
7 |
<DiskSection> |
|
8 |
<Info>Virtual disk information</Info> |
|
9 |
<Disk ovf:capacity="16514" ovf:capacityAllocationUnits="byte * 2^20" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize="2042953728"/> |
|
10 |
</DiskSection> |
|
11 |
<NetworkSection> |
|
12 |
<Info>The list of logical networks</Info> |
|
13 |
<Network ovf:name="bridged"> |
|
14 |
<Description>The bridged network</Description> |
|
15 |
</Network> |
|
16 |
</NetworkSection> |
|
17 |
<VirtualSystem ovf:id="vm"> |
|
18 |
<Info>A virtual machine</Info> |
|
19 |
<Name>AyertiennaSUSE.x86_64-0.0.2</Name> |
|
20 |
<OperatingSystemSection ovf:id="83" vmw:osType="suse64Guest"> |
|
21 |
<Info>The kind of installed guest operating system</Info> |
|
22 |
</OperatingSystemSection> |
|
23 |
<VirtualHardwareSection> |
|
24 |
<Info>Virtual hardware requirements</Info> |
|
25 |
<System> |
|
26 |
<vssd:ElementName>Virtual Hardware Family</vssd:ElementName> |
|
27 |
<vssd:InstanceID>0</vssd:InstanceID> |
|
28 |
<vssd:VirtualSystemIdentifier>AyertiennaSUSE.x86_64-0.0.2</vssd:VirtualSystemIdentifier> |
|
29 |
<vssd:VirtualSystemType>vmx-04</vssd:VirtualSystemType> |
|
30 |
</System> |
|
31 |
<Item> |
|
32 |
<rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits> |
|
33 |
<rasd:Description>Number of Virtual CPUs</rasd:Description> |
|
34 |
<rasd:ElementName>1 virtual CPU(s)</rasd:ElementName> |
|
35 |
<rasd:InstanceID>1</rasd:InstanceID> |
|
36 |
<rasd:ResourceType>3</rasd:ResourceType> |
|
37 |
<rasd:VirtualQuantity>1</rasd:VirtualQuantity> |
|
38 |
</Item> |
|
39 |
<Item> |
|
40 |
<rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits> |
|
41 |
<rasd:Description>Memory Size</rasd:Description> |
|
42 |
<rasd:ElementName>512MB of memory</rasd:ElementName> |
|
43 |
<rasd:InstanceID>2</rasd:InstanceID> |
|
44 |
<rasd:ResourceType>4</rasd:ResourceType> |
|
45 |
<rasd:VirtualQuantity>512</rasd:VirtualQuantity> |
|
46 |
</Item> |
|
47 |
<Item> |
|
48 |
<rasd:Address>0</rasd:Address> |
|
49 |
<rasd:Description>SCSI Controller</rasd:Description> |
|
50 |
<rasd:ElementName>scsiController0</rasd:ElementName> |
|
51 |
<rasd:InstanceID>4</rasd:InstanceID> |
|
52 |
<rasd:ResourceSubType>lsilogic</rasd:ResourceSubType> |
|
53 |
<rasd:ResourceType>6</rasd:ResourceType> |
|
54 |
</Item> |
|
55 |
<Item> |
|
56 |
<rasd:Address>0</rasd:Address> |
|
57 |
<rasd:Description>IDE Controller</rasd:Description> |
|
58 |
<rasd:ElementName>ideController0</rasd:ElementName> |
|
59 |
<rasd:InstanceID>5</rasd:InstanceID> |
|
60 |
<rasd:ResourceType>5</rasd:ResourceType> |
|
61 |
</Item> |
|
62 |
<Item> |
|
63 |
<rasd:AddressOnParent>0</rasd:AddressOnParent> |
|
64 |
<rasd:ElementName>disk1</rasd:ElementName> |
|
65 |
<rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource> |
|
66 |
<rasd:InstanceID>8</rasd:InstanceID> |
|
67 |
<rasd:Parent>4</rasd:Parent> |
|
68 |
<rasd:ResourceType>17</rasd:ResourceType> |
|
69 |
</Item> |
|
70 |
<Item |
|
71 |
</Item> |
|
72 |
</VirtualHardwareSection> |
|
73 |
</VirtualSystem> |
|
74 |
</Envelope> |
|
75 |
|
b/test/ganeti.ovf_unittest.py | ||
---|---|---|
1 |
#!/usr/bin/python |
|
2 |
# |
|
3 |
|
|
4 |
# Copyright (C) 2011 Google Inc. |
|
5 |
# |
|
6 |
# This program is free software; you can redistribute it and/or modify |
|
7 |
# it under the terms of the GNU General Public License as published by |
|
8 |
# the Free Software Foundation; either version 2 of the License, or |
|
9 |
# (at your option) any later version. |
|
10 |
# |
|
11 |
# This program is distributed in the hope that it will be useful, but |
|
12 |
# WITHOUT ANY WARRANTY; without even the implied warranty of |
|
13 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
14 |
# General Public License for more details. |
|
15 |
# |
|
16 |
# You should have received a copy of the GNU General Public License |
|
17 |
# along with this program; if not, write to the Free Software |
|
18 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA |
|
19 |
# 02110-1301, USA. |
|
20 |
|
|
21 |
|
|
22 |
"""Script for testing ganeti.ovf. |
|
23 |
|
|
24 |
""" |
|
25 |
|
|
26 |
import optparse |
|
27 |
import os |
|
28 |
import os.path |
|
29 |
import re |
|
30 |
import shutil |
|
31 |
import sys |
|
32 |
import tempfile |
|
33 |
import unittest |
|
34 |
|
|
35 |
from ganeti import constants |
|
36 |
from ganeti import errors |
|
37 |
from ganeti import ovf |
|
38 |
from ganeti import utils |
|
39 |
|
|
40 |
import testutils |
|
41 |
|
|
42 |
OUTPUT_DIR = "newdir" |
|
43 |
|
|
44 |
GANETI_DISKS = { |
|
45 |
"disk_count": "1", |
|
46 |
"disk0_dump": "new_disk.raw", |
|
47 |
"disk0_size": "0", |
|
48 |
"disk0_ivname": "disk/0", |
|
49 |
} |
|
50 |
GANETI_NETWORKS = { |
|
51 |
"nic_count": "1", |
|
52 |
"nic0_mode": "bridged", |
|
53 |
"nic0_ip": "none", |
|
54 |
"nic0_mac": "aa:00:00:d8:2c:1e", |
|
55 |
"nic0_link": "xen-br0", |
|
56 |
} |
|
57 |
GANETI_HYPERVISOR = { |
|
58 |
"hypervisor_name": "xen-pvm", |
|
59 |
"root-path": "/dev/sda", |
|
60 |
"kernel_args": "ro", |
|
61 |
} |
|
62 |
GANETI_OS = {"os_name": "lenny-image"} |
|
63 |
GANETI_BACKEND = { |
|
64 |
"vcpus": "1", |
|
65 |
"memory" : "2048", |
|
66 |
"auto_balance": "False", |
|
67 |
} |
|
68 |
GANETI_NAME = "ganeti-test-xen" |
|
69 |
GANETI_TEMPLATE = "plain" |
|
70 |
GANETI_TAGS = None |
|
71 |
GANETI_VERSION = "0" |
|
72 |
|
|
73 |
VIRTUALBOX_DISKS = { |
|
74 |
"disk_count": "2", |
|
75 |
"disk0_ivname": "disk/0", |
|
76 |
"disk0_dump": "new_disk.raw", |
|
77 |
"disk0_size": "0", |
|
78 |
"disk1_ivname": "disk/1", |
|
79 |
"disk1_dump": "second_disk.raw", |
|
80 |
"disk1_size": "0", |
|
81 |
} |
|
82 |
VIRTUALBOX_NETWORKS = { |
|
83 |
"nic_count": "1", |
|
84 |
"nic0_mode": "bridged", |
|
85 |
"nic0_ip": "none", |
|
86 |
"nic0_link": "auto", |
|
87 |
"nic0_mac": "auto", |
|
88 |
} |
|
89 |
VIRTUALBOX_HYPERVISOR = {"hypervisor_name": "auto"} |
|
90 |
VIRTUALBOX_OS = {"os_name": None} |
|
91 |
VIRTUALBOX_BACKEND = { |
|
92 |
"vcpus": "1", |
|
93 |
"memory" : "2048", |
|
94 |
"auto_balance": "auto", |
|
95 |
} |
|
96 |
VIRTUALBOX_NAME = None |
|
97 |
VIRTUALBOX_TEMPLATE = None |
|
98 |
VIRTUALBOX_TAGS = None |
|
99 |
VIRTUALBOX_VERSION = None |
|
100 |
|
|
101 |
EMPTY_DISKS = {} |
|
102 |
EMPTY_NETWORKS = {} |
|
103 |
EMPTY_HYPERVISOR = {"hypervisor_name": "auto"} |
|
104 |
EMPTY_OS = {} |
|
105 |
EMPTY_BACKEND = { |
|
106 |
"vcpus": "auto", |
|
107 |
"memory" : "auto", |
|
108 |
"auto_balance": "auto", |
|
109 |
} |
|
110 |
EMPTY_NAME = None |
|
111 |
EMPTY_TEMPLATE = None |
|
112 |
EMPTY_TAGS = None |
|
113 |
EMPTY_VERSION = None |
|
114 |
|
|
115 |
CMDARGS_DISKS = { |
|
116 |
"disk_count": "1", |
|
117 |
"disk0_ivname": "disk/0", |
|
118 |
"disk0_dump": "disk0.raw", |
|
119 |
"disk0_size": "8", |
|
120 |
} |
|
121 |
CMDARGS_NETWORKS = { |
|
122 |
"nic0_link": "auto", |
|
123 |
"nic0_mode": "bridged", |
|
124 |
"nic0_ip": "none", |
|
125 |
"nic0_mac": "auto", |
|
126 |
"nic_count": "1", |
|
127 |
} |
|
128 |
CMDARGS_HYPERVISOR = { |
|
129 |
"hypervisor_name": "xen-pvm" |
|
130 |
} |
|
131 |
CMDARGS_OS = {"os_name": "lenny-image"} |
|
132 |
CMDARGS_BACKEND = { |
|
133 |
"auto_balance": False, |
|
134 |
"vcpus": "1", |
|
135 |
"memory": "256", |
|
136 |
} |
|
137 |
CMDARGS_NAME = "test-instance" |
|
138 |
CMDARGS_TEMPLATE = "plain" |
|
139 |
CMDARGS_TAGS = "test-tag-1,test-tag-2" |
|
140 |
|
|
141 |
ARGS_EMPTY = { |
|
142 |
"output_dir": None, |
|
143 |
"nics": [], |
|
144 |
"disks": [], |
|
145 |
"name": "test-instance", |
|
146 |
} |
|
147 |
ARGS_EXPORT_DIR = dict(ARGS_EMPTY, **{ |
|
148 |
"output_dir": OUTPUT_DIR, |
|
149 |
"name": None, |
|
150 |
"hypervisor": None, |
|
151 |
"os": None, |
|
152 |
"beparams": {}, |
|
153 |
"no_nics": False, |
|
154 |
"disk_template": None, |
|
155 |
"tags": None, |
|
156 |
}) |
|
157 |
ARGS_VBOX = dict(ARGS_EXPORT_DIR, **{ |
|
158 |
"output_dir": OUTPUT_DIR, |
|
159 |
"name": "test-instance", |
|
160 |
"os": "lenny-image", |
|
161 |
"hypervisor": ("xen-pvm", {}), |
|
162 |
"osparams":{}, |
|
163 |
"disks": [], |
|
164 |
}) |
|
165 |
ARGS_COMPLETE = dict(ARGS_VBOX, **{ |
|
166 |
"beparams": {"vcpus":"1", "memory":"256", "auto_balance": False}, |
|
167 |
"disks": [(0,{"size":"5mb"})], |
|
168 |
"nics": [("0",{"mode":"bridged"})], |
|
169 |
"disk_template": "plain", |
|
170 |
"tags": "test-tag-1,test-tag-2", |
|
171 |
}) |
|
172 |
ARGS_BROKEN = dict(ARGS_EXPORT_DIR , **{ |
|
173 |
"no_nics": True, |
|
174 |
"disk_template": "diskless", |
|
175 |
"name": "test-instance", |
|
176 |
"os": "lenny-image", |
|
177 |
"osparams": {}, |
|
178 |
}) |
|
179 |
|
|
180 |
|
|
181 |
def _GetArgs(args, with_name=False): |
|
182 |
options = optparse.Values() |
|
183 |
needed = args |
|
184 |
if with_name: |
|
185 |
needed["name"] = "test-instance" |
|
186 |
options._update_loose(needed) |
|
187 |
return options |
|
188 |
|
|
189 |
|
|
190 |
OPTS_EMPTY = _GetArgs(ARGS_EMPTY) |
|
191 |
OPTS_EXPORT_NO_NAME = _GetArgs(ARGS_EXPORT_DIR) |
|
192 |
OPTS_EXPORT = _GetArgs(ARGS_EXPORT_DIR, with_name=True) |
|
193 |
OPTS_VBOX = _GetArgs(ARGS_VBOX) |
|
194 |
OPTS_COMPLETE = _GetArgs(ARGS_COMPLETE) |
|
195 |
OPTS_NONIC_NODISK = _GetArgs(ARGS_BROKEN) |
|
196 |
|
|
197 |
|
|
198 |
def _GetFullFilename(file_name): |
|
199 |
file_path = "%s/test/data/ovfdata/%s" % (testutils.GetSourceDir(), |
|
200 |
file_name) |
|
201 |
file_path = os.path.abspath(file_path) |
|
202 |
return file_path |
|
203 |
|
|
204 |
|
|
205 |
class BetterUnitTest(unittest.TestCase): |
|
206 |
def assertRaisesRegexp(self, exception, regexp_val, function, *args): |
|
207 |
try: |
|
208 |
function(*args) |
|
209 |
self.fail("Expected raising %s" % exception) |
|
210 |
except exception, err: |
|
211 |
regexp = re.compile(regexp_val) |
|
212 |
if re.search(regexp, str(err)) == None: |
|
213 |
self.fail("Expected matching '%s', got '%s'" % |
|
214 |
(regexp_val, str(err))) |
|
215 |
|
|
216 |
|
|
217 |
class TestOVFImporter(BetterUnitTest): |
|
218 |
def setUp(self): |
|
219 |
self.non_existing_file = _GetFullFilename("not_the_file.ovf") |
|
220 |
self.ganeti_ovf = _GetFullFilename("ganeti.ovf") |
|
221 |
self.virtualbox_ovf = _GetFullFilename("virtualbox.ovf") |
|
222 |
self.ova_package = _GetFullFilename("ova.ova") |
|
223 |
self.empty_ovf = _GetFullFilename("empty.ovf") |
|
224 |
self.wrong_extension = _GetFullFilename("wrong_extension.ovd") |
|
225 |
self.wrong_ova_archive = _GetFullFilename("wrong_ova.ova") |
|
226 |
self.no_ovf_in_ova = _GetFullFilename("no_ovf.ova") |
|
227 |
self.importer = None |
|
228 |
|
|
229 |
def tearDown(self): |
|
230 |
if self.importer: |
|
231 |
self.importer.Cleanup() |
|
232 |
del_dir = os.path.abspath(OUTPUT_DIR) |
|
233 |
try: |
|
234 |
shutil.rmtree(del_dir) |
|
235 |
except OSError: |
|
236 |
pass |
|
237 |
|
|
238 |
def testFileDoesNotExistError(self): |
|
239 |
self.assertRaisesRegexp(errors.OpPrereqError, "does not exist", |
|
240 |
ovf.OVFImporter, self.non_existing_file, None) |
|
241 |
|
|
242 |
def testWrongInputFileExtensionError(self): |
|
243 |
self.assertRaisesRegexp(errors.OpPrereqError, |
|
244 |
"Unknown file extension", ovf.OVFImporter, |
|
245 |
self.wrong_extension, None) |
|
246 |
|
|
247 |
def testOVAUnpackingDirectories(self): |
|
248 |
self.importer = ovf.OVFImporter(self.ova_package, OPTS_EMPTY) |
|
249 |
self.assertTrue(self.importer.input_dir != None) |
|
250 |
self.assertEquals(self.importer.output_dir , constants.EXPORT_DIR) |
|
251 |
self.assertTrue(self.importer.temp_dir != None) |
|
252 |
|
|
253 |
def testOVFUnpackingDirectories(self): |
|
254 |
self.importer = ovf.OVFImporter(self.virtualbox_ovf, |
|
255 |
OPTS_EMPTY) |
|
256 |
self.assertEquals(self.importer.input_dir , _GetFullFilename("")) |
|
257 |
self.assertEquals(self.importer.output_dir , constants.EXPORT_DIR) |
|
258 |
self.assertEquals(self.importer.temp_dir , None) |
|
259 |
|
|
260 |
def testOVFSetOutputDirDirectories(self): |
|
261 |
self.importer = ovf.OVFImporter(self.ganeti_ovf, OPTS_EXPORT) |
|
262 |
self.assertEquals(self.importer.input_dir , _GetFullFilename("")) |
|
263 |
self.assertTrue(OUTPUT_DIR in self.importer.output_dir) |
|
264 |
self.assertEquals(self.importer.temp_dir , None) |
|
265 |
|
|
266 |
def testWrongOVAArchiveError(self): |
|
267 |
self.assertRaisesRegexp(errors.OpPrereqError, "not a proper tar", |
|
268 |
ovf.OVFImporter, self.wrong_ova_archive, None) |
|
269 |
|
|
270 |
def testNoOVFFileInOVAPackageError(self): |
|
271 |
self.assertRaisesRegexp(errors.OpPrereqError, "No .ovf file", |
|
272 |
ovf.OVFImporter, self.no_ovf_in_ova, None) |
|
273 |
|
|
274 |
def testParseGanetiOvf(self): |
|
275 |
self.importer = ovf.OVFImporter(self.ganeti_ovf, OPTS_EXPORT_NO_NAME) |
|
276 |
self.importer.Parse() |
|
277 |
self.assertTrue("%s/ganeti-test-xen" % OUTPUT_DIR in |
|
278 |
self.importer.output_dir) |
|
279 |
self.assertEqual(self.importer.results_disk, GANETI_DISKS) |
|
280 |
self.assertEqual(self.importer.results_network, GANETI_NETWORKS) |
|
281 |
self.assertEqual(self.importer.results_hypervisor, GANETI_HYPERVISOR) |
|
282 |
self.assertEqual(self.importer.results_os, GANETI_OS) |
|
283 |
self.assertEqual(self.importer.results_backend, GANETI_BACKEND) |
|
284 |
self.assertEqual(self.importer.results_name, GANETI_NAME) |
|
285 |
self.assertEqual(self.importer.results_template, GANETI_TEMPLATE) |
|
286 |
self.assertEqual(self.importer.results_tags, GANETI_TAGS) |
|
287 |
self.assertEqual(self.importer.results_version, GANETI_VERSION) |
|
288 |
|
|
289 |
def testParseVirtualboxOvf(self): |
|
290 |
self.importer = ovf.OVFImporter(self.virtualbox_ovf, OPTS_VBOX) |
|
291 |
self.importer.Parse() |
|
292 |
self.assertTrue("%s/test-instance" % OUTPUT_DIR in self.importer.output_dir) |
|
293 |
self.assertEquals(self.importer.results_disk, VIRTUALBOX_DISKS) |
|
294 |
self.assertEquals(self.importer.results_network, VIRTUALBOX_NETWORKS) |
|
295 |
self.assertEquals(self.importer.results_hypervisor, CMDARGS_HYPERVISOR) |
|
296 |
self.assertEquals(self.importer.results_os, CMDARGS_OS) |
|
297 |
self.assertEquals(self.importer.results_backend, VIRTUALBOX_BACKEND) |
|
298 |
self.assertEquals(self.importer.results_name, CMDARGS_NAME) |
|
299 |
self.assertEquals(self.importer.results_template, VIRTUALBOX_TEMPLATE) |
|
300 |
self.assertEqual(self.importer.results_tags, VIRTUALBOX_TAGS) |
|
301 |
self.assertEqual(self.importer.results_version, constants.EXPORT_VERSION) |
|
302 |
|
|
303 |
def testParseEmptyOvf(self): |
|
304 |
self.importer = ovf.OVFImporter(self.empty_ovf, OPTS_COMPLETE) |
|
305 |
self.importer.Parse() |
|
306 |
self.assertTrue("%s/test-instance" % OUTPUT_DIR in self.importer.output_dir) |
|
307 |
self.assertEquals(self.importer.results_disk, CMDARGS_DISKS) |
|
308 |
self.assertEquals(self.importer.results_network, CMDARGS_NETWORKS) |
|
309 |
self.assertEquals(self.importer.results_hypervisor, CMDARGS_HYPERVISOR) |
|
310 |
self.assertEquals(self.importer.results_os, CMDARGS_OS) |
|
311 |
self.assertEquals(self.importer.results_backend, CMDARGS_BACKEND) |
|
312 |
self.assertEquals(self.importer.results_name, CMDARGS_NAME) |
|
313 |
self.assertEquals(self.importer.results_template, CMDARGS_TEMPLATE) |
|
314 |
self.assertEqual(self.importer.results_tags, CMDARGS_TAGS) |
|
315 |
self.assertEqual(self.importer.results_version, constants.EXPORT_VERSION) |
|
316 |
|
|
317 |
def testParseNameOptions(self): |
|
318 |
self.importer = ovf.OVFImporter(self.empty_ovf, OPTS_COMPLETE) |
|
319 |
results = self.importer._ParseNameOptions() |
|
320 |
self.assertEquals(results, CMDARGS_NAME) |
|
321 |
|
|
322 |
def testParseHypervisorOptions(self): |
|
323 |
self.importer = ovf.OVFImporter(self.empty_ovf, OPTS_COMPLETE) |
|
324 |
results = self.importer._ParseHypervisorOptions() |
|
325 |
self.assertEquals(results, CMDARGS_HYPERVISOR) |
|
326 |
|
|
327 |
def testParseOSOptions(self): |
|
328 |
self.importer = ovf.OVFImporter(self.empty_ovf, OPTS_COMPLETE) |
|
329 |
results = self.importer._ParseOSOptions() |
|
330 |
self.assertEquals(results, CMDARGS_OS) |
|
331 |
|
|
332 |
def testParseBackendOptions(self): |
|
333 |
self.importer = ovf.OVFImporter(self.empty_ovf, OPTS_COMPLETE) |
|
334 |
results = self.importer._ParseBackendOptions() |
|
335 |
self.assertEquals(results, CMDARGS_BACKEND) |
|
336 |
|
|
337 |
def testParseTags(self): |
|
338 |
self.importer = ovf.OVFImporter(self.empty_ovf, OPTS_COMPLETE) |
|
339 |
results = self.importer._ParseTags() |
|
340 |
self.assertEquals(results, CMDARGS_TAGS) |
|
341 |
|
|
342 |
def testParseNicOptions(self): |
|
343 |
self.importer = ovf.OVFImporter(self.empty_ovf, OPTS_COMPLETE) |
|
344 |
results = self.importer._ParseNicOptions() |
|
345 |
self.assertEquals(results, CMDARGS_NETWORKS) |
|
346 |
|
|
347 |
def testParseDiskOptionsFromGanetiOVF(self): |
|
348 |
self.importer = ovf.OVFImporter(self.ganeti_ovf, OPTS_EXPORT) |
|
349 |
os.mkdir(OUTPUT_DIR) |
|
350 |
results = self.importer._GetDiskInfo() |
|
351 |
self.assertEquals(results, GANETI_DISKS) |
|
352 |
|
|
353 |
def testParseTemplateOptions(self): |
|
354 |
self.importer = ovf.OVFImporter(self.empty_ovf, OPTS_COMPLETE) |
|
355 |
results = self.importer._ParseTemplateOptions() |
|
356 |
self.assertEquals(results, GANETI_TEMPLATE) |
|
357 |
|
|
358 |
def testParseDiskOptionsFromCmdLine(self): |
|
359 |
self.importer = ovf.OVFImporter(self.empty_ovf, OPTS_COMPLETE) |
|
360 |
os.mkdir(OUTPUT_DIR) |
|
361 |
results = self.importer._ParseDiskOptions() |
|
362 |
self.assertEquals(results, CMDARGS_DISKS) |
|
363 |
|
|
364 |
def testGetDiskFormat(self): |
|
365 |
self.importer = ovf.OVFImporter(self.ganeti_ovf, OPTS_EXPORT) |
|
366 |
disks_list = self.importer.ovf_reader.GetDisksNames() |
|
367 |
results = [self.importer._GetDiskQemuInfo("%s/%s" % |
|
368 |
(self.importer.input_dir, path), "file format: (\S+)") |
|
369 |
for (path, _) in disks_list] |
|
370 |
self.assertEqual(results, ["vmdk"]) |
|
371 |
|
|
372 |
def testNoInstanceNameOVF(self): |
|
373 |
self.importer = ovf.OVFImporter(self.empty_ovf, OPTS_EXPORT_NO_NAME) |
|
374 |
self.assertRaisesRegexp(errors.OpPrereqError, "Name of instance", |
|
375 |
self.importer.Parse) |
|
376 |
|
|
377 |
def testErrorNoOSNameOVF(self): |
|
378 |
self.importer = ovf.OVFImporter(self.virtualbox_ovf, OPTS_EXPORT) |
|
379 |
self.assertRaisesRegexp(errors.OpPrereqError, "OS name", |
|
380 |
self.importer.Parse) |
|
381 |
|
|
382 |
def testErrorNoDiskAndNoNetwork(self): |
|
383 |
self.importer = ovf.OVFImporter(self.empty_ovf, OPTS_NONIC_NODISK) |
|
384 |
self.assertRaisesRegexp(errors.OpPrereqError, |
|
385 |
"Either disk specification or network" |
|
386 |
" description", self.importer.Parse) |
|
387 |
|
|
388 |
|
|
389 |
class TestOVFReader(BetterUnitTest): |
|
390 |
def setUp(self): |
|
391 |
self.wrong_xml_file = _GetFullFilename("wrong_xml.ovf") |
|
392 |
self.ganeti_ovf = _GetFullFilename("ganeti.ovf") |
|
393 |
self.virtualbox_ovf = _GetFullFilename("virtualbox.ovf") |
|
394 |
self.corrupted_ovf = _GetFullFilename("corrupted_resources.ovf") |
|
395 |
self.wrong_manifest_ovf = _GetFullFilename("wrong_manifest.ovf") |
|
396 |
self.no_disk_in_ref_ovf = _GetFullFilename("no_disk_in_ref.ovf") |
|
397 |
self.empty_ovf = _GetFullFilename("empty.ovf") |
|
398 |
self.compressed_disk = _GetFullFilename("gzip_disk.ovf") |
|
399 |
|
|
400 |
def tearDown(self): |
|
401 |
pass |
|
402 |
|
|
403 |
def testXMLParsingError(self): |
|
404 |
self.assertRaisesRegexp(errors.OpPrereqError, |
|
405 |
"Error while reading .ovf", ovf.OVFReader, self.wrong_xml_file) |
|
406 |
|
|
407 |
def testFileInResourcesDoesNotExistError(self): |
|
408 |
self.assertRaisesRegexp(errors.OpPrereqError, "does not exist", |
|
409 |
ovf.OVFReader, self.corrupted_ovf) |
|
410 |
|
|
411 |
def testWrongManifestChecksumError(self): |
|
412 |
reader = ovf.OVFReader(self.wrong_manifest_ovf) |
|
413 |
self.assertRaisesRegexp(errors.OpPrereqError, |
|
414 |
"does not match the value in manifest file", reader.VerifyManifest) |
|
415 |
|
|
416 |
def testGoodManifestChecksum(self): |
|
417 |
reader = ovf.OVFReader(self.ganeti_ovf) |
|
418 |
self.assertEqual(reader.VerifyManifest(), None) |
|
419 |
|
|
420 |
def testGetDisksNamesOVFCorruptedError(self): |
|
421 |
reader = ovf.OVFReader(self.no_disk_in_ref_ovf) |
|
422 |
self.assertRaisesRegexp(errors.OpPrereqError, |
|
423 |
"not found in references", reader.GetDisksNames) |
|
424 |
|
|
425 |
def testGetDisksNamesVirtualbox(self): |
|
426 |
reader = ovf.OVFReader(self.virtualbox_ovf) |
|
427 |
disk_names = reader.GetDisksNames() |
|
428 |
expected_names = [ |
|
429 |
("new_disk.vmdk", None) , |
|
430 |
("second_disk.vmdk", None), |
|
431 |
] |
|
432 |
self.assertEqual(sorted(disk_names), sorted(expected_names)) |
|
433 |
|
|
434 |
def testGetDisksNamesEmpty(self): |
|
435 |
reader = ovf.OVFReader(self.empty_ovf) |
|
436 |
disk_names = reader.GetDisksNames() |
|
437 |
self.assertEqual(disk_names, []) |
|
438 |
|
|
439 |
def testGetDisksNamesCompressed(self): |
|
440 |
reader = ovf.OVFReader(self.compressed_disk) |
|
441 |
disk_names = reader.GetDisksNames() |
|
442 |
self.assertEqual(disk_names, [("compr_disk.vmdk.gz", "gzip")]) |
|
443 |
|
|
444 |
def testGetNetworkDataGaneti(self): |
|
445 |
reader = ovf.OVFReader(self.ganeti_ovf) |
|
446 |
networks = reader.GetNetworkData() |
|
447 |
self.assertEqual(networks, GANETI_NETWORKS) |
|
448 |
|
|
449 |
def testGetNetworkDataVirtualbox(self): |
|
450 |
reader = ovf.OVFReader(self.virtualbox_ovf) |
|
451 |
networks = reader.GetNetworkData() |
|
452 |
self.assertEqual(networks, VIRTUALBOX_NETWORKS) |
|
453 |
|
|
454 |
def testGetNetworkDataEmpty(self): |
|
455 |
reader = ovf.OVFReader(self.empty_ovf) |
|
456 |
networks = reader.GetNetworkData() |
|
457 |
self.assertEqual(networks, EMPTY_NETWORKS) |
|
458 |
|
|
459 |
def testGetHypervisorDataGaneti(self): |
|
460 |
reader = ovf.OVFReader(self.ganeti_ovf) |
|
461 |
hypervisor = reader.GetHypervisorData() |
|
462 |
self.assertEqual(hypervisor, GANETI_HYPERVISOR) |
|
463 |
|
|
464 |
def testGetHypervisorDataEmptyOvf(self): |
|
465 |
reader = ovf.OVFReader(self.empty_ovf) |
|
466 |
hypervisor = reader.GetHypervisorData() |
|
467 |
self.assertEqual(hypervisor, EMPTY_HYPERVISOR) |
|
468 |
|
|
469 |
def testGetOSDataGaneti(self): |
|
470 |
reader = ovf.OVFReader(self.ganeti_ovf) |
|
471 |
osys = reader.GetOSData() |
|
472 |
self.assertEqual(osys, GANETI_OS) |
|
473 |
|
|
474 |
def testGetOSDataEmptyOvf(self): |
|
475 |
reader = ovf.OVFReader(self.empty_ovf) |
|
476 |
osys = reader.GetOSData() |
|
477 |
self.assertEqual(osys, EMPTY_OS) |
|
478 |
|
|
479 |
def testGetBackendDataGaneti(self): |
|
480 |
reader = ovf.OVFReader(self.ganeti_ovf) |
|
481 |
backend = reader.GetBackendData() |
|
482 |
self.assertEqual(backend, GANETI_BACKEND) |
|
483 |
|
|
484 |
def testGetBackendDataVirtualbox(self): |
|
485 |
reader = ovf.OVFReader(self.virtualbox_ovf) |
|
486 |
backend = reader.GetBackendData() |
|
487 |
self.assertEqual(backend, VIRTUALBOX_BACKEND) |
|
488 |
|
|
489 |
def testGetBackendDataEmptyOvf(self): |
|
490 |
reader = ovf.OVFReader(self.empty_ovf) |
|
491 |
backend = reader.GetBackendData() |
|
492 |
self.assertEqual(backend, EMPTY_BACKEND) |
|
493 |
|
|
494 |
def testGetInstanceNameGaneti(self): |
|
495 |
reader = ovf.OVFReader(self.ganeti_ovf) |
|
496 |
name = reader.GetInstanceName() |
|
497 |
self.assertEqual(name, GANETI_NAME) |
|
498 |
|
|
499 |
def testGetInstanceNameDataEmptyOvf(self): |
|
500 |
reader = ovf.OVFReader(self.empty_ovf) |
|
501 |
name = reader.GetInstanceName() |
Also available in: Unified diff