Skip to content
Permalink
Browse files

Fix Huawei drivers to support other host OSs

Huawei drivers create Linux hosts by default when attaching volumes.
This patch makes them also support Windows, XenServer, AIX, etc.
The default OS is still Linux if it is not specified.

Users need to configure the host OS types in Huawei XML configuration
file. They need to set the items like this:
<Host OSType="Windows" HostIP="10.10.0.1, 10.10.0.2, ..." />
<Host .../>

When attaching a volume, the driver will get the host IP from nova. We
compare that IP with the IP in "HostIP" to get the corresponding OS type.

Closes-bug: #1229759
Change-Id: I36fd52b97f790f1c68eaf24b6c12e7ef5d16145d
  • Loading branch information...
zhangchao010 committed Oct 14, 2013
1 parent c287b15 commit b30402eeeddefb855126a32fee15db164684ba8c
@@ -61,7 +61,8 @@
FakeConnector = {'initiator': 'iqn.1993-08.debian:01:ec2bff7ac3a3',
'wwpns': ['10000090fa0d6754'],
'wwnns': ['10000090fa0d6755'],
'host': 'fakehost'}
'host': 'fakehost',
'ip': '10.10.0.1'}


def Fake_sleep(time):
@@ -34,6 +34,7 @@
from cinder import test
from cinder import utils
from cinder.volume import configuration as conf
from cinder.volume.drivers.huawei import huawei_utils
from cinder.volume.drivers.huawei import HuaweiVolumeDriver
from cinder.volume.drivers.huawei import ssh_common
from cinder.volume import volume_types
@@ -150,7 +151,8 @@
FAKE_CONNECTOR = {'initiator': 'iqn.1993-08.debian:01:ec2bff7ac3a3',
'wwpns': ['1000000164s45126'],
'wwnns': ['2000666666666565'],
'host': 'fakehost'}
'host': 'fakehost',
'ip': '10.10.0.1'}

RESPOOL_A_SIM = {'Size': '10240', 'Valid Size': '5120'}
RESPOOL_B_SIM = {'Size': '10240', 'Valid Size': '10240'}
@@ -300,6 +302,11 @@ def create_fake_conf_file(filename):
initiator.setAttribute('TargetIP', '192.168.100.2')
iscsi.appendChild(initiator)

os_type = doc.createElement('Host')
os_type.setAttribute('OSType', 'Linux')
os_type.setAttribute('HostIP', '10.10.0.1')
config.appendChild(os_type)

tmp_file = open(filename, 'w')
tmp_file.write(doc.toprettyxml(indent=''))
tmp_file.close()
@@ -1080,6 +1087,13 @@ def test_conf_invalid(self):
self.assertRaises(exception.InvalidInput,
tmp_driver.create_volume, FAKE_VOLUME)
modify_conf(self.fake_conf_file, 'LUN/LUNType', 'Thick')
# Test OSType invalid
modify_conf(self.fake_conf_file, 'Host', 'invalid_type',
attrib='OSType')
tmp_driver = HuaweiVolumeDriver(configuration=self.configuration)
self.assertRaises(exception.InvalidInput,
tmp_driver.do_setup, None)
modify_conf(self.fake_conf_file, 'Host', 'Linux', attrib='OSType')
# Test TargetIP not found
modify_conf(self.fake_conf_file, 'iSCSI/DefaultTargetIP', '')
modify_conf(self.fake_conf_file, 'iSCSI/Initiator', '', attrib='Name')
@@ -1643,3 +1657,59 @@ def _fake_recv1(self, nbytes):

def _fake_recv2(self, nBytes):
raise socket.timeout()


class HuaweiUtilsTestCase(test.TestCase):
def __init__(self, *args, **kwargs):
super(HuaweiUtilsTestCase, self).__init__(*args, **kwargs)

def setUp(self):
super(HuaweiUtilsTestCase, self).setUp()

self.tmp_dir = tempfile.mkdtemp()
self.fake_conf_file = self.tmp_dir + '/cinder_huawei_conf.xml'
create_fake_conf_file(self.fake_conf_file)

