From 56a081fa238967c18e77fd12c7ae697289e34c81 Mon Sep 17 00:00:00 2001
From: Richard Theis <rtheis@us.ibm.com>
Date: Fri, 10 Jun 2016 14:44:50 -0500
Subject: [PATCH] Add geneve provider network type
Add the "geneve" choice to the "os network create" command's
"--provider-network-type" option.
Change-Id: I7573232ec3594ec4acbfae43a8456b8c3fcd1a83
Implements: blueprint neutron-client
---
doc/source/command-objects/network.rst | 4 ++--
openstackclient/network/v2/network.py | 8 ++++----
.../notes/bp-neutron-client-a0552f8ca909b665.yaml | 5 +++++
3 files changed, 11 insertions(+), 6 deletions(-)
create mode 100644 releasenotes/notes/bp-neutron-client-a0552f8ca909b665.yaml
diff --git a/doc/source/command-objects/network.rst b/doc/source/command-objects/network.rst
index 8668daeee4..1cf442f222 100644
--- a/doc/source/command-objects/network.rst
+++ b/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*
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py
index 87e65dad11..df4d596d55 100644
--- a/openstackclient/network/v2/network.py
+++ b/openstackclient/network/v2/network.py
@@ -103,11 +103,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>',
@@ -118,8 +118,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(
diff --git a/releasenotes/notes/bp-neutron-client-a0552f8ca909b665.yaml b/releasenotes/notes/bp-neutron-client-a0552f8ca909b665.yaml
new file mode 100644
index 0000000000..f8de4ee6ae
--- /dev/null
+++ b/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`]