From b82b987b76f8d67b058a7c902d1124a3d16f63f5 Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem@us.ibm.com>
Date: Tue, 26 Jul 2016 15:00:57 -0400
Subject: [PATCH] Deprecate the nova-manage commands that rely on nova-network

nova-network is deprecated. The 2.36 microversion makes the
network REST APIs fail with a 404. And the network CLIs/APIs
in python-novaclient are being deprecated. So we should also
deprecate the nova-manage commands that use nova-network.

Change-Id: I5efeb5e5c552064028ae0dea5ce5314c5d92cf0e
---
 nova/cmd/manage.py                            | 27 ++++++++++++++++++-
 ...age-network-commands-212726e67bffdfc4.yaml | 15 +++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/deprecate-nova-manage-network-commands-212726e67bffdfc4.yaml

diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py
index b2275f0f0884..0fea7d685c0f 100644
--- a/nova/cmd/manage.py
+++ b/nova/cmd/manage.py
@@ -116,6 +116,11 @@ def param2id(object_id):
 class VpnCommands(object):
     """Class for managing VPNs."""
 
+    description = ('DEPRECATED: VPN commands are deprecated since '
+                   'nova-network is deprecated in favor of Neutron. The '
+                   'VPN commands will be removed in the Nova 15.0.0 '
+                   'Ocata release.')
+
     @args('--project', dest='project_id', metavar='<Project name>',
             help='Project name')
     @args('--ip', metavar='<IP Address>', help='IP Address')
@@ -319,7 +324,12 @@ class ProjectCommands(object):
     @args('--project', dest='project_id', metavar='<Project name>',
             help='Project name')
     def scrub(self, project_id):
-        """Deletes data associated with project."""
+        """DEPRECATED: Deletes network data associated with project.
+
+        This command is only for nova-network deployments and nova-network is
+        deprecated in favor of Neutron. This command will be removed in the
+        Nova 15.0.0 Ocata release.
+        """
         admin_context = context.get_admin_context()
         networks = db.project_get_networks(admin_context, project_id)
         for network in networks:
@@ -335,6 +345,11 @@ AccountCommands = ProjectCommands
 class FixedIpCommands(object):
     """Class for managing fixed IP."""
 
+    description = ('DEPRECATED: Fixed IP commands are deprecated since '
+                   'nova-network is deprecated in favor of Neutron. The '
+                   'fixed IP commands will be removed in the Nova 15.0.0 '
+                   'Ocata release.')
+
     @args('--host', metavar='<host>', help='Host')
     def list(self, host=None):
         """Lists all fixed IPs (optionally by host)."""
@@ -429,6 +444,11 @@ class FixedIpCommands(object):
 class FloatingIpCommands(object):
     """Class for managing floating IP."""
 
+    description = ('DEPRECATED: Floating IP commands are deprecated since '
+                   'nova-network is deprecated in favor of Neutron. The '
+                   'floating IP commands will be removed in the Nova 15.0.0 '
+                   'Ocata release.')
+
     @staticmethod
     def address_to_hosts(addresses):
         """Iterate over hosts within an address range.
@@ -527,6 +547,11 @@ def validate_network_plugin(f, *args, **kwargs):
 class NetworkCommands(object):
     """Class for managing networks."""
 
+    description = ('DEPRECATED: Network commands are deprecated since '
+                   'nova-network is deprecated in favor of Neutron. The '
+                   'network commands will be removed in the Nova 15.0.0 Ocata '
+                   'release.')
+
     @validate_network_plugin
     @args('--label', metavar='<label>', help='Label for network (ex: public)')
     @args('--fixed_range_v4', dest='cidr', metavar='<x.x.x.x/yy>',
diff --git a/releasenotes/notes/deprecate-nova-manage-network-commands-212726e67bffdfc4.yaml b/releasenotes/notes/deprecate-nova-manage-network-commands-212726e67bffdfc4.yaml
new file mode 100644
index 000000000000..72c6b7e56c93
--- /dev/null
+++ b/releasenotes/notes/deprecate-nova-manage-network-commands-212726e67bffdfc4.yaml
@@ -0,0 +1,15 @@
+---
+deprecations:
+  - |
+    The following nova-manage commands are deprecated for removal in the
+    Nova 15.0.0 Ocata release:
+
+    * nova-maange account scrub
+    * nova-manage fixed *
+    * nova-manage floating *
+    * nova-manage network *
+    * nova-manage project scrub
+    * nova-manage vpn *
+
+    These commands only work with nova-network which is itself deprecated in
+    favor of Neutron.