x/vmware-nsx
Code Issues Proposed changes

Merge "Ensure that ListOpt configuration variables are set"

Browse Source
This commit is contained in:
Jenkins 2016-06-18 01:19:18 +00:00 committed by Gerrit Code Review
commit 673dc7c131
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vmware_nsx/common/config.py
View File

@ -184,6 +184,7 @@ connection_opts = [
help=_('Maximum number of times a redirect response ' help=_('Maximum number of times a redirect response '
'should be followed')), 'should be followed')),
cfg.ListOpt('nsx_controllers', cfg.ListOpt('nsx_controllers',
default=[],
deprecated_name='nvp_controllers', deprecated_name='nvp_controllers',
help=_('Comma-separated list of NSX controller ' help=_('Comma-separated list of NSX controller '
'endpoints (<ip>:<port>). When port is omitted, ' 'endpoints (<ip>:<port>). When port is omitted, '
@ -249,6 +250,7 @@ nsx_v3_opts = [
secret=True, secret=True,
help=_('Password for the NSX manager')), help=_('Password for the NSX manager')),
cfg.ListOpt('nsx_api_managers', cfg.ListOpt('nsx_api_managers',
default=[],
deprecated_name='nsx_manager', deprecated_name='nsx_manager',
help=_("IP address of one or more NSX managers separated " help=_("IP address of one or more NSX managers separated "
"by commas. The IP address should be of the form:\n" "by commas. The IP address should be of the form:\n"
@ -446,6 +448,7 @@ nsxv_opts = [
help=_('(Optional) Portgroup MoRef ID for metadata proxy ' help=_('(Optional) Portgroup MoRef ID for metadata proxy '
'management network')), 'management network')),
cfg.ListOpt('mgt_net_proxy_ips', cfg.ListOpt('mgt_net_proxy_ips',
default=[],
help=_('(Optional) Comma separated list of management network ' help=_('(Optional) Comma separated list of management network '
'IP addresses for metadata proxy.')), 'IP addresses for metadata proxy.')),
cfg.StrOpt('mgt_net_proxy_netmask', cfg.StrOpt('mgt_net_proxy_netmask',
@ -455,6 +458,7 @@ nsxv_opts = [
help=_("(Optional) Management network default gateway for " help=_("(Optional) Management network default gateway for "
"metadata proxy.")), "metadata proxy.")),
cfg.ListOpt('nova_metadata_ips', cfg.ListOpt('nova_metadata_ips',
default=[],
help=_("(Optional) IP addresses used by Nova metadata " help=_("(Optional) IP addresses used by Nova metadata "
"service.")), "service.")),
cfg.PortOpt('nova_metadata_port', cfg.PortOpt('nova_metadata_port',
@ -510,6 +514,7 @@ nsxv_opts = [
help=_("If True, the server instance will attempt to " help=_("If True, the server instance will attempt to "
"initialize the metadata infrastructure")), "initialize the metadata infrastructure")),
cfg.ListOpt('metadata_service_allowed_ports', cfg.ListOpt('metadata_service_allowed_ports',
default=[],
help=_('List of tcp ports, to be allowed access to the ' help=_('List of tcp ports, to be allowed access to the '
'metadata proxy, in addition to the default ' 'metadata proxy, in addition to the default '
'80,443,8775 tcp ports')), '80,443,8775 tcp ports')),

2
vmware_nsx/tests/unit/nsx_mh/test_opts.py
View File

@ -126,7 +126,7 @@ class ConfigurationTest(base.BaseTestCase):
self.assertEqual(75, cfg.CONF.http_timeout) self.assertEqual(75, cfg.CONF.http_timeout)
self.assertEqual(2, cfg.CONF.retries) self.assertEqual(2, cfg.CONF.retries)
self.assertEqual(2, cfg.CONF.redirects) self.assertEqual(2, cfg.CONF.redirects)
self.assertIsNone(cfg.CONF.nsx_controllers) self.assertEqual([], cfg.CONF.nsx_controllers)
self.assertIsNone(cfg.CONF.default_l3_gw_service_uuid) self.assertIsNone(cfg.CONF.default_l3_gw_service_uuid)
self.assertIsNone(cfg.CONF.default_l2_gw_service_uuid) self.assertIsNone(cfg.CONF.default_l2_gw_service_uuid)
self.assertEqual('breth0', cfg.CONF.nsx_default_interface_name) self.assertEqual('breth0', cfg.CONF.nsx_default_interface_name)