Remove nova-network support

Most common code shared between networking and compute
was removed as it is no longer necessary. Network object
delete still remains as we need to handle multiple
resource deletion and deal with possible failures.
Updated documentation accordingly.

Add/remove floating IP via server will only use network
endpoint for operations.

Removed floating IP pool code as it is deprecated and no
longer used.

Removed remaining quota code in compute relating to
networks as it is deprecated.

Removed a number of tests that no longer apply.

Change-Id: I3138028f9aac49d5f54fd5c1d2bcd61920e94a1e
Signed-off-by: Brian Haley <haleyb.dev@gmail.com>

Author: brianphaley

doc/source/cli/backwards-incompatible.rst

@@ -16,6 +16,18 @@ from this backwards incompatible change handling.
 Backwards Incompatible Changes
 ==============================
 
+Release 10.0
+------------
+
+1. Nova network support was removed from the networking commands.
+
+   As Neutron has been the preferred networking solution in
+   Openstack for close to ten years, the old Nova network
+   code was finally removed. All networking API calls are still
+   supported, but they will only use the Neutron API endpoint.
+
+   * Commit: https://review.opendev.org/981613
+
 Release 4.0
 -----------
 

doc/source/cli/command-objects/floating-ip-pool.rst

@@ -99,7 +99,6 @@ referring to both Compute and Volume quotas.
 * ``flavor``: (**Compute**) predefined server configurations: ram, root disk and so on
 * ``fixed ip``: (**Compute**) - an internal IP address assigned to a server
 * ``floating ip``: (**Network**) - a public IP address that can be mapped to a server
-* ``floating ip pool``: (**Network**) - a pool of public IP addresses
 * ``group``: (**Identity**) a grouping of users
 * ``host``: (**Compute**) - the physical computer running compute services
 * ``hypervisor``: (**Compute**) the virtual machine manager

doc/source/cli/commands.rst

@@ -172,10 +172,11 @@ multiple ``delete_network()`` calls.
 
 .. code-block:: python
 
-    class DeleteNetwork(common.NetworkAndComputeCommand):
+    class DeleteNetwork(common.NetworkDelete):
         """Delete network(s)"""
 
-        def update_parser_common(self, parser):
+        def get_parser(self, prog_name):
+            parser = super().get_parser(prog_name)
             parser.add_argument(
                 'network',
                 metavar="<network>",
@@ -184,20 +185,7 @@ multiple ``delete_network()`` calls.
             )
             return parser
 
-        def take_action(self, client, parsed_args):
-            ret = 0
-
-            for network in parsed_args.network:
-                try:
-                    obj = client.find_network(network, ignore_missing=False)
-                    client.delete_network(obj)
-                except Exception:
-                    LOG.error(_("Failed to delete network with name "
-                                "or ID %s."), network)
-                    ret += 1
-
-            if ret > 0:
-                total = len(parsed_args.network)
-                msg = (_("Failed to delete %(ret)s of %(total)s networks.")
-                       % {"ret": ret, "total": total})
-                raise exceptions.CommandError(msg)
+        def take_action_delete(self, parsed_args):
+            client = self.app.client_manager.network
+            obj = client.find_network(network, ignore_missing=False)
+            client.delete_network(obj)

doc/source/contributor/command-errors.rst

@@ -27,7 +27,6 @@
 
 from openstackclient import command
 from openstackclient.i18n import _
-from openstackclient.network import common
 
 LOG = logging.getLogger(__name__)
 
@@ -62,13 +61,6 @@
     'volumes',
 ]
 
