Merge "Add support for swap_volume"

novaclient/tests/v1_1/fakes.py

@@ -1780,6 +1780,37 @@ class FakeHTTPClient(base_client.HTTPClient):
                 {"device": "/dev/vdb",
                  "volumeId": 2}})
 
+    def put_servers_1234_os_volume_attachments_Work(self, **kw):
+        return (200, {}, {"volumeAttachment": {"volumeId": 2}})
+
+    def get_servers_1234_os_volume_attachments(self, **kw):
+        return (200, {}, {"volumeAttachments": [
+                            {"display_name": "Work",
+                             "display_description": "volume for work",
+                             "status": "ATTACHED",
+                             "id": "15e59938-07d5-11e1-90e3-e3dffe0c5983",
+                             "created_at": "2011-09-09T00:00:00Z",
+                             "attached": "2011-11-11T00:00:00Z",
+                             "size": 1024,
+                             "attachments": [
+                                {"id": "3333",
+                                 "links": ''}],
+                             "metadata": {}}]})
+
+    def get_servers_1234_os_volume_attachments_Work(self, **kw):
+        return (200, {}, {"volumeAttachment":
+                            {"display_name": "Work",
+                             "display_description": "volume for work",
+                             "status": "ATTACHED",
+                             "id": "15e59938-07d5-11e1-90e3-e3dffe0c5983",
+                             "created_at": "2011-09-09T00:00:00Z",
+                             "attached": "2011-11-11T00:00:00Z",
+                             "size": 1024,
+                             "attachments": [
+                                {"id": "3333",
+                                 "links": ''}],
+                             "metadata": {}}})
+
     def delete_servers_1234_os_volume_attachments_Work(self, **kw):
         return (200, {}, {})
 

novaclient/tests/v1_1/test_shell.py

@@ -1582,6 +1582,11 @@ class ShellTest(utils.TestCase):
                                {'device': '/dev/vdb',
                                 'volumeId': 'Work'}})
 
+    def test_volume_update(self):
+        self.run_command('volume-update sample-server Work Work')
+        self.assert_called('PUT', '/servers/1234/os-volume_attachments/Work',
+                           {'volumeAttachment': {'volumeId': 'Work'}})
+
     def test_volume_detach(self):
         self.run_command('volume-detach sample-server Work')
         self.assert_called('DELETE',

novaclient/tests/v1_1/test_volumes.py

@@ -0,0 +1,93 @@
+# Copyright 2013 IBM Corp.
+# 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 novaclient.v1_1 import volumes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
+
+
+cs = fakes.FakeClient()
+
+
+class VolumesTest(utils.TestCase):
+
+    def test_list_servers(self):
+        vl = cs.volumes.list()
+        cs.assert_called('GET', '/volumes/detail')
+        [self.assertTrue(isinstance(v, volumes.Volume)) for v in vl]
+
+    def test_list_volumes_undetailed(self):
+        vl = cs.volumes.list(detailed=False)
+        cs.assert_called('GET', '/volumes')
+        [self.assertTrue(isinstance(v, volumes.Volume)) for v in vl]
+
+    def test_get_volume_details(self):
+        vol_id = '15e59938-07d5-11e1-90e3-e3dffe0c5983'
+        v = cs.volumes.get(vol_id)
+        cs.assert_called('GET', '/volumes/%s' % vol_id)
+        self.assertTrue(isinstance(v, volumes.Volume))
+        self.assertEqual(v.id, vol_id)
+
+    def test_create_volume(self):
+        v = cs.volumes.create(
+            size=2,
+            display_name="My volume",
+            display_description="My volume desc",
+        )
+        cs.assert_called('POST', '/volumes')
+        self.assertTrue(isinstance(v, volumes.Volume))
+
+    def test_delete_volume(self):
+        vol_id = '15e59938-07d5-11e1-90e3-e3dffe0c5983'
+        v = cs.volumes.get(vol_id)
+        v.delete()
+        cs.assert_called('DELETE', '/volumes/%s' % vol_id)
+        cs.volumes.delete(vol_id)
+        cs.assert_called('DELETE', '/volumes/%s' % vol_id)
+        cs.volumes.delete(v)
+        cs.assert_called('DELETE', '/volumes/%s' % vol_id)
+
+    def test_create_server_volume(self):
+        v = cs.volumes.create_server_volume(
+            server_id=1234,
+            volume_id='15e59938-07d5-11e1-90e3-e3dffe0c5983',
+            device='/dev/vdb'
+        )
+        cs.assert_called('POST', '/servers/1234/os-volume_attachments')
+        self.assertTrue(isinstance(v, volumes.Volume))
+
+    def test_update_server_volume(self):
+        vol_id = '15e59938-07d5-11e1-90e3-e3dffe0c5983'
+        v = cs.volumes.update_server_volume(
+            server_id=1234,
+            attachment_id='Work',
+            new_volume_id=vol_id
+        )
+        cs.assert_called('PUT', '/servers/1234/os-volume_attachments/Work')
+        self.assertTrue(isinstance(v, volumes.Volume))
+
+    def test_get_server_volume(self):
+        v = cs.volumes.get_server_volume(1234, 'Work')
+        cs.assert_called('GET', '/servers/1234/os-volume_attachments/Work')
+        self.assertTrue(isinstance(v, volumes.Volume))
+
+    def test_list_server_volumes(self):
+        vl = cs.volumes.get_server_volumes(1234)
+        cs.assert_called('GET', '/servers/1234/os-volume_attachments')
+        [self.assertTrue(isinstance(v, volumes.Volume)) for v in vl]
+
+    def test_delete_server_volume(self):
+        cs.volumes.delete_server_volume(1234, 'Work')
+        cs.assert_called('DELETE', '/servers/1234/os-volume_attachments/Work')

novaclient/v1_1/shell.py

@@ -1550,6 +1550,23 @@ def do_volume_attach(cs, args):
     _print_volume(volume)
 
 
+@utils.arg('server',
+    metavar='<server>',
+    help='Name or ID of server.')
+@utils.arg('attachment_id',
+    metavar='<volume>',
+    help='Attachment ID of the volume.')
+@utils.arg('new_volume',
+    metavar='<volume>',
+    help='ID of the volume to attach.')
+def do_volume_update(cs, args):
+    """Update volume attachment."""
+    volume = cs.volumes.update_server_volume(_find_server(cs, args.server).id,
+                                             args.attachment_id,
+                                             args.new_volume)
+    _print_volume(volume)
+
+
 @utils.arg('server',
     metavar='<server>',
     help='Name or ID of server.')

novaclient/v1_1/volumes.py

@@ -119,6 +119,20 @@ class VolumeManager(base.ManagerWithFind):
         return self._create("/servers/%s/os-volume_attachments" % server_id,
             body, "volumeAttachment")
 
+    def update_server_volume(self, server_id, attachment_id, new_volume_id):
+        """
+        Update the volume identified by the attachment ID, that is attached to
+        the given server ID
+
+        :param server_id: The ID of the server
+        :param attachment_id: The ID of the attachment
+        :param new_volume_id: The ID of the new volume to attach
+        :rtype: :class:`Volume`
+        """
+        body = {'volumeAttachment': {'volumeId': new_volume_id}}
+        return self._update("/servers/%s/os-volume_attachments/%s" %
+            (server_id, attachment_id,), body, "volumeAttachment")
+
     def get_server_volume(self, server_id, attachment_id):
         """
         Get the volume identified by the attachment ID, that is attached to