def tearDown(self):
if os.path.exists(self.fake_conf_file):
os.remove(self.fake_conf_file)
shutil.rmtree(self.tmp_dir)
super(HuaweiUtilsTestCase, self).tearDown()

def test_parse_xml_file_ioerror(self):
tmp_fonf_file = '/xxx/cinder_huawei_conf.xml'
self.assertRaises(IOError, huawei_utils.parse_xml_file, tmp_fonf_file)

def test_is_xml_item_exist(self):
root = huawei_utils.parse_xml_file(self.fake_conf_file)
res = huawei_utils.is_xml_item_exist(root, 'Storage/UserName')
self.assertTrue(res)
res = huawei_utils.is_xml_item_exist(root, 'xxx')
self.assertFalse(res)
res = huawei_utils.is_xml_item_exist(root, 'LUN/StoragePool', 'Name')
self.assertTrue(res)
res = huawei_utils.is_xml_item_exist(root, 'LUN/StoragePool', 'xxx')
self.assertFalse(res)

def test_is_xml_item_valid(self):
root = huawei_utils.parse_xml_file(self.fake_conf_file)
res = huawei_utils.is_xml_item_valid(root, 'LUN/LUNType',
['Thin', 'Thick'])
self.assertTrue(res)
res = huawei_utils.is_xml_item_valid(root, 'LUN/LUNType', ['test'])
self.assertFalse(res)
res = huawei_utils.is_xml_item_valid(root, 'Host',
['Linux', 'Windows'], 'OSType')
self.assertTrue(res)
res = huawei_utils.is_xml_item_valid(root, 'Host', ['test'], 'OSType')
self.assertFalse(res)

def test_get_conf_host_os_type(self):
# Default os is Linux
res = huawei_utils.get_conf_host_os_type('10.10.10.1',
self.fake_conf_file)
self.assertEqual(res, '0')
modify_conf(self.fake_conf_file, 'Host', 'Windows', 'OSType')
res = huawei_utils.get_conf_host_os_type(FAKE_CONNECTOR['ip'],
self.fake_conf_file)
self.assertEqual(res, '1')
@@ -30,7 +30,7 @@
from cinder.volume.drivers.huawei import huawei_dorado
from cinder.volume.drivers.huawei import huawei_hvs
from cinder.volume.drivers.huawei import huawei_t
from cinder.volume.drivers.huawei import ssh_common
from cinder.volume.drivers.huawei import huawei_utils

LOG = logging.getLogger(__name__)

@@ -78,7 +78,7 @@ def _instantiate_driver(self, *args, **kwargs):

