WaltHP

diff --git a/cinder/volume/drivers/ibm/ibm_storage/ds8k_helper.py b/cinder/volume/drivers/ibm/ibm_storage/ds8k_helper.py
index 1f452a5a6..d76115630 100644
--- a/cinder/volume/drivers/ibm/ibm_storage/ds8k_helper.py
+++ b/cinder/volume/drivers/ibm/ibm_storage/ds8k_helper.py
@@ -21,6 +21,8 @@ import six
 import string
 import time
 
+from oslo_log import log as logging
+

WaltHP

import libiscsi

target_portal = "10.52.1.11:3260"

my_iqn = "iqn.1993-08.org.debian:01:cb66a7b3fa5"
iscsi_ctx = libiscsi.iscsi_create_context(my_iqn)
#libiscsi.iscsi_set_alias(iscsi_ctx, "walt")
ass = libiscsi.iscsi_connect_sync(iscsi_ctx, target_portal)
print(ass)

WaltHP

CC         = gcc
CFLAGS     = -O2
INCLUDE    = -I/usr/include
LIBS       = -L/usr/lib -L/usr/lib/x86_64-linux-gnu -liscsi
PYVER = 2.7

all: _libiscsi.so

libiscsi_wrap.c: libiscsi.i
	swig -python -shadow libiscsi.i

WaltHP

"""

"""
import pyudev
from infi.multipathtools import MultipathClient

mpath_client = MultipathClient()
context = pyudev.Context()

#wwn = '360000000000000000e00000000020001'

WaltHP

diff --git a/os_brick/initiator/connector.py b/os_brick/initiator/connector.py
index 86adfa8..c4602a3 100644
--- a/os_brick/initiator/connector.py
+++ b/os_brick/initiator/connector.py
@@ -25,6 +25,7 @@ import re
 import socket
 import sys
 
+from debtcollector import removals
 from oslo_concurrency import lockutils

WaltHP

[{'ci_wiki_name': 'Quobyte_CI',
  'description': 'Cinder driver for Quobyte USP.\n\n    Volumes are stored as files on the mounted Quobyte volume. The hypervisor\n    will expose them as block devices.\n\n    Unlike other similar drivers, this driver uses exactly one Quobyte volume\n    because Quobyte USP is a distributed storage system. To add or remove\n    capacity, administrators can add or remove storage servers to/from the\n    volume.\n\n    For different types of volumes e.g., SSD vs. rotating disks,\n    use multiple backends in Cinder.\n\n    Note: To be compliant with the inherited RemoteFSSnapDriver, Quobyte\n          volumes are also referred to as shares.\n\n    Version history:\n        1.0   - Initial driver.\n        1.1   - Adds optional insecure NAS settings\n    ',
  'fqn': 'cinder.volume.drivers.quobyte.QuobyteDriver',
  'name': 'QuobyteDriver',
  'version': '1.1'},
 {'ci_wiki_name': 'Cinder_Jenkins',
  'description': 'Executes commands relating to Volumes.',
  'fqn': 'cinder.volume.dri

WaltHP

[{'ci_wiki_name': 'Quobyte_CI',
  'description': 'Cinder driver for Quobyte USP.\n\n    Volumes are stored as files on the mounted Quobyte volume. The hypervisor\n    will expose them as block devices.\n\n    Unlike other similar drivers, this driver uses exactly one Quobyte volume\n    because Quobyte USP is a distributed storage system. To add or remove\n    capacity, administrators can add or remove storage servers to/from the\n    volume.\n\n    For different types of volumes e.g., SSD vs. rotating disks,\n    use multiple backends in Cinder.\n\n    Note: To be compliant with the inherited RemoteFSSnapDriver, Quobyte\n          volumes are also referred to as shares.\n\n    Version history:\n        1.0   - Initial driver.\n        1.1   - Adds optional insecure NAS settings\n    ',
  'fqn': 'cinder.volume.drivers.quobyte.QuobyteDriver',
  'name': 'QuobyteDriver',
  'version': '1.1'},
 {'ci_wiki_name': 'Cinder_Jenkins',
  'description': 'Executes commands relating to Volumes.',
  'fqn': 'cinder.volume.dri

WaltHP

diff --git a/os_brick/initiator/AoEConnector.py b/os_brick/initiator/AoEConnector.py
deleted file mode 100644
index 6d7acbb..0000000
--- a/os_brick/initiator/AoEConnector.py
+++ /dev/null
@@ -1,170 +0,0 @@
-# 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

WaltHP

diff --git a/os_brick/initiator/AoEConnector.py b/os_brick/initiator/AoEConnector.py
deleted file mode 100644
index 6d7acbb..0000000
--- a/os_brick/initiator/AoEConnector.py
+++ /dev/null
@@ -1,170 +0,0 @@
-# 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

WaltHP

diff --git a/os_brick/initiator/AoEConnector.py b/os_brick/initiator/AoEConnector.py
index 6d7acbb..2ccea9d 100644
--- a/os_brick/initiator/AoEConnector.py
+++ b/os_brick/initiator/AoEConnector.py
@@ -28,7 +28,7 @@ DEVICE_SCAN_ATTEMPTS_DEFAULT = 3
 LOG = logging.getLogger(__name__)
 
 
-class AoEConnector(InitiatorConnector):
+class AoEConnector(InitiatorConnector.InitiatorConnector):