x/vmware-nsx
Code Issues Proposed changes

Merge "Removes unused nvp plugin config param"

Browse Source
This commit is contained in:
Jenkins 2013-11-17 17:01:40 +00:00 committed by Gerrit Code Review
commit 9413554ad9
6 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/neutron/plugins/nicira/nvp.ini
View File

@ -26,10 +26,6 @@
# tunneled isolated "Neutron" networks. This option MUST be specified, e.g.: # tunneled isolated "Neutron" networks. This option MUST be specified, e.g.:
# default_tz_uuid = 1e8e52cf-fa7f-46b0-a14a-f99835a9cb53 # 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. # (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. # To be specified if planning to use logical routers with external gateways.
# default_l3_gw_service_uuid = # default_l3_gw_service_uuid =

2
neutron/plugins/nicira/README
View File

@ -31,8 +31,6 @@ NVP Plugin configuration
- default_tz_uuid: This is uuid of the default NVP Transport zone that - default_tz_uuid: This is uuid of the default NVP Transport zone that
will be used for creating tunneled isolated "Neutron" networks. It will be used for creating tunneled isolated "Neutron" networks. It
needs to be created in NVP before starting Neutron with the nvp plugin. 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 - nvp_controllers: describes the list of controllers
More details can be found in etc/neutron/plugins/nicira/nvp.ini More details can be found in etc/neutron/plugins/nicira/nvp.ini

4
neutron/plugins/nicira/common/config.py
View File

@ -108,10 +108,6 @@ cluster_opts = [
"will be used for creating tunneled isolated " "will be used for creating tunneled isolated "
"\"Neutron\" networks. It needs to be created in NVP " "\"Neutron\" networks. It needs to be created in NVP "
"before starting Neutron with the nvp plugin.")), "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', cfg.StrOpt('default_l3_gw_service_uuid',
help=_("Unique identifier of the NVP L3 Gateway service " help=_("Unique identifier of the NVP L3 Gateway service "
"which will be used for implementing routers and " "which will be used for implementing routers and "

1
neutron/tests/unit/nicira/etc/nvp.ini.agentless.test
View File

@ -1,7 +1,6 @@
[DEFAULT] [DEFAULT]
default_tz_uuid = fake_tz_uuid default_tz_uuid = fake_tz_uuid
nova_zone_id = whatever nova_zone_id = whatever
nvp_cluster_uuid = fake_cluster_uuid
nvp_controllers = fake_1, fake_2 nvp_controllers = fake_1, fake_2
nvp_user = foo nvp_user = foo
nvp_password = bar nvp_password = bar

1
neutron/tests/unit/nicira/etc/nvp.ini.full.test
View File

@ -1,7 +1,6 @@
[DEFAULT] [DEFAULT]
default_tz_uuid = fake_tz_uuid default_tz_uuid = fake_tz_uuid
nova_zone_id = whatever nova_zone_id = whatever
nvp_cluster_uuid = fake_cluster_uuid
nvp_controllers = fake_1, fake_2 nvp_controllers = fake_1, fake_2
nvp_user = foo nvp_user = foo
nvp_password = bar nvp_password = bar

2
neutron/tests/unit/nicira/test_nvpopts.py
View File

@ -43,7 +43,6 @@ class NVPClusterTest(testtools.TestCase):
cluster_opts = {'default_tz_uuid': uuidutils.generate_uuid(), cluster_opts = {'default_tz_uuid': uuidutils.generate_uuid(),
'default_l2_gw_service_uuid': uuidutils.generate_uuid(), 'default_l2_gw_service_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_user': 'foo',
'nvp_password': 'bar', 'nvp_password': 'bar',
'req_timeout': 45, 'req_timeout': 45,
@ -128,7 +127,6 @@ class ConfigurationTest(testtools.TestCase):
self.assertEqual('stt', cfg.CONF.NVP.default_transport_type) self.assertEqual('stt', cfg.CONF.NVP.default_transport_type)
self.assertIsNone(cfg.CONF.default_tz_uuid) 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_user)
self.assertEqual('admin', cfg.CONF.nvp_password) self.assertEqual('admin', cfg.CONF.nvp_password)
self.assertEqual(30, cfg.CONF.req_timeout) self.assertEqual(30, cfg.CONF.req_timeout)