x/vmware-nsx
Code Issues Proposed changes

NSX|V: remove deprectaed vcns section

Browse Source 
This is no longer valid. Was added in Kilo.

Change-Id: If340e1761bac6f0efa07c58f89499c6fbd68fa86
This commit is contained in:
Gary Kotton 2017-01-30 03:50:11 -08:00
parent 2e113b305a
commit db09bf5b42
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vmware_nsx/common/config.py
View File

@ -413,15 +413,12 @@ DEFAULT_MAXIMUM_TUNNELS_PER_VNIC = 20
nsxv_opts = [ nsxv_opts = [
cfg.StrOpt('user', cfg.StrOpt('user',
default='admin', default='admin',
deprecated_group="vcns",
help=_('User name for NSXv manager')), help=_('User name for NSXv manager')),
cfg.StrOpt('password', cfg.StrOpt('password',
default='default', default='default',
deprecated_group="vcns",
secret=True, secret=True,
help=_('Password for NSXv manager')), help=_('Password for NSXv manager')),
cfg.StrOpt('manager_uri', cfg.StrOpt('manager_uri',
deprecated_group="vcns",
help=_('URL for NSXv manager')), help=_('URL for NSXv manager')),
cfg.StrOpt('ca_file', cfg.StrOpt('ca_file',
help=_('Specify a CA bundle file to use in verifying the NSXv ' help=_('Specify a CA bundle file to use in verifying the NSXv '
@ -437,15 +434,12 @@ nsxv_opts = [
help=_('(Required) Parameter listing the IDs of the clusters ' help=_('(Required) Parameter listing the IDs of the clusters '
'which are used by OpenStack.')), 'which are used by OpenStack.')),
cfg.StrOpt('datacenter_moid', cfg.StrOpt('datacenter_moid',
deprecated_group="vcns",
help=_('Required parameter identifying the ID of datacenter ' help=_('Required parameter identifying the ID of datacenter '
'to deploy NSX Edges')), 'to deploy NSX Edges')),
cfg.StrOpt('deployment_container_id', cfg.StrOpt('deployment_container_id',
deprecated_group="vcns",
help=_('Optional parameter identifying the ID of datastore to ' help=_('Optional parameter identifying the ID of datastore to '
'deploy NSX Edges')), 'deploy NSX Edges')),
cfg.StrOpt('resource_pool_id', cfg.StrOpt('resource_pool_id',
deprecated_group="vcns",
help=_('Optional parameter identifying the ID of resource to ' help=_('Optional parameter identifying the ID of resource to '
'deploy NSX Edges')), 'deploy NSX Edges')),
cfg.ListOpt('availability_zones', cfg.ListOpt('availability_zones',
@ -455,7 +449,6 @@ nsxv_opts = [
'<resource pool id]:<datastore id>:<edge_ha True/False>' '<resource pool id]:<datastore id>:<edge_ha True/False>'
'<(optional)HA datastore id>.')), '<(optional)HA datastore id>.')),
cfg.StrOpt('datastore_id', cfg.StrOpt('datastore_id',
deprecated_group="vcns",
help=_('Optional parameter identifying the ID of datastore to ' help=_('Optional parameter identifying the ID of datastore to '
'deploy NSX Edges')), 'deploy NSX Edges')),
cfg.StrOpt('ha_datastore_id', cfg.StrOpt('ha_datastore_id',
@ -463,12 +456,10 @@ nsxv_opts = [
'deploy NSX Edges in addition to data_store_id in case' 'deploy NSX Edges in addition to data_store_id in case'
'edge_ha is True')), 'edge_ha is True')),
cfg.StrOpt('external_network', cfg.StrOpt('external_network',
deprecated_group="vcns",
help=_('(Required) Network ID for physical network ' help=_('(Required) Network ID for physical network '
'connectivity')), 'connectivity')),
cfg.IntOpt('task_status_check_interval', cfg.IntOpt('task_status_check_interval',
default=DEFAULT_STATUS_CHECK_INTERVAL, default=DEFAULT_STATUS_CHECK_INTERVAL,
deprecated_group="vcns",
help=_("(Optional) Asynchronous task status check interval. " help=_("(Optional) Asynchronous task status check interval. "
"Default is 2000 (millisecond)")), "Default is 2000 (millisecond)")),
cfg.StrOpt('vdn_scope_id', cfg.StrOpt('vdn_scope_id',

2
vmware_nsx/tests/unit/etc/vcns.ini.test
View File

@ -1,4 +1,4 @@
[vcns] [nsxv]
manager_uri = https://fake-host manager_uri = https://fake-host
user = fake-user user = fake-user
passwordd = fake-password passwordd = fake-password