From 11dbe27afb96c5b54b9f4f0a1c8b21194f59dc7b Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Sat, 3 Oct 2015 16:54:43 +0200 Subject: Moving tag arno.2015.1.0 from genesis to fuel/stable/arno Change-Id: I8bb3e28a814e04ad15e8a4b24b40bd7685600f46 Signed-off-by: Jonas Bjurel --- fuel/deploy/dha_adapters/libvirt_adapter.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to '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 b285c1676..dde494635 100644 --- a/fuel/deploy/dha_adapters/libvirt_adapter.py +++ b/fuel/deploy/dha_adapters/libvirt_adapter.py @@ -1,13 +1,3 @@ -############################################################################### -# 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 @@ -20,7 +10,6 @@ DEV = {'pxe': 'network', 'disk': 'hd', 'iso': 'cdrom'} - class LibvirtAdapter(HardwareAdapter): def __init__(self, yaml_path): @@ -99,8 +88,7 @@ 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 --config --live' - % (vm_name, device), False) + exec_cmd('virsh change-media %s --eject %s' % (vm_name, device), False) def node_insert_iso(self, node_id, iso_file): vm_name = self.get_node_property(node_id, 'libvirtName') @@ -108,6 +96,12 @@ 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') @@ -131,6 +125,3 @@ class LibvirtAdapter(HardwareAdapter): device = target.get('dev') if device: return device - - def get_virt_net_conf_dir(self): - return self.dha_struct['virtNetConfDir'] -- cgit 1.2.3-korg