From a8c085fdd53b4bdb0e22bd5e715f2530eb24ffd5 Mon Sep 17 00:00:00 2001
From: reedip <reedip.banerjee@nectechnologies.in>
Date: Fri, 8 Apr 2016 10:05:17 +0900
Subject: [PATCH] TrivialFix: Rename provider segment option
As per [1], provider-segmentation-id is changed to provider-segment
as segments may soon have a "name" support as well.
[1]: https://review.openstack.org/#/c/294422/12/doc/source/command-objects/network.rst
Change-Id: I74d4366301b41fa181faccbc12cff9530df60353
---
doc/source/command-objects/network.rst | 6 +++---
openstackclient/network/v2/network.py | 6 +++---
openstackclient/tests/network/v2/test_network.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/source/command-objects/network.rst b/doc/source/command-objects/network.rst
index 9fbc02164c..3d01f25330 100644
--- a/doc/source/command-objects/network.rst
+++ b/doc/source/command-objects/network.rst
@@ -20,7 +20,7 @@ Create new network
[--external [--default | --no-default] | --internal]
[--provider-network-type <provider-network-type>]
[--provider-physical-network <provider-physical-network>]
- [--provider-segmentation-id <provider-segmentation-id>]
+ [--provider-segment <provider-segment>]
<name>
.. option:: --project <project>
@@ -97,9 +97,9 @@ Create new network
Name of the physical network over which the virtual network is implemented
(Network v2 only)
-.. option:: --provider-segmentation-id <provider-segmentation-id>
+.. option:: --provider-segment <provider-segment>
- VLAN ID for VLAN networks or tunnel-id for GRE/VXLAN networks
+ VLAN ID for VLAN networks or Tunnel ID for GRE/VXLAN networks
(Network v2 only)
.. _network_create-name:
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py
index d3b20c0f3e..ebd5cb63de 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 2493362e29..0dec0e2ff8 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 = [