diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-15 00:41:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-15 00:41:50 +0000 |
| commit | 0ec711c640120539e4968c81fd6ee158257845d4 (patch) | |
| tree | b2d9d6baba9bce0e4b00def5aad2e5986f36ab27 | |
| parent | 968d8bb662465c3ae5b09d3dd381f89d6541b6bf (diff) | |
| parent | 56a081fa238967c18e77fd12c7ae697289e34c81 (diff) | |
| download | python-openstackclient-0ec711c640120539e4968c81fd6ee158257845d4.tar.gz | |
Merge "Add geneve provider network type"
| -rw-r--r-- | doc/source/command-objects/network.rst | 4 | ||||
| -rw-r--r-- | openstackclient/network/v2/network.py | 8 | ||||
| -rw-r--r-- | releasenotes/notes/bp-neutron-client-a0552f8ca909b665.yaml | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/doc/source/command-objects/network.rst b/doc/source/command-objects/network.rst index 8668daee..1cf442f2 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 4d01accd..41735500 100644 --- a/openstackclient/network/v2/network.py +++ b/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( diff --git a/releasenotes/notes/bp-neutron-client-a0552f8ca909b665.yaml b/releasenotes/notes/bp-neutron-client-a0552f8ca909b665.yaml new file mode 100644 index 00000000..f8de4ee6 --- /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`] |