python-openstackclient 9.0.0__py3-none-any.whl → 10.1.0__py3-none-any.whl

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

@@ -21,7 +21,7 @@ from openstackclient.compute.v2 import server_event
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
-class TestListServerEvent(compute_fakes.TestComputev2):
+class TestListServerEvent(compute_fakes.TestCompute):
     fake_server = compute_fakes.create_one_server()
     fake_event = compute_fakes.create_one_server_action()
 
@@ -365,7 +365,7 @@ class TestListServerEvent(compute_fakes.TestComputev2):
         )
 
 
-class TestShowServerEvent(compute_fakes.TestComputev2):
+class TestShowServerEvent(compute_fakes.TestCompute):
     fake_server = compute_fakes.create_one_server()
     fake_event = compute_fakes.create_one_server_action()
     columns = (

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

@@ -23,7 +23,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
-class TestServerGroup(compute_fakes.TestComputev2):
+class TestServerGroup(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -21,7 +21,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 
 
-class TestServerImageCreate(compute_fakes.TestComputev2):
+class TestServerImageCreate(compute_fakes.TestCompute):
     def image_columns(self, image):
         columnlist = (
             'id',

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

@@ -18,7 +18,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestListMigration(compute_fakes.TestComputev2):
+class TestListMigration(compute_fakes.TestCompute):
     """Test fetch all migrations."""
 
     MIGRATION_COLUMNS = [
@@ -690,7 +690,7 @@ class TestListMigrationV280(TestListMigration):
         )
 
 
-class TestServerMigrationShow(compute_fakes.TestComputev2):
+class TestServerMigrationShow(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -893,7 +893,7 @@ class TestServerMigrationShow(compute_fakes.TestComputev2):
         )
 
 
-class TestServerMigrationAbort(compute_fakes.TestComputev2):
+class TestServerMigrationAbort(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -1008,7 +1008,7 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2):
         )
 
 
-class TestServerMigrationForceComplete(compute_fakes.TestComputev2):
+class TestServerMigrationForceComplete(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -0,0 +1,287 @@
+#   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.
+#
+
+import uuid
+
+from osc_lib import exceptions
+
+from openstackclient.compute.v2 import server_share
+from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
+
+
+class TestServerShareList(compute_fakes.TestCompute):
+    def setUp(self):
+        super().setUp()
+
+        self.set_compute_api_version('2.97')
+
+        self.server = compute_fakes.create_one_server()
+        self.shares = compute_fakes.create_shares()
+
+        self.compute_client.find_server.return_value = self.server
+        self.compute_client.share_attachments.return_value = self.shares
+
+        self.cmd = server_share.ListServerShare(self.app, None)
+
+    def test_server_share_list(self):
+        arglist = [
+            self.server.id,
+        ]
+        verifylist = [
+            ('server', self.server.id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.assertEqual(("Share ID", "Status", "Tag"), columns)
+        self.assertEqual(
+            (
+                (
+                    self.shares[0].share_id,
+                    self.shares[0].status,
+                    self.shares[0].tag,
+                ),
+                (
+                    self.shares[1].share_id,
+                    self.shares[1].status,
+                    self.shares[1].tag,
+                ),
+            ),
+            tuple(data),
+        )
+        self.compute_client.share_attachments.assert_called_once_with(
+            self.server,
+        )
+
+    def test_server_share_list_pre_v297(self):
+        self.set_compute_api_version('2.96')
+        arglist = [self.server.id]
+        verifylist = [('server', self.server.id)]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+
+
+class TestServerShareShow(compute_fakes.TestCompute):
+    def setUp(self):
+        super().setUp()
+
+        self.set_compute_api_version('2.97')
+
+        self.server = compute_fakes.create_one_server()
+        self.share = compute_fakes.create_one_share()
+
+        self.compute_client.find_server.return_value = self.server
+        self.compute_client.get_share_attachment.return_value = self.share
+
+        self.shared_file_system_client = (
+            self.app.client_manager.sdk_connection.shared_file_system
+        )
+        self._manila_share_id = uuid.uuid4().hex
+        self.shared_file_system_client.find_share.return_value = type(
+            'FakeShare', (), {'id': self._manila_share_id}
+        )()
+
+        self.cmd = server_share.ShowServerShare(self.app, None)
+
+    def test_server_share_show(self):
+        arglist = [
+            self.server.id,
+            self._manila_share_id,
+        ]
+        verifylist = [
+            ('server', self.server.id),
+            ('share', self._manila_share_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.assertEqual(
+            ('Export Location', 'Share ID', 'Status', 'Tag', 'UUID'), columns
+        )
+        self.assertEqual(
+            (
+                self.share.export_location,
+                self.share.share_id,
+                self.share.status,
+                self.share.tag,
+                self.share.uuid,
+            ),
+            tuple(data),
+        )
+        self.shared_file_system_client.find_share.assert_called_once_with(
+            self._manila_share_id, ignore_missing=False
+        )
+        self.compute_client.get_share_attachment.assert_called_once_with(
+            self.server, self._manila_share_id
+        )
+
+    def test_server_share_show_pre_v297(self):
+        self.set_compute_api_version('2.96')
+        arglist = [self.server.id, self._manila_share_id]
+        verifylist = [
+            ('server', self.server.id),
+            ('share', self._manila_share_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+
+
+class TestServerShareCreate(compute_fakes.TestCompute):
+    def setUp(self):
+        super().setUp()
+
+        self.set_compute_api_version('2.97')
+
+        self.server = compute_fakes.create_one_server()
+        self.share = compute_fakes.create_one_share()
+
+        self.compute_client.find_server.return_value = self.server
+        self.compute_client.create_share_attachment.return_value = self.share
+
+        self.shared_file_system_client = (
+            self.app.client_manager.sdk_connection.shared_file_system
+        )
+        self._manila_share_id = uuid.uuid4().hex
+        self.shared_file_system_client.find_share.return_value = type(
+            'FakeShare', (), {'id': self._manila_share_id}
+        )()
+
+        self.cmd = server_share.AddServerShare(self.app, None)
+
+    def test_server_share_create(self):
+        arglist = [
+            self.server.id,
+            self._manila_share_id,
+            "--tag",
+            "my-tag",
+        ]
+        verifylist = [
+            ('server', self.server.id),
+            ('share', self._manila_share_id),
+            ('tag', 'my-tag'),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.assertEqual(
+            ("Export Location", "Share ID", "Status", "Tag", "UUID"), columns
+        )
+        self.assertEqual(
+            (
+                self.share.export_location,
+                self.share.share_id,
+                self.share.status,
+                self.share.tag,
+                self.share.uuid,
+            ),
+            tuple(data),
+        )
+        self.shared_file_system_client.find_share.assert_called_once_with(
+            self._manila_share_id, ignore_missing=False
+        )
+        self.compute_client.create_share_attachment.assert_called_once_with(
+            self.server, self._manila_share_id, tag='my-tag'
+        )
+
+    def test_server_share_create_no_tag(self):
+        arglist = [
+            self.server.id,
+            self._manila_share_id,
+        ]
+        verifylist = [
+            ('server', self.server.id),
+            ('share', self._manila_share_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        self.compute_client.create_share_attachment.assert_called_once_with(
+            self.server, self._manila_share_id
+        )
+
+    def test_server_share_create_pre_v297(self):
+        self.set_compute_api_version('2.96')
+        arglist = [self.server.id, self._manila_share_id]
+        verifylist = [
+            ('server', self.server.id),
+            ('share', self._manila_share_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+
+
+class TestServerShareDelete(compute_fakes.TestCompute):
+    def setUp(self):
+        super().setUp()
+
+        self.set_compute_api_version('2.97')
+
+        self.server = compute_fakes.create_one_server()
+
+        self.compute_client.find_server.return_value = self.server
+
+        self.shared_file_system_client = (
+            self.app.client_manager.sdk_connection.shared_file_system
+        )
+        self._manila_share_id = uuid.uuid4().hex
+        self.shared_file_system_client.find_share.return_value = type(
+            'FakeShare', (), {'id': self._manila_share_id}
+        )()
+
+        self.cmd = server_share.RemoveServerShare(self.app, None)
+
+    def test_server_share_delete(self):
+        arglist = [
+            self.server.id,
+            self._manila_share_id,
+        ]
+        verifylist = [
+            ('server', self.server.id),
+            ('share', self._manila_share_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        self.shared_file_system_client.find_share.assert_called_once_with(
+            self._manila_share_id, ignore_missing=False
+        )
+        self.compute_client.delete_share_attachment.assert_called_once_with(
+            self.server,
+            self._manila_share_id,
+        )
+
+    def test_server_share_delete_pre_v297(self):
+        self.set_compute_api_version('2.96')
+        arglist = [self.server.id, self._manila_share_id]
+        verifylist = [
+            ('server', self.server.id),
+            ('share', self._manila_share_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )

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

@@ -20,7 +20,7 @@ from openstackclient.compute.v2 import server_volume
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
-class TestServerVolumeList(compute_fakes.TestComputev2):
+class TestServerVolumeList(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -220,7 +220,7 @@ class TestServerVolumeList(compute_fakes.TestComputev2):
         )
 
 
-class TestServerVolumeUpdate(compute_fakes.TestComputev2):
+class TestServerVolumeUpdate(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -22,7 +22,7 @@ from openstackclient.compute.v2 import service
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
-class TestServiceDelete(compute_fakes.TestComputev2):
+class TestServiceDelete(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -95,7 +95,7 @@ class TestServiceDelete(compute_fakes.TestComputev2):
         )
 
 
-class TestServiceList(compute_fakes.TestComputev2):
+class TestServiceList(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -261,7 +261,7 @@ class TestServiceList(compute_fakes.TestComputev2):
         self.assertEqual(expected_data, list(data))
 
 
-class TestServiceSet(compute_fakes.TestComputev2):
+class TestServiceSet(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -22,7 +22,7 @@ from openstackclient.compute.v2 import usage as usage_cmds
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
-class TestUsage(compute_fakes.TestComputev2):
+class TestUsage(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

openstackclient/tests/unit/identity/v2_0/fakes.py

@@ -155,7 +155,7 @@ def fake_auth_ref(fake_token, fake_service=None):
     return auth_ref
 
 
-class FakeIdentityv2Client:
+class FakeIdentityClient:
     def __init__(self, **kwargs):
         self.roles = mock.Mock()
         self.roles.resource_class = fakes.FakeResource(None, {})
@@ -167,14 +167,10 @@ class FakeIdentityv2Client:
         self.tokens.resource_class = fakes.FakeResource(None, {})
         self.users = mock.Mock()
         self.users.resource_class = fakes.FakeResource(None, {})
-        self.ec2 = mock.Mock()
-        self.ec2.resource_class = fakes.FakeResource(None, {})
         self.endpoints = mock.Mock()
         self.endpoints.resource_class = fakes.FakeResource(None, {})
         self.extensions = mock.Mock()
         self.extensions.resource_class = fakes.FakeResource(None, {})
-        self.auth_token = kwargs['token']
-        self.management_url = kwargs['endpoint']
 
     def __getattr__(self, name):
         # Map v3 'projects' back to v2 'tenants'
@@ -188,7 +184,7 @@ class FakeClientMixin:
     def setUp(self):
         super().setUp()
 
-        self.app.client_manager.identity = FakeIdentityv2Client(
+        self.app.client_manager.identity = FakeIdentityClient(
             endpoint=fakes.AUTH_URL,
             token=fakes.AUTH_TOKEN,
         )
@@ -204,7 +200,7 @@ class FakeClientMixin:
         )
 
 
-class TestIdentityv2(
+class TestIdentity(
     FakeClientMixin,
     utils.TestCommand,
 ): ...

openstackclient/tests/unit/identity/v2_0/test_endpoint.py

@@ -15,7 +15,7 @@ from openstackclient.identity.v2_0 import endpoint
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 
-class TestEndpoint(identity_fakes.TestIdentityv2):
+class TestEndpoint(identity_fakes.TestIdentity):
     fake_service = identity_fakes.FakeService.create_one_service()
     attr = {
         'service_name': fake_service.name,

openstackclient/tests/unit/identity/v2_0/test_project.py

@@ -24,7 +24,7 @@ from openstackclient.identity.v2_0 import project
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 
-class TestProject(identity_fakes.TestIdentityv2):
+class TestProject(identity_fakes.TestIdentity):
     fake_project = identity_fakes.FakeProject.create_one_project()
     fake_projects = identity_fakes.FakeProject.create_projects()
 

openstackclient/tests/unit/identity/v2_0/test_role.py

@@ -23,7 +23,7 @@ from openstackclient.identity.v2_0 import role
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 
-class TestRole(identity_fakes.TestIdentityv2):
+class TestRole(identity_fakes.TestIdentity):
     attr = {}
     attr['endpoints'] = [
         {

openstackclient/tests/unit/identity/v2_0/test_role_assignment.py

@@ -21,7 +21,7 @@ from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 
-class TestRoleAssignment(identity_fakes.TestIdentityv2):
+class TestRoleAssignment(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 

openstackclient/tests/unit/identity/v2_0/test_service.py

@@ -20,7 +20,7 @@ from openstackclient.identity.v2_0 import service
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 
-class TestService(identity_fakes.TestIdentityv2):
+class TestService(identity_fakes.TestIdentity):
     fake_service = identity_fakes.FakeService.create_one_service()
 
     def setUp(self):

openstackclient/tests/unit/identity/v2_0/test_token.py

@@ -16,7 +16,7 @@ from openstackclient.identity.v2_0 import token
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 
-class TestTokenIssue(identity_fakes.TestIdentityv2):
+class TestTokenIssue(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 
@@ -77,7 +77,7 @@ class TestTokenIssue(identity_fakes.TestIdentityv2):
         self.assertEqual(datalist, data)
 
 
-class TestTokenRevoke(identity_fakes.TestIdentityv2):
+class TestTokenRevoke(identity_fakes.TestIdentity):
     TOKEN = 'fob'
 
     def setUp(self):

openstackclient/tests/unit/identity/v2_0/test_user.py

@@ -23,7 +23,7 @@ from openstackclient.identity.v2_0 import user
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 
-class TestUser(identity_fakes.TestIdentityv2):
+class TestUser(identity_fakes.TestIdentity):
     fake_project = identity_fakes.FakeProject.create_one_project()
     attr = {
         'tenantId': fake_project.id,

openstackclient/tests/unit/identity/v3/fakes.py

@@ -578,12 +578,10 @@ class FakeSession:
         self.auth = FakeAuth()
 
 
-class FakeIdentityv3Client:
+class FakeIdentityClient:
     def __init__(self, **kwargs):
         self.domains = mock.Mock()
         self.domains.resource_class = fakes.FakeResource(None, {})
-        self.credentials = mock.Mock()
-        self.credentials.resource_class = fakes.FakeResource(None, {})
         self.endpoints = mock.Mock()
         self.endpoints.resource_class = fakes.FakeResource(None, {})
         self.endpoint_filter = mock.Mock()
@@ -596,24 +594,14 @@ class FakeIdentityv3Client:
         self.oauth1.resource_class = fakes.FakeResource(None, {})
         self.projects = mock.Mock()
         self.projects.resource_class = fakes.FakeResource(None, {})
-        self.regions = mock.Mock()
-        self.regions.resource_class = fakes.FakeResource(None, {})
         self.roles = mock.Mock()
         self.roles.resource_class = fakes.FakeResource(None, {})
         self.services = mock.Mock()
         self.services.resource_class = fakes.FakeResource(None, {})
-        self.session = mock.Mock()
-        self.session.auth.auth_ref.service_catalog.resource_class = (
-            fakes.FakeResource(None, {})
-        )
         self.tokens = mock.Mock()
         self.tokens.resource_class = fakes.FakeResource(None, {})
-        self.trusts = mock.Mock()
-        self.trusts.resource_class = fakes.FakeResource(None, {})
         self.users = mock.Mock()
         self.users.resource_class = fakes.FakeResource(None, {})
-        self.role_assignments = mock.Mock()
-        self.role_assignments.resource_class = fakes.FakeResource(None, {})
         self.auth_token = kwargs['token']
         self.management_url = kwargs['endpoint']
         self.auth = FakeAuth()
@@ -623,55 +611,34 @@ class FakeIdentityv3Client:
         self.application_credentials.resource_class = fakes.FakeResource(
             None, {}
         )
-        self.access_rules = mock.Mock()
-        self.access_rules.resource_class = fakes.FakeResource(None, {})
         self.inference_rules = mock.Mock()
         self.inference_rules.resource_class = fakes.FakeResource(None, {})
-        self.registered_limits = mock.Mock()
-        self.registered_limits.resource_class = fakes.FakeResource(None, {})
-        self.limits = mock.Mock()
-        self.limits.resource_class = fakes.FakeResource(None, {})
 
 
 class FakeFederationManager:
     def __init__(self, **kwargs):
-        self.identity_providers = mock.Mock()
-        self.identity_providers.resource_class = fakes.FakeResource(None, {})
-        self.mappings = mock.Mock()
-        self.mappings.resource_class = fakes.FakeResource(None, {})
-        self.protocols = mock.Mock()
-        self.protocols.resource_class = fakes.FakeResource(None, {})
         self.projects = mock.Mock()
         self.projects.resource_class = fakes.FakeResource(None, {})
         self.domains = mock.Mock()
         self.domains.resource_class = fakes.FakeResource(None, {})
-        self.service_providers = mock.Mock()
-        self.service_providers.resource_class = fakes.FakeResource(None, {})
 
 
-class FakeFederatedClient(FakeIdentityv3Client):
+class FakeFederatedClient(FakeIdentityClient):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.federation = FakeFederationManager()
 
 
-class FakeOAuth1Client(FakeIdentityv3Client):
+class FakeOAuth1Client(FakeIdentityClient):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-        self.access_tokens = mock.Mock()
-        self.access_tokens.resource_class = fakes.FakeResource(None, {})
-        self.consumers = mock.Mock()
-        self.consumers.resource_class = fakes.FakeResource(None, {})
-        self.request_tokens = mock.Mock()
-        self.request_tokens.resource_class = fakes.FakeResource(None, {})
-
 
 class FakeClientMixin:
     def setUp(self):
         super().setUp()
 
-        self.app.client_manager.identity = FakeIdentityv3Client(
+        self.app.client_manager.identity = FakeIdentityClient(
             endpoint=fakes.AUTH_URL,
             token=fakes.AUTH_TOKEN,
         )
@@ -682,12 +649,13 @@ class FakeClientMixin:
         self.app.client_manager.sdk_connection.identity = mock.Mock(
             _proxy.Proxy
         )
+        self.app.client_manager.sdk_connection.identity.api_version = '3'
         self.identity_sdk_client = (
             self.app.client_manager.sdk_connection.identity
         )
 
 
-class TestIdentityv3(
+class TestIdentity(
     FakeClientMixin,
     utils.TestCommand,
 ): ...
@@ -716,6 +684,7 @@ class TestFederatedIdentity(utils.TestCommand):
         self.app.client_manager.sdk_connection.identity = mock.Mock(
             _proxy.Proxy
         )
+        self.app.client_manager.sdk_connection.identity.api_version = '3'
         self.identity_sdk_client = (
             self.app.client_manager.sdk_connection.identity
         )
@@ -736,6 +705,7 @@ class TestOAuth1(utils.TestCommand):
         self.app.client_manager.sdk_connection.identity = mock.Mock(
             _proxy.Proxy
         )
+        self.app.client_manager.sdk_connection.identity.api_version = '3'
         self.identity_sdk_client = (
             self.app.client_manager.sdk_connection.identity
         )