openstack/python-openstackclient
Code Issues Proposed changes

TrivialFix: Rename provider segment option

Browse Source 
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
This commit is contained in:
reedip 2016-04-08 10:05:17 +09:00 committed by Reedip
parent 1b351e1695
commit a8c085fdd5
3 changed files with 7 additions and 7 deletions
doc/source/command-objects
network.rst
openstackclient
network/v2
network.py
tests/network/v2
test_network.py

6
doc/source/command-objects/network.rst

@ -20,7 +20,7 @@ Create new network
[--external [--default | --no-default] | --internal] [--external [--default | --no-default] | --internal]
[--provider-network-type <provider-network-type>] [--provider-network-type <provider-network-type>]
[--provider-physical-network <provider-physical-network>] [--provider-physical-network <provider-physical-network>]
[--provider-segmentation-id <provider-segmentation-id>] [--provider-segment <provider-segment>]
<name> <name>
.. option:: --project <project> .. option:: --project <project>
@ -97,9 +97,9 @@ Create new network
Name of the physical network over which the virtual network is implemented Name of the physical network over which the virtual network is implemented
(Network v2 only) (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 v2 only)
.. _network_create-name: .. _network_create-name:

6
openstackclient/network/v2/network.py

@ -180,10 +180,10 @@ class CreateNetwork(common.NetworkAndComputeShowOne):
help='Name of the physical network over which the virtual ' help='Name of the physical network over which the virtual '
'network is implemented') 'network is implemented')
parser.add_argument( parser.add_argument(
'--provider-segmentation-id', '--provider-segment',
metavar='<provider-segmentation-id>', metavar='<provider-segment>',
dest='segmentation_id', 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') 'networks')
return parser return parser

2
openstackclient/tests/network/v2/test_network.py

@ -144,7 +144,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
"--external", "--default", "--external", "--default",
"--provider-network-type", "vlan", "--provider-network-type", "vlan",
"--provider-physical-network", "physnet1", "--provider-physical-network", "physnet1",
"--provider-segmentation-id", "400", "--provider-segment", "400",
self._network.name, self._network.name,
] ]
verifylist = [ verifylist = [