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.py | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'fuel/deploy/dha.py') diff --git a/fuel/deploy/dha.py b/fuel/deploy/dha.py index 1feee6039..bf9a9512a 100644 --- a/fuel/deploy/dha.py +++ b/fuel/deploy/dha.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 yaml import io @@ -15,20 +5,15 @@ from dha_adapters.libvirt_adapter import LibvirtAdapter from dha_adapters.ipmi_adapter import IpmiAdapter from dha_adapters.hp_adapter import HpAdapter - class DeploymentHardwareAdapter(object): - def __new__(cls, yaml_path): with io.open(yaml_path) as yaml_file: dha_struct = yaml.load(yaml_file) type = dha_struct['adapter'] if cls is DeploymentHardwareAdapter: - if type == 'libvirt': - return LibvirtAdapter(yaml_path) - if type == 'ipmi': - return IpmiAdapter(yaml_path) - if type == 'hp': - return HpAdapter(yaml_path) + if type == 'libvirt': return LibvirtAdapter(yaml_path) + if type == 'ipmi': return IpmiAdapter(yaml_path) + if type == 'hp': return HpAdapter(yaml_path) return super(DeploymentHardwareAdapter, cls).__new__(cls) -- cgit 1.2.3-korg