openstack/python-openstackclient
Code Issues Proposed changes

Merge "TrivialFix: Rename provider segment option"

Browse Source
This commit is contained in:
Jenkins 2016-04-08 04:23:22 +00:00 committed by Gerrit Code Review
commit 9f2e7039e1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
View File

@ -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
View File

@ -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 = [