From bbee6536d98f0ad7e20f302ff1936cfb9cda0c2c Mon Sep 17 00:00:00 2001
From: Mate Lakat <mate.lakat@citrix.com>
Date: Mon, 29 Oct 2012 13:51:34 +0000
Subject: [PATCH] refactor: extract method: connect_volume

Related to blueprint xenapi-volume-drivers

Extract connect_volume call from attach_volume, and a test for
attach_volume. By extracting this call, it will be easier to implement
other drivers, by providing an alternate implementation for this
extracted method.

Change-Id: Ie5a17ec7fada26a9df5ba8a29ed0dadeb02516e8
---
 nova/tests/virt/__init__.py              |  0
 nova/tests/virt/xenapi/__init__.py       |  0
 nova/tests/virt/xenapi/test_volumeops.py | 40 ++++++++++++++++++++++++
 nova/virt/xenapi/volumeops.py            | 14 ++++++---
 4 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 nova/tests/virt/__init__.py
 create mode 100644 nova/tests/virt/xenapi/__init__.py
 create mode 100644 nova/tests/virt/xenapi/test_volumeops.py

diff --git a/nova/tests/virt/__init__.py b/nova/tests/virt/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/nova/tests/virt/xenapi/__init__.py b/nova/tests/virt/xenapi/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/nova/tests/virt/xenapi/test_volumeops.py b/nova/tests/virt/xenapi/test_volumeops.py
new file mode 100644
index 000000000000..8ecfcf61526b
--- /dev/null
+++ b/nova/tests/virt/xenapi/test_volumeops.py
@@ -0,0 +1,40 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2012 Citrix Systems, Inc.
+#
+#    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 nova import test
+from nova.virt.xenapi import volumeops
+import unittest
+
+
+class VolumeAttachTestCase(test.TestCase):
+    def test_connect_volume_call(self):
+        ops = volumeops.VolumeOps('session')
+        self.mox.StubOutWithMock(ops, 'connect_volume')
+        self.mox.StubOutWithMock(volumeops.vm_utils, 'vm_ref_or_raise')
+        self.mox.StubOutWithMock(volumeops.volume_utils, 'get_device_number')
+
+        volumeops.vm_utils.vm_ref_or_raise('session', 'instance_1').AndReturn(
+            'vmref')
+
+        volumeops.volume_utils.get_device_number('mountpoint').AndReturn(
+            'devnumber')
+
+        ops.connect_volume('conn_data', 'devnumber', 'instance_1', 'vmref')
+
+        self.mox.ReplayAll()
+        ops.attach_volume(
+            dict(driver_volume_type='iscsi', data='conn_data'),
+            'instance_1', 'mountpoint')
diff --git a/nova/virt/xenapi/volumeops.py b/nova/virt/xenapi/volumeops.py
index c44e38f92ea2..ae21518d8452 100644
--- a/nova/virt/xenapi/volumeops.py
+++ b/nova/virt/xenapi/volumeops.py
@@ -113,6 +113,7 @@ class VolumeOps(object):
         # NOTE: No Resource Pool concept so far
         LOG.debug(_("Attach_volume: %(connection_info)s, %(instance_name)s,"
                 " %(mountpoint)s") % locals())
+
         driver_type = connection_info['driver_volume_type']
         if driver_type not in ['iscsi', 'xensm']:
             raise exception.VolumeDriverNotFound(driver_type=driver_type)
@@ -120,6 +121,15 @@ class VolumeOps(object):
         connection_data = connection_info['data']
         dev_number = volume_utils.get_device_number(mountpoint)
 
+        self.connect_volume(
+            connection_data, dev_number, instance_name, vm_ref)
+
+        LOG.info(_('Mountpoint %(mountpoint)s attached to'
+                ' instance %(instance_name)s') % locals())
+
+    def connect_volume(self, connection_data, dev_number, instance_name,
+                       vm_ref):
+
         if 'name_label' not in connection_data:
             label = 'tempSR-%s' % connection_data['volume_id']
         else:
@@ -131,7 +141,6 @@ class VolumeOps(object):
         else:
             desc = connection_data['name_description']
 
-        LOG.debug(connection_info)
         sr_params = {}
         if u'sr_uuid' not in connection_data:
             sr_params = volume_utils.parse_volume_info(connection_data)
@@ -190,9 +199,6 @@ class VolumeOps(object):
             raise Exception(_('Unable to attach volume to instance %s')
                             % instance_name)
 
-        LOG.info(_('Mountpoint %(mountpoint)s attached to'
-                ' instance %(instance_name)s') % locals())
-
     def detach_volume(self, connection_info, instance_name, mountpoint):
         """Detach volume storage to VM instance"""