python-openstackclient 6.6.1__py3-none-any.whl → 7.0.0__py3-none-any.whl

openstackclient/image/v2/metadef_resource_type_association.py

@@ -0,0 +1,189 @@
+#   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 logging
+
+from osc_lib.command import command
+from osc_lib import exceptions
+from osc_lib import utils
+
+from openstackclient.i18n import _
+
+LOG = logging.getLogger(__name__)
+
+
+def _get_columns(item):
+    column_map = {}
+    hidden_columns = ['location']
+    return utils.get_osc_show_columns_for_sdk_resource(
+        item, column_map, hidden_columns
+    )
+
+
+class CreateMetadefResourceTypeAssociation(command.ShowOne):
+    _description = _("Create metadef resource type association")
+
+    def get_parser(self, prog_name):
+        parser = super().get_parser(prog_name)
+        parser.add_argument(
+            "namespace",
+            metavar="<namespace>",
+            help=_(
+                "The name of the namespace you want to create the "
+                "resource type association in"
+            ),
+        )
+        parser.add_argument(
+            "name",
+            metavar="<name>",
+            help=_("A name of the new resource type"),
+        )
+        parser.add_argument(
+            "--properties-target",
+            metavar="<properties_target>",
+            help=_(
+                "Some resource types allow more than one "
+                "key/value pair per instance."
+            ),
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        image_client = self.app.client_manager.image
+        kwargs = {}
+
+        kwargs['namespace'] = parsed_args.namespace
+        kwargs['name'] = parsed_args.name
+
+        if parsed_args.properties_target:
+            kwargs['properties_target'] = parsed_args.properties_target
+
+        obj = image_client.create_metadef_resource_type_association(
+            parsed_args.namespace, **kwargs
+        )
+
+        display_columns, columns = _get_columns(obj)
+        data = utils.get_item_properties(obj, columns, formatters={})
+
+        return (display_columns, data)
+
+
+class DeleteMetadefResourceTypeAssociation(command.Command):
+    _description = _("Delete metadef resource type association")
+
+    def get_parser(self, prog_name):
+        parser = super().get_parser(prog_name)
+        parser.add_argument(
+            "metadef_namespace",
+            metavar="<metadef_namespace>",
+            help=_("The name of the namespace whose details you want to see"),
+        )
+        parser.add_argument(
+            "name",
+            metavar="<name>",
+            nargs="+",
+            help=_(
+                "The name of the resource type(s) (repeat option to delete"
+                "multiple metadef resource type associations)"
+            ),
+        )
+        parser.add_argument(
+            "--force",
+            dest='force',
+            action='store_true',
+            default=False,
+            help=_(
+                "Force delete the resource type association if the"
+                "namespace is protected"
+            ),
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        image_client = self.app.client_manager.image
+
+        result = 0
+        for resource_type in parsed_args.name:
+            try:
+                metadef_namespace = image_client.get_metadef_namespace(
+                    parsed_args.metadef_namespace
+                )
+
+                kwargs = {}
+                is_initially_protected = (
+                    True if metadef_namespace.is_protected else False
+                )
+                if is_initially_protected and parsed_args.force:
+                    kwargs['is_protected'] = False
+
+                    image_client.update_metadef_namespace(
+                        metadef_namespace.namespace, **kwargs
+                    )
+
+                try:
+                    image_client.delete_metadef_resource_type_association(
+                        resource_type, metadef_namespace, ignore_missing=False
+                    )
+                finally:
+                    if is_initially_protected:
+                        kwargs['is_protected'] = True
+                        image_client.update_metadef_namespace(
+                            metadef_namespace.namespace, **kwargs
+                        )
+
+            except Exception as e:
+                result += 1
+                LOG.error(
+                    _(
+                        "Failed to delete resource type with name or "
+                        "ID '%(resource_type)s': %(e)s"
+                    ),
+                    {'resource_type': resource_type, 'e': e},
+                )
+
+        if result > 0:
+            total = len(parsed_args.metadef_namespace)
+            msg = _(
+                "%(result)s of %(total)s resource type failed to delete."
+            ) % {'result': result, 'total': total}
+            raise exceptions.CommandError(msg)
+
+
+class ListMetadefResourceTypeAssociations(command.Lister):
+    _description = _("List metadef resource type associations")
+
+    def get_parser(self, prog_name):
+        parser = super().get_parser(prog_name)
+        parser.add_argument(
+            "metadef_namespace",
+            metavar="<metadef_namespace>",
+            help=_("The name of the namespace whose details you want to see"),
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        image_client = self.app.client_manager.image
+        data = image_client.metadef_resource_type_associations(
+            parsed_args.metadef_namespace,
+        )
+        columns = ['Name']
+        column_headers = columns
+        return (
+            column_headers,
+            (
+                utils.get_item_properties(
+                    s,
+                    columns,
+                )
+                for s in data
+            ),
+        )

openstackclient/image/v2/task.py

@@ -64,7 +64,7 @@ class ShowTask(command.ShowOne):
     _description = _('Display task details')
 
     def get_parser(self, prog_name):
-        parser = super(ShowTask, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
 
         parser.add_argument(
             'task',

openstackclient/network/common.py

@@ -132,7 +132,7 @@ class NetDetectionMixin(metaclass=abc.ABCMeta):
 
     def get_parser(self, prog_name):
         LOG.debug('get_parser(%s)', prog_name)
-        parser = super(NetDetectionMixin, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser = self.update_parser_common(parser)
         LOG.debug('common parser: %s', parser)
         if self.is_neutron or self.is_docs_build:
@@ -161,7 +161,7 @@ class NetDetectionMixin(metaclass=abc.ABCMeta):
             )
         elif self.is_nova_network:
             return self.take_action_compute(
-                self.app.client_manager.compute, parsed_args
+                self.app.client_manager.sdk_connection.compute, parsed_args
             )
 
     def take_action_network(self, client, parsed_args):
@@ -210,7 +210,8 @@ class NetworkAndComputeDelete(NetworkAndComputeCommand, metaclass=abc.ABCMeta):
                     )
                 else:
                     self.take_action_compute(
-                        self.app.client_manager.compute, parsed_args
+                        self.app.client_manager.sdk_connection.compute,
+                        parsed_args,
                     )
             except Exception as e:
                 msg = _(
@@ -267,7 +268,7 @@ class NetworkAndComputeShowOne(
                 )
             else:
                 return self.take_action_compute(
-                    self.app.client_manager.compute, parsed_args
+                    self.app.client_manager.sdk_connection.compute, parsed_args
                 )
         except openstack.exceptions.HttpException as exc:
             msg = _("Error while executing command: %s") % exc.message
@@ -318,7 +319,7 @@ class NeutronCommandWithExtraArgs(command.Command):
         return result
 
     def get_parser(self, prog_name):
-        parser = super(NeutronCommandWithExtraArgs, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--extra-property',
             metavar='type=<property_type>,name=<property_name>,'

openstackclient/network/utils.py

@@ -27,7 +27,7 @@ def transform_compute_security_group_rule(sg_rule):
     elif from_port is None and to_port is None:
         port_range = {'port_range': ""}
     else:
-        port_range = {'port_range': "%s:%s" % (from_port, to_port)}
+        port_range = {'port_range': f"{from_port}:{to_port}"}
     info.update(port_range)
     if 'cidr' in info['ip_range']:
         info['ip_range'] = info['ip_range']['cidr']
@@ -76,7 +76,7 @@ def str2dict(strdict):
             msg = _("missing value for key '%s'")
             raise exceptions.CommandError(msg % kv)
         else:
-            kvlist[i - 1] = "%s;%s" % (kvlist[i - 1], kv)
+            kvlist[i - 1] = f"{kvlist[i - 1]};{kv}"
     for kv in kvlist:
         key, sep, value = kv.partition(':')
         result[key] = value

openstackclient/network/v2/address_group.py

@@ -61,7 +61,7 @@ class CreateAddressGroup(command.ShowOne, common.NeutronCommandWithExtraArgs):
     _description = _("Create a new Address Group")
 
     def get_parser(self, prog_name):
-        parser = super(CreateAddressGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'name', metavar="<name>", help=_("New address group name")
         )
@@ -108,7 +108,7 @@ class DeleteAddressGroup(command.Command):
     _description = _("Delete address group(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteAddressGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'address_group',
             metavar="<address-group>",
@@ -148,7 +148,7 @@ class ListAddressGroup(command.Lister):
     _description = _("List address groups")
 
     def get_parser(self, prog_name):
-        parser = super(ListAddressGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
 
         parser.add_argument(
             '--name',
@@ -213,7 +213,7 @@ class SetAddressGroup(common.NeutronCommandWithExtraArgs):
     _description = _("Set address group properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetAddressGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'address_group',
             metavar="<address-group>",
@@ -265,7 +265,7 @@ class ShowAddressGroup(command.ShowOne):
     _description = _("Display address group details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowAddressGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'address_group',
             metavar="<address-group>",
@@ -289,7 +289,7 @@ class UnsetAddressGroup(command.Command):
     _description = _("Unset address group properties")
 
     def get_parser(self, prog_name):
-        parser = super(UnsetAddressGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'address_group',
             metavar="<address-group>",

openstackclient/network/v2/address_scope.py

@@ -62,7 +62,7 @@ class CreateAddressScope(command.ShowOne, common.NeutronCommandWithExtraArgs):
     _description = _("Create a new Address Scope")
 
     def get_parser(self, prog_name):
-        parser = super(CreateAddressScope, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'name', metavar="<name>", help=_("New address scope name")
         )
@@ -113,7 +113,7 @@ class DeleteAddressScope(command.Command):
     _description = _("Delete address scope(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteAddressScope, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'address_scope',
             metavar="<address-scope>",
@@ -155,7 +155,7 @@ class ListAddressScope(command.Lister):
     _description = _("List address scopes")
 
     def get_parser(self, prog_name):
-        parser = super(ListAddressScope, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
 
         parser.add_argument(
             '--name',
@@ -249,7 +249,7 @@ class SetAddressScope(common.NeutronCommandWithExtraArgs):
     _description = _("Set address scope properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetAddressScope, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'address_scope',
             metavar="<address-scope>",
@@ -294,7 +294,7 @@ class ShowAddressScope(command.ShowOne):
     _description = _("Display address scope details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowAddressScope, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'address_scope',
             metavar="<address-scope>",

openstackclient/network/v2/default_security_group_rule.py

@@ -142,7 +142,7 @@ class CreateDefaultSecurityGroupRule(
         parser.add_argument(
             '--for-custom-sg',
             action='store_true',
-            default=True,
+            default=False,
             help=_(
                 "Set this default security group rule to be used in all "
                 "custom security groups created manually by users"

openstackclient/network/v2/floating_ip.py

@@ -9,18 +9,17 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 """IP Floating action implementations"""
 
 from osc_lib import utils
 from osc_lib.utils import tags as _tag
 
+from openstackclient.api import compute_v2
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
 
-
 _formatters = {
     'port_details': utils.format_dict,
 }
@@ -200,7 +199,7 @@ class CreateFloatingIP(
         return (display_columns, data)
 
     def take_action_compute(self, client, parsed_args):
-        obj = client.api.floating_ip_create(parsed_args.network)
+        obj = compute_v2.create_floating_ip(client, parsed_args.network)
         columns = _get_columns(obj)
         data = utils.get_dict_properties(obj, columns)
         return (columns, data)
@@ -230,7 +229,7 @@ class DeleteFloatingIP(common.NetworkAndComputeDelete):
         client.delete_ip(obj)
 
     def take_action_compute(self, client, parsed_args):
-        client.api.floating_ip_delete(self.r)
+        compute_v2.delete_floating_ip(client, self.r)
 
 
 class ListFloatingIP(common.NetworkAndComputeLister):
@@ -421,8 +420,7 @@ class ListFloatingIP(common.NetworkAndComputeLister):
             'Pool',
         )
 
-        data = client.api.floating_ip_list()
-
+        objs = compute_v2.list_floating_ips(client)
         return (
             headers,
             (
@@ -431,7 +429,7 @@ class ListFloatingIP(common.NetworkAndComputeLister):
                     columns,
                     formatters={},
                 )
-                for s in data
+                for s in objs
             ),
         )
 
@@ -440,7 +438,7 @@ class SetFloatingIP(common.NeutronCommandWithExtraArgs):
     _description = _("Set floating IP Properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetFloatingIP, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'floating_ip',
             metavar='<floating-ip>',
@@ -538,7 +536,7 @@ class ShowFloatingIP(common.NetworkAndComputeShowOne):
         return (display_columns, data)
 
     def take_action_compute(self, client, parsed_args):
-        obj = client.api.floating_ip_find(parsed_args.floating_ip)
+        obj = compute_v2.get_floating_ip(client, parsed_args.floating_ip)
         columns = _get_columns(obj)
         data = utils.get_dict_properties(obj, columns)
         return (columns, data)
@@ -548,7 +546,7 @@ class UnsetFloatingIP(common.NeutronCommandWithExtraArgs):
     _description = _("Unset floating IP Properties")
 
     def get_parser(self, prog_name):
-        parser = super(UnsetFloatingIP, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'floating_ip',
             metavar='<floating-ip>',

openstackclient/network/v2/floating_ip_pool.py

@@ -9,14 +9,12 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 """Floating IP Pool action implementations"""
 
-
 from osc_lib import exceptions
-from osc_lib import utils
 
+from openstackclient.api import compute_v2
 from openstackclient.i18n import _
 from openstackclient.network import common
 
@@ -33,15 +31,8 @@ class ListFloatingIPPool(common.NetworkAndComputeLister):
 
     def take_action_compute(self, client, parsed_args):
         columns = ('Name',)
-        data = client.api.floating_ip_pool_list()
-
-        return (
-            columns,
-            (
-                utils.get_dict_properties(
-                    s,
-                    columns,
-                )
-                for s in data
-            ),
-        )
+        data = [
+            (x['name'],) for x in compute_v2.list_floating_ip_pools(client)
+        ]
+
+        return (columns, data)

openstackclient/network/v2/floating_ip_port_forwarding.py

@@ -98,9 +98,7 @@ class CreateFloatingIPPortForwarding(
     _description = _("Create floating IP port forwarding")
 
     def get_parser(self, prog_name):
-        parser = super(CreateFloatingIPPortForwarding, self).get_parser(
-            prog_name
-        )
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--internal-ip-address',
             required=True,
@@ -201,9 +199,7 @@ class DeleteFloatingIPPortForwarding(command.Command):
     _description = _("Delete floating IP port forwarding")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteFloatingIPPortForwarding, self).get_parser(
-            prog_name
-        )
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'floating_ip',
             metavar='<floating-ip>',
@@ -256,9 +252,7 @@ class ListFloatingIPPortForwarding(command.Lister):
     _description = _("List floating IP port forwarding")
 
     def get_parser(self, prog_name):
-        parser = super(ListFloatingIPPortForwarding, self).get_parser(
-            prog_name
-        )
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'floating_ip',
             metavar='<floating-ip>',
@@ -358,7 +352,7 @@ class SetFloatingIPPortForwarding(common.NeutronCommandWithExtraArgs):
     _description = _("Set floating IP Port Forwarding Properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetFloatingIPPortForwarding, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'floating_ip',
             metavar='<floating-ip>',
@@ -458,9 +452,7 @@ class ShowFloatingIPPortForwarding(command.ShowOne):
     _description = _("Display floating IP Port Forwarding details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowFloatingIPPortForwarding, self).get_parser(
-            prog_name
-        )
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'floating_ip',
             metavar='<floating-ip>',

openstackclient/network/v2/ip_availability.py

@@ -39,7 +39,7 @@ class ListIPAvailability(command.Lister):
     _description = _("List IP availability for network")
 
     def get_parser(self, prog_name):
-        parser = super(ListIPAvailability, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--ip-version',
             type=int,
@@ -105,7 +105,7 @@ class ShowIPAvailability(command.ShowOne):
     _description = _("Show network IP availability details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowIPAvailability, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'network',
             metavar="<network>",

openstackclient/network/v2/l3_conntrack_helper.py

@@ -49,7 +49,7 @@ class CreateConntrackHelper(command.ShowOne):
     _description = _("Create a new L3 conntrack helper")
 
     def get_parser(self, prog_name):
-        parser = super(CreateConntrackHelper, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'router',
             metavar='<router>',
@@ -95,7 +95,7 @@ class DeleteConntrackHelper(command.Command):
     _description = _("Delete L3 conntrack helper")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteConntrackHelper, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'router',
             metavar='<router>',
@@ -143,7 +143,7 @@ class ListConntrackHelper(command.Lister):
     _description = _("List L3 conntrack helpers")
 
     def get_parser(self, prog_name):
-        parser = super(ListConntrackHelper, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'router',
             metavar='<router>',
@@ -206,7 +206,7 @@ class SetConntrackHelper(command.Command):
     _description = _("Set L3 conntrack helper properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetConntrackHelper, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'router',
             metavar='<router>',
@@ -253,7 +253,7 @@ class ShowConntrackHelper(command.ShowOne):
     _description = _("Display L3 conntrack helper details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowConntrackHelper, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'router',
             metavar='<router>',

openstackclient/network/v2/network.py

@@ -9,7 +9,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 """Network action implementations"""
 
@@ -18,6 +17,7 @@ from osc_lib.cli import format_columns
 from osc_lib import utils
 from osc_lib.utils import tags as _tag
 
+from openstackclient.api import compute_v2
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
@@ -61,7 +61,6 @@ def _get_columns_network(item):
         'tags': 'tags',
     }
     hidden_columns = ['location', 'tenant_id']
-    hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
         item, column_map, hidden_columns
     )
@@ -389,7 +388,7 @@ class CreateNetwork(
 
     def take_action_compute(self, client, parsed_args):
         attrs = _get_attrs_compute(self.app.client_manager, parsed_args)
-        obj = client.api.network_create(**attrs)
+        obj = compute_v2.create_network(client, **attrs)
         display_columns, columns = _get_columns_compute(obj)
         data = utils.get_dict_properties(obj, columns)
         return (display_columns, data)
@@ -417,7 +416,8 @@ class DeleteNetwork(common.NetworkAndComputeDelete):
         client.delete_network(obj)
 
     def take_action_compute(self, client, parsed_args):
-        client.api.network_delete(self.r)
+        network = compute_v2.find_network(client, self.r)
+        compute_v2.delete_network(client, network['id'])
 
 
 # TODO(sindhu): Use the SDK resource mapped attribute names once the
@@ -674,7 +674,7 @@ class ListNetwork(common.NetworkAndComputeLister):
             'Subnet',
         )
 
-        data = client.api.network_list()
+        data = compute_v2.list_networks(client)
 
         return (
             column_headers,
@@ -695,7 +695,7 @@ class SetNetwork(common.NeutronCommandWithExtraArgs):
     _description = _("Set network properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetNetwork, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'network',
             metavar="<network>",
@@ -829,7 +829,7 @@ class ShowNetwork(common.NetworkAndComputeShowOne):
         return (display_columns, data)
 
     def take_action_compute(self, client, parsed_args):
-        obj = client.api.network_find(parsed_args.network)
+        obj = compute_v2.find_network(client, parsed_args.network)
         display_columns, columns = _get_columns_compute(obj)
         data = utils.get_dict_properties(obj, columns)
         return (display_columns, data)
@@ -839,7 +839,7 @@ class UnsetNetwork(common.NeutronUnsetCommandWithExtraArgs):
     _description = _("Unset network properties")
 
     def get_parser(self, prog_name):
-        parser = super(UnsetNetwork, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'network',
             metavar="<network>",