openstack/horizon
Code Issues Proposed changes

Add Geneve support

Browse Source 
Closes-Bug: #1461069
Change-Id: Ib8d150d36d617e0ff381a40115bde2183dace4f8
This commit is contained in:
YAMAMOTO Takashi 2015-10-13 12:29:05 +09:00 committed by Akihiro Motoki
parent a968f9a500
commit ed7c766854
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/topics/settings.rst
View File

@ -1196,7 +1196,7 @@ Network types defined in Horizon or defined in ``extra_provider_types``
settings can be specified in this list. settings can be specified in this list.
As of the Newton release, the network types defined in Horizon include As of the Newton release, the network types defined in Horizon include
network types supported by Neutron ML2 plugin with Open vSwitch driver network types supported by Neutron ML2 plugin with Open vSwitch driver
(``local``, ``flat``, ``vlan``, ``gre``, and ``vxlan``) (``local``, ``flat``, ``vlan``, ``gre``, ``vxlan`` and ``geneve``)
and supported by Midonet plugin (``midonet`` and ``uplink``). and supported by Midonet plugin (``midonet`` and ``uplink``).
``["*"]`` means that all provider network types supported by Neutron ``["*"]`` means that all provider network types supported by Neutron
ML2 plugin will be available to choose from. ML2 plugin will be available to choose from.

8
openstack_dashboard/dashboards/admin/networks/forms.py
View File

@ -56,6 +56,11 @@ PROVIDER_TYPES = {
'require_physical_network': False, 'require_physical_network': False,
'require_segmentation_id': True, 'require_segmentation_id': True,
}, },
'geneve': {
'display_name': _('Geneve'),
'require_physical_network': False,
'require_segmentation_id': True,
},
'midonet': { 'midonet': {
'display_name': _('MidoNet'), 'display_name': _('MidoNet'),
'require_physical_network': False, 'require_physical_network': False,
@ -74,13 +79,14 @@ SEGMENTATION_ID_RANGE = {
'vlan': (1, 4094), 'vlan': (1, 4094),
'gre': (0, (2 ** 32) - 1), 'gre': (0, (2 ** 32) - 1),
'vxlan': (0, (2 ** 24) - 1), 'vxlan': (0, (2 ** 24) - 1),
'geneve': (1, (2 ** 24) - 1),
} }
# DEFAULT_PROVIDER_TYPES is used when ['*'] is specified # DEFAULT_PROVIDER_TYPES is used when ['*'] is specified
# in supported_provider_types. This list contains network types # in supported_provider_types. This list contains network types
# supported by Neutron ML2 plugin reference implementation. # supported by Neutron ML2 plugin reference implementation.
# You can control enabled network types by # You can control enabled network types by
# supported_provider_types setting. # supported_provider_types setting.
DEFAULT_PROVIDER_TYPES = ['local', 'flat', 'vlan', 'gre', 'vxlan'] DEFAULT_PROVIDER_TYPES = ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve']
class CreateNetwork(forms.SelfHandlingForm): class CreateNetwork(forms.SelfHandlingForm):

2
openstack_dashboard/local/local_settings.py.example
View File

@ -290,7 +290,7 @@ OPENSTACK_NEUTRON_NETWORK = {
# Set which provider network types are supported. Only the network types # Set which provider network types are supported. Only the network types
# in this list will be available to choose from when creating a network. # in this list will be available to choose from when creating a network.
# Network types include local, flat, vlan, gre, and vxlan. # Network types include local, flat, vlan, gre, vxlan and geneve.
# 'supported_provider_types': ['*'], # 'supported_provider_types': ['*'],
# You can configure available segmentation ID range per network type # You can configure available segmentation ID range per network type

3
releasenotes/notes/network-type-geneve-71eed4104699754e.yaml Normal file
View File

@ -0,0 +1,3 @@
---
features:
- Neutron network type for Geneve tunneling protocol is now supported.