diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-12 05:21:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-12 05:21:21 +0000 |
| commit | 6f95276db29f62245e3484931518ccce35c05bd2 (patch) | |
| tree | 3eb8e1da928478a2da20685a43fd3c12d60b2368 | |
| parent | f164a440cbccb683ac475843e8d6eb4431ecfb2b (diff) | |
| parent | 7d408aa8db7bcec158f9ab61702a39324cc8db28 (diff) | |
| download | nova-6f95276db29f62245e3484931518ccce35c05bd2.tar.gz nova-6f95276db29f62245e3484931518ccce35c05bd2.tar.xz nova-6f95276db29f62245e3484931518ccce35c05bd2.zip | |
Merge "Fixes a bug in attaching volumes on Hyper-V"
| -rw-r--r-- | nova/virt/hyperv/basevolumeutils.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/virt/hyperv/basevolumeutils.py b/nova/virt/hyperv/basevolumeutils.py index 34b15ea53..5b515a0f1 100644 --- a/nova/virt/hyperv/basevolumeutils.py +++ b/nova/virt/hyperv/basevolumeutils.py @@ -43,6 +43,7 @@ class BaseVolumeUtils(object): def __init__(self): if sys.platform == 'win32': self._conn_wmi = wmi.WMI(moniker='//./root/wmi') + self._conn_cimv2 = wmi.WMI(moniker='//./root/cimv2') @abc.abstractmethod def login_storage_target(self, target_lun, target_iqn, target_portal): @@ -56,10 +57,10 @@ class BaseVolumeUtils(object): def execute_log_out(self, session_id): pass - def get_iscsi_initiator(self, cim_conn): + def get_iscsi_initiator(self): """Get iscsi initiator name for this machine.""" - computer_system = cim_conn.Win32_ComputerSystem()[0] + computer_system = self._conn_cimv2.Win32_ComputerSystem()[0] hostname = computer_system.name keypath = ("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\" "iSCSI\\Discovery") @@ -72,7 +73,7 @@ class BaseVolumeUtils(object): except Exception: LOG.info(_("The ISCSI initiator name can't be found. " "Choosing the default one")) - computer_system = cim_conn.Win32_ComputerSystem()[0] + computer_system = self._conn_cimv2.Win32_ComputerSystem()[0] initiator_name = "iqn.1991-05.com.microsoft:" + hostname.lower() return { 'ip': CONF.my_ip, |