def _get_conf_info(self, filename):
"""Get product type and connection protocol from config file."""
root = ssh_common.parse_xml_file(filename)
root = huawei_utils.parse_xml_file(filename)
product = root.findtext('Storage/Product').strip()
protocol = root.findtext('Storage/Protocol').strip()
if (product in self._product.keys() and
@@ -81,7 +81,7 @@ def initialize_connection(self, volume, connector):

self.common._update_login_info()
# First, add a host if it is not added before.
host_id = self.common.add_host(connector['host'])
host_id = self.common.add_host(connector['host'], connector['ip'])
# Then, add free FC ports to the host.
ini_wwns = connector['wwpns']
free_wwns = self._get_connected_free_wwns()
@@ -34,11 +34,11 @@ def __init__(self, *args, **kwargs):
def do_setup(self, context):
"""Instantiate common class and log in storage system."""
self.common = HVSCommon(configuration=self.configuration)
self.common.login()

def check_for_setup_error(self):
"""Check configuration file."""
self.common._check_conf_file()
self.common.login()

def create_volume(self, volume):
"""Create a volume."""
@@ -25,6 +25,7 @@
from cinder import exception
from cinder.openstack.common import log as logging
from cinder.volume import driver
from cinder.volume.drivers.huawei import huawei_utils
from cinder.volume.drivers.huawei import ssh_common


@@ -106,7 +107,7 @@ def initialize_connection(self, volume, connector):
self._get_iscsi_params(connector['initiator'])

# First, add a host if not added before.
host_id = self.common.add_host(connector['host'],
host_id = self.common.add_host(connector['host'], connector['ip'],
connector['initiator'])

# Then, add the iSCSI port to the host.
@@ -175,7 +176,7 @@ def _get_iscsi_conf(self, filename):
"""

iscsiinfo = {}
root = ssh_common.parse_xml_file(filename)
root = huawei_utils.parse_xml_file(filename)

default_ip = root.findtext('iSCSI/DefaultTargetIP')
if default_ip:
@@ -441,7 +442,7 @@ def initialize_connection(self, volume, connector):

self.common._update_login_info()
# First, add a host if it is not added before.
host_id = self.common.add_host(connector['host'])
host_id = self.common.add_host(connector['host'], connector['ip'])
# Then, add free FC ports to the host.
ini_wwns = connector['wwpns']
free_wwns = self._get_connected_free_wwns()
@@ -0,0 +1,135 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4

# Copyright (c) 2013 Huawei Technologies Co., Ltd.
# Copyright (c) 2012 OpenStack LLC.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

from xml.etree import ElementTree as ET

from cinder import exception
from cinder.openstack.common import log as logging

LOG = logging.getLogger(__name__)

os_type = {'Linux': '0',
'Windows': '1',
'Solaris': '2',
'HP-UX': '3',
'AIX': '4',
'XenServer': '5',
'Mac OS X': '6',
'VMware ESX': '7'}


def parse_xml_file(filepath):
"""Get root of xml file."""
try:
tree = ET.parse(filepath)
root = tree.getroot()
return root
except IOError as err:
LOG.error(_('parse_xml_file: %s') % err)
raise err


def get_xml_item(xml_root, item):
"""Get the given item details.
:param xml_root: The root of xml tree
:param item: The tag need to get
:return: A dict contains all the config info of the given item.
"""
items_list = []
items = xml_root.findall(item)
for item in items:
tmp_dict = {'text': None, 'attrib': {}}
if item.text:
tmp_dict['text'] = item.text.strip()
for key, val in item.attrib.items():
if val:
item.attrib[key] = val.strip()
tmp_dict['attrib'] = item.attrib
items_list.append(tmp_dict)
return items_list


def is_xml_item_exist(xml_root, item, attrib_key=None):
"""Check if the given item exits in xml config file.
:param xml_root: The root of xml tree
:param item: The xml tag to check
:param attrib_key: The xml attrib to check
:return: True of False
"""
items_list = get_xml_item(xml_root, item)
value = []
if attrib_key:
for tmp_dict in items_list:
if tmp_dict['attrib'].get(attrib_key, None):
return True
else:
if items_list and items_list[0]['text']:
return True
return False


def is_xml_item_valid(xml_root, item, valid_list, attrib_key=None):
"""Check if the given item is valid in xml config file.
:param xml_root: The root of xml tree
:param item: The xml tag to check
:param valid_list: The valid item value
:param attrib_key: The xml attrib to check
:return: True of False
"""
items_list = get_xml_item(xml_root, item)
if attrib_key:
for tmp_dict in items_list:
value = tmp_dict['attrib'].get(attrib_key, None)
if value not in valid_list:
return False
else:
value = items_list[0]['text']
if value not in valid_list:
return False

return True


def get_conf_host_os_type(host_ip, config):
"""Get host OS type from xml config file.
:param host_ip: The IP of Nova host
:param config: xml config file
:return: host OS type
"""
os_conf = {}
root = parse_xml_file(config)
hosts_list = get_xml_item(root, 'Host')
for host in hosts_list:
os = host['attrib']['OSType'].strip()
ips = [ip.strip() for ip in host['attrib']['HostIP'].split(',')]
os_conf[os] = ips
host_os = None
for k, v in os_conf.items():
if host_ip in v:
host_os = os_type.get(k, None)
if not host_os:
host_os = os_type['Linux'] # default os type

LOG.debug(_('_get_host_os_type: Host %(ip)s OS type is %(os)s.')
% {'ip': host_ip, 'os': host_os})

return host_os

0 comments on commit b30402e

Please sign in to comment.
You can’t perform that action at this time.