"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "tests/unit/modules/test_virt.py" between
salt-3002.1.tar.gz and salt-3002.2.tar.gz

About: SaltStack is a systems management software for data center automation, cloud orchestration, server provisioning, configuration management and more. Community version.

test_virt.py  (salt-3002.1)	:	test_virt.py  (salt-3002.2)
skipping to change at line 3558		skipping to change at line 3558
<emulator>/usr/bin/qemu-kvm</emulator>		<emulator>/usr/bin/qemu-kvm</emulator>
<machine maxCpus='255'>pc-i440fx-2.6</machine>		<machine maxCpus='255'>pc-i440fx-2.6</machine>
<machine canonical='pc-i440fx-2.6' maxCpus='255'>pc</machine>		<machine canonical='pc-i440fx-2.6' maxCpus='255'>pc</machine>
<machine maxCpus='255'>pc-0.12</machine>		<machine maxCpus='255'>pc-0.12</machine>
</domain>		</domain>
</arch>		</arch>
<features>		<features>
<cpuselection/>		<cpuselection/>
<deviceboot/>		<deviceboot/>
<disksnapshot default='on' toggle='no'/>		<disksnapshot default='on' toggle='no'/>
<acpi default='on' toggle='yes'/>		<acpi default='off' toggle='yes'/>
<apic default='on' toggle='no'/>		<apic default='on' toggle='no'/>
<pae/>		<pae/>
<nonpae/>		<nonpae/>
</features>		</features>
</guest>		</guest>
<guest>		<guest>
<os_type>hvm</os_type>		<os_type>hvm</os_type>
<arch name='x86_64'>		<arch name='x86_64'>
<wordsize>64</wordsize>		<wordsize>64</wordsize>
skipping to change at line 3586		skipping to change at line 3586
<machine maxCpus='255'>pc-i440fx-2.6</machine>		<machine maxCpus='255'>pc-i440fx-2.6</machine>
<machine canonical='pc-i440fx-2.6' maxCpus='255'>pc</machine>		<machine canonical='pc-i440fx-2.6' maxCpus='255'>pc</machine>
<machine maxCpus='255'>pc-0.12</machine>		<machine maxCpus='255'>pc-0.12</machine>
</domain>		</domain>
</arch>		</arch>
<features>		<features>
<cpuselection/>		<cpuselection/>
<deviceboot/>		<deviceboot/>
<disksnapshot default='on' toggle='no'/>		<disksnapshot default='on' toggle='no'/>
<acpi default='on' toggle='yes'/>		<acpi default='on' toggle='yes'/>
<apic default='on' toggle='no'/>		<apic default='off' toggle='no'/>
</features>		</features>
</guest>		</guest>
<guest>		<guest>
<os_type>xen</os_type>		<os_type>xen</os_type>
<arch name='x86_64'>		<arch name='x86_64'>
<wordsize>64</wordsize>		<wordsize>64</wordsize>
<emulator>/usr/bin/qemu-system-x86_64</emulator>		<emulator>/usr/bin/qemu-system-x86_64</emulator>
<machine>xenpv</machine>		<machine>xenpv</machine>
<domain type='xen'/>		<domain type='xen'/>
skipping to change at line 3739		skipping to change at line 3739
},		},
"pc-0.12": {"maxcpus": 255, "alternate_names ": []},		"pc-0.12": {"maxcpus": 255, "alternate_names ": []},
},		},
},		},
},		},
},		},
"features": {		"features": {
"cpuselection": {"default": True, "toggle": False},		"cpuselection": {"default": True, "toggle": False},
"deviceboot": {"default": True, "toggle": False},		"deviceboot": {"default": True, "toggle": False},
"disksnapshot": {"default": True, "toggle": False},		"disksnapshot": {"default": True, "toggle": False},
"acpi": {"default": True, "toggle": True},		"acpi": {"default": False, "toggle": True},
"apic": {"default": True, "toggle": False},		"apic": {"default": True, "toggle": False},
"pae": {"default": True, "toggle": False},		"pae": {"default": True, "toggle": False},
"nonpae": {"default": True, "toggle": False},		"nonpae": {"default": True, "toggle": False},
},		},
},		},
{		{
"os_type": "hvm",		"os_type": "hvm",
"arch": {		"arch": {
"name": "x86_64",		"name": "x86_64",
"wordsize": 64,		"wordsize": 64,
skipping to change at line 3777		skipping to change at line 3777
"pc-0.12": {"maxcpus": 255, "alternate_names ": []},		"pc-0.12": {"maxcpus": 255, "alternate_names ": []},
},		},
},		},
},		},
},		},
"features": {		"features": {
"cpuselection": {"default": True, "toggle": False},		"cpuselection": {"default": True, "toggle": False},
"deviceboot": {"default": True, "toggle": False},		"deviceboot": {"default": True, "toggle": False},
"disksnapshot": {"default": True, "toggle": False},		"disksnapshot": {"default": True, "toggle": False},
"acpi": {"default": True, "toggle": True},		"acpi": {"default": True, "toggle": True},
"apic": {"default": True, "toggle": False},		"apic": {"default": False, "toggle": False},
},		},
},		},
{		{
"os_type": "xen",		"os_type": "xen",
"arch": {		"arch": {
"name": "x86_64",		"name": "x86_64",
"wordsize": 64,		"wordsize": 64,
"emulator": "/usr/bin/qemu-system-x86_64",		"emulator": "/usr/bin/qemu-system-x86_64",
"machines": {"xenpv": {"alternate_names": []}},		"machines": {"xenpv": {"alternate_names": []}},
"domains": {"xen": {"emulator": None, "machines": {}}},		"domains": {"xen": {"emulator": None, "machines": {}}},
},		},
},		},
],		],
}		}
self.assertEqual(expected, caps)		self.assertEqual(expected, caps)
def test_network(self):		def test_network(self):
"""		"""
Test virt._get_net_xml()		Test virt._get_net_xml()
"""		"""
xml_data = virt._gen_net_xml("network", "main", "bridge", "openvswitch")		xml_data = virt._gen_net_xml("network", "main", "bridge", "openvswitch")
root = ET.fromstring(xml_data)		root = ET.fromstring(xml_data)
self.assertEqual(root.find("name").text, "network")		self.assertEqual(root.find("name").text, "network")
self.assertEqual(root.find("bridge").attrib["name"], "main")		self.assertEqual(root.find("bridge").attrib["name"], "main")
End of changes. 5 change blocks.
5 lines changed or deleted		4 lines changed or added

---