openstack
/
dragonflow
Code Issues Proposed changes

Merge "Rename OVS INTERFACE constants to PORT INTERFACE"

This commit is contained in:
Zuul 2018-07-25 09:40:58 +00:00 committed by Gerrit Code Review
parent c5fc7722ab 8114ddbf8a
commit 78dcc3c951
8 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dragonflow/common/constants.py
View File

@ -12,11 +12,11 @@
# limitations under the License. # limitations under the License.
from neutron_lib import constants as n_const from neutron_lib import constants as n_const
OVS_COMPUTE_INTERFACE = "compute" SWITCH_COMPUTE_INTERFACE = "compute"
OVS_BRIDGE_INTERFACE = "bridge" SWITCH_BRIDGE_INTERFACE = "bridge"
OVS_PATCH_INTERFACE = "patch" SWITCH_PATCH_INTERFACE = "patch"
OVS_TUNNEL_INTERFACE = "tunnel" SWITCH_TUNNEL_INTERFACE = "tunnel"
OVS_UNKNOWN_INTERFACE = "unknown" SWITCH_UNKNOWN_INTERFACE = "unknown"
DHCP_SIADDR = "siaddr" DHCP_SIADDR = "siaddr"

22
dragonflow/controller/topology.py
View File

@ -30,8 +30,8 @@ LOG = log.getLogger(__name__)
OvsLportMapping = collections.namedtuple('OvsLportMapping', OvsLportMapping = collections.namedtuple('OvsLportMapping',
('lport_id', 'topic')) ('lport_id', 'topic'))
_OVS_PORT_TYPES = (constants.OVS_COMPUTE_INTERFACE, _SWITCH_PORT_TYPES = (constants.SWITCH_COMPUTE_INTERFACE,
constants.OVS_TUNNEL_INTERFACE) constants.SWITCH_TUNNEL_INTERFACE)
class Topology(object): class Topology(object):
@ -65,7 +65,7 @@ class Topology(object):
""" """
LOG.info("Ovs port updated: %s", ovs_port) LOG.info("Ovs port updated: %s", ovs_port)
if ovs_port.type not in _OVS_PORT_TYPES: if ovs_port.type not in _SWITCH_PORT_TYPES:
LOG.info("Unmanaged port online: %s", ovs_port) LOG.info("Unmanaged port online: %s", ovs_port)
return return
@ -80,18 +80,18 @@ class Topology(object):
def _handle_ovs_port_added(self, ovs_port): def _handle_ovs_port_added(self, ovs_port):
port_type = ovs_port.type port_type = ovs_port.type
if port_type == constants.OVS_COMPUTE_INTERFACE: if port_type == constants.SWITCH_COMPUTE_INTERFACE:
self._compute_port_added(ovs_port) self._compute_port_added(ovs_port)
elif port_type == constants.OVS_TUNNEL_INTERFACE: elif port_type == constants.SWITCH_TUNNEL_INTERFACE:
self._tunnel_port_added(ovs_port) self._tunnel_port_added(ovs_port)
else: else:
LOG.warning('Invalid port type on %r', ovs_port) LOG.warning('Invalid port type on %r', ovs_port)
def _handle_ovs_port_updated(self, ovs_port): def _handle_ovs_port_updated(self, ovs_port):
port_type = ovs_port.type port_type = ovs_port.type
if port_type == constants.OVS_COMPUTE_INTERFACE: if port_type == constants.SWITCH_COMPUTE_INTERFACE:
self._compute_port_updated(ovs_port) self._compute_port_updated(ovs_port)
elif port_type == constants.OVS_TUNNEL_INTERFACE: elif port_type == constants.SWITCH_TUNNEL_INTERFACE:
self._tunnel_port_updated(ovs_port) self._tunnel_port_updated(ovs_port)
else: else:
LOG.warning('Invalid port type on %r', ovs_port) LOG.warning('Invalid port type on %r', ovs_port)
@ -105,7 +105,7 @@ class Topology(object):
@param ovs_port: @param ovs_port:
@return : None @return : None
""" """
if ovs_port.type not in _OVS_PORT_TYPES: if ovs_port.type not in _SWITCH_PORT_TYPES:
LOG.info("Unmanaged port offline: %s", ovs_port) LOG.info("Unmanaged port offline: %s", ovs_port)
return return
@ -117,9 +117,9 @@ class Topology(object):
def _handle_ovs_port_deleted(self, ovs_port): def _handle_ovs_port_deleted(self, ovs_port):
port_type = ovs_port.type port_type = ovs_port.type
if port_type == constants.OVS_COMPUTE_INTERFACE: if port_type == constants.SWITCH_COMPUTE_INTERFACE:
self._compute_port_deleted(ovs_port) self._compute_port_deleted(ovs_port)
elif port_type == constants.OVS_TUNNEL_INTERFACE: elif port_type == constants.SWITCH_TUNNEL_INTERFACE:
self._tunnel_port_deleted(ovs_port) self._tunnel_port_deleted(ovs_port)
else: else:
LOG.warning('Invalid port type on %r', ovs_port) LOG.warning('Invalid port type on %r', ovs_port)
@ -291,7 +291,7 @@ class Topology(object):
delete_ovs_to_lport_mapping = self.ovs_to_lport_mapping delete_ovs_to_lport_mapping = self.ovs_to_lport_mapping
for ovs_port in self.db_store.get_all(ovs.OvsPort): for ovs_port in self.db_store.get_all(ovs.OvsPort):
key = ovs_port.id key = ovs_port.id
if ovs_port.type == constants.OVS_COMPUTE_INTERFACE: if ovs_port.type == constants.SWITCH_COMPUTE_INTERFACE:
lport = self._get_lport(ovs_port) lport = self._get_lport(ovs_port)
if lport is None: if lport is None:
LOG.warning("No logical port found for ovs port: %s", LOG.warning("No logical port found for ovs port: %s",

24
dragonflow/db/models/ovs.py
View File

@ -23,19 +23,19 @@ def _get_interface_type(row):
interface_name = row.name interface_name = row.name
if interface_type == "internal" and "br" in interface_name: if interface_type == "internal" and "br" in interface_name:
return constants.OVS_BRIDGE_INTERFACE return constants.SWITCH_BRIDGE_INTERFACE
if interface_type == "patch": if interface_type == "patch":
return constants.OVS_PATCH_INTERFACE return constants.SWITCH_PATCH_INTERFACE
if 'iface-id' in row.external_ids: if 'iface-id' in row.external_ids:
return constants.OVS_COMPUTE_INTERFACE return constants.SWITCH_COMPUTE_INTERFACE
options = row.options options = row.options
if 'remote_ip' in options: if 'remote_ip' in options:
return constants.OVS_TUNNEL_INTERFACE return constants.SWITCH_TUNNEL_INTERFACE
return constants.OVS_UNKNOWN_INTERFACE return constants.SWITCH_UNKNOWN_INTERFACE
@mf.register_model @mf.register_model
@ -48,11 +48,11 @@ class OvsPort(mf.ModelBase, mixins.BasicEvents, mixins.Name):
lport = df_fields.ReferenceField(l2.LogicalPort) lport = df_fields.ReferenceField(l2.LogicalPort)
type = df_fields.EnumField( type = df_fields.EnumField(
( (
constants.OVS_BRIDGE_INTERFACE, constants.SWITCH_BRIDGE_INTERFACE,
constants.OVS_PATCH_INTERFACE, constants.SWITCH_PATCH_INTERFACE,
constants.OVS_COMPUTE_INTERFACE, constants.SWITCH_COMPUTE_INTERFACE,
constants.OVS_TUNNEL_INTERFACE, constants.SWITCH_TUNNEL_INTERFACE,
constants.OVS_UNKNOWN_INTERFACE, constants.SWITCH_UNKNOWN_INTERFACE,
), ),
) )
peer = fields.StringField() peer = fields.StringField()
@ -76,10 +76,10 @@ class OvsPort(mf.ModelBase, mixins.BasicEvents, mixins.Name):
if row.admin_state: if row.admin_state:
res.admin_state = row.admin_state[0] res.admin_state = row.admin_state[0]
if res.type == constants.OVS_PATCH_INTERFACE: if res.type == constants.SWITCH_PATCH_INTERFACE:
res.peer = row.options['peer'] res.peer = row.options['peer']
if res.type == constants.OVS_TUNNEL_INTERFACE: if res.type == constants.SWITCH_TUNNEL_INTERFACE:
res.tunnel_type = row.type res.tunnel_type = row.type
external_ids = row.external_ids external_ids = row.external_ids

8
dragonflow/ovsdb/impl_idl.py
View File

@ -66,9 +66,9 @@ ovsdb_monitor_table_filter_default = {
} }
_HANDLED_INTERFACE_TYPES = ( _HANDLED_INTERFACE_TYPES = (
constants.OVS_COMPUTE_INTERFACE, constants.SWITCH_COMPUTE_INTERFACE,
constants.OVS_TUNNEL_INTERFACE, constants.SWITCH_TUNNEL_INTERFACE,
constants.OVS_BRIDGE_INTERFACE, constants.SWITCH_BRIDGE_INTERFACE,
) )
@ -82,7 +82,7 @@ def _is_ovsport_update_valid(action, ovsport):
if ovsport.name.startswith('qg'): if ovsport.name.startswith('qg'):
return False return False
if (ovsport.type == constants.OVS_COMPUTE_INTERFACE and if (ovsport.type == constants.SWITCH_COMPUTE_INTERFACE and
ovsport.lport is None): ovsport.lport is None):
return False return False

4
dragonflow/tests/fullstack/test_ovsdb_monitor.py
View File

@ -35,7 +35,7 @@ class TestOvsdbMonitor(test_base.DFTestBase):
_interface = ovs.OvsPort.from_json(update.value) _interface = ovs.OvsPort.from_json(update.value)
if str(_interface.attached_mac) != mac: if str(_interface.attached_mac) != mac:
return False return False
elif _interface.type != constants.OVS_COMPUTE_INTERFACE: elif _interface.type != constants.SWITCH_COMPUTE_INTERFACE:
return False return False
elif _interface.lport is None: elif _interface.lport is None:
return False return False
@ -56,7 +56,7 @@ class TestOvsdbMonitor(test_base.DFTestBase):
return False return False
elif str(_interface.attached_mac) != mac: elif str(_interface.attached_mac) != mac:
return False return False
elif _interface.type != constants.OVS_COMPUTE_INTERFACE: elif _interface.type != constants.SWITCH_COMPUTE_INTERFACE:
return False return False
elif _interface.lport is None: elif _interface.lport is None:
return False return False

4
dragonflow/tests/unit/test_app_base.py
View File

@ -295,7 +295,7 @@ fake_ovs_port1 = ovs.OvsPort(
ofport=2, ofport=2,
name='tap-fake_port1', name='tap-fake_port1',
admin_state='up', admin_state='up',
type=constants.OVS_COMPUTE_INTERFACE, type=constants.SWITCH_COMPUTE_INTERFACE,
lport='fake_port1', lport='fake_port1',
attached_mac='fa:16:3e:8c:2e:b3', attached_mac='fa:16:3e:8c:2e:b3',
) )
@ -313,7 +313,7 @@ fake_ovs_port2 = ovs.OvsPort(
ofport=3, ofport=3,
name='tap-fake_port2', name='tap-fake_port2',
admin_state='up', admin_state='up',
type=constants.OVS_COMPUTE_INTERFACE, type=constants.SWITCH_COMPUTE_INTERFACE,
lport='fake_port2', lport='fake_port2',
attached_mac='fa:16:3e:8c:2e:b4', attached_mac='fa:16:3e:8c:2e:b4',
) )

