summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-08 04:23:22 +0000
committerGerrit Code Review <review@openstack.org>2016-04-08 04:23:22 +0000
commit9f2e7039e1ac631a4e83fe96d945e9e220db9ad8 (patch)
treed3f305238e2b31c3d756223c4cc3aecc985946ed /openstackclient
parent3485c223ea4b5a7b532df377aabbeca66a3e0e11 (diff)
parenta8c085fdd53b4bdb0e22bd5e715f2530eb24ffd5 (diff)
downloadpython-openstackclient-9f2e7039e1ac631a4e83fe96d945e9e220db9ad8.tar.gz
Merge "TrivialFix: Rename provider segment option"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/network/v2/network.py6
-rw-r--r--openstackclient/tests/network/v2/test_network.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py
index d3b20c0f..ebd5cb63 100644
--- a/openstackclient/network/v2/network.py
+++ b/openstackclient/network/v2/network.py
@@ -180,10 +180,10 @@ class CreateNetwork(common.NetworkAndComputeShowOne):
help='Name of the physical network over which the virtual '
'network is implemented')
parser.add_argument(
- '--provider-segmentation-id',
- metavar='<provider-segmentation-id>',
+ '--provider-segment',
+ metavar='<provider-segment>',
dest='segmentation_id',
- help='VLAN ID for VLAN networks or tunnel-id for GRE/VXLAN '
+ help='VLAN ID for VLAN networks or Tunnel ID for GRE/VXLAN '
'networks')
return parser
diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py
index 2493362e..0dec0e2f 100644
--- a/openstackclient/tests/network/v2/test_network.py
+++ b/openstackclient/tests/network/v2/test_network.py
@@ -144,7 +144,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
"--external", "--default",
"--provider-network-type", "vlan",
"--provider-physical-network", "physnet1",
- "--provider-segmentation-id", "400",
+ "--provider-segment", "400",
self._network.name,
]
verifylist = [