WaltHP

diff --git a/cinder/volume/drivers/san/hp/hp_3par_common.py b/cinder/volume/drivers/san/hp/hp_3par_common.py
index 2e562a3..e288cf9 100644
--- a/cinder/volume/drivers/san/hp/hp_3par_common.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_common.py
@@ -748,6 +748,7 @@ class HP3PARCommon(object):
                       'free_capacity_gb': 0,
                       'reserved_percentage': 0,
                       'pools': pools}
+        LOG.warning(self.stats)
 

WaltHP

diff --git a/cinder/scheduler/manager.py b/cinder/scheduler/manager.py
index cc03b15..eb71734 100644
--- a/cinder/scheduler/manager.py
+++ b/cinder/scheduler/manager.py
@@ -196,8 +196,8 @@ class SchedulerManager(manager.Manager):
                                      volume_ref, msg, reservations):
             if reservations:
                 QUOTAS.rollback(context, reservations)
-            if (volume_ref['instance_uuid'] is None and
-                    volume_ref['attached_host'] is None):

WaltHP

diff --git a/cinder/brick/initiator/connector.py b/cinder/brick/initiator/connector.py
index ba469d6..7e4edf2 100644
--- a/cinder/brick/initiator/connector.py
+++ b/cinder/brick/initiator/connector.py
@@ -403,15 +403,19 @@ class ISCSIConnector(InitiatorConnector):
         if dev_name:
             self._linuxscsi.remove_scsi_device(dev_name)
 
+        LOG.debug("connection properties %s" % connection_properties)
         # NOTE(vish): Only disconnect from the target if no luns from the

WaltHP

diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 9cf5c9d..efd3dbf 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -1034,6 +1034,7 @@ class LibvirtDriver(driver.ComputeDriver):
                                                 image_meta, bdm)
         self._connect_volume(connection_info, disk_info)
         conf = self._get_volume_config(connection_info, disk_info)
+        LOG.warning("CONF = %s", conf)
         self._set_cache_mode(conf)

WaltHP

import platform
import mock


def test(arch=platform.machine()):
    print "arch = %s" % arch
    print "machine = %s" % platform.machine()

with mock.patch.object(platform, "machine", return_value="TEST"):
    test()

WaltHP

diff --git a/os_brick/exception.py b/os_brick/exception.py
index 8120de0..dcc0c23 100644
--- a/os_brick/exception.py
+++ b/os_brick/exception.py
@@ -53,7 +53,7 @@ class BrickException(Exception):
                 # log the issue and the kwargs
                 LOG.exception(_LE("Exception in string format operation. "
                                   "msg='%s'"), self.message)
-                for name, value in kwargs.iteritems():
+                for name, value in kwargs.items():

WaltHP

diff --git a/os_brick/tests/initiator/test_connector.py b/os_brick/tests/initiator/test_connector.py
index 5b73911..d9c21b5 100644
--- a/os_brick/tests/initiator/test_connector.py
+++ b/os_brick/tests/initiator/test_connector.py
@@ -941,6 +941,7 @@ class FibreChannelConnectorTestCase(ConnectorTestCase):
                        exp_wwn)
             self.assertEqual(dev_info['type'], 'block')
             self.assertEqual(dev_info['path'], dev_str)
+            self.assertTrue('devices' not in dev_info)
 

WaltHP

diff --git a/cinder/tests/unit/test_volume.py b/cinder/tests/unit/test_volume.py
index 26bd8fe..c35d69a 100644
--- a/cinder/tests/unit/test_volume.py
+++ b/cinder/tests/unit/test_volume.py
@@ -4583,6 +4583,18 @@ class VolumeTestCase(BaseVolumeTestCase):
                                             fake_create_cg, fake_rollback,
                                             fake_commit, fake_reserve):
         """Test consistencygroup can be created and deleted."""
+
+        def fake_driver_create_cg(context, group):

WaltHP

"""
verify_live_migration_client.py

Description:
    A sample client that interacts with and tests the verify_live_migration
    flask server.

Usage:
    # Start the flask server API.
    python verify_live_migration.py -port 5005

WaltHP

diff --git a/README.md b/README.md
index 5e8590b..9757551 100644
--- a/README.md
+++ b/README.md
@@ -6,3 +6,15 @@ Documentation for usage is in the files currently.
 Flask servers must be started on the controller and compute nodes.
 
 Run the test_live_migrate script with needed inputs to start automated live-migration.
+
+