2
dragonflow/tests/unit/test_classifier_app.py
View File

@ -61,7 +61,7 @@ class TestClassifierAppForVlan(testscenarios.WithScenarios,
ovs_port = ovs.OvsPort(id='fake_ovs_port', ovs_port = ovs.OvsPort(id='fake_ovs_port',
lport=fake_local_vlan_port.id, lport=fake_local_vlan_port.id,
ofport=1, admin_state='up', ofport=1, admin_state='up',
type=constants.OVS_COMPUTE_INTERFACE) type=constants.SWITCH_COMPUTE_INTERFACE)
self.controller.update(ovs_port) self.controller.update(ovs_port)
port_key = fake_local_vlan_port.unique_key port_key = fake_local_vlan_port.unique_key
match = self.app.parser.OFPMatch(reg7=port_key) match = self.app.parser.OFPMatch(reg7=port_key)

4
dragonflow/tests/unit/test_ovsdb_monitor.py
View File

@ -57,7 +57,7 @@ class TestDFIdl(tests_base.BaseTestCase):
'set', 'set',
ovs.OvsPort( ovs.OvsPort(
ofport=1, ofport=1,
type=constants.OVS_PATCH_INTERFACE, type=constants.SWITCH_PATCH_INTERFACE,
name='tap-uuid', name='tap-uuid',
), ),
), ),
@ -69,7 +69,7 @@ class TestDFIdl(tests_base.BaseTestCase):
'set', 'set',
ovs.OvsPort( ovs.OvsPort(
ofport=1, ofport=1,
type=constants.OVS_COMPUTE_INTERFACE, type=constants.SWITCH_COMPUTE_INTERFACE,
name='tap-uuid', name='tap-uuid',
), ),
), ),