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

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

@@ -1716,7 +1716,7 @@ class TestUserSetPassword(identity_fakes.TestIdentityv3):
         conn = self.app.client_manager.sdk_connection
         user_id = conn.config.get_auth().get_user_id(conn.identity)
 
-        self.identity_sdk_client.update_user.assert_called_with(
+        self.identity_sdk_client.update_password.assert_called_with(
             user=user_id, current_password=current_pass, password=new_pass
         )
 
@@ -1733,7 +1733,7 @@ class TestUserSetPassword(identity_fakes.TestIdentityv3):
         conn = self.app.client_manager.sdk_connection
         user_id = conn.config.get_auth().get_user_id(conn.identity)
 
-        self.identity_sdk_client.update_user.assert_called_with(
+        self.identity_sdk_client.update_password.assert_called_with(
             user=user_id, current_password=current_pass, password=new_pass
         )
 
@@ -1758,7 +1758,7 @@ class TestUserSetPassword(identity_fakes.TestIdentityv3):
         conn = self.app.client_manager.sdk_connection
         user_id = conn.config.get_auth().get_user_id(conn.identity)
 
-        self.identity_sdk_client.update_user.assert_called_with(
+        self.identity_sdk_client.update_password.assert_called_with(
             user=user_id, current_password=current_pass, password=new_pass
         )
 
@@ -1773,7 +1773,7 @@ class TestUserShow(identity_fakes.TestIdentityv3):
 
         # Get the command object to test
         self.cmd = user.ShowUser(self.app, None)
-        self.identity_client.auth.client.get_user_id.return_value = (  # noqa: E501
+        self.identity_client.auth.client.get_user_id.return_value = (
             self.user.id
         )
         self.identity_client.tokens.get_token_data.return_value = {

openstackclient/tests/unit/image/v2/test_image.py

@@ -305,7 +305,7 @@ class TestImageCreate(TestImage):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        columns, data = self.cmd.take_action(parsed_args)
+        self.cmd.take_action(parsed_args)
 
         self.image_client.create_image.assert_called_with(
             name=self.new_image.name,
@@ -336,7 +336,7 @@ class TestImageCreate(TestImage):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        columns, data = self.cmd.take_action(parsed_args)
+        self.cmd.take_action(parsed_args)
 
         self.volume_sdk_client.upload_volume_to_image.assert_called_once_with(
             volume.id,
@@ -397,7 +397,7 @@ class TestImageCreate(TestImage):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        columns, data = self.cmd.take_action(parsed_args)
+        self.cmd.take_action(parsed_args)
 
         self.volume_sdk_client.upload_volume_to_image.assert_called_once_with(
             volume.id,
@@ -946,7 +946,7 @@ class TestImageList(TestImage):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        columns, data = self.cmd.take_action(parsed_args)
+        self.cmd.take_action(parsed_args)
         self.image_client.images.assert_called_with(
             marker=self._image.id,
         )
@@ -966,7 +966,7 @@ class TestImageList(TestImage):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        columns, data = self.cmd.take_action(parsed_args)
+        self.cmd.take_action(parsed_args)
         self.image_client.images.assert_called_with(
             name='abc',
             # marker=self._image.id
@@ -982,7 +982,7 @@ class TestImageList(TestImage):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        columns, data = self.cmd.take_action(parsed_args)
+        self.cmd.take_action(parsed_args)
         self.image_client.images.assert_called_with(status='active')
 
     def test_image_list_hidden_option(self):
@@ -994,7 +994,7 @@ class TestImageList(TestImage):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        columns, data = self.cmd.take_action(parsed_args)
+        self.cmd.take_action(parsed_args)
         self.image_client.images.assert_called_with(is_hidden=True)
 
     def test_image_list_tag_option(self):
@@ -1004,7 +1004,7 @@ class TestImageList(TestImage):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        columns, data = self.cmd.take_action(parsed_args)
+        self.cmd.take_action(parsed_args)
         self.image_client.images.assert_called_with(tag=['abc', 'cba'])
 
 
@@ -1329,7 +1329,7 @@ class TestImageSet(TestImage):
         self.image_client.update_image.assert_called()
         call_args = self.image_client.update_image.call_args
         if call_args:
-            args, kwargs = call_args
+            _args, kwargs = call_args
             self.assertNotIn('owner_id', kwargs)
 
     def test_image_set_membership_reject_with_project_no_owner_change(self):
@@ -1366,7 +1366,7 @@ class TestImageSet(TestImage):
         self.image_client.update_image.assert_called()
         call_args = self.image_client.update_image.call_args
         if call_args:
-            args, kwargs = call_args
+            _args, kwargs = call_args
             self.assertNotIn('owner_id', kwargs)
 
     def test_image_set_membership_pending_with_project_no_owner_change(self):
@@ -1403,7 +1403,7 @@ class TestImageSet(TestImage):
         self.image_client.update_image.assert_called()
         call_args = self.image_client.update_image.call_args
         if call_args:
-            args, kwargs = call_args
+            _args, kwargs = call_args
             self.assertNotIn('owner_id', kwargs)
 
     def test_image_set_options(self):

openstackclient/tests/unit/image/v2/test_metadef_namespaces.py

@@ -12,6 +12,8 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
+from unittest import mock
+
 from openstackclient.image.v2 import metadef_namespaces
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 
@@ -24,6 +26,7 @@ class TestMetadefNamespaceCreate(image_fakes.TestImagev2):
         'display_name',
         'namespace',
         'owner',
+        'tags',
         'visibility',
     )
     expected_data = (
@@ -31,6 +34,7 @@ class TestMetadefNamespaceCreate(image_fakes.TestImagev2):
         _metadef_namespace.display_name,
         _metadef_namespace.namespace,
         _metadef_namespace.owner,
+        _metadef_namespace.tags,
         _metadef_namespace.visibility,
     )
 
@@ -114,21 +118,25 @@ class TestMetadefNamespaceList(image_fakes.TestImagev2):
 
 
 class TestMetadefNamespaceSet(image_fakes.TestImagev2):
-    _metadef_namespace = image_fakes.create_one_metadef_namespace()
-
     def setUp(self):
         super().setUp()
 
+        self.metadef_namespace = image_fakes.create_one_metadef_namespace()
+
+        self.image_client.get_metadef_namespace.return_value = (
+            self.metadef_namespace
+        )
         self.image_client.update_metadef_namespace.return_value = (
-            self._metadef_namespace
+            self.metadef_namespace
         )
+        self.image_client.add_tag_to_metadef_namespace.return_value = None
+
         self.cmd = metadef_namespaces.SetMetadefNamespace(self.app, None)
-        self.datalist = self._metadef_namespace
 
     def test_namespace_set_no_options(self):
-        arglist = [self._metadef_namespace.namespace]
+        arglist = [self.metadef_namespace.namespace]
         verifylist = [
-            ('namespace', self._metadef_namespace.namespace),
+            ('namespace', self.metadef_namespace.namespace),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -137,6 +145,95 @@ class TestMetadefNamespaceSet(image_fakes.TestImagev2):
 
         self.assertIsNone(result)
 
+    def test_namespace_set_tag(self):
+        arglist = [
+            self.metadef_namespace.namespace,
+            '--tag',
+            't1',
+            '--tag',
+            't2',
+        ]
+        verifylist = [
+            ('namespace', self.metadef_namespace.namespace),
+            ('tags', ['t1', 't2']),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        self.image_client.add_tag_to_metadef_namespace.assert_has_calls(
+            [
+                mock.call(self.metadef_namespace.namespace, 't1'),
+                mock.call(self.metadef_namespace.namespace, 't2'),
+            ]
+        )
+
+
+class TestMetadefNamespaceUnset(image_fakes.TestImagev2):
+    def setUp(self):
+        super().setUp()
+
+        self.metadef_namespace = image_fakes.create_one_metadef_namespace(
+            attrs={'tags': [{'name': 't1'}]}
+        )
+
+        self.image_client.get_metadef_namespace.return_value = (
+            self.metadef_namespace
+        )
+        self.image_client.update_metadef_namespace.return_value = (
+            self.metadef_namespace
+        )
+        self.image_client.remove_tag_from_metadef_namespace.return_value = None
+        self.image_client.remove_tags_from_metadef_namespace.return_value = (
+            None
+        )
+
+        self.cmd = metadef_namespaces.UnsetMetadefNamespace(self.app, None)
+
+    def test_namespace_unset_tag(self):
+        arglist = [
+            self.metadef_namespace.namespace,
+            '--tag',
+            't1',
+            '--tag',
+            't2',
+        ]
+        verifylist = [
+            ('namespace', self.metadef_namespace.namespace),
+            ('tags', ['t1', 't2']),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        self.image_client.remove_tag_from_metadef_namespace.assert_has_calls(
+            [
+                mock.call(self.metadef_namespace, 't1'),
+                mock.call(self.metadef_namespace, 't2'),
+            ]
+        )
+        self.image_client.remove_tags_from_metadef_namespace.assert_not_called()
+
+    def test_namespace_unset_all_tag(self):
+        arglist = [
+            self.metadef_namespace.namespace,
+            '--all-tags',
+        ]
+        verifylist = [
+            ('namespace', self.metadef_namespace.namespace),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        self.image_client.remove_tags_from_metadef_namespace.assert_called_once_with(
+            self.metadef_namespace
+        )
+        self.image_client.remove_tag_from_metadef_namespace.assert_not_called()
+
 
 class TestMetadefNamespaceShow(image_fakes.TestImagev2):
     _metadef_namespace = image_fakes.create_one_metadef_namespace()
@@ -146,6 +243,7 @@ class TestMetadefNamespaceShow(image_fakes.TestImagev2):
         'display_name',
         'namespace',
         'owner',
+        'tags',
         'visibility',
     )
     expected_data = (
@@ -153,6 +251,7 @@ class TestMetadefNamespaceShow(image_fakes.TestImagev2):
         _metadef_namespace.display_name,
         _metadef_namespace.namespace,
         _metadef_namespace.owner,
+        _metadef_namespace.tags,
         _metadef_namespace.visibility,
     )
 

openstackclient/tests/unit/network/test_common.py

@@ -13,91 +13,11 @@
 
 from unittest import mock
 
-import openstack
-from osc_lib import exceptions
 
 from openstackclient.network import common
 from openstackclient.tests.unit import utils
 
 
-def _add_common_argument(parser):
-    parser.add_argument(
-        'common',
-        metavar='<common>',
-        help='Common argument',
-    )
-    return parser
-
-
-def _add_network_argument(parser):
-    parser.add_argument(
-        'network',
-        metavar='<network>',
-        help='Network argument',
-    )
-    return parser
-
-
-def _add_compute_argument(parser):
-    parser.add_argument(
-        'compute',
-        metavar='<compute>',
-        help='Compute argument',
-    )
-    return parser
-
-
-class FakeNetworkAndComputeCommand(common.NetworkAndComputeCommand):
-    def update_parser_common(self, parser):
-        return _add_common_argument(parser)
-
-    def update_parser_network(self, parser):
-        return _add_network_argument(parser)
-
-    def update_parser_compute(self, parser):
-        return _add_compute_argument(parser)
-
-    def take_action_network(self, client, parsed_args):
-        return client.network_action(parsed_args)
-
-    def take_action_compute(self, client, parsed_args):
-        return client.compute_action(parsed_args)
-
-
-class FakeNetworkAndComputeLister(common.NetworkAndComputeLister):
-    def update_parser_common(self, parser):
-        return _add_common_argument(parser)
-
-    def update_parser_network(self, parser):
-        return _add_network_argument(parser)
-
-    def update_parser_compute(self, parser):
-        return _add_compute_argument(parser)
-
-    def take_action_network(self, client, parsed_args):
-        return client.network_action(parsed_args)
-
-    def take_action_compute(self, client, parsed_args):
-        return client.compute_action(parsed_args)
-
-
-class FakeNetworkAndComputeShowOne(common.NetworkAndComputeShowOne):
-    def update_parser_common(self, parser):
-        return _add_common_argument(parser)
-
-    def update_parser_network(self, parser):
-        return _add_network_argument(parser)
-
-    def update_parser_compute(self, parser):
-        return _add_compute_argument(parser)
-
-    def take_action_network(self, client, parsed_args):
-        return client.network_action(parsed_args)
-
-    def take_action_compute(self, client, parsed_args):
-        return client.compute_action(parsed_args)
-
-
 class FakeCreateNeutronCommandWithExtraArgs(
     common.NeutronCommandWithExtraArgs
 ):
@@ -119,81 +39,6 @@ class FakeCreateNeutronCommandWithExtraArgs(
         client.test_create_action(**attrs)
 
 
-class TestNetworkAndCompute(utils.TestCommand):
-    def setUp(self):
-        super().setUp()
-
-        # Create client mocks. Note that we intentionally do not use specced
-        # mocks since we want to test fake methods.
-
-        self.app.client_manager.network = mock.Mock()  # noqa: O401
-        self.network_client = self.app.client_manager.network  # noqa: O401
-        self.network_client.network_action.return_value = 'take_action_network'
-
-        self.app.client_manager.compute = mock.Mock()  # noqa: O401
-        self.compute_client = self.app.client_manager.compute  # noqa: O401
-        self.compute_client.compute_action.return_value = 'take_action_compute'
-
-        self.cmd = FakeNetworkAndComputeCommand(self.app, None)
-
-    def test_take_action_network(self):
-        arglist = ['common', 'network']
-        verifylist = [('common', 'common'), ('network', 'network')]
-
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        result = self.cmd.take_action(parsed_args)
-        self.network_client.network_action.assert_called_with(parsed_args)
-        self.assertEqual('take_action_network', result)
-
-    def test_take_action_compute(self):
-        arglist = ['common', 'compute']
-        verifylist = [('common', 'common'), ('compute', 'compute')]
-
-        self.app.client_manager.network_endpoint_enabled = False
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        result = self.cmd.take_action(parsed_args)
-        self.compute_client.compute_action.assert_called_with(parsed_args)
-        self.assertEqual('take_action_compute', result)
-
-
-class TestNetworkAndComputeCommand(TestNetworkAndCompute):
-    def setUp(self):
-        super().setUp()
-        self.cmd = FakeNetworkAndComputeCommand(self.app, None)
-
-
-class TestNetworkAndComputeLister(TestNetworkAndCompute):
-    def setUp(self):
-        super().setUp()
-        self.cmd = FakeNetworkAndComputeLister(self.app, None)
-
-
-class TestNetworkAndComputeShowOne(TestNetworkAndCompute):
-    def setUp(self):
-        super().setUp()
-        self.cmd = FakeNetworkAndComputeShowOne(self.app, None)
-
-    def test_take_action_with_http_exception(self):
-        with mock.patch.object(self.cmd, 'take_action_network') as m_action:
-            m_action.side_effect = openstack.exceptions.HttpException("bar")
-            self.assertRaisesRegex(
-                exceptions.CommandError,
-                "bar",
-                self.cmd.take_action,
-                mock.Mock(),
-            )
-
-        self.app.client_manager.network_endpoint_enabled = False
-        with mock.patch.object(self.cmd, 'take_action_compute') as m_action:
-            m_action.side_effect = openstack.exceptions.HttpException("bar")
-            self.assertRaisesRegex(
-                exceptions.CommandError,
-                "bar",
-                self.cmd.take_action,
-                mock.Mock(),
-            )
-
-
 class TestNeutronCommandWithExtraArgs(utils.TestCommand):
     def setUp(self):
         super().setUp()

openstackclient/tests/unit/network/v2/bgpvpn/fakes.py

@@ -0,0 +1,179 @@
+# Copyright (c) 2016 Juniper Networks Inc.
+# 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 openstack.network.v2 import bgpvpn as _bgpvpn
+from openstack.network.v2 import bgpvpn_network_association as _net_assoc
+from openstack.network.v2 import bgpvpn_port_association as _port_assoc
+from openstack.network.v2 import bgpvpn_router_association as _router_assoc
+from openstack import resource as sdk_resource
+
+from openstackclient.tests.unit.network.v2 import fakes as test_fakes
+
+
+_FAKE_PROJECT_ID = 'fake_project_id'
+
+
+class TestNeutronClientBgpvpn(test_fakes.TestNetworkV2):
+    def setUp(self):
+        super().setUp()
+
+
+def create_one_bgpvpn(attrs=None):
+    """Create a fake BGP VPN."""
+
+    attrs = attrs or {}
+
+    # Set default attributes.
+    bgpvpn_attrs = {
+        'id': 'fake_bgpvpn_id',
+        'project_id': _FAKE_PROJECT_ID,
+        'name': '',
+        'type': 'l3',
+        'route_targets': [],
+        'import_targets': [],
+        'export_targets': [],
+        'route_distinguishers': [],
+        'networks': [],
+        'routers': [],
+        'ports': [],
+        'vni': 100,
+        'local_pref': 777,
+    }
+
+    # Overwrite default attributes.
+    bgpvpn_attrs.update(attrs)
+    return _bgpvpn.BgpVpn(**bgpvpn_attrs)
+
+
+def create_bgpvpns(attrs=None, count=1):
+    """Create multiple fake BGP VPN."""
+
+    bgpvpns = []
+    for i in range(0, count):
+        if attrs is None:
+            attrs = {'id': 'fake_id{i}'}
+        elif getattr(attrs, 'id', None) is None:
+            attrs['id'] = 'fake_id{i}'
+        bgpvpns.append(create_one_bgpvpn(attrs))
+
+    return bgpvpns
+
+
+def create_one_resource(attrs=None):
+    """Create a fake resource."""
+    attrs = attrs or {}
+
+    res_attrs = {
+        'id': 'fake_resource_id',
+    }
+
+    res_attrs.update(attrs)
+    return sdk_resource.Resource(**res_attrs)
+
+
+def create_resources(attrs=None, count=1):
+    """Create multiple fake resources."""
+
+    resources = []
+    for i in range(0, count):
+        if attrs is None:
+            attrs = {'id': 'fake_id{i}'}
+        elif getattr(attrs, 'id', None) is None:
+            attrs['id'] = 'fake_id{i}'
+        resources.append(create_one_resource(attrs))
+
+    return resources
+
+
+def create_one_network_association(attrs=None):
+    """Create a fake network association."""
+    attrs = attrs or {}
+    assoc_attrs = {
+        'id': 'fake_association_id',
+        'network_id': 'fake_resource_id',
+        'project_id': _FAKE_PROJECT_ID,
+    }
+    assoc_attrs.update(attrs)
+    return _net_assoc.BgpVpnNetworkAssociation(**assoc_attrs)
+
+
+def create_network_associations(count=1):
+    """Create multiple fake network associations."""
+    assocs = []
+    for idx in range(count):
+        assocs.append(
+            {
+                'id': f'fake_association_id{idx}',
+                'network_id': f'fake_resource_id{idx}',
+                'project_id': _FAKE_PROJECT_ID,
+            }
+        )
+    return assocs
+
+
+def create_one_router_association(attrs=None):
+    """Create a fake router association."""
+    attrs = attrs or {}
+    assoc_attrs = {
+        'id': 'fake_association_id',
+        'router_id': 'fake_resource_id',
+        'project_id': _FAKE_PROJECT_ID,
+    }
+    assoc_attrs.update(attrs)
+    return _router_assoc.BgpVpnRouterAssociation(**assoc_attrs)
+
+
+def create_router_associations(count=1):
+    """Create multiple fake router associations."""
+    assocs = []
+    for idx in range(count):
+        assocs.append(
+            {
+                'id': f'fake_association_id{idx}',
+                'router_id': f'fake_resource_id{idx}',
+                'project_id': _FAKE_PROJECT_ID,
+            }
+        )
+    return assocs
+
+
+def create_one_port_association(attrs=None):
+    """Create a fake port association."""
+    attrs = attrs or {}
+    assoc_attrs = {
+        'id': 'fake_association_id',
+        'port_id': 'fake_resource_id',
+        'project_id': _FAKE_PROJECT_ID,
+        'routes': [],
+    }
+    assoc_attrs.update(attrs)
+    return _port_assoc.BgpVpnPortAssociation(**assoc_attrs)
+
+
+def create_port_associations(count=1):
+    """Create multiple fake port associations."""
+    assocs = []
+    for idx in range(count):
+        assocs.append(
+            {
+                'id': f'fake_association_id{idx}',
+                'port_id': f'fake_resource_id{idx}',
+                'project_id': _FAKE_PROJECT_ID,
+                'routes': [],
+            }
+        )
+    return assocs