Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[odl-l3] Get OVS plugin into the action
[fuel.git]
/
deploy
/
environments
/
virtual_fuel.py
diff --git
a/deploy/environments/virtual_fuel.py
b/deploy/environments/virtual_fuel.py
index
2fac98b
..
b1a76e4
100644
(file)
--- a/
deploy/environments/virtual_fuel.py
+++ b/
deploy/environments/virtual_fuel.py
@@
-67,22
+67,25
@@
class VirtualFuel(ExecutionEnvironment):
with open(self.temp_vm_file, "wc") as f:
self.vm_xml.write(f, pretty_print=True, xml_declaration=True)
with open(self.temp_vm_file, "wc") as f:
self.vm_xml.write(f, pretty_print=True, xml_declaration=True)
- def
set_vm_nic
(self):
+ def
del_vm_nics
(self):
interfaces = self.vm_xml.xpath('/domain/devices/interface')
for interface in interfaces:
interface.getparent().remove(interface)
interfaces = self.vm_xml.xpath('/domain/devices/interface')
for interface in interfaces:
interface.getparent().remove(interface)
+
+ def add_vm_nic(self, bridge):
interface = etree.Element('interface')
interface.set('type', 'bridge')
source = etree.SubElement(interface, 'source')
interface = etree.Element('interface')
interface.set('type', 'bridge')
source = etree.SubElement(interface, 'source')
- source.set('bridge',
self.pxe_
bridge)
+ source.set('bridge', bridge)
model = etree.SubElement(interface, 'model')
model.set('type', 'virtio')
model = etree.SubElement(interface, 'model')
model.set('type', 'virtio')
+
devices = self.vm_xml.xpath('/domain/devices')
if devices:
device = devices[0]
device.append(interface)
devices = self.vm_xml.xpath('/domain/devices')
if devices:
device = devices[0]
device.append(interface)
-
-
self.update_vm_template_file(
)
+ else:
+
err('No devices!'
)
def create_volume(self, pool, name, su, img_type='qcow2'):
log('Creating image using Libvirt volumes in pool %s, name: %s' %
def create_volume(self, pool, name, su, img_type='qcow2'):
log('Creating image using Libvirt volumes in pool %s, name: %s' %
@@
-121,11
+124,14
@@
class VirtualFuel(ExecutionEnvironment):
disk_size = disk_sizes['fuel']
disk_path = self.create_image(disk_path, disk_size)
disk_size = disk_sizes['fuel']
disk_path = self.create_image(disk_path, disk_size)
- temp_vm_file = '%s/%s' % (self.temp_dir, self.vm_name)
- exec_cmd('cp %s %s' % (self.vm_template, temp_vm_file))
- self.set_vm_nic()
+ self.del_vm_nics()
+ for bridge in self.pxe_bridge:
+ self.add_vm_nic(bridge)
+ self.update_vm_template_file()
+
vm_definition_overwrite = self.dha.get_vm_definition('fuel')
vm_definition_overwrite = self.dha.get_vm_definition('fuel')
- self.define_vm(self.vm_name, temp_vm_file, disk_path,
+
+ self.define_vm(self.vm_name, self.temp_vm_file, disk_path,
vm_definition_overwrite)
def setup_environment(self):
vm_definition_overwrite)
def setup_environment(self):