Remove pkt-out dead code
Change-Id: I0619a8124dbc748563d1f47a92104786972096c9
diff --git a/voltha/adapters/openolt/openolt.py b/voltha/adapters/openolt/openolt.py
index db9fe35..be31655 100644
--- a/voltha/adapters/openolt/openolt.py
+++ b/voltha/adapters/openolt/openolt.py
@@ -257,24 +257,10 @@
raise NotImplementedError()
def receive_packet_out(self, logical_device_id, egress_port_no, msg):
- log.debug('packet-out', logical_device_id=logical_device_id,
+ log.error('DEPRECATED - openolt now uses fast path packet out',
+ logical_device_id=logical_device_id,
egress_port_no=egress_port_no, msg_len=len(msg))
- def ldi_to_di(ldi):
- di = self.logical_device_id_to_root_device_id.get(ldi)
- if di is None:
- logical_device = self.adapter_agent.get_logical_device(ldi)
- di = logical_device.root_device_id
- self.logical_device_id_to_root_device_id[ldi] = di
- return di
-
- try:
- device_id = ldi_to_di(logical_device_id)
- handler = self.devices[device_id]
- handler.packet_out(egress_port_no, msg)
- except Exception as e:
- log.error('packet-out:exception', e=e.message)
-
def receive_inter_adapter_message(self, msg):
log.info('rx_inter_adapter_msg - Not implemented')
raise NotImplementedError()
diff --git a/voltha/adapters/openolt/openolt_device.py b/voltha/adapters/openolt/openolt_device.py
index a3cd442..ef94da7 100644
--- a/voltha/adapters/openolt/openolt_device.py
+++ b/voltha/adapters/openolt/openolt_device.py
@@ -273,64 +273,6 @@
omci_indication.onu_id,
omci_indication.pkt)
- def packet_out(self, egress_port, msg):
- pkt = Ether(msg)
- self.log.debug('packet out', egress_port=egress_port,
- packet=str(pkt).encode("HEX"))
-
- # Find port type
- egress_port_type = self.platform.intf_id_to_port_type_name(egress_port)
- if egress_port_type == Port.ETHERNET_UNI:
-
- if pkt.haslayer(Dot1Q):
- outer_shim = pkt.getlayer(Dot1Q)
- if isinstance(outer_shim.payload, Dot1Q):
- # If double tag, remove the outer tag
- payload = (
- Ether(src=pkt.src, dst=pkt.dst,
- type=outer_shim.type) /
- outer_shim.payload
- )
- else:
- payload = pkt
- else:
- payload = pkt
-
- send_pkt = binascii.unhexlify(str(payload).encode("HEX"))
-
- self.log.debug(
- 'sending-packet-to-ONU', egress_port=egress_port,
- intf_id=self.platform.intf_id_from_uni_port_num(egress_port),
- onu_id=self.platform.onu_id_from_port_num(egress_port),
- uni_id=self.platform.uni_id_from_port_num(egress_port),
- port_no=egress_port,
- packet=str(payload).encode("HEX"))
-
- onu_pkt = openolt_pb2.OnuPacket(
- intf_id=self.platform.intf_id_from_uni_port_num(egress_port),
- onu_id=self.platform.onu_id_from_port_num(egress_port),
- port_no=egress_port,
- pkt=send_pkt)
-
- self.stub.OnuPacketOut(onu_pkt)
-
- elif egress_port_type == Port.ETHERNET_NNI:
- self.log.debug('sending-packet-to-uplink', egress_port=egress_port,
- packet=str(pkt).encode("HEX"))
-
- send_pkt = binascii.unhexlify(str(pkt).encode("HEX"))
-
- uplink_pkt = openolt_pb2.UplinkPacket(
- intf_id=self.platform.intf_id_from_nni_port_num(egress_port),
- pkt=send_pkt)
-
- self.stub.UplinkPacketOut(uplink_pkt)
-
- else:
- self.log.warn('Packet-out-to-this-interface-type-not-implemented',
- egress_port=egress_port,
- port_type=egress_port_type)
-
def send_proxied_message(self, proxy_address, msg):
omci = openolt_pb2.OmciMsg(intf_id=proxy_address.channel_id,
onu_id=proxy_address.onu_id, pkt=str(msg))