Merge "Add geneve provider network type"

Author: Jenkins

doc/source/command-objects/network.rst

@@ -108,7 +108,7 @@ Create new network
 .. option:: --provider-network-type <provider-network-type>
 
     The physical mechanism by which the virtual network is implemented.
-    The supported options are: flat, gre, local, vlan, vxlan
+    The supported options are: flat, geneve, gre, local, vlan, vxlan
 
     *Network version 2 only*
 
@@ -120,7 +120,7 @@ Create new network
 
 .. 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 GENEVE/GRE/VXLAN networks
 
     *Network version 2 only*
 

openstackclient/network/v2/network.py

@@ -104,11 +104,11 @@ def _add_additional_network_options(parser):
     parser.add_argument(
         '--provider-network-type',
         metavar='<provider-network-type>',
-        choices=['flat', 'gre', 'local',
+        choices=['flat', 'geneve', 'gre', 'local',
                  'vlan', 'vxlan'],
         help=_("The physical mechanism by which the virtual network "
                "is implemented. The supported options are: "
-               "flat, gre, local, vlan, vxlan"))
+               "flat, geneve, gre, local, vlan, vxlan"))
     parser.add_argument(
         '--provider-physical-network',
         metavar='<provider-physical-network>',
@@ -119,8 +119,8 @@ def _add_additional_network_options(parser):
         '--provider-segment',
         metavar='<provider-segment>',
         dest='segmentation_id',
-        help=_("VLAN ID for VLAN networks or Tunnel ID for GRE/VXLAN "
-               "networks"))
+        help=_("VLAN ID for VLAN networks or Tunnel ID for "
+               "GENEVE/GRE/VXLAN networks"))
 
     vlan_transparent_grp = parser.add_mutually_exclusive_group()
     vlan_transparent_grp.add_argument(

releasenotes/notes/bp-neutron-client-a0552f8ca909b665.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - Add ``geneve`` choice to the  ``network create`` command
+    ``--provider-network-type`` option.
+    [Blueprint :oscbp:`neutron-client`]