From ec09c06c5a6f75fbd70d20af253cb15f983d75b5 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 14 Mar 2019 17:57:43 +0000 Subject: [PATCH] trivial: Remove unused constants, functions Change-Id: I5943cce6434ece0c6152caf8e097486064296032 Signed-off-by: Stephen Finucane --- nova/cmd/manage.py | 8 -------- nova/cmd/status.py | 3 --- nova/tests/unit/virt/powervm/test_vm.py | 7 ------- nova/virt/xenapi/vm_utils.py | 1 - 4 files changed, 19 deletions(-) diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py index dc28cf45efa7..cf89edd6cc81 100644 --- a/nova/cmd/manage.py +++ b/nova/cmd/manage.py @@ -102,14 +102,6 @@ def mask_passwd_in_url(url): return urlparse.urlunparse(new_parsed) -def _db_error(caught_exception): - print(caught_exception) - print(_("The above error may show that the database has not " - "been created.\nPlease create a database using " - "'nova-manage db sync' before running this command.")) - sys.exit(1) - - class FloatingIpCommands(object): """Class for managing floating IP.""" diff --git a/nova/cmd/status.py b/nova/cmd/status.py index 8a15935456c2..b2a06a9bdb7d 100644 --- a/nova/cmd/status.py +++ b/nova/cmd/status.py @@ -44,9 +44,6 @@ from nova import version CONF = nova.conf.CONF -PLACEMENT_DOCS_LINK = 'https://docs.openstack.org/nova/latest' \ - '/user/placement.html' - # NOTE(efried): 1.30 is required by nova-compute to support resource provider # reshaping (inventory and allocation data migration). # NOTE: If you bump this version, remember to update the history diff --git a/nova/tests/unit/virt/powervm/test_vm.py b/nova/tests/unit/virt/powervm/test_vm.py index 7f6155c94bb4..d9d6e88bce1b 100644 --- a/nova/tests/unit/virt/powervm/test_vm.py +++ b/nova/tests/unit/virt/powervm/test_vm.py @@ -31,13 +31,6 @@ from nova.tests.unit.virt import powervm from nova.virt.powervm import vm -LPAR_MAPPING = ( - { - 'z3-9-5-126-127-00000001': '089ffb20-5d19-4a8c-bb80-13650627d985', - 'z3-9-5-126-208-000001f0': '668b0882-c24a-4ae9-91c8-297e95e3fe29' - }) - - class TestVMBuilder(test.NoDBTestCase): def setUp(self): diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index b5394f0e83b6..de1d403cad08 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -81,7 +81,6 @@ XENAPI_POWER_STATE = { SECTOR_SIZE = 512 MBR_SIZE_SECTORS = 63 MBR_SIZE_BYTES = MBR_SIZE_SECTORS * SECTOR_SIZE -KERNEL_DIR = '/boot/guest' MAX_VDI_CHAIN_SIZE = 16 PROGRESS_INTERVAL_SECONDS = 300 DD_BLOCKSIZE = 65536