-NOVA_NETWORK_QUOTAS = {
-    'fixed_ips': 'fixed-ips',
-    'floating_ips': 'floating-ips',
-    'security_group_rules': 'secgroup-rules',
-    'security_groups': 'secgroups',
-}
-
 NETWORK_QUOTAS = {
     'floatingip': 'floating-ips',
     'security_group_rule': 'secgroup-rules',
@@ -467,41 +459,20 @@ def take_action(self, parsed_args):
         return ((), ())
 
 
-class SetQuota(common.NetDetectionMixin, command.Command):
+class SetQuota(command.Command):
     _description = _("Set quotas for project or class")
 
     def _build_options_list(self):
         help_fmt = _('New value for the %s quota')
-        # Compute and volume quota options are always the same
+        # Compute volume and network quota options are always the same
         rets = [
             (k, v, help_fmt % v)
             for k, v in itertools.chain(
                 COMPUTE_QUOTAS.items(),
                 VOLUME_QUOTAS.items(),
+                NETWORK_QUOTAS.items(),
             )
         ]
-        # For docs build, we want to produce helps for both neutron and
-        # nova-network options. They overlap, so we have to figure out which
-        # need to be tagged as specific to one network type or the other.
-        if self.is_docs_build:
-            # NOTE(efried): This takes advantage of the fact that we know the
-            # nova-net options are a subset of the neutron options. If that
-            # ever changes, this algorithm will need to be adjusted accordingly
-            inv_compute = set(NOVA_NETWORK_QUOTAS.values())
-            for k, v in NETWORK_QUOTAS.items():
-                _help = help_fmt % v
-                if v not in inv_compute:
-                    # This one is unique to neutron
-                    _help = self.enhance_help_neutron(_help)
-                rets.append((k, v, _help))
-        elif self.is_neutron:
-            rets.extend(
-                [(k, v, help_fmt % v) for k, v in NETWORK_QUOTAS.items()]
-            )
-        elif self.is_nova_network:
-            rets.extend(
-                [(k, v, help_fmt % v) for k, v in NOVA_NETWORK_QUOTAS.items()]
-            )
         return rets
 
     def get_parser(self, prog_name):
@@ -631,11 +602,6 @@ def take_action(self, parsed_args):
                 value = getattr(parsed_args, k, None)
                 if value is not None:
                     network_kwargs[k] = value
-        elif self.app.client_manager.is_compute_endpoint_enabled():
-            for k, v in NOVA_NETWORK_QUOTAS.items():
-                value = getattr(parsed_args, k, None)
-                if value is not None:
-                    compute_kwargs[k] = value
 
         if network_kwargs:
             if parsed_args.force is True:
@@ -818,7 +784,6 @@ def _normalize_names(section: dict) -> None:
             # in nova will be replaced by neutron's.
             for k, v in itertools.chain(
                 COMPUTE_QUOTAS.items(),
-                NOVA_NETWORK_QUOTAS.items(),
                 VOLUME_QUOTAS.items(),
                 NETWORK_QUOTAS.items(),
             ):

openstackclient/common/quota.py

@@ -39,7 +39,6 @@
 from openstackclient.common import pagination
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
-from openstackclient.network import common as network_common
 
 LOG = logging.getLogger(__name__)
 
@@ -461,12 +460,11 @@ def take_action(
         )
 
 
-class AddFloatingIP(network_common.NetworkAndComputeCommand):
+class AddFloatingIP(command.Command):
     _description = _("Add floating IP address to server")
 
-    def update_parser_common(
-        self, parser: argparse.ArgumentParser
-    ) -> argparse.ArgumentParser:
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
             metavar="<server>",
@@ -491,9 +489,8 @@ def update_parser_common(
         )
         return parser
 
-    def take_action_network(
-        self, client: Any, parsed_args: argparse.Namespace
-    ) -> None:
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
+        client = self.app.client_manager.network
         compute_client = self.app.client_manager.compute
 
         attrs = {}
@@ -552,16 +549,6 @@ def take_action_network(
             if error:
                 raise error
 
-    def take_action_compute(
-        self, client: Any, parsed_args: argparse.Namespace
-    ) -> None:
-        server = client.find_server(parsed_args.server, ignore_missing=False)
-        client.add_floating_ip_to_server(
-            server,
-            parsed_args.ip_address,
-            fixed_address=parsed_args.fixed_ip_address,
-        )
-
 
 class AddPort(command.Command):
     _description = _("Add port to server")
@@ -4069,12 +4056,11 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
         )
 
 
-class RemoveFloatingIP(network_common.NetworkAndComputeCommand):
+class RemoveFloatingIP(command.Command):
     _description = _("Remove floating IP address from server")
 
-    def update_parser_common(
-        self, parser: argparse.ArgumentParser
-    ) -> argparse.ArgumentParser:
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
             metavar="<server>",
@@ -4089,22 +4075,15 @@ def update_parser_common(
         )
         return parser
 
-    def take_action_network(
-        self, client: Any, parsed_args: argparse.Namespace
-    ) -> None:
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
+        client = self.app.client_manager.network
         obj = client.find_ip(
             parsed_args.ip_address,
             ignore_missing=False,
         )
 
         client.update_ip(obj, port_id=None)
 
-    def take_action_compute(
-        self, client: Any, parsed_args: argparse.Namespace
-    ) -> None:
-        server = client.find_server(parsed_args.server, ignore_missing=False)
-        client.remove_floating_ip_from_server(server, parsed_args.ip_address)
-
 
 class RemovePort(command.Command):
     _description = _("Remove port from server")

openstackclient/compute/v2/server.py

@@ -437,17 +437,14 @@ def add_group_domain_option_to_parser(parser: argparse.ArgumentParser) -> None:
 
 def add_project_domain_option_to_parser(
     parser: argparse.ArgumentParser,
-    enhance_help: Callable[[str], str] = lambda _h: _h,
 ) -> None:
     parser.add_argument(
         '--project-domain',
         metavar='<project-domain>',
-        help=enhance_help(
-            _(
-                'Domain the project belongs to (name or ID). This '
-                'can be used in case collisions between project '
-                'names exist.'
-            )
+        help=_(
+            'Domain the project belongs to (name or ID). This '
+            'can be used in case collisions between project '
+            'names exist.'
         ),
     )