diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-15 16:43:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-15 16:43:47 +0000 |
| commit | e40532a67f4ab6b6b4555dc8dcf066d3ff613823 (patch) | |
| tree | 159f128694f832311142b41486dc88bde902f960 | |
| parent | bb193c8dc0c917462fc6e76960ada4488e4c7994 (diff) | |
| parent | 11897cb42c2ba67c8afc1c6791c6c40184689784 (diff) | |
| download | python-neutronclient-e40532a67f4ab6b6b4555dc8dcf066d3ff613823.tar.gz | |
Merge "NSX gateway extension: allow more transport type values"
| -rw-r--r-- | neutronclient/neutron/v2_0/nsx/networkgateway.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/neutronclient/neutron/v2_0/nsx/networkgateway.py b/neutronclient/neutron/v2_0/nsx/networkgateway.py index 52a3825..251fbc6 100644 --- a/neutronclient/neutron/v2_0/nsx/networkgateway.py +++ b/neutronclient/neutron/v2_0/nsx/networkgateway.py @@ -23,8 +23,9 @@ from neutronclient.neutron import v2_0 as neutronV20 GW_RESOURCE = 'network_gateway' DEV_RESOURCE = 'gateway_device' CONNECTOR_TYPE_HELP = _("Type of the transport zone connector to use for this " - "device. Valid values are gre, stt, ipsecgre, " - "ipsecstt, and bridge. Defaults to stt.") + "device. Valid values are gre, stt, ipsec_gre, " + "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. " "It must correspond to the IP address of the interface " "used for tenant traffic on the NSX gateway node.") @@ -84,7 +85,8 @@ class CreateGatewayDevice(neutronV20.CreateCommand): parser.add_argument( '--connector-type', default='stt', - choices=['stt', 'gre', 'ipsecgre', 'ipsecstt', 'bridge'], + choices=['stt', 'gre', 'ipsecgre', 'ipsecstt', 'bridge', + 'ipsec_gre', 'ipsec_stt'], help=CONNECTOR_TYPE_HELP) parser.add_argument( '--connector-ip', @@ -117,7 +119,8 @@ class UpdateGatewayDevice(neutronV20.UpdateCommand): parser.add_argument( '--connector-type', required=False, - choices=['stt', 'gre', 'ipsecgre', 'ipsecstt', 'bridge'], + choices=['stt', 'gre', 'ipsecgre', 'ipsecstt', 'bridge', + 'ipsec_gre', 'ipsec_stt'], help=CONNECTOR_TYPE_HELP) parser.add_argument( '--connector-ip', |