j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2025-07-31 12:41:08 +00:00
Code Issues Projects Releases Wiki Activity

instance/network: allow to select compute interface, previously only compute network

Browse source
This commit is contained in:
Ing. Jan KRCMAR 2018-08-28 12:18:35 +02:00
parent 9c37dcc2dc
commit b4da655644
4 changed files with 42 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
vrtManager/instance.py
View file

@ -742,16 +742,25 @@ class wvmInstance(wvmConnect):
return self.get_instance(clone_data['name']).UUIDString()
def add_network(self, mac_address, network, interface_type='bridge', model='virtio'):
def get_bridge_name(self, source, source_type='net'):
if source_type == 'iface':
iface = self.get_iface(source)
bridge_name = iface.name()
else:
net = self.get_network(source)
bridge_name = net.bridgeName()
return bridge_name
def add_network(self, mac_address, source, source_type='net', interface_type='bridge', model='virtio'):
tree = ElementTree.fromstring(self._XMLDesc(0))
net = self.get_network(network)
bridge_name = self.get_bridge_name(source, source_type)
xml_interface = """
<interface type='%s'>
<mac address='%s'/>
<source bridge='%s'/>
<model type='%s'/>
</interface>
""" % (interface_type, mac_address, net.bridgeName(), model)
""" % (interface_type, mac_address, bridge_name, model)
if self.get_status() == 5:
devices = tree.find('devices')
elm_interface = ElementTree.fromstring(xml_interface)
@ -764,13 +773,15 @@ class wvmInstance(wvmConnect):
tree = ElementTree.fromstring(xml)
for num, interface in enumerate(tree.findall('devices/interface')):
net = self.get_network(network_data['net-source-' + str(num)])
net_source = network_data['net-source-' + str(num)]
net_source_type = network_data['net-source-' + str(num) + '-type']
net_mac = network_data['net-mac-' + str(num)]
bridge_name = self.get_bridge_name(net_source, net_source_type)
if interface.get('type') == 'bridge':
source = interface.find('mac')
source.set('address', network_data['net-mac-' + str(num)])
source.set('address', net_mac)
source = interface.find('source')
source.set('bridge', net.bridgeName())
source.set('network', net.name())
source.set('bridge', bridge_name)
new_xml = ElementTree.tostring(tree)
self._defineXML(new_xml)