diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py
index fc0947e8b4ea..9a3c535a5c43 100644
--- a/nova/cmd/manage.py
+++ b/nova/cmd/manage.py
@@ -30,9 +30,7 @@ import sys
 import traceback
 
 from dateutil import parser as dateutil_parser
-import decorator
 from keystoneauth1 import exceptions as ks_exc
-import netaddr
 from neutronclient.common import exceptions as neutron_client_exc
 from oslo_config import cfg
 from oslo_db import exception as db_exc
@@ -40,7 +38,6 @@ from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
-from oslo_utils import importutils
 from oslo_utils import uuidutils
 import prettytable
 import six
@@ -67,20 +64,15 @@ from nova.objects import instance as instance_obj
 from nova.objects import instance_mapping as instance_mapping_obj
 from nova.objects import quotas as quotas_obj
 from nova.objects import virtual_interface as virtual_interface_obj
-from nova import quota
 from nova import rpc
 from nova.scheduler.client import report
 from nova.scheduler import utils as scheduler_utils
-from nova import utils
 from nova import version
 from nova.virt import ironic
 
 CONF = nova.conf.CONF
-
 LOG = logging.getLogger(__name__)
 
-QUOTAS = quota.QUOTAS
-
 # Keep this list sorted and one entry per line for readability.
 _EXTRA_DEFAULT_LOG_LEVELS = ['oslo_concurrency=INFO',
                              'oslo_db=INFO',
@@ -106,268 +98,6 @@ def mask_passwd_in_url(url):
     return urlparse.urlunparse(new_parsed)
 
 
-class FloatingIpCommands(object):
-    """Class for managing floating IP."""
-
-    # TODO(stephenfin): Remove these when we remove cells v1
-    description = ('DEPRECATED: Floating IP commands are deprecated since '
-                   'nova-network is deprecated in favor of Neutron. The '
-                   'floating IP commands will be removed in an upcoming '
-                   'release.')
-
-    @staticmethod
-    def address_to_hosts(addresses):
-        """Iterate over hosts within an address range.
-
-        If an explicit range specifier is missing, the parameter is
-        interpreted as a specific individual address.
-        """
-        try:
-            return [netaddr.IPAddress(addresses)]
-        except ValueError:
-            net = netaddr.IPNetwork(addresses)
-            if net.size < 4:
-                reason = _("/%s should be specified as single address(es) "
-                           "not in cidr format") % net.prefixlen
-                raise exception.InvalidInput(reason=reason)
-            elif net.size >= 1000000:
-                # NOTE(dripton): If we generate a million IPs and put them in
-                # the database, the system will slow to a crawl and/or run
-                # out of memory and crash.  This is clearly a misconfiguration.
-                reason = _("Too many IP addresses will be generated.  Please "
-                           "increase /%s to reduce the number generated."
-                          ) % net.prefixlen
-                raise exception.InvalidInput(reason=reason)
-            else:
-                return net.iter_hosts()
-
-    @args('--ip_range', metavar='<range>', help='IP range')
-    @args('--pool', metavar='<pool>', help='Optional pool')
-    @args('--interface', metavar='<interface>', help='Optional interface')
-    def create(self, ip_range, pool=None, interface=None):
-        """Creates floating IPs for zone by range."""
-        admin_context = context.get_admin_context()
-        if not pool:
-            pool = CONF.default_floating_pool
-        if not interface:
-            interface = CONF.public_interface
-
-        ips = [{'address': str(address), 'pool': pool, 'interface': interface}
-               for address in self.address_to_hosts(ip_range)]
-        try:
-            db.floating_ip_bulk_create(admin_context, ips, want_result=False)
-        except exception.FloatingIpExists as exc:
-            # NOTE(simplylizz): Maybe logging would be better here
-            # instead of printing, but logging isn't used here and I
-            # don't know why.
-            print('error: %s' % exc)
-            return 1
-
-    @args('--ip_range', metavar='<range>', help='IP range')
-    def delete(self, ip_range):
-        """Deletes floating IPs by range."""
-        admin_context = context.get_admin_context()
-
-        ips = ({'address': str(address)}
-               for address in self.address_to_hosts(ip_range))
-        db.floating_ip_bulk_destroy(admin_context, ips)
-
-    @args('--host', metavar='<host>', help='Host')
-    def list(self, host=None):
-        """Lists all floating IPs (optionally by host).
-
-        Note: if host is given, only active floating IPs are returned
-        """
-        ctxt = context.get_admin_context()
-        try:
-            if host is None:
-                floating_ips = db.floating_ip_get_all(ctxt)
-            else:
-                floating_ips = db.floating_ip_get_all_by_host(ctxt, host)
-        except exception.NoFloatingIpsDefined:
-            print(_("No floating IP addresses have been defined."))
-            return
-        for floating_ip in floating_ips:
-            instance_uuid = None
-            if floating_ip['fixed_ip_id']:
-                fixed_ip = db.fixed_ip_get(ctxt, floating_ip['fixed_ip_id'])
-                instance_uuid = fixed_ip['instance_uuid']
-
-            print("%s\t%s\t%s\t%s\t%s" % (floating_ip['project_id'],
-                                          floating_ip['address'],
-                                          instance_uuid,
-                                          floating_ip['pool'],
-                                          floating_ip['interface']))
-
-
-@decorator.decorator
-def validate_network_plugin(f, *args, **kwargs):
-    """Decorator to validate the network plugin."""
-    if utils.is_neutron():
-        print(_("ERROR: Network commands are not supported when using the "
-                "Neutron API.  Use python-neutronclient instead."))
-        return 2
-    return f(*args, **kwargs)
-
-
-class NetworkCommands(object):
-    """Class for managing networks."""
-
-    # TODO(stephenfin): Remove these when we remove cells v1
-    description = ('DEPRECATED: Network commands are deprecated since '
-                   'nova-network is deprecated in favor of Neutron. The '
-                   'network commands will be removed in an upcoming 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>',
-            help='IPv4 subnet (ex: 10.0.0.0/8)')
-    @args('--num_networks', metavar='<number>',
-            help='Number of networks to create')
-    @args('--network_size', metavar='<number>',
-            help='Number of IPs per network')
-    @args('--vlan', metavar='<vlan id>', help='vlan id')
-    @args('--vlan_start', dest='vlan_start', metavar='<vlan start id>',
-          help='vlan start id')
-    @args('--vpn', dest='vpn_start', help='vpn start')
-    @args('--fixed_range_v6', dest='cidr_v6',
-          help='IPv6 subnet (ex: fe80::/64')
-    @args('--gateway', help='gateway')
-    @args('--gateway_v6', help='ipv6 gateway')
-    @args('--bridge', metavar='<bridge>',
-            help='VIFs on this network are connected to this bridge')
-    @args('--bridge_interface', metavar='<bridge interface>',
-            help='the bridge is connected to this interface')
-    @args('--multi_host', metavar="<'T'|'F'>",
-            help='Multi host')
-    @args('--dns1', metavar="<DNS Address>", help='First DNS')
-    @args('--dns2', metavar="<DNS Address>", help='Second DNS')
-    @args('--uuid', metavar="<network uuid>", help='Network UUID')
-    @args('--fixed_cidr', metavar='<x.x.x.x/yy>',
-            help='IPv4 subnet for fixed IPs (ex: 10.20.0.0/16)')
-    @args('--project_id', metavar="<project id>",
-          help='Project id')
-    @args('--priority', metavar="<number>", help='Network interface priority')
-    def create(self, label=None, cidr=None, num_networks=None,
-               network_size=None, multi_host=None, vlan=None,
-               vlan_start=None, vpn_start=None, cidr_v6=None, gateway=None,
-               gateway_v6=None, bridge=None, bridge_interface=None,
-               dns1=None, dns2=None, project_id=None, priority=None,
-               uuid=None, fixed_cidr=None):
-        """Creates fixed IPs for host by range."""
-
-        # NOTE(gmann): These checks are moved here as API layer does all these
-        # validation through JSON schema.
-        if not label:
-            raise exception.NetworkNotCreated(req="label")
-        if len(label) > 255:
-            raise exception.LabelTooLong()
-        if not (cidr or cidr_v6):
-            raise exception.NetworkNotCreated(req="cidr or cidr_v6")
-
-        kwargs = {k: v for k, v in locals().items()
-                  if v and k != "self"}
-        if multi_host is not None:
-            kwargs['multi_host'] = multi_host == 'T'
-        net_manager = importutils.import_object(CONF.network_manager)
-        net_manager.create_networks(context.get_admin_context(), **kwargs)
-
-    @validate_network_plugin
-    def list(self):
-        """List all created networks."""
-        _fmt = "%-5s\t%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s"
-        print(_fmt % (_('id'),
-                          _('IPv4'),
-                          _('IPv6'),
-                          _('start address'),
-                          _('DNS1'),
-                          _('DNS2'),
-                          _('VlanID'),
-                          _('project'),
-                          _("uuid")))
-        try:
-            # Since network_get_all can throw exception.NoNetworksFound
-            # for this command to show a nice result, this exception
-            # should be caught and handled as such.
-            networks = db.network_get_all(context.get_admin_context())
-        except exception.NoNetworksFound:
-            print(_('No networks found'))
-        else:
-            for network in networks:
-                print(_fmt % (network.id,
-                              network.cidr,
-                              network.cidr_v6,
-                              network.dhcp_start,
-                              network.dns1,
-                              network.dns2,
-                              network.vlan,
-                              network.project_id,
-                              network.uuid))
-
-    @validate_network_plugin
-    @args('--fixed_range', metavar='<x.x.x.x/yy>', help='Network to delete')
-    @args('--uuid', metavar='<uuid>', help='UUID of network to delete')
-    def delete(self, fixed_range=None, uuid=None):
-        """Deletes a network."""
-        if fixed_range is None and uuid is None:
-            raise Exception(_("Please specify either fixed_range or uuid"))
-
-        net_manager = importutils.import_object(CONF.network_manager)
-
-        # delete the network
-        net_manager.delete_network(context.get_admin_context(),
-            fixed_range, uuid)
-
-    @validate_network_plugin
-    @args('--fixed_range', metavar='<x.x.x.x/yy>', help='Network to modify')
-    @args('--project', metavar='<project name>',
-            help='Project name to associate')
-    @args('--host', metavar='<host>', help='Host to associate')
-    @args('--disassociate-project', action="store_true", dest='dis_project',
-          default=False, help='Disassociate Network from Project')
-    @args('--disassociate-host', action="store_true", dest='dis_host',
-          default=False, help='Disassociate Host from Project')
-    def modify(self, fixed_range, project=None, host=None,
-               dis_project=None, dis_host=None):
-        """Associate/Disassociate Network with Project and/or Host
-        arguments: network project host
-        leave any field blank to ignore it
-        """
-        admin_context = context.get_admin_context()
-        network = db.network_get_by_cidr(admin_context, fixed_range)
-        net = {}
-        # User can choose the following actions each for project and host.
-        # 1) Associate (set not None value given by project/host parameter)
-        # 2) Disassociate (set None by disassociate parameter)
-        # 3) Keep unchanged (project/host key is not added to 'net')
-        if dis_project:
-            net['project_id'] = None
-        if dis_host:
-            net['host'] = None
-
-        # The --disassociate-X are boolean options, but if they user
-        # mistakenly provides a value, it will be used as a positional argument
-        # and be erroneously interpreted as some other parameter (e.g.
-        # a project instead of host value). The safest thing to do is error-out
-        # with a message indicating that there is probably a problem with
-        # how the disassociate modifications are being used.
-        if dis_project or dis_host:
-            if project or host:
-                error_msg = "ERROR: Unexpected arguments provided. Please " \
-                    "use separate commands."
-                print(error_msg)
-                return 1
-            db.network_update(admin_context, network['id'], net)
-            return
-
-        if project:
-            net['project_id'] = project
-        if host:
-            net['host'] = host
-
-        db.network_update(admin_context, network['id'], net)
-
-
 class DbCommands(object):
     """Class for managing the main database."""
 
@@ -2666,8 +2396,6 @@ CATEGORIES = {
     'api_db': ApiDbCommands,
     'cell_v2': CellV2Commands,
     'db': DbCommands,
-    'floating': FloatingIpCommands,
-    'network': NetworkCommands,
     'placement': PlacementCommands
 }
 
diff --git a/nova/tests/unit/cmd/test_manage.py b/nova/tests/unit/cmd/test_manage.py
index a7d0e0a696c8..9d4f1d803a10 100644
--- a/nova/tests/unit/cmd/test_manage.py
+++ b/nova/tests/unit/cmd/test_manage.py
@@ -36,9 +36,7 @@ from nova import exception
 from nova import objects
 from nova import test
 from nova.tests import fixtures as nova_fixtures
-from nova.tests.unit.db import fakes as db_fakes
 from nova.tests.unit import fake_requests
-from nova.tests.unit.objects import test_network
 
 
 CONF = conf.CONF
@@ -80,303 +78,6 @@ class UtilitiesTestCase(test.NoDBTestCase):
             manage.mask_passwd_in_url(url4))
 
 
