x/vmware-nsx
Code Issues Proposed changes

Update common network type consts to same origin

Browse Source 
This patch removes new definitions of common network type constants (TYPE_FLAT,
TYPE_LOCAL, etc.) and modifies uses of aforementioned constants to a common
place where constants are defined (neutron.plugins.common.constants). This
patch does not change values that are equal in value but different in name:
NETWORK_TYPE_FLAT vs TYPE_FLAT. A second changeset will be made to handle that
case.

Unit tests were modified as well when they referred to the constant.

Finally, the ovs agent code refers to the OVS plugin constants directly and
these had to be changed as well. A TODO flag was put in that file due to use
of another plugin specific constant.

Network types that were only defined in a single plugin, such as mellanox's
infiniband (IB) network type was not carried over to the common constants file.

Fixes-bug: #1196170

Change-Id: Ib6bfc8275496a24bf247946d177c734b62ae44bb
This commit is contained in:
Justin Hammond 2013-09-02 11:58:10 -05:00
parent e76646b6ac
commit c86e299e66
23 changed files with 177 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/agent/linux/ovs_lib.py
View File

@ -24,6 +24,8 @@ from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils from neutron.agent.linux import utils
from neutron.openstack.common import jsonutils from neutron.openstack.common import jsonutils
from neutron.openstack.common import log as logging from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as p_const
# TODO(JLH) Should we remove the explicit include of the ovs plugin here
from neutron.plugins.openvswitch.common import constants from neutron.plugins.openvswitch.common import constants
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -245,13 +247,13 @@ class OVSBridge(BaseOVS):
self.deferred_flows = {'add': '', 'mod': '', 'del': ''} self.deferred_flows = {'add': '', 'mod': '', 'del': ''}
def add_tunnel_port(self, port_name, remote_ip, local_ip, def add_tunnel_port(self, port_name, remote_ip, local_ip,
tunnel_type=constants.TYPE_GRE, tunnel_type=p_const.TYPE_GRE,
vxlan_udp_port=constants.VXLAN_UDP_PORT): vxlan_udp_port=constants.VXLAN_UDP_PORT):
vsctl_command = ["--", "--may-exist", "add-port", self.br_name, vsctl_command = ["--", "--may-exist", "add-port", self.br_name,
port_name] port_name]
vsctl_command.extend(["--", "set", "Interface", port_name, vsctl_command.extend(["--", "set", "Interface", port_name,
"type=%s" % tunnel_type]) "type=%s" % tunnel_type])
if tunnel_type == constants.TYPE_VXLAN: if tunnel_type == p_const.TYPE_VXLAN:
# Only set the VXLAN UDP port if it's not the default # Only set the VXLAN UDP port if it's not the default
if vxlan_udp_port != constants.VXLAN_UDP_PORT: if vxlan_udp_port != constants.VXLAN_UDP_PORT:
vsctl_command.append("options:dst_port=%s" % vxlan_udp_port) vsctl_command.append("options:dst_port=%s" % vxlan_udp_port)

8
neutron/plugins/common/constants.py
View File

@ -66,3 +66,11 @@ FWAAS_DENY = "deny"
TCP = "tcp" TCP = "tcp"
UDP = "udp" UDP = "udp"
ICMP = "icmp" ICMP = "icmp"
# Network Type constants
TYPE_FLAT = 'flat'
TYPE_GRE = 'gre'
TYPE_LOCAL = 'local'
TYPE_VXLAN = 'vxlan'
TYPE_VLAN = 'vlan'
TYPE_NONE = 'none'

13
neutron/plugins/hyperv/agent/hyperv_neutron_agent.py
View File

@ -34,6 +34,7 @@ from neutron import context
from neutron.openstack.common import log as logging from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall from neutron.openstack.common import loopingcall
from neutron.openstack.common.rpc import dispatcher from neutron.openstack.common.rpc import dispatcher
from neutron.plugins.common import constants as p_const
from neutron.plugins.hyperv.agent import utils from neutron.plugins.hyperv.agent import utils
from neutron.plugins.hyperv.agent import utilsfactory from neutron.plugins.hyperv.agent import utilsfactory
from neutron.plugins.hyperv.common import constants from neutron.plugins.hyperv.common import constants
@ -173,7 +174,7 @@ class HyperVNeutronAgent(object):
return dispatcher.RpcDispatcher([self]) return dispatcher.RpcDispatcher([self])
def _get_vswitch_name(self, network_type, physical_network): def _get_vswitch_name(self, network_type, physical_network):
if network_type != constants.TYPE_LOCAL: if network_type != p_const.TYPE_LOCAL:
vswitch_name = self._get_vswitch_for_physical_network( vswitch_name = self._get_vswitch_for_physical_network(
physical_network) physical_network)
else: else:
@ -188,10 +189,10 @@ class HyperVNeutronAgent(object):
vswitch_name = self._get_vswitch_name(network_type, physical_network) vswitch_name = self._get_vswitch_name(network_type, physical_network)
if network_type in [constants.TYPE_VLAN, constants.TYPE_FLAT]: if network_type in [p_const.TYPE_VLAN, p_const.TYPE_FLAT]:
#Nothing to do #Nothing to do
pass pass
elif network_type == constants.TYPE_LOCAL: elif network_type == p_const.TYPE_LOCAL:
#TODO(alexpilotti): Check that the switch type is private #TODO(alexpilotti): Check that the switch type is private
#or create it if not existing #or create it if not existing
pass pass
@ -229,17 +230,17 @@ class HyperVNeutronAgent(object):
self._utils.connect_vnic_to_vswitch(map['vswitch_name'], port_id) self._utils.connect_vnic_to_vswitch(map['vswitch_name'], port_id)
if network_type == constants.TYPE_VLAN: if network_type == p_const.TYPE_VLAN:
LOG.info(_('Binding VLAN ID %(segmentation_id)s ' LOG.info(_('Binding VLAN ID %(segmentation_id)s '
'to switch port %(port_id)s'), 'to switch port %(port_id)s'),
dict(segmentation_id=segmentation_id, port_id=port_id)) dict(segmentation_id=segmentation_id, port_id=port_id))
self._utils.set_vswitch_port_vlan_id( self._utils.set_vswitch_port_vlan_id(
segmentation_id, segmentation_id,
port_id) port_id)
elif network_type == constants.TYPE_FLAT: elif network_type == p_const.TYPE_FLAT:
#Nothing to do #Nothing to do
pass pass
elif network_type == constants.TYPE_LOCAL: elif network_type == p_const.TYPE_LOCAL:
#Nothing to do #Nothing to do
pass pass
else: else:

7
neutron/plugins/hyperv/common/constants.py
View File

@ -21,10 +21,3 @@ TUNNEL = 'tunnel'
# Special vlan_id value in ovs_vlan_allocations table indicating flat network # Special vlan_id value in ovs_vlan_allocations table indicating flat network
FLAT_VLAN_ID = -1 FLAT_VLAN_ID = -1
# Values for network_type
TYPE_LOCAL = 'local'
TYPE_FLAT = 'flat'
TYPE_VLAN = 'vlan'
TYPE_NVGRE = 'gre'
TYPE_NONE = 'none'

16
neutron/plugins/hyperv/hyperv_neutron_plugin.py
View File

