From 288eac9f47a050bd94c76485bbf8fea2e5902e46 Mon Sep 17 00:00:00 2001 From: armando-migliaccio Date: Wed, 13 Nov 2013 17:03:27 -0800 Subject: [PATCH] Removes unused nvp plugin config param nvp_cluster_uuid is no longer used; it was missed during the configuration file tweaks that was done during Havana. Change-Id: Id6dd684833c99453cd97d88584be04d99fd21550 Closes-bug: #1251086 --- etc/neutron/plugins/nicira/nvp.ini | 4 ---- neutron/plugins/nicira/README | 2 -- neutron/plugins/nicira/common/config.py | 4 ---- neutron/tests/unit/nicira/etc/nvp.ini.agentless.test | 1 - neutron/tests/unit/nicira/etc/nvp.ini.full.test | 1 - neutron/tests/unit/nicira/test_nvpopts.py | 2 -- 6 files changed, 14 deletions(-) diff --git a/etc/neutron/plugins/nicira/nvp.ini b/etc/neutron/plugins/nicira/nvp.ini index 921520387b..1e0aa3bee4 100644 --- a/etc/neutron/plugins/nicira/nvp.ini +++ b/etc/neutron/plugins/nicira/nvp.ini @@ -26,10 +26,6 @@ # tunneled isolated "Neutron" networks. This option MUST be specified, e.g.: # default_tz_uuid = 1e8e52cf-fa7f-46b0-a14a-f99835a9cb53 -# (Optional) UUID of the cluster in NVP. It can be retrieved from NVP management -# console "admin" section. -# nvp_cluster_uuid = 615be8e4-82e9-4fd2-b4b3-fd141e51a5a7 - # (Optional) UUID for the default l3 gateway service to use with this cluster. # To be specified if planning to use logical routers with external gateways. # default_l3_gw_service_uuid = diff --git a/neutron/plugins/nicira/README b/neutron/plugins/nicira/README index a5695451bf..5077024701 100644 --- a/neutron/plugins/nicira/README +++ b/neutron/plugins/nicira/README @@ -31,8 +31,6 @@ NVP Plugin configuration - default_tz_uuid: This is uuid of the default NVP Transport zone that will be used for creating tunneled isolated "Neutron" networks. It needs to be created in NVP before starting Neutron with the nvp plugin. - - nvp_cluster_uuid: Optional paramter identifying the UUID of the cluster - in NVP. This can be retrieved from NVP management console "admin" section. - nvp_controllers: describes the list of controllers More details can be found in etc/neutron/plugins/nicira/nvp.ini diff --git a/neutron/plugins/nicira/common/config.py b/neutron/plugins/nicira/common/config.py index 09d7e232a2..301181470e 100644 --- a/neutron/plugins/nicira/common/config.py +++ b/neutron/plugins/nicira/common/config.py @@ -108,10 +108,6 @@ cluster_opts = [ "will be used for creating tunneled isolated " "\"Neutron\" networks. It needs to be created in NVP " "before starting Neutron with the nvp plugin.")), - cfg.StrOpt('nvp_cluster_uuid', - help=_("Optional paramter identifying the UUID of the cluster " - "in NVP. This can be retrieved from NVP management " - "console \"admin\" section.")), cfg.StrOpt('default_l3_gw_service_uuid', help=_("Unique identifier of the NVP L3 Gateway service " "which will be used for implementing routers and " diff --git a/neutron/tests/unit/nicira/etc/nvp.ini.agentless.test b/neutron/tests/unit/nicira/etc/nvp.ini.agentless.test index 33550520ab..746dcba72c 100644 --- a/neutron/tests/unit/nicira/etc/nvp.ini.agentless.test +++ b/neutron/tests/unit/nicira/etc/nvp.ini.agentless.test @@ -1,7 +1,6 @@ [DEFAULT] default_tz_uuid = fake_tz_uuid nova_zone_id = whatever -nvp_cluster_uuid = fake_cluster_uuid nvp_controllers = fake_1, fake_2 nvp_user = foo nvp_password = bar diff --git a/neutron/tests/unit/nicira/etc/nvp.ini.full.test b/neutron/tests/unit/nicira/etc/nvp.ini.full.test index fdcdcb8980..b856b2af67 100644 --- a/neutron/tests/unit/nicira/etc/nvp.ini.full.test +++ b/neutron/tests/unit/nicira/etc/nvp.ini.full.test @@ -1,7 +1,6 @@ [DEFAULT] default_tz_uuid = fake_tz_uuid nova_zone_id = whatever -nvp_cluster_uuid = fake_cluster_uuid nvp_controllers = fake_1, fake_2 nvp_user = foo nvp_password = bar diff --git a/neutron/tests/unit/nicira/test_nvpopts.py b/neutron/tests/unit/nicira/test_nvpopts.py index a245ddca6b..ab667bbc22 100644 --- a/neutron/tests/unit/nicira/test_nvpopts.py +++ b/neutron/tests/unit/nicira/test_nvpopts.py @@ -43,7 +43,6 @@ class NVPClusterTest(testtools.TestCase): cluster_opts = {'default_tz_uuid': uuidutils.generate_uuid(), 'default_l2_gw_service_uuid': uuidutils.generate_uuid(), 'default_l2_gw_service_uuid': uuidutils.generate_uuid(), - 'nvp_cluster_uuid': uuidutils.generate_uuid(), 'nvp_user': 'foo', 'nvp_password': 'bar', 'req_timeout': 45, @@ -128,7 +127,6 @@ class ConfigurationTest(testtools.TestCase): self.assertEqual('stt', cfg.CONF.NVP.default_transport_type) self.assertIsNone(cfg.CONF.default_tz_uuid) - self.assertIsNone(cfg.CONF.nvp_cluster_uuid) self.assertEqual('admin', cfg.CONF.nvp_user) self.assertEqual('admin', cfg.CONF.nvp_password) self.assertEqual(30, cfg.CONF.req_timeout)