openstack/python-neutronclient
Code Issues Proposed changes

Merge "NSX gateway extension: allow more transport type values"

Browse Source
This commit is contained in:
Jenkins
2015-09-15 16:43:47 +00:00
committed by Gerrit Code Review
parent bb193c8dc0 11897cb42c
commit e40532a67f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
neutronclient/neutron/v2_0/nsx/networkgateway.py
View File

@@ -23,8 +23,9 @@ from neutronclient.neutron import v2_0 as neutronV20
GW_RESOURCE = 'network_gateway' GW_RESOURCE = 'network_gateway'
DEV_RESOURCE = 'gateway_device' DEV_RESOURCE = 'gateway_device'
CONNECTOR_TYPE_HELP = _("Type of the transport zone connector to use for this " CONNECTOR_TYPE_HELP = _("Type of the transport zone connector to use for this "
"device. Valid values are gre, stt, ipsecgre, " "device. Valid values are gre, stt, ipsec_gre, "
"ipsecstt, and bridge. Defaults to stt.") "ipsec_stt, and bridge. Defaults to stt. ipsecgre and "
"ipsecstt are also accepted as alternative names")
CONNECTOR_IP_HELP = _("IP address for this device's transport connector. " CONNECTOR_IP_HELP = _("IP address for this device's transport connector. "
"It must correspond to the IP address of the interface " "It must correspond to the IP address of the interface "
"used for tenant traffic on the NSX gateway node.") "used for tenant traffic on the NSX gateway node.")
@@ -84,7 +85,8 @@ class CreateGatewayDevice(neutronV20.CreateCommand):
parser.add_argument( parser.add_argument(
'--connector-type', '--connector-type',
default='stt', default='stt',
choices=['stt', 'gre', 'ipsecgre', 'ipsecstt', 'bridge'], choices=['stt', 'gre', 'ipsecgre', 'ipsecstt', 'bridge',
'ipsec_gre', 'ipsec_stt'],
help=CONNECTOR_TYPE_HELP) help=CONNECTOR_TYPE_HELP)
parser.add_argument( parser.add_argument(
'--connector-ip', '--connector-ip',
@@ -117,7 +119,8 @@ class UpdateGatewayDevice(neutronV20.UpdateCommand):
parser.add_argument( parser.add_argument(
'--connector-type', '--connector-type',
required=False, required=False,
choices=['stt', 'gre', 'ipsecgre', 'ipsecstt', 'bridge'], choices=['stt', 'gre', 'ipsecgre', 'ipsecstt', 'bridge',
'ipsec_gre', 'ipsec_stt'],
help=CONNECTOR_TYPE_HELP) help=CONNECTOR_TYPE_HELP)
parser.add_argument( parser.add_argument(
'--connector-ip', '--connector-ip',