@ -173,10 +173,10 @@ class HyperVNeutronPlugin(agents_db.AgentDbMixin,
def _set_tenant_network_type(self): def _set_tenant_network_type(self):
tenant_network_type = cfg.CONF.HYPERV.tenant_network_type tenant_network_type = cfg.CONF.HYPERV.tenant_network_type
if tenant_network_type not in [constants.TYPE_LOCAL, if tenant_network_type not in [svc_constants.TYPE_LOCAL,
constants.TYPE_FLAT, svc_constants.TYPE_FLAT,
constants.TYPE_VLAN, svc_constants.TYPE_VLAN,
constants.TYPE_NONE]: svc_constants.TYPE_NONE]:
msg = _( msg = _(
"Invalid tenant_network_type: %s. " "Invalid tenant_network_type: %s. "
"Agent terminated!") % tenant_network_type "Agent terminated!") % tenant_network_type
@ -210,16 +210,16 @@ class HyperVNeutronPlugin(agents_db.AgentDbMixin,
def _create_network_providers_map(self): def _create_network_providers_map(self):
self._network_providers_map = { self._network_providers_map = {
constants.TYPE_LOCAL: LocalNetworkProvider(), svc_constants.TYPE_LOCAL: LocalNetworkProvider(),
constants.TYPE_FLAT: FlatNetworkProvider(), svc_constants.TYPE_FLAT: FlatNetworkProvider(),
constants.TYPE_VLAN: VlanNetworkProvider() svc_constants.TYPE_VLAN: VlanNetworkProvider()
} }
def _process_provider_create(self, context, session, attrs): def _process_provider_create(self, context, session, attrs):
network_type = attrs.get(provider.NETWORK_TYPE) network_type = attrs.get(provider.NETWORK_TYPE)
network_type_set = attributes.is_attr_set(network_type) network_type_set = attributes.is_attr_set(network_type)
if not network_type_set: if not network_type_set:
if self._tenant_network_type == constants.TYPE_NONE: if self._tenant_network_type == svc_constants.TYPE_NONE:
raise q_exc.TenantNetworksDisabled() raise q_exc.TenantNetworksDisabled()
network_type = self._tenant_network_type network_type = self._tenant_network_type
attrs[provider.NETWORK_TYPE] = network_type attrs[provider.NETWORK_TYPE] = network_type

17
neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
View File

@ -46,6 +46,7 @@ from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall from neutron.openstack.common import loopingcall
from neutron.openstack.common.rpc import common as rpc_common from neutron.openstack.common.rpc import common as rpc_common
from neutron.openstack.common.rpc import dispatcher from neutron.openstack.common.rpc import dispatcher
from neutron.plugins.common import constants as p_const
from neutron.plugins.linuxbridge.common import config # noqa from neutron.plugins.linuxbridge.common import config # noqa
from neutron.plugins.linuxbridge.common import constants as lconst from neutron.plugins.linuxbridge.common import constants as lconst
@ -343,7 +344,7 @@ class LinuxBridgeManager:
network_type, network_type,
physical_network, physical_network,
segmentation_id): segmentation_id):
if network_type == lconst.TYPE_VXLAN: if network_type == p_const.TYPE_VXLAN:
if self.vxlan_mode == lconst.VXLAN_NONE: if self.vxlan_mode == lconst.VXLAN_NONE:
LOG.error(_("Unable to add vxlan interface for network %s"), LOG.error(_("Unable to add vxlan interface for network %s"),
network_id) network_id)
@ -355,9 +356,9 @@ class LinuxBridgeManager:
LOG.error(_("No mapping for physical network %s"), LOG.error(_("No mapping for physical network %s"),
physical_network) physical_network)
return return
if network_type == lconst.TYPE_FLAT: if network_type == p_const.TYPE_FLAT:
return self.ensure_flat_bridge(network_id, physical_interface) return self.ensure_flat_bridge(network_id, physical_interface)
elif network_type == lconst.TYPE_VLAN: elif network_type == p_const.TYPE_VLAN:
return self.ensure_vlan_bridge(network_id, physical_interface, return self.ensure_vlan_bridge(network_id, physical_interface,
segmentation_id) segmentation_id)
else: else:
@ -378,7 +379,7 @@ class LinuxBridgeManager:
return False return False
bridge_name = self.get_bridge_name(network_id) bridge_name = self.get_bridge_name(network_id)
if network_type == lconst.TYPE_LOCAL: if network_type == p_const.TYPE_LOCAL:
self.ensure_local_bridge(network_id) self.ensure_local_bridge(network_id)
elif not self.ensure_physical_in_bridge(network_id, elif not self.ensure_physical_in_bridge(network_id,
network_type, network_type,
@ -687,7 +688,7 @@ class LinuxBridgeRpcCallbacks(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
if not segment: if not segment:
return return
if segment.network_type != lconst.TYPE_VXLAN: if segment.network_type != p_const.TYPE_VXLAN:
return return
interface = self.agent.br_mgr.get_vxlan_device_name( interface = self.agent.br_mgr.get_vxlan_device_name(
@ -709,7 +710,7 @@ class LinuxBridgeRpcCallbacks(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
if not segment: if not segment:
return return
if segment.network_type != lconst.TYPE_VXLAN: if segment.network_type != p_const.TYPE_VXLAN:
return return
interface = self.agent.br_mgr.get_vxlan_device_name( interface = self.agent.br_mgr.get_vxlan_device_name(
@ -731,7 +732,7 @@ class LinuxBridgeRpcCallbacks(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
if not segment: if not segment:
return return
if segment.network_type != lconst.TYPE_VXLAN: if segment.network_type != p_const.TYPE_VXLAN:
return return
interface = self.agent.br_mgr.get_vxlan_device_name( interface = self.agent.br_mgr.get_vxlan_device_name(
@ -782,7 +783,7 @@ class LinuxBridgeNeutronAgentRPC(sg_rpc.SecurityGroupAgentRpcMixin):
configurations = {'interface_mappings': interface_mappings} configurations = {'interface_mappings': interface_mappings}
if self.br_mgr.vxlan_mode is not lconst.VXLAN_NONE: if self.br_mgr.vxlan_mode is not lconst.VXLAN_NONE:
configurations['tunneling_ip'] = self.br_mgr.local_ip configurations['tunneling_ip'] = self.br_mgr.local_ip
configurations['tunnel_types'] = [lconst.TYPE_VXLAN] configurations['tunnel_types'] = [p_const.TYPE_VXLAN]
configurations['l2_population'] = cfg.CONF.VXLAN.l2_population configurations['l2_population'] = cfg.CONF.VXLAN.l2_population
self.agent_state = { self.agent_state = {
'binary': 'neutron-linuxbridge-agent', 'binary': 'neutron-linuxbridge-agent',

16
neutron/plugins/linuxbridge/common/constants.py
View File

@ -17,16 +17,12 @@
# @author: Sumit Naiksatam, Cisco Systems, Inc. # @author: Sumit Naiksatam, Cisco Systems, Inc.
from neutron.plugins.common import constants as p_const
FLAT_VLAN_ID = -1 FLAT_VLAN_ID = -1
LOCAL_VLAN_ID = -2 LOCAL_VLAN_ID = -2
# Values for network_type
TYPE_FLAT = 'flat'
TYPE_VLAN = 'vlan'
TYPE_VXLAN = 'vxlan'
TYPE_LOCAL = 'local'
TYPE_NONE = 'none'
# Supported VXLAN features # Supported VXLAN features
VXLAN_NONE = 'not_supported' VXLAN_NONE = 'not_supported'
VXLAN_MCAST = 'multicast_flooding' VXLAN_MCAST = 'multicast_flooding'
@ -42,8 +38,8 @@ MIN_VXLAN_KVER = {VXLAN_MCAST: '3.8', VXLAN_UCAST: '3.11'}
def interpret_vlan_id(vlan_id): def interpret_vlan_id(vlan_id):
"""Return (network_type, segmentation_id) tuple for encoded vlan_id.""" """Return (network_type, segmentation_id) tuple for encoded vlan_id."""
if vlan_id == LOCAL_VLAN_ID: if vlan_id == LOCAL_VLAN_ID:
return (TYPE_LOCAL, None) return (p_const.TYPE_LOCAL, None)
elif vlan_id == FLAT_VLAN_ID: elif vlan_id == FLAT_VLAN_ID:
return (TYPE_FLAT, None) return (p_const.TYPE_FLAT, None)
else: else:
return (TYPE_VLAN, vlan_id) return (p_const.TYPE_VLAN, vlan_id)

27
neutron/plugins/linuxbridge/lb_neutron_plugin.py
View File

@ -261,9 +261,9 @@ class LinuxBridgePluginV2(db_base_plugin_v2.NeutronDbPluginV2,
self._parse_network_vlan_ranges() self._parse_network_vlan_ranges()
db.sync_network_states(self.network_vlan_ranges) db.sync_network_states(self.network_vlan_ranges)
self.tenant_network_type = cfg.CONF.VLANS.tenant_network_type self.tenant_network_type = cfg.CONF.VLANS.tenant_network_type
if self.tenant_network_type not in [constants.TYPE_LOCAL, if self.tenant_network_type not in [svc_constants.TYPE_LOCAL,
constants.TYPE_VLAN, svc_constants.TYPE_VLAN,
constants.TYPE_NONE]: svc_constants.TYPE_NONE]:
LOG.error(_("Invalid tenant_network_type: %s. " LOG.error(_("Invalid tenant_network_type: %s. "
"Service terminated!"), "Service terminated!"),
self.tenant_network_type) self.tenant_network_type)
@ -316,15 +316,15 @@ class LinuxBridgePluginV2(db_base_plugin_v2.NeutronDbPluginV2,
def _extend_network_dict_provider(self, context, network): def _extend_network_dict_provider(self, context, network):
binding = db.get_network_binding(context.session, network['id']) binding = db.get_network_binding(context.session, network['id'])
if binding.vlan_id == constants.FLAT_VLAN_ID: if binding.vlan_id == constants.FLAT_VLAN_ID:
network[provider.NETWORK_TYPE] = constants.TYPE_FLAT network[provider.NETWORK_TYPE] = svc_constants.TYPE_FLAT
network[provider.PHYSICAL_NETWORK] = binding.physical_network network[provider.PHYSICAL_NETWORK] = binding.physical_network
network[provider.SEGMENTATION_ID] = None network[provider.SEGMENTATION_ID] = None
elif binding.vlan_id == constants.LOCAL_VLAN_ID: elif binding.vlan_id == constants.LOCAL_VLAN_ID:
network[provider.NETWORK_TYPE] = constants.TYPE_LOCAL network[provider.NETWORK_TYPE] = svc_constants.TYPE_LOCAL
network[provider.PHYSICAL_NETWORK] = None network[provider.PHYSICAL_NETWORK] = None
network[provider.SEGMENTATION_ID] = None network[provider.SEGMENTATION_ID] = None
else: else:
network[provider.NETWORK_TYPE] = constants.TYPE_VLAN network[provider.NETWORK_TYPE] = svc_constants.TYPE_VLAN
network[provider.PHYSICAL_NETWORK] = binding.physical_network network[provider.PHYSICAL_NETWORK] = binding.physical_network
network[provider.SEGMENTATION_ID] = binding.vlan_id network[provider.SEGMENTATION_ID] = binding.vlan_id
@ -344,13 +344,13 @@ class LinuxBridgePluginV2(db_base_plugin_v2.NeutronDbPluginV2,
if not network_type_set: if not network_type_set:
msg = _("provider:network_type required") msg = _("provider:network_type required")
raise q_exc.InvalidInput(error_message=msg) raise q_exc.InvalidInput(error_message=msg)
elif network_type == constants.TYPE_FLAT: elif network_type == svc_constants.TYPE_FLAT:
if segmentation_id_set: if segmentation_id_set:
msg = _("provider:segmentation_id specified for flat network") msg = _("provider:segmentation_id specified for flat network")
raise q_exc.InvalidInput(error_message=msg) raise q_exc.InvalidInput(error_message=msg)
else: else:
segmentation_id = constants.FLAT_VLAN_ID segmentation_id = constants.FLAT_VLAN_ID
elif network_type == constants.TYPE_VLAN: elif network_type == svc_constants.TYPE_VLAN:
if not segmentation_id_set: if not segmentation_id_set:
msg = _("provider:segmentation_id required") msg = _("provider:segmentation_id required")
raise q_exc.InvalidInput(error_message=msg) raise q_exc.InvalidInput(error_message=msg)
@ -360,7 +360,7 @@ class LinuxBridgePluginV2(db_base_plugin_v2.NeutronDbPluginV2,
{'min_id': q_const.MIN_VLAN_TAG, {'min_id': q_const.MIN_VLAN_TAG,
'max_id': q_const.MAX_VLAN_TAG}) 'max_id': q_const.MAX_VLAN_TAG})
raise q_exc.InvalidInput(error_message=msg) raise q_exc.InvalidInput(error_message=msg)
elif network_type == constants.TYPE_LOCAL: elif network_type == svc_constants.TYPE_LOCAL:
if physical_network_set: if physical_network_set:
msg = _("provider:physical_network specified for local " msg = _("provider:physical_network specified for local "
"network") "network")
@ -377,7 +377,7 @@ class LinuxBridgePluginV2(db_base_plugin_v2.NeutronDbPluginV2,
msg = _("provider:network_type %s not supported") % network_type msg = _("provider:network_type %s not supported") % network_type
raise q_exc.InvalidInput(error_message=msg) raise q_exc.InvalidInput(error_message=msg)
if network_type in [constants.TYPE_VLAN, constants.TYPE_FLAT]: if network_type in [svc_constants.TYPE_VLAN, svc_constants.TYPE_FLAT]:
if physical_network_set: if physical_network_set:
if physical_network not in self.network_vlan_ranges: if physical_network not in self.network_vlan_ranges:
msg = (_("Unknown provider:physical_network %s") % msg = (_("Unknown provider:physical_network %s") %
@ -406,15 +406,16 @@ class LinuxBridgePluginV2(db_base_plugin_v2.NeutronDbPluginV2,
if not network_type: if not network_type:
# tenant network # tenant network
network_type = self.tenant_network_type network_type = self.tenant_network_type
if network_type == constants.TYPE_NONE: if network_type == svc_constants.TYPE_NONE:
raise q_exc.TenantNetworksDisabled() raise q_exc.TenantNetworksDisabled()
elif network_type == constants.TYPE_VLAN: elif network_type == svc_constants.TYPE_VLAN:
physical_network, vlan_id = db.reserve_network(session) physical_network, vlan_id = db.reserve_network(session)
else: # TYPE_LOCAL else: # TYPE_LOCAL
vlan_id = constants.LOCAL_VLAN_ID vlan_id = constants.LOCAL_VLAN_ID
else: else:
# provider network # provider network
if network_type in [constants.TYPE_VLAN, constants.TYPE_FLAT]: if network_type in [svc_constants.TYPE_VLAN,
svc_constants.TYPE_FLAT]:
db.reserve_specific_network(session, physical_network, db.reserve_specific_network(session, physical_network,
vlan_id) vlan_id)
# no reservation needed for TYPE_LOCAL # no reservation needed for TYPE_LOCAL

5
neutron/plugins/ml2/drivers/type_flat.py
View File

@ -19,12 +19,11 @@ import sqlalchemy as sa
from neutron.common import exceptions as exc from neutron.common import exceptions as exc
from neutron.db import model_base from neutron.db import model_base
from neutron.openstack.common import log from neutron.openstack.common import log
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2 import driver_api as api
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
TYPE_FLAT = 'flat'
flat_opts = [ flat_opts = [
cfg.ListOpt('flat_networks', cfg.ListOpt('flat_networks',
default=[], default=[],
@ -75,7 +74,7 @@ class FlatTypeDriver(api.TypeDriver):
self.flat_networks) self.flat_networks)
def get_type(self): def get_type(self):
return TYPE_FLAT return p_const.TYPE_FLAT
def initialize(self): def initialize(self):
LOG.info(_("ML2 FlatTypeDriver initialization complete")) LOG.info(_("ML2 FlatTypeDriver initialization complete"))

9
neutron/plugins/ml2/drivers/type_gre.py
View File

@ -21,13 +21,12 @@ from neutron.common import exceptions as exc
from neutron.db import api as db_api from neutron.db import api as db_api
from neutron.db import model_base from neutron.db import model_base
from neutron.openstack.common import log from neutron.openstack.common import log
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers import type_tunnel from neutron.plugins.ml2.drivers import type_tunnel
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
TYPE_GRE = 'gre'
gre_opts = [ gre_opts = [
cfg.ListOpt('tunnel_id_ranges', cfg.ListOpt('tunnel_id_ranges',
default=[], default=[],
@ -61,14 +60,14 @@ class GreEndpoints(model_base.BASEV2):
class GreTypeDriver(type_tunnel.TunnelTypeDriver): class GreTypeDriver(type_tunnel.TunnelTypeDriver):
def get_type(self): def get_type(self):
return TYPE_GRE return p_const.TYPE_GRE
def initialize(self): def initialize(self):
self.gre_id_ranges = [] self.gre_id_ranges = []
self._parse_tunnel_ranges( self._parse_tunnel_ranges(
cfg.CONF.ml2_type_gre.tunnel_id_ranges, cfg.CONF.ml2_type_gre.tunnel_id_ranges,
self.gre_id_ranges, self.gre_id_ranges,
TYPE_GRE p_const.TYPE_GRE
) )
self._sync_gre_allocations() self._sync_gre_allocations()
@ -102,7 +101,7 @@ class GreTypeDriver(type_tunnel.TunnelTypeDriver):
LOG.debug(_("Allocating gre tunnel id %(gre_id)s"), LOG.debug(_("Allocating gre tunnel id %(gre_id)s"),
{'gre_id': alloc.gre_id}) {'gre_id': alloc.gre_id})
alloc.allocated = True alloc.allocated = True
return {api.NETWORK_TYPE: TYPE_GRE, return {api.NETWORK_TYPE: p_const.TYPE_GRE,
api.PHYSICAL_NETWORK: None, api.PHYSICAL_NETWORK: None,
api.SEGMENTATION_ID: alloc.gre_id} api.SEGMENTATION_ID: alloc.gre_id}

7
neutron/plugins/ml2/drivers/type_local.py
View File

@ -15,12 +15,11 @@
from neutron.common import exceptions as exc from neutron.common import exceptions as exc
from neutron.openstack.common import log from neutron.openstack.common import log
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2 import driver_api as api
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
TYPE_LOCAL = 'local'
class LocalTypeDriver(api.TypeDriver): class LocalTypeDriver(api.TypeDriver):
"""Manage state for local networks with ML2. """Manage state for local networks with ML2.
@ -36,7 +35,7 @@ class LocalTypeDriver(api.TypeDriver):
LOG.info(_("ML2 LocalTypeDriver initialization complete")) LOG.info(_("ML2 LocalTypeDriver initialization complete"))
def get_type(self): def get_type(self):
return TYPE_LOCAL return p_const.TYPE_LOCAL
def initialize(self): def initialize(self):
pass pass
@ -53,7 +52,7 @@ class LocalTypeDriver(api.TypeDriver):
def allocate_tenant_segment(self, session): def allocate_tenant_segment(self, session):
# No resources to allocate # No resources to allocate
return {api.NETWORK_TYPE: TYPE_LOCAL} return {api.NETWORK_TYPE: p_const.TYPE_LOCAL}
def release_segment(self, session, segment): def release_segment(self, session, segment):
# No resources to release # No resources to release

7
neutron/plugins/ml2/drivers/type_vlan.py
View File

@ -24,13 +24,12 @@ from neutron.common import utils
from neutron.db import api as db_api from neutron.db import api as db_api
from neutron.db import model_base from neutron.db import model_base
from neutron.openstack.common import log from neutron.openstack.common import log
from neutron.plugins.common import constants as p_const
from neutron.plugins.common import utils as plugin_utils from neutron.plugins.common import utils as plugin_utils
from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2 import driver_api as api
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
TYPE_VLAN = 'vlan'
vlan_opts = [ vlan_opts = [
cfg.ListOpt('network_vlan_ranges', cfg.ListOpt('network_vlan_ranges',
default=[], default=[],
@ -154,7 +153,7 @@ class VlanTypeDriver(api.TypeDriver):
session.delete(alloc) session.delete(alloc)
def get_type(self): def get_type(self):
return TYPE_VLAN return p_const.TYPE_VLAN
def initialize(self): def initialize(self):
self._sync_vlan_allocations() self._sync_vlan_allocations()
@ -228,7 +227,7 @@ class VlanTypeDriver(api.TypeDriver):
{'vlan_id': alloc.vlan_id, {'vlan_id': alloc.vlan_id,
'physical_network': alloc.physical_network}) 'physical_network': alloc.physical_network})
alloc.allocated = True alloc.allocated = True
return {api.NETWORK_TYPE: TYPE_VLAN, return {api.NETWORK_TYPE: p_const.TYPE_VLAN,
api.PHYSICAL_NETWORK: alloc.physical_network, api.PHYSICAL_NETWORK: alloc.physical_network,
api.SEGMENTATION_ID: alloc.vlan_id} api.SEGMENTATION_ID: alloc.vlan_id}

8
neutron/plugins/ml2/drivers/type_vxlan.py
View File

@ -22,12 +22,12 @@ from neutron.common import exceptions as exc
from neutron.db import api as db_api from neutron.db import api as db_api
from neutron.db import model_base from neutron.db import model_base
from neutron.openstack.common import log from neutron.openstack.common import log
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers import type_tunnel from neutron.plugins.ml2.drivers import type_tunnel
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
TYPE_VXLAN = 'vxlan'
VXLAN_UDP_PORT = 4789 VXLAN_UDP_PORT = 4789
MAX_VXLAN_VNI = 16777215 MAX_VXLAN_VNI = 16777215
@ -69,14 +69,14 @@ class VxlanEndpoints(model_base.BASEV2):
class VxlanTypeDriver(type_tunnel.TunnelTypeDriver): class VxlanTypeDriver(type_tunnel.TunnelTypeDriver):
def get_type(self): def get_type(self):
return TYPE_VXLAN return p_const.TYPE_VXLAN
def initialize(self): def initialize(self):
self.vxlan_vni_ranges = [] self.vxlan_vni_ranges = []
self._parse_tunnel_ranges( self._parse_tunnel_ranges(
cfg.CONF.ml2_type_vxlan.vni_ranges, cfg.CONF.ml2_type_vxlan.vni_ranges,
self.vxlan_vni_ranges, self.vxlan_vni_ranges,
TYPE_VXLAN p_const.TYPE_VXLAN
) )
self._sync_vxlan_allocations() self._sync_vxlan_allocations()
@ -110,7 +110,7 @@ class VxlanTypeDriver(type_tunnel.TunnelTypeDriver):
LOG.debug(_("Allocating vxlan tunnel vni %(vxlan_vni)s"), LOG.debug(_("Allocating vxlan tunnel vni %(vxlan_vni)s"),
{'vxlan_vni': alloc.vxlan_vni}) {'vxlan_vni': alloc.vxlan_vni})
alloc.allocated = True alloc.allocated = True
return {api.NETWORK_TYPE: TYPE_VXLAN, return {api.NETWORK_TYPE: p_const.TYPE_VXLAN,
api.PHYSICAL_NETWORK: None, api.PHYSICAL_NETWORK: None,
api.SEGMENTATION_ID: alloc.vxlan_vni} api.SEGMENTATION_ID: alloc.vxlan_vni}

5
neutron/plugins/mlnx/agent/eswitch_neutron_agent.py
View File

@ -34,6 +34,7 @@ from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall from neutron.openstack.common import loopingcall
from neutron.openstack.common.rpc import common as rpc_common from neutron.openstack.common.rpc import common as rpc_common
from neutron.openstack.common.rpc import dispatcher from neutron.openstack.common.rpc import dispatcher
from neutron.plugins.common import constants as p_const
from neutron.plugins.mlnx.agent import utils from neutron.plugins.mlnx.agent import utils
from neutron.plugins.mlnx.common import config # noqa from neutron.plugins.mlnx.common import config # noqa
from neutron.plugins.mlnx.common import constants from neutron.plugins.mlnx.common import constants
@ -102,7 +103,7 @@ class EswitchManager(object):
net_map = self.network_map[network_id] net_map = self.network_map[network_id]
net_map['ports'].append({'port_id': port_id, 'port_mac': port_mac}) net_map['ports'].append({'port_id': port_id, 'port_mac': port_mac})
if network_type in (constants.TYPE_VLAN, if network_type in (p_const.TYPE_VLAN,
constants.TYPE_IB): constants.TYPE_IB):
LOG.info(_('Binding Segmentation ID %(seg_id)s' LOG.info(_('Binding Segmentation ID %(seg_id)s'
'to eSwitch for vNIC mac_address %(mac)s'), 'to eSwitch for vNIC mac_address %(mac)s'),
@ -129,7 +130,7 @@ class EswitchManager(object):
network_id, network_type, network_id, network_type,
physical_network, segmentation_id): physical_network, segmentation_id):
LOG.info(_("Provisioning network %s"), network_id) LOG.info(_("Provisioning network %s"), network_id)
if network_type == constants.TYPE_VLAN: if network_type == p_const.TYPE_VLAN:
LOG.debug(_("Creating VLAN Network")) LOG.debug(_("Creating VLAN Network"))
elif network_type == constants.TYPE_IB: elif network_type == constants.TYPE_IB:
LOG.debug(_("Creating IB Network")) LOG.debug(_("Creating IB Network"))

4
neutron/plugins/mlnx/common/constants.py
View File

@ -19,11 +19,7 @@ LOCAL_VLAN_ID = -2
FLAT_VLAN_ID = -1 FLAT_VLAN_ID = -1
# Values for network_type # Values for network_type
TYPE_LOCAL = 'local'
TYPE_FLAT = 'flat'
TYPE_VLAN = 'vlan'
TYPE_IB = 'ib' TYPE_IB = 'ib'
TYPE_NONE = 'none'
VIF_TYPE_DIRECT = 'mlnx_direct' VIF_TYPE_DIRECT = 'mlnx_direct'
VIF_TYPE_HOSTDEV = 'hostdev' VIF_TYPE_HOSTDEV = 'hostdev'

31
neutron/plugins/mlnx/mlnx_plugin.py
View File

@ -153,10 +153,10 @@ class MellanoxEswitchPlugin(db_base_plugin_v2.NeutronDbPluginV2,
def _extend_network_dict_provider(self, context, network): def _extend_network_dict_provider(self, context, network):
binding = db.get_network_binding(context.session, network['id']) binding = db.get_network_binding(context.session, network['id'])
network[provider.NETWORK_TYPE] = binding.network_type network[provider.NETWORK_TYPE] = binding.network_type
if binding.network_type == constants.TYPE_FLAT: if binding.network_type == svc_constants.TYPE_FLAT:
network[provider.PHYSICAL_NETWORK] = binding.physical_network network[provider.PHYSICAL_NETWORK] = binding.physical_network
network[provider.SEGMENTATION_ID] = None network[provider.SEGMENTATION_ID] = None
elif binding.network_type == constants.TYPE_LOCAL: elif binding.network_type == svc_constants.TYPE_LOCAL:
network[provider.PHYSICAL_NETWORK] = None network[provider.PHYSICAL_NETWORK] = None
network[provider.SEGMENTATION_ID] = None network[provider.SEGMENTATION_ID] = None
else: else:
@ -165,10 +165,10 @@ class MellanoxEswitchPlugin(db_base_plugin_v2.NeutronDbPluginV2,
def _set_tenant_network_type(self): def _set_tenant_network_type(self):
self.tenant_network_type = cfg.CONF.MLNX.tenant_network_type self.tenant_network_type = cfg.CONF.MLNX.tenant_network_type
if self.tenant_network_type not in [constants.TYPE_VLAN, if self.tenant_network_type not in [svc_constants.TYPE_VLAN,
constants.TYPE_IB, constants.TYPE_IB,
constants.TYPE_LOCAL, svc_constants.TYPE_LOCAL,
constants.TYPE_NONE]: svc_constants.TYPE_NONE]:
LOG.error(_("Invalid tenant_network_type: %s. " LOG.error(_("Invalid tenant_network_type: %s. "
"Service terminated!"), "Service terminated!"),
self.tenant_network_type) self.tenant_network_type)
@ -190,14 +190,14 @@ class MellanoxEswitchPlugin(db_base_plugin_v2.NeutronDbPluginV2,
if not network_type_set: if not network_type_set:
msg = _("provider:network_type required") msg = _("provider:network_type required")
raise q_exc.InvalidInput(error_message=msg) raise q_exc.InvalidInput(error_message=msg)
elif network_type == constants.TYPE_FLAT: elif network_type == svc_constants.TYPE_FLAT:
self._process_flat_net(segmentation_id_set) self._process_flat_net(segmentation_id_set)
segmentation_id = constants.FLAT_VLAN_ID segmentation_id = constants.FLAT_VLAN_ID
elif network_type in [constants.TYPE_VLAN, constants.TYPE_IB]: elif network_type in [svc_constants.TYPE_VLAN, constants.TYPE_IB]:
self._process_vlan_net(segmentation_id, segmentation_id_set) self._process_vlan_net(segmentation_id, segmentation_id_set)
elif network_type == constants.TYPE_LOCAL: elif network_type == svc_constants.TYPE_LOCAL:
self._process_local_net(physical_network_set, self._process_local_net(physical_network_set,
segmentation_id_set) segmentation_id_set)
segmentation_id = constants.LOCAL_VLAN_ID segmentation_id = constants.LOCAL_VLAN_ID
@ -240,9 +240,9 @@ class MellanoxEswitchPlugin(db_base_plugin_v2.NeutronDbPluginV2,
def _process_net_type(self, network_type, def _process_net_type(self, network_type,
physical_network, physical_network,
physical_network_set): physical_network_set):
if network_type in [constants.TYPE_VLAN, if network_type in [svc_constants.TYPE_VLAN,
constants.TYPE_IB, constants.TYPE_IB,
constants.TYPE_FLAT]: svc_constants.TYPE_FLAT]:
if physical_network_set: if physical_network_set:
if physical_network not in self.network_vlan_ranges: if physical_network not in self.network_vlan_ranges:
msg = _("Unknown provider:physical_network " msg = _("Unknown provider:physical_network "
@ -256,7 +256,7 @@ class MellanoxEswitchPlugin(db_base_plugin_v2.NeutronDbPluginV2,
return physical_network return physical_network
def _check_port_binding_for_net_type(self, vnic_type, net_type): def _check_port_binding_for_net_type(self, vnic_type, net_type):
if net_type == constants.TYPE_VLAN: if net_type == svc_constants.TYPE_VLAN:
return vnic_type in (constants.VIF_TYPE_DIRECT, return vnic_type in (constants.VIF_TYPE_DIRECT,
constants.VIF_TYPE_HOSTDEV) constants.VIF_TYPE_HOSTDEV)
elif net_type == constants.TYPE_IB: elif net_type == constants.TYPE_IB:
@ -305,17 +305,18 @@ class MellanoxEswitchPlugin(db_base_plugin_v2.NeutronDbPluginV2,
if not network_type: if not network_type:
# tenant network # tenant network
network_type = self.tenant_network_type network_type = self.tenant_network_type
if network_type == constants.TYPE_NONE: if network_type == svc_constants.TYPE_NONE:
raise q_exc.TenantNetworksDisabled() raise q_exc.TenantNetworksDisabled()
elif network_type in [constants.TYPE_VLAN, constants.TYPE_IB]: elif network_type in [svc_constants.TYPE_VLAN,
constants.TYPE_IB]:
physical_network, vlan_id = db.reserve_network(session) physical_network, vlan_id = db.reserve_network(session)
else: # TYPE_LOCAL else: # TYPE_LOCAL
vlan_id = constants.LOCAL_VLAN_ID vlan_id = constants.LOCAL_VLAN_ID
else: else:
# provider network # provider network
if network_type in [constants.TYPE_VLAN, if network_type in [svc_constants.TYPE_VLAN,
constants.TYPE_IB, constants.TYPE_IB,
constants.TYPE_FLAT]: svc_constants.TYPE_FLAT]:
db.reserve_specific_network(session, db.reserve_specific_network(session,
physical_network, physical_network,
vlan_id) vlan_id)

21
neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
View File

@ -47,6 +47,7 @@ from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall from neutron.openstack.common import loopingcall
from neutron.openstack.common.rpc import common as rpc_common from neutron.openstack.common.rpc import common as rpc_common
from neutron.openstack.common.rpc import dispatcher from neutron.openstack.common.rpc import dispatcher
from neutron.plugins.common import constants as p_const
from neutron.plugins.openvswitch.common import config # noqa from neutron.plugins.openvswitch.common import config # noqa
from neutron.plugins.openvswitch.common import constants from neutron.plugins.openvswitch.common import constants
@ -204,8 +205,8 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
self.setup_integration_br() self.setup_integration_br()
self.setup_physical_bridges(bridge_mappings) self.setup_physical_bridges(bridge_mappings)
self.local_vlan_map = {} self.local_vlan_map = {}
self.tun_br_ofports = {constants.TYPE_GRE: {}, self.tun_br_ofports = {p_const.TYPE_GRE: {},
constants.TYPE_VXLAN: {}} p_const.TYPE_VXLAN: {}}
self.polling_interval = polling_interval self.polling_interval = polling_interval
self.minimize_polling = minimize_polling self.minimize_polling = minimize_polling
@ -232,7 +233,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
self.iter_num = 0 self.iter_num = 0
def _check_ovs_version(self): def _check_ovs_version(self):
if constants.TYPE_VXLAN in self.tunnel_types: if p_const.TYPE_VXLAN in self.tunnel_types:
check_ovs_version(constants.MINIMUM_OVS_VXLAN_VERSION, check_ovs_version(constants.MINIMUM_OVS_VXLAN_VERSION,
self.root_helper) self.root_helper)
@ -490,7 +491,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
"net-id=%(net_uuid)s - tunneling disabled"), "net-id=%(net_uuid)s - tunneling disabled"),
{'network_type': network_type, {'network_type': network_type,
'net_uuid': net_uuid}) 'net_uuid': net_uuid})
elif network_type == constants.TYPE_FLAT: elif network_type == p_const.TYPE_FLAT:
if physical_network in self.phys_brs: if physical_network in self.phys_brs:
# outbound # outbound
br = self.phys_brs[physical_network] br = self.phys_brs[physical_network]
@ -510,7 +511,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
"physical_network %(physical_network)s"), "physical_network %(physical_network)s"),
{'net_uuid': net_uuid, {'net_uuid': net_uuid,
'physical_network': physical_network}) 'physical_network': physical_network})
elif network_type == constants.TYPE_VLAN: elif network_type == p_const.TYPE_VLAN:
if physical_network in self.phys_brs: if physical_network in self.phys_brs:
# outbound # outbound
br = self.phys_brs[physical_network] br = self.phys_brs[physical_network]
@ -530,7 +531,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
"physical_network %(physical_network)s"), "physical_network %(physical_network)s"),
{'net_uuid': net_uuid, {'net_uuid': net_uuid,
'physical_network': physical_network}) 'physical_network': physical_network})
elif network_type == constants.TYPE_LOCAL: elif network_type == p_const.TYPE_LOCAL:
# no flows needed for local networks # no flows needed for local networks
pass pass
else: else:
@ -565,7 +566,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
# Try to remove tunnel ports if not used by other networks # Try to remove tunnel ports if not used by other networks
for ofport in lvm.tun_ofports: for ofport in lvm.tun_ofports:
self.cleanup_tunnel_port(ofport, lvm.network_type) self.cleanup_tunnel_port(ofport, lvm.network_type)
elif lvm.network_type == constants.TYPE_FLAT: elif lvm.network_type == p_const.TYPE_FLAT:
if lvm.physical_network in self.phys_brs: if lvm.physical_network in self.phys_brs:
# outbound # outbound
br = self.phys_brs[lvm.physical_network] br = self.phys_brs[lvm.physical_network]
@ -576,7 +577,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
br = self.int_br br = self.int_br
br.delete_flows(in_port=self.int_ofports[lvm.physical_network], br.delete_flows(in_port=self.int_ofports[lvm.physical_network],
dl_vlan=0xffff) dl_vlan=0xffff)
elif lvm.network_type == constants.TYPE_VLAN: elif lvm.network_type == p_const.TYPE_VLAN:
if lvm.physical_network in self.phys_brs: if lvm.physical_network in self.phys_brs:
# outbound # outbound
br = self.phys_brs[lvm.physical_network] br = self.phys_brs[lvm.physical_network]
@ -587,7 +588,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
br = self.int_br br = self.int_br
br.delete_flows(in_port=self.int_ofports[lvm.physical_network], br.delete_flows(in_port=self.int_ofports[lvm.physical_network],
dl_vlan=lvm.segmentation_id) dl_vlan=lvm.segmentation_id)
elif lvm.network_type == constants.TYPE_LOCAL: elif lvm.network_type == p_const.TYPE_LOCAL:
# no flows needed for local networks # no flows needed for local networks
pass pass
else: else:
@ -1252,7 +1253,7 @@ def create_agent_config_map(config):
# If enable_tunneling is TRUE, set tunnel_type to default to GRE # If enable_tunneling is TRUE, set tunnel_type to default to GRE
if config.OVS.enable_tunneling and not kwargs['tunnel_types']: if config.OVS.enable_tunneling and not kwargs['tunnel_types']:
kwargs['tunnel_types'] = [constants.TYPE_GRE] kwargs['tunnel_types'] = [p_const.TYPE_GRE]
# Verify the tunnel_types specified are valid # Verify the tunnel_types specified are valid
for tun in kwargs['tunnel_types']: for tun in kwargs['tunnel_types']:

14
neutron/plugins/openvswitch/common/constants.py
View File

@ -13,6 +13,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from neutron.plugins.common import constants as p_const
# Special vlan_id value in ovs_vlan_allocations table indicating flat network # Special vlan_id value in ovs_vlan_allocations table indicating flat network
FLAT_VLAN_ID = -1 FLAT_VLAN_ID = -1
@ -20,12 +23,6 @@ FLAT_VLAN_ID = -1
TUNNEL = 'tunnel' TUNNEL = 'tunnel'
# Values for network_type # Values for network_type
TYPE_FLAT = 'flat'
TYPE_VLAN = 'vlan'
TYPE_GRE = 'gre'
TYPE_LOCAL = 'local'
TYPE_VXLAN = 'vxlan'
TYPE_NONE = 'none'
VXLAN_UDP_PORT = 4789 VXLAN_UDP_PORT = 4789
# Name prefixes for veth device pair linking the integration bridge # Name prefixes for veth device pair linking the integration bridge
@ -37,7 +34,7 @@ VETH_PHYSICAL_PREFIX = 'phy-'
MINIMUM_OVS_VXLAN_VERSION = "1.10" MINIMUM_OVS_VXLAN_VERSION = "1.10"
# The different types of tunnels # The different types of tunnels
TUNNEL_NETWORK_TYPES = [TYPE_GRE, TYPE_VXLAN] TUNNEL_NETWORK_TYPES = [p_const.TYPE_GRE, p_const.TYPE_VXLAN]
# Various tables for tunneling flows # Various tables for tunneling flows
PATCH_LV_TO_TUN = 1 PATCH_LV_TO_TUN = 1
@ -47,7 +44,8 @@ LEARN_FROM_TUN = 10
UCAST_TO_TUN = 20 UCAST_TO_TUN = 20
FLOOD_TO_TUN = 21 FLOOD_TO_TUN = 21
# Map tunnel types to tables number # Map tunnel types to tables number
TUN_TABLE = {TYPE_GRE: GRE_TUN_TO_LV, TYPE_VXLAN: VXLAN_TUN_TO_LV} TUN_TABLE = {p_const.TYPE_GRE: GRE_TUN_TO_LV,
p_const.TYPE_VXLAN: VXLAN_TUN_TO_LV}
# The default respawn interval for the ovsdb monitor # The default respawn interval for the ovsdb monitor
DEFAULT_OVSDBMON_RESPAWN = 30 DEFAULT_OVSDBMON_RESPAWN = 30

38
neutron/plugins/openvswitch/ovs_neutron_plugin.py
View File

@ -300,11 +300,11 @@ class OVSNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
self._parse_network_vlan_ranges() self._parse_network_vlan_ranges()
ovs_db_v2.sync_vlan_allocations(self.network_vlan_ranges) ovs_db_v2.sync_vlan_allocations(self.network_vlan_ranges)
self.tenant_network_type = cfg.CONF.OVS.tenant_network_type self.tenant_network_type = cfg.CONF.OVS.tenant_network_type
if self.tenant_network_type not in [constants.TYPE_LOCAL, if self.tenant_network_type not in [svc_constants.TYPE_LOCAL,
constants.TYPE_VLAN, svc_constants.TYPE_VLAN,
constants.TYPE_GRE, svc_constants.TYPE_GRE,
constants.TYPE_VXLAN, svc_constants.TYPE_VXLAN,
constants.TYPE_NONE]: svc_constants.TYPE_NONE]:
LOG.error(_("Invalid tenant_network_type: %s. " LOG.error(_("Invalid tenant_network_type: %s. "
"Server terminated!"), "Server terminated!"),
self.tenant_network_type) self.tenant_network_type)
@ -312,7 +312,8 @@ class OVSNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
self.enable_tunneling = cfg.CONF.OVS.enable_tunneling self.enable_tunneling = cfg.CONF.OVS.enable_tunneling
self.tunnel_type = None self.tunnel_type = None
if self.enable_tunneling: if self.enable_tunneling:
self.tunnel_type = cfg.CONF.OVS.tunnel_type or constants.TYPE_GRE self.tunnel_type = (cfg.CONF.OVS.tunnel_type or
svc_constants.TYPE_GRE)
elif cfg.CONF.OVS.tunnel_type: elif cfg.CONF.OVS.tunnel_type:
self.tunnel_type = cfg.CONF.OVS.tunnel_type self.tunnel_type = cfg.CONF.OVS.tunnel_type
self.enable_tunneling = True self.enable_tunneling = True
@ -380,13 +381,13 @@ class OVSNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
if binding.network_type in constants.TUNNEL_NETWORK_TYPES: if binding.network_type in constants.TUNNEL_NETWORK_TYPES:
network[provider.PHYSICAL_NETWORK] = None network[provider.PHYSICAL_NETWORK] = None
network[provider.SEGMENTATION_ID] = binding.segmentation_id network[provider.SEGMENTATION_ID] = binding.segmentation_id
elif binding.network_type == constants.TYPE_FLAT: elif binding.network_type == svc_constants.TYPE_FLAT:
network[provider.PHYSICAL_NETWORK] = binding.physical_network network[provider.PHYSICAL_NETWORK] = binding.physical_network
network[provider.SEGMENTATION_ID] = None network[provider.SEGMENTATION_ID] = None
elif binding.network_type == constants.TYPE_VLAN: elif binding.network_type == svc_constants.TYPE_VLAN:
network[provider.PHYSICAL_NETWORK] = binding.physical_network network[provider.PHYSICAL_NETWORK] = binding.physical_network
network[provider.SEGMENTATION_ID] = binding.segmentation_id network[provider.SEGMENTATION_ID] = binding.segmentation_id
elif binding.network_type == constants.TYPE_LOCAL: elif binding.network_type == svc_constants.TYPE_LOCAL:
network[provider.PHYSICAL_NETWORK] = None network[provider.PHYSICAL_NETWORK] = None
network[provider.SEGMENTATION_ID] = None network[provider.SEGMENTATION_ID] = None
@ -406,13 +407,13 @@ class OVSNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
if not network_type_set: if not network_type_set:
msg = _("provider:network_type required") msg = _("provider:network_type required")
raise q_exc.InvalidInput(error_message=msg) raise q_exc.InvalidInput(error_message=msg)
elif network_type == constants.TYPE_FLAT: elif network_type == svc_constants.TYPE_FLAT:
if segmentation_id_set: if segmentation_id_set:
msg = _("provider:segmentation_id specified for flat network") msg = _("provider:segmentation_id specified for flat network")
raise q_exc.InvalidInput(error_message=msg) raise q_exc.InvalidInput(error_message=msg)
else: else:
segmentation_id = constants.FLAT_VLAN_ID segmentation_id = constants.FLAT_VLAN_ID
elif network_type == constants.TYPE_VLAN: elif network_type == svc_constants.TYPE_VLAN:
if not segmentation_id_set: if not segmentation_id_set:
msg = _("provider:segmentation_id required") msg = _("provider:segmentation_id required")
raise q_exc.InvalidInput(error_message=msg) raise q_exc.InvalidInput(error_message=msg)
@ -435,7 +436,7 @@ class OVSNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
if not segmentation_id_set: if not segmentation_id_set:
msg = _("provider:segmentation_id required") msg = _("provider:segmentation_id required")
raise q_exc.InvalidInput(error_message=msg) raise q_exc.InvalidInput(error_message=msg)
elif network_type == constants.TYPE_LOCAL: elif network_type == svc_constants.TYPE_LOCAL:
if physical_network_set: if physical_network_set:
msg = _("provider:physical_network specified for local " msg = _("provider:physical_network specified for local "
"network") "network")
@ -452,7 +453,7 @@ class OVSNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
msg = _("provider:network_type %s not supported") % network_type msg = _("provider:network_type %s not supported") % network_type
raise q_exc.InvalidInput(error_message=msg) raise q_exc.InvalidInput(error_message=msg)
if network_type in [constants.TYPE_VLAN, constants.TYPE_FLAT]: if network_type in [svc_constants.TYPE_VLAN, svc_constants.TYPE_FLAT]:
if physical_network_set: if physical_network_set:
if physical_network not in self.network_vlan_ranges: if physical_network not in self.network_vlan_ranges:
msg = _("Unknown provider:physical_network " msg = _("Unknown provider:physical_network "
@ -481,9 +482,9 @@ class OVSNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
if not network_type: if not network_type:
# tenant network # tenant network
network_type = self.tenant_network_type network_type = self.tenant_network_type
if network_type == constants.TYPE_NONE: if network_type == svc_constants.TYPE_NONE:
raise q_exc.TenantNetworksDisabled() raise q_exc.TenantNetworksDisabled()
elif network_type == constants.TYPE_VLAN: elif network_type == svc_constants.TYPE_VLAN:
(physical_network, (physical_network,
segmentation_id) = ovs_db_v2.reserve_vlan(session) segmentation_id) = ovs_db_v2.reserve_vlan(session)
elif network_type in constants.TUNNEL_NETWORK_TYPES: elif network_type in constants.TUNNEL_NETWORK_TYPES:
@ -491,7 +492,8 @@ class OVSNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
# no reservation needed for TYPE_LOCAL # no reservation needed for TYPE_LOCAL
else: else:
# provider network # provider network
if network_type in [constants.TYPE_VLAN, constants.TYPE_FLAT]: if network_type in [svc_constants.TYPE_VLAN,
svc_constants.TYPE_FLAT]:
ovs_db_v2.reserve_specific_vlan(session, physical_network, ovs_db_v2.reserve_specific_vlan(session, physical_network,
segmentation_id) segmentation_id)
elif network_type in constants.TUNNEL_NETWORK_TYPES: elif network_type in constants.TUNNEL_NETWORK_TYPES:
@ -527,8 +529,8 @@ class OVSNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
if binding.network_type in constants.TUNNEL_NETWORK_TYPES: if binding.network_type in constants.TUNNEL_NETWORK_TYPES:
ovs_db_v2.release_tunnel(session, binding.segmentation_id, ovs_db_v2.release_tunnel(session, binding.segmentation_id,
self.tunnel_id_ranges) self.tunnel_id_ranges)
elif binding.network_type in [constants.TYPE_VLAN, elif binding.network_type in [svc_constants.TYPE_VLAN,
constants.TYPE_FLAT]: svc_constants.TYPE_FLAT]:
ovs_db_v2.release_vlan(session, binding.physical_network, ovs_db_v2.release_vlan(session, binding.physical_network,
binding.segmentation_id, binding.segmentation_id,
self.network_vlan_ranges) self.network_vlan_ranges)

49
neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
View File

@ -25,6 +25,7 @@ from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils from neutron.agent.linux import utils
from neutron.common import constants from neutron.common import constants
from neutron.openstack.common.rpc import common as rpc_common from neutron.openstack.common.rpc import common as rpc_common
from neutron.plugins.common import constants as p_const
from neutron.plugins.linuxbridge.agent import linuxbridge_neutron_agent from neutron.plugins.linuxbridge.agent import linuxbridge_neutron_agent
from neutron.plugins.linuxbridge.common import constants as lconst from neutron.plugins.linuxbridge.common import constants as lconst
from neutron.tests import base from neutron.tests import base
@ -55,7 +56,7 @@ class TestLinuxBridge(base.BaseTestCase):
def test_ensure_physical_in_bridge_invalid(self): def test_ensure_physical_in_bridge_invalid(self):
result = self.linux_bridge.ensure_physical_in_bridge('network_id', result = self.linux_bridge.ensure_physical_in_bridge('network_id',
lconst.TYPE_VLAN, p_const.TYPE_VLAN,
'physnetx', 'physnetx',
7) 7)
self.assertFalse(result) self.assertFalse(result)
@ -64,14 +65,14 @@ class TestLinuxBridge(base.BaseTestCase):
with mock.patch.object(self.linux_bridge, with mock.patch.object(self.linux_bridge,
'ensure_flat_bridge') as flat_bridge_func: 'ensure_flat_bridge') as flat_bridge_func:
self.linux_bridge.ensure_physical_in_bridge( self.linux_bridge.ensure_physical_in_bridge(
'network_id', lconst.TYPE_FLAT, 'physnet1', None) 'network_id', p_const.TYPE_FLAT, 'physnet1', None)
self.assertTrue(flat_bridge_func.called) self.assertTrue(flat_bridge_func.called)
def test_ensure_physical_in_bridge_vlan(self): def test_ensure_physical_in_bridge_vlan(self):
with mock.patch.object(self.linux_bridge, with mock.patch.object(self.linux_bridge,
'ensure_vlan_bridge') as vlan_bridge_func: 'ensure_vlan_bridge') as vlan_bridge_func:
self.linux_bridge.ensure_physical_in_bridge( self.linux_bridge.ensure_physical_in_bridge(
'network_id', lconst.TYPE_VLAN, 'physnet1', 7) 'network_id', p_const.TYPE_VLAN, 'physnet1', 7)
self.assertTrue(vlan_bridge_func.called) self.assertTrue(vlan_bridge_func.called)
def test_ensure_physical_in_bridge_vxlan(self): def test_ensure_physical_in_bridge_vxlan(self):
@ -433,18 +434,18 @@ class TestLinuxBridgeManager(base.BaseTestCase):
def test_ensure_physical_in_bridge(self): def test_ensure_physical_in_bridge(self):
self.assertFalse( self.assertFalse(
self.lbm.ensure_physical_in_bridge("123", lconst.TYPE_VLAN, self.lbm.ensure_physical_in_bridge("123", p_const.TYPE_VLAN,
"phys", "1") "phys", "1")
) )
with mock.patch.object(self.lbm, "ensure_flat_bridge") as flbr_fn: with mock.patch.object(self.lbm, "ensure_flat_bridge") as flbr_fn:
self.assertTrue( self.assertTrue(
self.lbm.ensure_physical_in_bridge("123", lconst.TYPE_FLAT, self.lbm.ensure_physical_in_bridge("123", p_const.TYPE_FLAT,
"physnet1", None) "physnet1", None)
) )
self.assertTrue(flbr_fn.called) self.assertTrue(flbr_fn.called)
with mock.patch.object(self.lbm, "ensure_vlan_bridge") as vlbr_fn: with mock.patch.object(self.lbm, "ensure_vlan_bridge") as vlbr_fn:
self.assertTrue( self.assertTrue(
self.lbm.ensure_physical_in_bridge("123", lconst.TYPE_VLAN, self.lbm.ensure_physical_in_bridge("123", p_const.TYPE_VLAN,
"physnet1", "1") "physnet1", "1")
) )
self.assertTrue(vlbr_fn.called) self.assertTrue(vlbr_fn.called)
@ -452,7 +453,7 @@ class TestLinuxBridgeManager(base.BaseTestCase):
with mock.patch.object(self.lbm, "ensure_vxlan_bridge") as vlbr_fn: with mock.patch.object(self.lbm, "ensure_vxlan_bridge") as vlbr_fn:
self.lbm.vxlan_mode = lconst.VXLAN_MCAST self.lbm.vxlan_mode = lconst.VXLAN_MCAST
self.assertTrue( self.assertTrue(
self.lbm.ensure_physical_in_bridge("123", lconst.TYPE_VXLAN, self.lbm.ensure_physical_in_bridge("123", p_const.TYPE_VXLAN,
"physnet1", "1") "physnet1", "1")
) )
self.assertTrue(vlbr_fn.called) self.assertTrue(vlbr_fn.called)
@ -461,7 +462,7 @@ class TestLinuxBridgeManager(base.BaseTestCase):
with mock.patch.object(self.lbm, "device_exists") as de_fn: with mock.patch.object(self.lbm, "device_exists") as de_fn:
de_fn.return_value = False de_fn.return_value = False
self.assertFalse( self.assertFalse(
self.lbm.add_tap_interface("123", lconst.TYPE_VLAN, self.lbm.add_tap_interface("123", p_const.TYPE_VLAN,
"physnet1", "1", "tap1") "physnet1", "1", "tap1")
) )
@ -474,7 +475,7 @@ class TestLinuxBridgeManager(base.BaseTestCase):
exec_fn.return_value = False exec_fn.return_value = False
get_br.return_value = True get_br.return_value = True
self.assertTrue(self.lbm.add_tap_interface("123", self.assertTrue(self.lbm.add_tap_interface("123",
lconst.TYPE_LOCAL, p_const.TYPE_LOCAL,
"physnet1", None, "physnet1", None,
"tap1")) "tap1"))
en_fn.assert_called_with("123") en_fn.assert_called_with("123")
@ -482,7 +483,7 @@ class TestLinuxBridgeManager(base.BaseTestCase):
get_br.return_value = False get_br.return_value = False
exec_fn.return_value = True exec_fn.return_value = True
self.assertFalse(self.lbm.add_tap_interface("123", self.assertFalse(self.lbm.add_tap_interface("123",
lconst.TYPE_LOCAL, p_const.TYPE_LOCAL,
"physnet1", None, "physnet1", None,
"tap1")) "tap1"))
@ -490,15 +491,15 @@ class TestLinuxBridgeManager(base.BaseTestCase):
"ensure_physical_in_bridge") as ens_fn: "ensure_physical_in_bridge") as ens_fn:
ens_fn.return_value = False ens_fn.return_value = False
self.assertFalse(self.lbm.add_tap_interface("123", self.assertFalse(self.lbm.add_tap_interface("123",
lconst.TYPE_VLAN, p_const.TYPE_VLAN,
"physnet1", "1", "physnet1", "1",
"tap1")) "tap1"))
def test_add_interface(self): def test_add_interface(self):
with mock.patch.object(self.lbm, "add_tap_interface") as add_tap: with mock.patch.object(self.lbm, "add_tap_interface") as add_tap:
self.lbm.add_interface("123", lconst.TYPE_VLAN, "physnet-1", self.lbm.add_interface("123", p_const.TYPE_VLAN, "physnet-1",
"1", "234") "1", "234")
add_tap.assert_called_with("123", lconst.TYPE_VLAN, "physnet-1", add_tap.assert_called_with("123", p_const.TYPE_VLAN, "physnet-1",
"1", "tap234") "1", "tap234")
def test_delete_vlan_bridge(self): def test_delete_vlan_bridge(self):
@ -729,50 +730,50 @@ class TestLinuxBridgeRpcCallbacks(base.BaseTestCase):
self.lb_rpc.port_update("unused_context", port=port, self.lb_rpc.port_update("unused_context", port=port,
vlan_id="1", physical_network="physnet1") vlan_id="1", physical_network="physnet1")
self.assertFalse(reffw_fn.called) self.assertFalse(reffw_fn.called)
addif_fn.assert_called_with(port["network_id"], lconst.TYPE_VLAN, addif_fn.assert_called_with(port["network_id"], p_const.TYPE_VLAN,
"physnet1", "1", port["id"]) "physnet1", "1", port["id"])
self.lb_rpc.port_update("unused_context", port=port, self.lb_rpc.port_update("unused_context", port=port,
network_type=lconst.TYPE_VLAN, network_type=p_const.TYPE_VLAN,
segmentation_id="2", segmentation_id="2",
physical_network="physnet1") physical_network="physnet1")
self.assertFalse(reffw_fn.called) self.assertFalse(reffw_fn.called)
addif_fn.assert_called_with(port["network_id"], lconst.TYPE_VLAN, addif_fn.assert_called_with(port["network_id"], p_const.TYPE_VLAN,
"physnet1", "2", port["id"]) "physnet1", "2", port["id"])
self.lb_rpc.port_update("unused_context", port=port, self.lb_rpc.port_update("unused_context", port=port,
vlan_id=lconst.FLAT_VLAN_ID, vlan_id=lconst.FLAT_VLAN_ID,
physical_network="physnet1") physical_network="physnet1")
self.assertFalse(reffw_fn.called) self.assertFalse(reffw_fn.called)
addif_fn.assert_called_with(port["network_id"], lconst.TYPE_FLAT, addif_fn.assert_called_with(port["network_id"], p_const.TYPE_FLAT,
"physnet1", None, port["id"]) "physnet1", None, port["id"])
self.lb_rpc.port_update("unused_context", port=port, self.lb_rpc.port_update("unused_context", port=port,
network_type=lconst.TYPE_FLAT, network_type=p_const.TYPE_FLAT,
segmentation_id=None, segmentation_id=None,
physical_network="physnet1") physical_network="physnet1")
self.assertFalse(reffw_fn.called) self.assertFalse(reffw_fn.called)
addif_fn.assert_called_with(port["network_id"], lconst.TYPE_FLAT, addif_fn.assert_called_with(port["network_id"], p_const.TYPE_FLAT,
"physnet1", None, port["id"]) "physnet1", None, port["id"])
self.lb_rpc.port_update("unused_context", port=port, self.lb_rpc.port_update("unused_context", port=port,
vlan_id=lconst.LOCAL_VLAN_ID, vlan_id=lconst.LOCAL_VLAN_ID,
physical_network=None) physical_network=None)
self.assertFalse(reffw_fn.called) self.assertFalse(reffw_fn.called)
addif_fn.assert_called_with(port["network_id"], lconst.TYPE_LOCAL, addif_fn.assert_called_with(port["network_id"], p_const.TYPE_LOCAL,
None, None, port["id"]) None, None, port["id"])
self.lb_rpc.port_update("unused_context", port=port, self.lb_rpc.port_update("unused_context", port=port,
network_type=lconst.TYPE_LOCAL, network_type=p_const.TYPE_LOCAL,
segmentation_id=None, segmentation_id=None,
physical_network=None) physical_network=None)
self.assertFalse(reffw_fn.called) self.assertFalse(reffw_fn.called)
addif_fn.assert_called_with(port["network_id"], lconst.TYPE_LOCAL, addif_fn.assert_called_with(port["network_id"], p_const.TYPE_LOCAL,
None, None, port["id"]) None, None, port["id"])
addif_fn.return_value = True addif_fn.return_value = True
self.lb_rpc.port_update("unused_context", port=port, self.lb_rpc.port_update("unused_context", port=port,
network_type=lconst.TYPE_LOCAL, network_type=p_const.TYPE_LOCAL,
segmentation_id=None, segmentation_id=None,
physical_network=None) physical_network=None)
rpc_obj.update_device_up.assert_called_with( rpc_obj.update_device_up.assert_called_with(
@ -784,7 +785,7 @@ class TestLinuxBridgeRpcCallbacks(base.BaseTestCase):
addif_fn.return_value = False addif_fn.return_value = False
self.lb_rpc.port_update("unused_context", port=port, self.lb_rpc.port_update("unused_context", port=port,
network_type=lconst.TYPE_LOCAL, network_type=p_const.TYPE_LOCAL,
segmentation_id=None, segmentation_id=None,
physical_network=None) physical_network=None)
rpc_obj.update_device_down.assert_called_with( rpc_obj.update_device_down.assert_called_with(

3
neutron/tests/unit/ml2/test_type_vxlan.py
View File

@ -20,6 +20,7 @@ from testtools import matchers
from neutron.common import exceptions as exc from neutron.common import exceptions as exc
from neutron.db import api as db from neutron.db import api as db
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2 import db as ml2_db from neutron.plugins.ml2 import db as ml2_db
from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers import type_vxlan from neutron.plugins.ml2.drivers import type_vxlan
@ -54,7 +55,7 @@ class VxlanTypeTest(base.BaseTestCase):
self.addCleanup(db.clear_db) self.addCleanup(db.clear_db)
def test_vxlan_tunnel_type(self): def test_vxlan_tunnel_type(self):
self.assertEqual(self.driver.get_type(), type_vxlan.TYPE_VXLAN) self.assertEqual(self.driver.get_type(), p_const.TYPE_VXLAN)
def test_validate_provider_segment(self): def test_validate_provider_segment(self):
segment = {api.NETWORK_TYPE: 'vxlan', segment = {api.NETWORK_TYPE: 'vxlan',

25
neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
View File

@ -26,6 +26,7 @@ from neutron.agent.linux import ovs_lib
from neutron.agent.linux import utils from neutron.agent.linux import utils
from neutron.common import constants as n_const from neutron.common import constants as n_const
from neutron.openstack.common.rpc import common as rpc_common from neutron.openstack.common.rpc import common as rpc_common
from neutron.plugins.common import constants as p_const
from neutron.plugins.openvswitch.agent import ovs_neutron_agent from neutron.plugins.openvswitch.agent import ovs_neutron_agent
from neutron.plugins.openvswitch.common import constants from neutron.plugins.openvswitch.common import constants
from neutron.tests import base from neutron.tests import base
@ -44,11 +45,11 @@ class CreateAgentConfigMap(base.BaseTestCase):
self.addCleanup(cfg.CONF.reset) self.addCleanup(cfg.CONF.reset)
# An ip address is required for tunneling but there is no default, # An ip address is required for tunneling but there is no default,
# verify this for both gre and vxlan tunnels. # verify this for both gre and vxlan tunnels.
cfg.CONF.set_override('tunnel_types', [constants.TYPE_GRE], cfg.CONF.set_override('tunnel_types', [p_const.TYPE_GRE],
group='AGENT') group='AGENT')
with testtools.ExpectedException(ValueError): with testtools.ExpectedException(ValueError):
ovs_neutron_agent.create_agent_config_map(cfg.CONF) ovs_neutron_agent.create_agent_config_map(cfg.CONF)
cfg.CONF.set_override('tunnel_types', [constants.TYPE_VXLAN], cfg.CONF.set_override('tunnel_types', [p_const.TYPE_VXLAN],
group='AGENT') group='AGENT')
with testtools.ExpectedException(ValueError): with testtools.ExpectedException(ValueError):
ovs_neutron_agent.create_agent_config_map(cfg.CONF) ovs_neutron_agent.create_agent_config_map(cfg.CONF)
@ -60,7 +61,7 @@ class CreateAgentConfigMap(base.BaseTestCase):
cfg.CONF.set_override('enable_tunneling', True, group='OVS') cfg.CONF.set_override('enable_tunneling', True, group='OVS')
cfg.CONF.set_override('local_ip', '10.10.10.10', group='OVS') cfg.CONF.set_override('local_ip', '10.10.10.10', group='OVS')
cfgmap = ovs_neutron_agent.create_agent_config_map(cfg.CONF) cfgmap = ovs_neutron_agent.create_agent_config_map(cfg.CONF)
self.assertEqual(cfgmap['tunnel_types'], [constants.TYPE_GRE]) self.assertEqual(cfgmap['tunnel_types'], [p_const.TYPE_GRE])
def test_create_agent_config_map_fails_no_local_ip(self): def test_create_agent_config_map_fails_no_local_ip(self):
self.addCleanup(cfg.CONF.reset) self.addCleanup(cfg.CONF.reset)
@ -78,11 +79,11 @@ class CreateAgentConfigMap(base.BaseTestCase):
def test_create_agent_config_map_multiple_tunnel_types(self): def test_create_agent_config_map_multiple_tunnel_types(self):
self.addCleanup(cfg.CONF.reset) self.addCleanup(cfg.CONF.reset)
cfg.CONF.set_override('local_ip', '10.10.10.10', group='OVS') cfg.CONF.set_override('local_ip', '10.10.10.10', group='OVS')
cfg.CONF.set_override('tunnel_types', [constants.TYPE_GRE, cfg.CONF.set_override('tunnel_types', [p_const.TYPE_GRE,
constants.TYPE_VXLAN], group='AGENT') p_const.TYPE_VXLAN], group='AGENT')
cfgmap = ovs_neutron_agent.create_agent_config_map(cfg.CONF) cfgmap = ovs_neutron_agent.create_agent_config_map(cfg.CONF)
self.assertEqual(cfgmap['tunnel_types'], self.assertEqual(cfgmap['tunnel_types'],
[constants.TYPE_GRE, constants.TYPE_VXLAN]) [p_const.TYPE_GRE, p_const.TYPE_VXLAN])
class TestOvsNeutronAgent(base.BaseTestCase): class TestOvsNeutronAgent(base.BaseTestCase):
@ -599,13 +600,13 @@ class TestOvsNeutronAgent(base.BaseTestCase):
mock.patch.object(ovs_neutron_agent.LOG, 'error') mock.patch.object(ovs_neutron_agent.LOG, 'error')
) as (add_tunnel_port_fn, log_error_fn): ) as (add_tunnel_port_fn, log_error_fn):
ofport = self.agent.setup_tunnel_port( ofport = self.agent.setup_tunnel_port(
'gre-1', 'remote_ip', constants.TYPE_GRE) 'gre-1', 'remote_ip', p_const.TYPE_GRE)
add_tunnel_port_fn.assert_called_once_with( add_tunnel_port_fn.assert_called_once_with(
'gre-1', 'remote_ip', self.agent.local_ip, constants.TYPE_GRE, 'gre-1', 'remote_ip', self.agent.local_ip, p_const.TYPE_GRE,
self.agent.vxlan_udp_port) self.agent.vxlan_udp_port)
log_error_fn.assert_called_once_with( log_error_fn.assert_called_once_with(
_("Failed to set-up %(type)s tunnel port to %(ip)s"), _("Failed to set-up %(type)s tunnel port to %(ip)s"),
{'type': constants.TYPE_GRE, 'ip': 'remote_ip'}) {'type': p_const.TYPE_GRE, 'ip': 'remote_ip'})
self.assertEqual(ofport, 0) self.assertEqual(ofport, 0)
def test_setup_tunnel_port_error_not_int(self): def test_setup_tunnel_port_error_not_int(self):
@ -616,16 +617,16 @@ class TestOvsNeutronAgent(base.BaseTestCase):
mock.patch.object(ovs_neutron_agent.LOG, 'error') mock.patch.object(ovs_neutron_agent.LOG, 'error')
) as (add_tunnel_port_fn, log_exc_fn, log_error_fn): ) as (add_tunnel_port_fn, log_exc_fn, log_error_fn):
ofport = self.agent.setup_tunnel_port( ofport = self.agent.setup_tunnel_port(
'gre-1', 'remote_ip', constants.TYPE_GRE) 'gre-1', 'remote_ip', p_const.TYPE_GRE)
add_tunnel_port_fn.assert_called_once_with( add_tunnel_port_fn.assert_called_once_with(
'gre-1', 'remote_ip', self.agent.local_ip, constants.TYPE_GRE, 'gre-1', 'remote_ip', self.agent.local_ip, p_const.TYPE_GRE,
self.agent.vxlan_udp_port) self.agent.vxlan_udp_port)
log_exc_fn.assert_called_once_with( log_exc_fn.assert_called_once_with(
_("ofport should have a value that can be " _("ofport should have a value that can be "
"interpreted as an integer")) "interpreted as an integer"))
log_error_fn.assert_called_once_with( log_error_fn.assert_called_once_with(
_("Failed to set-up %(type)s tunnel port to %(ip)s"), _("Failed to set-up %(type)s tunnel port to %(ip)s"),
{'type': constants.TYPE_GRE, 'ip': 'remote_ip'}) {'type': p_const.TYPE_GRE, 'ip': 'remote_ip'})
self.assertEqual(ofport, 0) self.assertEqual(ofport, 0)

17
neutron/tests/unit/openvswitch/test_ovs_tunnel.py
View File

@ -24,6 +24,7 @@ from oslo.config import cfg
from neutron.agent.linux import ip_lib from neutron.agent.linux import ip_lib
from neutron.agent.linux import ovs_lib from neutron.agent.linux import ovs_lib
from neutron.openstack.common import log from neutron.openstack.common import log
from neutron.plugins.common import constants as p_const
from neutron.plugins.openvswitch.agent import ovs_neutron_agent from neutron.plugins.openvswitch.agent import ovs_neutron_agent
from neutron.plugins.openvswitch.common import constants from neutron.plugins.openvswitch.common import constants
from neutron.tests import base from neutron.tests import base
@ -46,7 +47,7 @@ LVM_FLAT = ovs_neutron_agent.LocalVLANMapping(
LVM_VLAN = ovs_neutron_agent.LocalVLANMapping( LVM_VLAN = ovs_neutron_agent.LocalVLANMapping(
LV_ID, 'vlan', 'net1', LS_ID, VIF_PORTS) LV_ID, 'vlan', 'net1', LS_ID, VIF_PORTS)
TUN_OFPORTS = {constants.TYPE_GRE: {'ip1': '11', 'ip2': '12'}} TUN_OFPORTS = {p_const.TYPE_GRE: {'ip1': '11', 'ip2': '12'}}
BCAST_MAC = "01:00:00:00:00:00/01:00:00:00:00:00" BCAST_MAC = "01:00:00:00:00:00/01:00:00:00:00:00"
UCAST_MAC = "00:00:00:00:00:00/01:00:00:00:00:00" UCAST_MAC = "00:00:00:00:00:00/01:00:00:00:00:00"
@ -261,7 +262,7 @@ class TunnelTest(base.BaseTestCase):
self._verify_mock_calls() self._verify_mock_calls()
def test_provision_local_vlan(self): def test_provision_local_vlan(self):
ofports = ','.join(TUN_OFPORTS[constants.TYPE_GRE].values()) ofports = ','.join(TUN_OFPORTS[p_const.TYPE_GRE].values())
self.mock_tun_bridge_expected += [ self.mock_tun_bridge_expected += [
mock.call.mod_flow(table=constants.FLOOD_TO_TUN, mock.call.mod_flow(table=constants.FLOOD_TO_TUN,
priority=1, priority=1,
@ -283,7 +284,7 @@ class TunnelTest(base.BaseTestCase):
self.VETH_MTU) self.VETH_MTU)
a.available_local_vlans = set([LV_ID]) a.available_local_vlans = set([LV_ID])
a.tun_br_ofports = TUN_OFPORTS a.tun_br_ofports = TUN_OFPORTS
a.provision_local_vlan(NET_UUID, constants.TYPE_GRE, None, LS_ID) a.provision_local_vlan(NET_UUID, p_const.TYPE_GRE, None, LS_ID)
self._verify_mock_calls() self._verify_mock_calls()
def test_provision_local_vlan_flat(self): def test_provision_local_vlan_flat(self):
@ -306,7 +307,7 @@ class TunnelTest(base.BaseTestCase):
a.phys_brs['net1'] = self.mock_map_tun_bridge a.phys_brs['net1'] = self.mock_map_tun_bridge
a.phys_ofports['net1'] = self.MAP_TUN_OFPORT a.phys_ofports['net1'] = self.MAP_TUN_OFPORT
a.int_ofports['net1'] = self.INT_OFPORT a.int_ofports['net1'] = self.INT_OFPORT
a.provision_local_vlan(NET_UUID, constants.TYPE_FLAT, 'net1', LS_ID) a.provision_local_vlan(NET_UUID, p_const.TYPE_FLAT, 'net1', LS_ID)
self._verify_mock_calls() self._verify_mock_calls()
def test_provision_local_vlan_flat_fail(self): def test_provision_local_vlan_flat_fail(self):
@ -315,7 +316,7 @@ class TunnelTest(base.BaseTestCase):
'10.0.0.1', self.NET_MAPPING, '10.0.0.1', self.NET_MAPPING,
'sudo', 2, ['gre'], 'sudo', 2, ['gre'],
self.VETH_MTU) self.VETH_MTU)
a.provision_local_vlan(NET_UUID, constants.TYPE_FLAT, 'net2', LS_ID) a.provision_local_vlan(NET_UUID, p_const.TYPE_FLAT, 'net2', LS_ID)
self._verify_mock_calls() self._verify_mock_calls()
def test_provision_local_vlan_vlan(self): def test_provision_local_vlan_vlan(self):
@ -338,7 +339,7 @@ class TunnelTest(base.BaseTestCase):
a.phys_brs['net1'] = self.mock_map_tun_bridge a.phys_brs['net1'] = self.mock_map_tun_bridge
a.phys_ofports['net1'] = self.MAP_TUN_OFPORT a.phys_ofports['net1'] = self.MAP_TUN_OFPORT
a.int_ofports['net1'] = self.INT_OFPORT a.int_ofports['net1'] = self.INT_OFPORT
a.provision_local_vlan(NET_UUID, constants.TYPE_VLAN, 'net1', LS_ID) a.provision_local_vlan(NET_UUID, p_const.TYPE_VLAN, 'net1', LS_ID)
self._verify_mock_calls() self._verify_mock_calls()
def test_provision_local_vlan_vlan_fail(self): def test_provision_local_vlan_vlan_fail(self):
@ -347,7 +348,7 @@ class TunnelTest(base.BaseTestCase):
'10.0.0.1', self.NET_MAPPING, '10.0.0.1', self.NET_MAPPING,
'sudo', 2, ['gre'], 'sudo', 2, ['gre'],
self.VETH_MTU) self.VETH_MTU)
a.provision_local_vlan(NET_UUID, constants.TYPE_VLAN, 'net2', LS_ID) a.provision_local_vlan(NET_UUID, p_const.TYPE_VLAN, 'net2', LS_ID)
self._verify_mock_calls() self._verify_mock_calls()
def test_reclaim_local_vlan(self): def test_reclaim_local_vlan(self):
@ -480,7 +481,7 @@ class TunnelTest(base.BaseTestCase):
self.VETH_MTU) self.VETH_MTU)
a.tunnel_update( a.tunnel_update(
mock.sentinel.ctx, tunnel_id='1', tunnel_ip='10.0.10.1', mock.sentinel.ctx, tunnel_id='1', tunnel_ip='10.0.10.1',
tunnel_type=constants.TYPE_GRE) tunnel_type=p_const.TYPE_GRE)
self._verify_mock_calls() self._verify_mock_calls()
def test_tunnel_update_self(self): def test_tunnel_update_self(self):