Updates docs for SR1 with final revision

[genesis.git] / fuel / deploy / dha_adapters / libvirt_adapter.py

diff --git a/fuel/deploy/dha_adapters/libvirt_adapter.py b/fuel/deploy/dha_adapters/libvirt_adapter.py
index dde4946..b285c16 100644 (file)
--- a/fuel/deploy/dha_adapters/libvirt_adapter.py
+++ b/fuel/deploy/dha_adapters/libvirt_adapter.py
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2015 Ericsson AB and others.
+# szilard.cserey@ericsson.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+###############################################################################
+
+
 import common
 from lxml import etree
 from hardware_adapter import HardwareAdapter
@@ -10,6 +20,7 @@ DEV = {'pxe': 'network',
        'disk': 'hd',
        'iso': 'cdrom'}
 
+
 class LibvirtAdapter(HardwareAdapter):
 
     def __init__(self, yaml_path):
@@ -88,7 +99,8 @@ class LibvirtAdapter(HardwareAdapter):
     def node_eject_iso(self, node_id):
         vm_name = self.get_node_property(node_id, 'libvirtName')
         device = self.get_name_of_device(vm_name, 'cdrom')
-        exec_cmd('virsh change-media %s --eject %s' % (vm_name, device), False)
+        exec_cmd('virsh change-media %s --eject %s --config --live'
+                 % (vm_name, device), False)
 
     def node_insert_iso(self, node_id, iso_file):
         vm_name = self.get_node_property(node_id, 'libvirtName')
@@ -96,12 +108,6 @@ class LibvirtAdapter(HardwareAdapter):
         exec_cmd('virsh change-media %s --insert %s %s'
                  % (vm_name, device, iso_file))
 
-    def get_disks(self):
-        return self.dha_struct['disks']
-
-    def get_node_role(self, node_id):
-        return self.get_node_property(node_id, 'role')
-
     def get_node_pxe_mac(self, node_id):
         mac_list = []
         vm_name = self.get_node_property(node_id, 'libvirtName')
@@ -125,3 +131,6 @@ class LibvirtAdapter(HardwareAdapter):
                     device = target.get('dev')
                     if device:
                         return device
+
+    def get_virt_net_conf_dir(self):
+        return self.dha_struct['virtNetConfDir']