Merge "Switch command server add volume to sdk."

Author: Zuul

openstackclient/compute/v2/server.py

@@ -548,24 +548,25 @@ def get_parser(self, prog_name):
         return parser
 
     def take_action(self, parsed_args):
-        compute_client = self.app.client_manager.compute
-        volume_client = self.app.client_manager.volume
+        compute_client = self.app.client_manager.sdk_connection.compute
+        volume_client = self.app.client_manager.sdk_connection.volume
 
-        server = utils.find_resource(
-            compute_client.servers,
+        server = compute_client.find_server(
             parsed_args.server,
+            ignore_missing=False,
         )
-        volume = utils.find_resource(
-            volume_client.volumes,
+        volume = volume_client.find_volume(
             parsed_args.volume,
+            ignore_missing=False,
         )
 
         kwargs = {
+            "volumeId": volume.id,
             "device": parsed_args.device
         }
 
         if parsed_args.tag:
-            if compute_client.api_version < api_versions.APIVersion('2.49'):
+            if not sdk_utils.supports_microversion(compute_client, '2.49'):
                 msg = _(
                     '--os-compute-api-version 2.49 or greater is required to '
                     'support the --tag option'
@@ -575,7 +576,7 @@ def take_action(self, parsed_args):
             kwargs['tag'] = parsed_args.tag
 
         if parsed_args.enable_delete_on_termination:
-            if compute_client.api_version < api_versions.APIVersion('2.79'):
+            if not sdk_utils.supports_microversion(compute_client, '2.79'):
                 msg = _(
                     '--os-compute-api-version 2.79 or greater is required to '
                     'support the --enable-delete-on-termination option.'
@@ -585,7 +586,7 @@ def take_action(self, parsed_args):
             kwargs['delete_on_termination'] = True
 
         if parsed_args.disable_delete_on_termination:
-            if compute_client.api_version < api_versions.APIVersion('2.79'):
+            if not sdk_utils.supports_microversion(compute_client, '2.79'):
                 msg = _(
                     '--os-compute-api-version 2.79 or greater is required to '
                     'support the --disable-delete-on-termination option.'
@@ -594,28 +595,23 @@ def take_action(self, parsed_args):
 
             kwargs['delete_on_termination'] = False
 
-        volume_attachment = compute_client.volumes.create_server_volume(
-            server.id,
-            volume.id,
-            **kwargs
+        volume_attachment = compute_client.create_volume_attachment(
+            server,
+            **kwargs,
         )
 
-        columns = ('id', 'serverId', 'volumeId', 'device')
+        columns = ('id', 'server id', 'volume id', 'device')
         column_headers = ('ID', 'Server ID', 'Volume ID', 'Device')
-        if compute_client.api_version >= api_versions.APIVersion('2.49'):
+        if sdk_utils.supports_microversion(compute_client, '2.49'):
             columns += ('tag',)
             column_headers += ('Tag',)
-        if compute_client.api_version >= api_versions.APIVersion('2.79'):
+        if sdk_utils.supports_microversion(compute_client, '2.79'):
             columns += ('delete_on_termination',)
             column_headers += ('Delete On Termination',)
 
         return (
             column_headers,
-            utils.get_item_properties(
-                volume_attachment,
-                columns,
-                mixed_case_fields=('serverId', 'volumeId'),
-            )
+            utils.get_item_properties(volume_attachment, columns,)
         )
 
 

openstackclient/tests/unit/compute/v2/fakes.py

@@ -21,6 +21,7 @@
 from novaclient import api_versions
 from openstack.compute.v2 import flavor as _flavor
 from openstack.compute.v2 import server
+from openstack.compute.v2 import volume_attachment
 
 from openstackclient.api import compute_v2
 from openstackclient.tests.unit import fakes
@@ -1803,3 +1804,58 @@ def create_volume_attachments(attrs=None, methods=None, count=2):
                     attrs, methods))
 
         return volume_attachments
+
+    @staticmethod
+    def create_one_sdk_volume_attachment(attrs=None, methods=None):
+        """Create a fake sdk VolumeAttachment.
+
+        :param dict attrs:
+            A dictionary with all attributes
+        :param dict methods:
+            A dictionary with all methods
+        :return:
+            A fake VolumeAttachment object, with id, device, and so on
+        """
+        attrs = attrs or {}
+        methods = methods or {}
+
+        # Set default attributes.
+        volume_attachment_info = {
+            "id": uuid.uuid4().hex,
+            "device": "/dev/sdb",
+            "server_id": uuid.uuid4().hex,
+            "volume_id": uuid.uuid4().hex,
+            # introduced in API microversion 2.70
+            "tag": "foo",
+            # introduced in API microversion 2.79
+            "delete_on_termination": True,
+            # introduced in API microversion 2.89
+            "attachment_id": uuid.uuid4().hex,
+            "bdm_uuid": uuid.uuid4().hex
+        }
+
+        # Overwrite default attributes.
+        volume_attachment_info.update(attrs)
+
+        return volume_attachment.VolumeAttachment(**volume_attachment_info)
+
+    @staticmethod
+    def create_sdk_volume_attachments(attrs=None, methods=None, count=2):
+        """Create multiple fake VolumeAttachment objects (BDMs).
+
+        :param dict attrs:
+            A dictionary with all attributes
+        :param dict methods:
+            A dictionary with all methods
+        :param int count:
+            The number of volume attachments to fake
+        :return:
+            A list of VolumeAttachment objects faking the volume attachments.
+        """
+        volume_attachments = []
+        for i in range(0, count):
+            volume_attachments.append(
+                FakeVolumeAttachment.create_one_sdk_volume_attachment(
+                    attrs, methods))
+
+        return volume_attachments