GitHub/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud.git synced 2026-05-28 16:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

instance/settings: inputs renamed according to action type (net -> clone-net-mac, net -> net-mac)

Browse Source 
instance/network: correct multiple interfaces handling, add mac handling
This commit is contained in:
Jan Krcmar
2016-02-10 17:52:50 +01:00
parent 71c6161291
commit 96982ce58b
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vrtManager/instance.py
View File

@@ -632,7 +632,7 @@ class wvmInstance(wvmConnect):
for num, net in enumerate(tree.findall('devices/interface')):
elm = net.find('mac')
mac_address = self.fix_mac(clone_data['net-' + str(num)])
mac_address = self.fix_mac(clone_data['clone-net-mac-' + str(num)])
elm.set('address', mac_address)
for disk in tree.findall('devices/disk'):
@@ -693,10 +693,12 @@ class wvmInstance(wvmConnect):
xml = self._XMLDesc(VIR_DOMAIN_XML_SECURE)
tree = ElementTree.fromstring(xml)
for interface in tree.findall('devices/interface'):
for num, interface in enumerate(tree.findall('devices/interface')):
if interface.get('type') == 'bridge':
source = interface.find('mac')
source.set('address', network_data['net-mac-' + str(num)])
source = interface.find('source')
source.set('bridge', network_data['net-source-0'])
source.set('bridge', network_data['net-source-' + str(num)])
new_xml = ElementTree.tostring(tree)
self._defineXML(new_xml)