-class FloatingIpCommandsTestCase(test.NoDBTestCase):
-    def setUp(self):
-        super(FloatingIpCommandsTestCase, self).setUp()
-        self.output = StringIO()
-        self.useFixture(fixtures.MonkeyPatch('sys.stdout', self.output))
-        db_fakes.stub_out_db_network_api(self)
-        self.commands = manage.FloatingIpCommands()
-
-    def test_address_to_hosts(self):
-        def assert_loop(result, expected):
-            for ip in result:
-                self.assertIn(str(ip), expected)
-
-        address_to_hosts = self.commands.address_to_hosts
-        # /32 and /31
-        self.assertRaises(exception.InvalidInput, address_to_hosts,
-                          '192.168.100.1/32')
-        self.assertRaises(exception.InvalidInput, address_to_hosts,
-                          '192.168.100.1/31')
-        # /30
-        expected = ["192.168.100.%s" % i for i in range(1, 3)]
-        result = address_to_hosts('192.168.100.0/30')
-        self.assertEqual(2, len(list(result)))
-        assert_loop(result, expected)
-        # /29
-        expected = ["192.168.100.%s" % i for i in range(1, 7)]
-        result = address_to_hosts('192.168.100.0/29')
-        self.assertEqual(6, len(list(result)))
-        assert_loop(result, expected)
-        # /28
-        expected = ["192.168.100.%s" % i for i in range(1, 15)]
-        result = address_to_hosts('192.168.100.0/28')
-        self.assertEqual(14, len(list(result)))
-        assert_loop(result, expected)
-        # /16
-        result = address_to_hosts('192.168.100.0/16')
-        self.assertEqual(65534, len(list(result)))
-        # NOTE(dripton): I don't test /13 because it makes the test take 3s.
-        # /12 gives over a million IPs, which is ridiculous.
-        self.assertRaises(exception.InvalidInput, address_to_hosts,
-                          '192.168.100.1/12')
-
-
-class NetworkCommandsTestCase(test.NoDBTestCase):
-    def setUp(self):
-        super(NetworkCommandsTestCase, self).setUp()
-        # These are all tests that assume nova-network and using the nova DB.
-        self.flags(use_neutron=False)
-        self.output = StringIO()
-        self.useFixture(fixtures.MonkeyPatch('sys.stdout', self.output))
-        self.commands = manage.NetworkCommands()
-        self.net = {'id': 0,
-                    'label': 'fake',
-                    'injected': False,
-                    'cidr': '192.168.0.0/24',
-                    'cidr_v6': 'dead:beef::/64',
-                    'multi_host': False,
-                    'gateway_v6': 'dead:beef::1',
-                    'netmask_v6': '64',
-                    'netmask': '255.255.255.0',
-                    'bridge': 'fa0',
-                    'bridge_interface': 'fake_fa0',
-                    'gateway': '192.168.0.1',
-                    'broadcast': '192.168.0.255',
-                    'dns1': '8.8.8.8',
-                    'dns2': '8.8.4.4',
-                    'vlan': 200,
-                    'vlan_start': 201,
-                    'vpn_public_address': '10.0.0.2',
-                    'vpn_public_port': '2222',
-                    'vpn_private_address': '192.168.0.2',
-                    'dhcp_start': '192.168.0.3',
-                    'project_id': 'fake_project',
-                    'host': 'fake_host',
-                    'uuid': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'}
-
-        def fake_network_get_by_cidr(context, cidr):
-            self.assertTrue(context.to_dict()['is_admin'])
-            self.assertEqual(cidr, self.fake_net['cidr'])
-            return db_fakes.FakeModel(dict(test_network.fake_network,
-                                           **self.fake_net))
-
-        def fake_network_get_by_uuid(context, uuid):
-            self.assertTrue(context.to_dict()['is_admin'])
-            self.assertEqual(uuid, self.fake_net['uuid'])
-            return db_fakes.FakeModel(dict(test_network.fake_network,
-                                           **self.fake_net))
-
-        def fake_network_update(context, network_id, values):
-            self.assertTrue(context.to_dict()['is_admin'])
-            self.assertEqual(network_id, self.fake_net['id'])
-            self.assertEqual(values, self.fake_update_value)
-        self.fake_network_get_by_cidr = fake_network_get_by_cidr
-        self.fake_network_get_by_uuid = fake_network_get_by_uuid
-        self.fake_network_update = fake_network_update
-
-    def test_create(self):
-
-        def fake_create_networks(obj, context, **kwargs):
-            self.assertTrue(context.to_dict()['is_admin'])
-            self.assertEqual(kwargs['label'], 'Test')
-            self.assertEqual(kwargs['cidr'], '10.2.0.0/24')
-            self.assertFalse(kwargs['multi_host'])
-            self.assertEqual(kwargs['num_networks'], 1)
-            self.assertEqual(kwargs['network_size'], 256)
-            self.assertEqual(kwargs['vlan'], 200)
-            self.assertEqual(kwargs['vlan_start'], 201)
-            self.assertEqual(kwargs['vpn_start'], 2000)
-            self.assertEqual(kwargs['cidr_v6'], 'fd00:2::/120')
-            self.assertEqual(kwargs['gateway'], '10.2.0.1')
-            self.assertEqual(kwargs['gateway_v6'], 'fd00:2::22')
-            self.assertEqual(kwargs['bridge'], 'br200')
-            self.assertEqual(kwargs['bridge_interface'], 'eth0')
-            self.assertEqual(kwargs['dns1'], '8.8.8.8')
-            self.assertEqual(kwargs['dns2'], '8.8.4.4')
-        self.flags(network_manager='nova.network.manager.VlanManager')
-        self.stub_out('nova.network.manager.VlanManager.create_networks',
-                      fake_create_networks)
-        self.commands.create(
-                            label='Test',
-                            cidr='10.2.0.0/24',
-                            num_networks=1,
-                            network_size=256,
-                            multi_host='F',
-                            vlan=200,
-                            vlan_start=201,
-                            vpn_start=2000,
-                            cidr_v6='fd00:2::/120',
-                            gateway='10.2.0.1',
-                            gateway_v6='fd00:2::22',
-                            bridge='br200',
-                            bridge_interface='eth0',
-                            dns1='8.8.8.8',
-                            dns2='8.8.4.4',
-                            uuid='aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
-
-    def test_create_without_lable(self):
-        self.assertRaises(exception.NetworkNotCreated,
-                          self.commands.create,
-                          cidr='10.2.0.0/24',
-                          num_networks=1,
-                          network_size=256,
-                          multi_host='F',
-                          vlan=200,
-                          vlan_start=201,
-                          vpn_start=2000,
-                          cidr_v6='fd00:2::/120',
-                          gateway='10.2.0.1',
-                          gateway_v6='fd00:2::22',
-                          bridge='br200',
-                          bridge_interface='eth0',
-                          dns1='8.8.8.8',
-                          dns2='8.8.4.4',
-                          uuid='aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
-
-    def test_create_with_lable_too_long(self):
-        self.assertRaises(exception.LabelTooLong,
-                          self.commands.create,
-                          label='x' * 256,
-                          cidr='10.2.0.0/24',
-                          num_networks=1,
-                          network_size=256,
-                          multi_host='F',
-                          vlan=200,
-                          vlan_start=201,
-                          vpn_start=2000,
-                          cidr_v6='fd00:2::/120',
-                          gateway='10.2.0.1',
-                          gateway_v6='fd00:2::22',
-                          bridge='br200',
-                          bridge_interface='eth0',
-                          dns1='8.8.8.8',
-                          dns2='8.8.4.4',
-                          uuid='aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
-
-    def test_create_without_cidr(self):
-        self.assertRaises(exception.NetworkNotCreated,
-                          self.commands.create,
-                          label='Test',
-                          num_networks=1,
-                          network_size=256,
-                          multi_host='F',
-                          vlan=200,
-                          vlan_start=201,
-                          vpn_start=2000,
-                          gateway='10.2.0.1',
-                          gateway_v6='fd00:2::22',
-                          bridge='br200',
-                          bridge_interface='eth0',
-                          dns1='8.8.8.8',
-                          dns2='8.8.4.4',
-                          uuid='aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
-
-    def test_list(self):
-
-        def fake_network_get_all(context):
-            return [db_fakes.FakeModel(self.net)]
-        self.stub_out('nova.db.api.network_get_all', fake_network_get_all)
-        self.commands.list()
-        result = self.output.getvalue()
-        _fmt = "\t".join(["%(id)-5s", "%(cidr)-18s", "%(cidr_v6)-15s",
-                          "%(dhcp_start)-15s", "%(dns1)-15s", "%(dns2)-15s",
-                          "%(vlan)-15s", "%(project_id)-15s", "%(uuid)-15s"])
-        head = _fmt % {'id': 'id',
-                       'cidr': 'IPv4',
-                       'cidr_v6': 'IPv6',
-                       'dhcp_start': 'start address',
-                       'dns1': 'DNS1',
-                       'dns2': 'DNS2',
-                       'vlan': 'VlanID',
-                       'project_id': 'project',
-                       'uuid': "uuid"}
-        body = _fmt % {'id': self.net['id'],
-                       'cidr': self.net['cidr'],
-                       'cidr_v6': self.net['cidr_v6'],
-                       'dhcp_start': self.net['dhcp_start'],
-                       'dns1': self.net['dns1'],
-                       'dns2': self.net['dns2'],
-                       'vlan': self.net['vlan'],
-                       'project_id': self.net['project_id'],
-                       'uuid': self.net['uuid']}
-        answer = '%s\n%s\n' % (head, body)
-        self.assertEqual(result, answer)
-
-    def test_delete(self):
-        self.fake_net = self.net
-        self.fake_net['project_id'] = None
-        self.fake_net['host'] = None
-        self.stub_out('nova.db.api.network_get_by_uuid',
-                      self.fake_network_get_by_uuid)
-
-        def fake_network_delete_safe(context, network_id):
-            self.assertTrue(context.to_dict()['is_admin'])
-            self.assertEqual(network_id, self.fake_net['id'])
-        self.stub_out('nova.db.api.network_delete_safe',
-                      fake_network_delete_safe)
-        self.commands.delete(uuid=self.fake_net['uuid'])
-
-    def test_delete_by_cidr(self):
-        self.fake_net = self.net
-        self.fake_net['project_id'] = None
-        self.fake_net['host'] = None
-        self.stub_out('nova.db.api.network_get_by_cidr',
-                      self.fake_network_get_by_cidr)
-
-        def fake_network_delete_safe(context, network_id):
-            self.assertTrue(context.to_dict()['is_admin'])
-            self.assertEqual(network_id, self.fake_net['id'])
-        self.stub_out('nova.db.api.network_delete_safe',
-                      fake_network_delete_safe)
-        self.commands.delete(fixed_range=self.fake_net['cidr'])
-
-    def _test_modify_base(self, update_value, project, host, dis_project=None,
-                          dis_host=None):
-        self.fake_net = self.net
-        self.fake_update_value = update_value
-        self.stub_out('nova.db.api.network_get_by_cidr',
-                      self.fake_network_get_by_cidr)
-        self.stub_out('nova.db.api.network_update', self.fake_network_update)
-        self.commands.modify(self.fake_net['cidr'], project=project, host=host,
-                             dis_project=dis_project, dis_host=dis_host)
-
-    def test_modify_associate(self):
-        self._test_modify_base(update_value={'project_id': 'test_project',
-                                             'host': 'test_host'},
-                               project='test_project', host='test_host')
-
-    def test_modify_unchanged(self):
-        self._test_modify_base(update_value={}, project=None, host=None)
-
-    def test_modify_disassociate(self):
-        self._test_modify_base(update_value={'project_id': None, 'host': None},
-                               project=None, host=None, dis_project=True,
-                               dis_host=True)
-
-
-class NeutronV2NetworkCommandsTestCase(test.NoDBTestCase):
-    def setUp(self):
-        super(NeutronV2NetworkCommandsTestCase, self).setUp()
-        self.output = StringIO()
-        self.useFixture(fixtures.MonkeyPatch('sys.stdout', self.output))
-        self.flags(use_neutron=True)
-        self.commands = manage.NetworkCommands()
-
-    def test_create(self):
-        self.assertEqual(2, self.commands.create())
-
-    def test_list(self):
-        self.assertEqual(2, self.commands.list())
-
-    def test_delete(self):
-        self.assertEqual(2, self.commands.delete())
-
-    def test_modify(self):
-        self.assertEqual(2, self.commands.modify('192.168.0.1'))
-
-
 class DbCommandsTestCase(test.NoDBTestCase):
     USES_DB_SELF = True
 
diff --git a/releasenotes/notes/remove-nova-network-c02953ba72a1795d.yaml b/releasenotes/notes/remove-nova-network-c02953ba72a1795d.yaml
index ff6d2a9d4170..c56ce87b79c7 100644
--- a/releasenotes/notes/remove-nova-network-c02953ba72a1795d.yaml
+++ b/releasenotes/notes/remove-nova-network-c02953ba72a1795d.yaml
@@ -43,3 +43,11 @@ upgrade:
 
     * ``enable_network_quota``
     * ``quota_networks``
+  - |
+    The following ``nova-manage`` commands have been removed.
+
+    * ``network``
+    * ``floating``
+
+    These were only useful for the now-removed *nova-network* service and have
+    been deprecated since the 15.0.0 (Ocata) release.