Merge "TrivialFix: Rename provider segment option"

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:

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
 

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