From 02eb9cffe6dd72b58bbcd660588e79a504e4d738 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <sfinucan@redhat.com>
Date: Fri, 16 Aug 2019 01:19:59 +0100
Subject: Remove 'nova-xvpvncproxy'

This legacy service is no longer used and was deprecated during the
Stein cycle [1]. It's time to say adios and remove them in their
entirety. This is pretty straightforward, with the sole exception of
schema for the 'remote-consoles' API, which has to continue supporting
requests for type 'xvpvnc' even if we can't fulfil those requests now.

[1] https://review.opendev.org/#/c/610076/

Part of blueprint remove-xvpvncproxy

Depends-On: https://review.opendev.org/695853
Change-Id: I2f7f2379d0cd54e4d0a91008ddb44858cfc5a4cf
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
---
 nova/db/api.py               | 10 ----------
 nova/db/sqlalchemy/api.py    | 12 ------------
 nova/db/sqlalchemy/models.py |  1 +
 3 files changed, 1 insertion(+), 22 deletions(-)

(limited to 'nova/db')

diff --git a/nova/db/api.py b/nova/db/api.py
index d448cb0911..4f3c8e9982 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -1398,16 +1398,6 @@ def project_get_networks(context, project_id, associate=True):
 ##################
 
 
-def console_pool_get_all_by_host_type(context, host, console_type):
-    """Fetch all pools for given proxy host and type."""
-    return IMPL.console_pool_get_all_by_host_type(context,
-                                                  host,
-                                                  console_type)
-
-
-##################
-
-
 def pci_device_get_by_addr(context, node_id, dev_addr):
     """Get PCI device by address."""
     return IMPL.pci_device_get_by_addr(context, node_id, dev_addr)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index fc66425ab1..9411f622f5 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -4461,18 +4461,6 @@ def migration_migrate_to_uuid(context, count):
     return done, done
 
 
-##################
-
-
-@pick_context_manager_reader
-def console_pool_get_all_by_host_type(context, host, console_type):
-    return model_query(context, models.ConsolePool, read_deleted="no").\
-                   filter_by(host=host).\
-                   filter_by(console_type=console_type).\
-                   options(joinedload('consoles')).\
-                   all()
-
-
 ########################
 # User-provided metadata
 
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 579adce231..c6f43ef763 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -985,6 +985,7 @@ class DNSDomain(BASE, NovaBase, models.SoftDeleteMixin):
     project_id = Column(String(255))
 
 
+# TODO(stephenfin): Remove in V or later
 class ConsolePool(BASE, NovaBase, models.SoftDeleteMixin):
     """Represents pool of consoles on the same physical node."""
     __tablename__ = 'console_pools'
-- 
cgit v1.2.1