1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
From: Josep Puigdemont <josep.puigdemont@enea.com>
Date: Fri, 20 May 2016 10:23:45 +0200
Subject: [PATCH] virtual_fuel: prepare class to allow multiple bridges
The VirtualFuel class has now two new methods:
del_vm_nics: Deletes all interfaces from the VM.
add_vm_nic: Adds a NIC to the VM, attached to the specified bridge.
The following method has been deleted:
set_vm_nic: implemented with the two new methods
Apart from the deleted method, no functionality has been changed. This
is just a small but necessary step towards adding support for supporting
more than one bridge in the fuel VM.
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
deploy/environments/virtual_fuel.py | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/deploy/environments/virtual_fuel.py b/deploy/environments/virtual_fuel.py
index 7dc9720..5a86c97 100644
--- 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)
- 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)
+
+ def add_vm_nic(self, bridge):
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')
+
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' %
@@ -121,11 +124,13 @@ class VirtualFuel(ExecutionEnvironment):
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(temp_vm_file)
+ self.del_vm_nics()
+ self.add_vm_nic(self.pxe_bridge)
+ self.update_vm_template_file()
+
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):
|
