VOL-951: Make OpenOLT adapter pep8
Change-Id: I0fb8ca6e7da4dd83b0149628b5fe57f140d62acf
diff --git a/voltha/adapters/openolt/openolt_flow_mgr.py b/voltha/adapters/openolt/openolt_flow_mgr.py
index 367525e..063101b 100644
--- a/voltha/adapters/openolt/openolt_flow_mgr.py
+++ b/voltha/adapters/openolt/openolt_flow_mgr.py
@@ -14,21 +14,20 @@
# limitations under the License.
#
-import time
-
from voltha.protos.openflow_13_pb2 import OFPXMC_OPENFLOW_BASIC
import voltha.core.flow_decomposer as fd
import openolt_platform as platform
from voltha.adapters.openolt.protos import openolt_pb2
-HSIA_FLOW_INDEX = 0 # FIXME
-DHCP_FLOW_INDEX = 1 # FIXME
-EAPOL_FLOW_INDEX = 2 # FIXME
-EAPOL_DOWNLINK_FLOW_INDEX = 3 # FIXME
+HSIA_FLOW_INDEX = 0 # FIXME
+DHCP_FLOW_INDEX = 1 # FIXME
+EAPOL_FLOW_INDEX = 2 # FIXME
+EAPOL_DOWNLINK_FLOW_INDEX = 3 # FIXME
# FIXME - see also BRDCM_DEFAULT_VLAN in broadcom_onu.py
DEFAULT_MGMT_VLAN = 4091
+
class OpenOltFlowMgr(object):
def __init__(self, log, stub):
@@ -47,43 +46,43 @@
if field.type == fd.ETH_TYPE:
classifier_info['eth_type'] = field.eth_type
self.log.debug('field-type-eth-type',
- eth_type=classifier_info['eth_type'])
+ eth_type=classifier_info['eth_type'])
elif field.type == fd.IP_PROTO:
classifier_info['ip_proto'] = field.ip_proto
self.log.debug('field-type-ip-proto',
- ip_proto=classifier_info['ip_proto'])
+ ip_proto=classifier_info['ip_proto'])
elif field.type == fd.IN_PORT:
classifier_info['in_port'] = field.port
self.log.debug('field-type-in-port',
- in_port=classifier_info['in_port'])
+ in_port=classifier_info['in_port'])
elif field.type == fd.VLAN_VID:
classifier_info['vlan_vid'] = field.vlan_vid & 0xfff
self.log.debug('field-type-vlan-vid',
- vlan=classifier_info['vlan_vid'])
+ vlan=classifier_info['vlan_vid'])
elif field.type == fd.VLAN_PCP:
classifier_info['vlan_pcp'] = field.vlan_pcp
self.log.debug('field-type-vlan-pcp',
- pcp=classifier_info['vlan_pcp'])
+ pcp=classifier_info['vlan_pcp'])
elif field.type == fd.UDP_DST:
classifier_info['udp_dst'] = field.udp_dst
self.log.debug('field-type-udp-dst',
- udp_dst=classifier_info['udp_dst'])
+ udp_dst=classifier_info['udp_dst'])
elif field.type == fd.UDP_SRC:
classifier_info['udp_src'] = field.udp_src
self.log.debug('field-type-udp-src',
- udp_src=classifier_info['udp_src'])
+ udp_src=classifier_info['udp_src'])
elif field.type == fd.IPV4_DST:
classifier_info['ipv4_dst'] = field.ipv4_dst
self.log.debug('field-type-ipv4-dst',
- ipv4_dst=classifier_info['ipv4_dst'])
+ ipv4_dst=classifier_info['ipv4_dst'])
elif field.type == fd.IPV4_SRC:
classifier_info['ipv4_src'] = field.ipv4_src
self.log.debug('field-type-ipv4-src',
- ipv4_dst=classifier_info['ipv4_src'])
+ ipv4_dst=classifier_info['ipv4_src'])
elif field.type == fd.METADATA:
classifier_info['metadata'] = field.table_metadata
self.log.debug('field-type-metadata',
- metadata=classifier_info['metadata'])
+ metadata=classifier_info['metadata'])
else:
raise NotImplementedError('field.type={}'.format(
field.type))
@@ -92,8 +91,8 @@
if action.type == fd.OUTPUT:
action_info['output'] = action.output.port
self.log.debug('action-type-output',
- output=action_info['output'],
- in_port=classifier_info['in_port'])
+ output=action_info['output'],
+ in_port=classifier_info['in_port'])
elif action.type == fd.POP_VLAN:
action_info['pop_vlan'] = True
self.log.debug('action-type-pop-vlan', in_port=in_port)
@@ -101,34 +100,37 @@
action_info['push_vlan'] = True
action_info['tpid'] = action.push.ethertype
self.log.debug('action-type-push-vlan',
- push_tpid=action_info['tpid'], in_port=in_port)
+ push_tpid=action_info['tpid'], in_port=in_port)
if action.push.ethertype != 0x8100:
self.log.error('unhandled-tpid',
- ethertype=action.push.ethertype)
+ ethertype=action.push.ethertype)
elif action.type == fd.SET_FIELD:
# action_info['action_type'] = 'set_field'
_field = action.set_field.field.ofb_field
assert (action.set_field.field.oxm_class ==
OFPXMC_OPENFLOW_BASIC)
self.log.debug('action-type-set-field',
- field=_field, in_port=in_port)
+ field=_field, in_port=in_port)
if _field.type == fd.VLAN_VID:
self.log.debug('set-field-type-vlan-vid',
- vlan_vid=_field.vlan_vid & 0xfff)
+ vlan_vid=_field.vlan_vid & 0xfff)
action_info['vlan_vid'] = (_field.vlan_vid & 0xfff)
else:
self.log.error('unsupported-action-set-field-type',
- field_type=_field.type)
+ field_type=_field.type)
else:
self.log.error('unsupported-action-type',
- action_type=action.type, in_port=in_port)
+ action_type=action.type, in_port=in_port)
# FIXME - Why ignore downstream flows?
if is_down_stream is False:
- intf_id = platform.intf_id_from_uni_port_num(classifier_info['in_port'])
- onu_id = platform.onu_id_from_port_num(classifier_info['in_port'])
- self.divide_and_add_flow(intf_id, onu_id, classifier_info, action_info)
- #else:
+ intf_id = platform.intf_id_from_uni_port_num(
+ classifier_info['in_port'])
+ onu_id = platform.onu_id_from_port_num(
+ classifier_info['in_port'])
+ self.divide_and_add_flow(intf_id, onu_id, classifier_info,
+ action_info)
+ # else:
# self.log.info('ignore downstream flow', flow=flow,
# classifier_info=classifier_info,
# action_info=action_info)
@@ -144,8 +146,9 @@
elif classifier['ip_proto'] == 2:
self.log.debug('igmp flow add ignored')
else:
- self.log.debug("Invalid-Classifier-to-handle", classifier=classifier,
- action=action)
+ self.log.debug("Invalid-Classifier-to-handle",
+ classifier=classifier,
+ action=action)
elif 'eth_type' in classifier:
if classifier['eth_type'] == 0x888e:
self.log.debug('eapol flow add')
@@ -153,8 +156,9 @@
elif 'push_vlan' in action:
self.add_data_flow(intf_id, onu_id, classifier, action)
else:
- self.log.debug('Invalid-flow-type-to-handle', classifier=classifier,
- action=action)
+ self.log.debug('Invalid-flow-type-to-handle',
+ classifier=classifier,
+ action=action)
def add_data_flow(self, intf_id, onu_id, uplink_classifier, uplink_action):
@@ -173,27 +177,30 @@
# will take care of handling all the p bits.
# We need to revisit when mulitple gem port per p bits is needed.
self.add_hsia_flow(intf_id, onu_id, uplink_classifier, uplink_action,
- downlink_classifier, downlink_action, HSIA_FLOW_INDEX)
+ downlink_classifier, downlink_action,
+ HSIA_FLOW_INDEX)
def add_hsia_flow(self, intf_id, onu_id, uplink_classifier, uplink_action,
- downlink_classifier, downlink_action, hsia_id):
+ downlink_classifier, downlink_action, hsia_id):
gemport_id = platform.mk_gemport_id(onu_id)
flow_id = platform.mk_flow_id(intf_id, onu_id, hsia_id)
- self.log.debug('add upstream flow', onu_id=onu_id, classifier=uplink_classifier,
- action=uplink_action, gemport_id=gemport_id, flow_id=flow_id)
+ self.log.debug('add upstream flow', onu_id=onu_id,
+ classifier=uplink_classifier, action=uplink_action,
+ gemport_id=gemport_id, flow_id=flow_id)
flow = openolt_pb2.Flow(
- onu_id=onu_id, flow_id=flow_id, flow_type="upstream",
- access_intf_id=intf_id, gemport_id=gemport_id,
- classifier=self.mk_classifier(uplink_classifier), action=self.mk_action(uplink_action))
-
+ onu_id=onu_id, flow_id=flow_id, flow_type="upstream",
+ access_intf_id=intf_id, gemport_id=gemport_id,
+ classifier=self.mk_classifier(uplink_classifier),
+ action=self.mk_action(uplink_action))
self.stub.FlowAdd(flow)
self.log.debug('add downstream flow', classifier=downlink_classifier,
- action=downlink_action, gemport_id=gemport_id, flow_id=flow_id)
+ action=downlink_action, gemport_id=gemport_id,
+ flow_id=flow_id)
flow = openolt_pb2.Flow(
onu_id=onu_id, flow_id=flow_id, flow_type="downstream",
@@ -216,18 +223,20 @@
flow_id = platform.mk_flow_id(intf_id, onu_id, DHCP_FLOW_INDEX)
upstream_flow = openolt_pb2.Flow(
- onu_id=onu_id, flow_id=flow_id, flow_type="upstream",
- access_intf_id=intf_id, gemport_id=gemport_id,
- classifier=self.mk_classifier(classifier), action=self.mk_action(action))
+ onu_id=onu_id, flow_id=flow_id, flow_type="upstream",
+ access_intf_id=intf_id, gemport_id=gemport_id,
+ classifier=self.mk_classifier(classifier),
+ action=self.mk_action(action))
self.stub.FlowAdd(upstream_flow)
def add_eapol_flow(self, intf_id, onu_id, uplink_classifier, uplink_action,
- uplink_eapol_id=EAPOL_FLOW_INDEX,
- downlink_eapol_id=EAPOL_DOWNLINK_FLOW_INDEX,
- vlan_id=DEFAULT_MGMT_VLAN):
+ uplink_eapol_id=EAPOL_FLOW_INDEX,
+ downlink_eapol_id=EAPOL_DOWNLINK_FLOW_INDEX,
+ vlan_id=DEFAULT_MGMT_VLAN):
- self.log.debug('add eapol flow', classifier=uplink_classifier, action=uplink_action)
+ self.log.debug('add eapol flow', classifier=uplink_classifier,
+ action=uplink_action)
downlink_classifier = dict(uplink_classifier)
downlink_action = dict(uplink_action)
@@ -242,22 +251,24 @@
uplink_action['trap_to_host'] = True
upstream_flow = openolt_pb2.Flow(
- onu_id=onu_id, flow_id=uplink_flow_id, flow_type="upstream",
- access_intf_id=intf_id,gemport_id=gemport_id,
- classifier=self.mk_classifier(uplink_classifier), action=self.mk_action(uplink_action))
+ onu_id=onu_id, flow_id=uplink_flow_id, flow_type="upstream",
+ access_intf_id=intf_id, gemport_id=gemport_id,
+ classifier=self.mk_classifier(uplink_classifier),
+ action=self.mk_action(uplink_action))
self.stub.FlowAdd(upstream_flow)
# Add Downstream EAPOL Flow.
- downlink_flow_id = platform.mk_flow_id(intf_id, onu_id, downlink_eapol_id)
+ downlink_flow_id = platform.mk_flow_id(intf_id, onu_id,
+ downlink_eapol_id)
downlink_classifier['pkt_tag_type'] = 'single_tag'
downlink_classifier['vlan_vid'] = vlan_id
downstream_flow = openolt_pb2.Flow(
- onu_id=onu_id, flow_id=downlink_flow_id, flow_type="downstream",
- access_intf_id=intf_id, gemport_id=gemport_id,
- classifier=self.mk_classifier(downlink_classifier), action=self.mk_action(downlink_action))
-
+ onu_id=onu_id, flow_id=downlink_flow_id, flow_type="downstream",
+ access_intf_id=intf_id, gemport_id=gemport_id,
+ classifier=self.mk_classifier(downlink_classifier),
+ action=self.mk_action(downlink_action))
self.stub.FlowAdd(downstream_flow)
@@ -298,15 +309,15 @@
def mk_action(self, action_info):
action = openolt_pb2.Action()
- if 'pop_vlan' in action_info:
- action.o_vid = action_info['vlan_vid']
+ if 'pop_vlan' in action_info:
+ action.o_vid = action_info['vlan_vid']
action.cmd.remove_outer_tag = True
- elif 'push_vlan' in action_info:
- action.o_vid = action_info['vlan_vid']
+ elif 'push_vlan' in action_info:
+ action.o_vid = action_info['vlan_vid']
action.cmd.add_outer_tag = True
- elif 'trap_to_host' in action_info:
+ elif 'trap_to_host' in action_info:
action.cmd.trap_to_host = True
- else:
- self.log.info('Invalid-action-field')
- return
+ else:
+ self.log.info('Invalid-action-field')
+ return
return action