This commit consists of some miscellaneous small changes and some
exception tracking to help packet-out debugging in the adapter.
Change-Id: I1d6b50f60c800768acb5a132c1d630416ac9811f
diff --git a/python/adapters/kafka/adapter_request_facade.py b/python/adapters/kafka/adapter_request_facade.py
index e104cbc..fccb049 100644
--- a/python/adapters/kafka/adapter_request_facade.py
+++ b/python/adapters/kafka/adapter_request_facade.py
@@ -309,26 +309,29 @@
def receive_packet_out(self, deviceId, outPort, packet):
- d_id = StrType()
- if deviceId:
- deviceId.Unpack(d_id)
- else:
- return False, Error(code=ErrorCode.INVALID_PARAMETERS,
- reason="deviceid-invalid")
+ try:
+ d_id = StrType()
+ if deviceId:
+ deviceId.Unpack(d_id)
+ else:
+ return False, Error(code=ErrorCode.INVALID_PARAMETERS,
+ reason="deviceid-invalid")
- op = IntType()
- if outPort:
- outPort.Unpack(op)
- else:
- return False, Error(code=ErrorCode.INVALID_PARAMETERS,
- reason="outport-invalid")
+ op = IntType()
+ if outPort:
+ outPort.Unpack(op)
+ else:
+ return False, Error(code=ErrorCode.INVALID_PARAMETERS,
+ reason="outport-invalid")
- p = ofp_packet_out()
- if packet:
- packet.Unpack(p)
- else:
- return False, Error(code=ErrorCode.INVALID_PARAMETERS,
- reason="packet-invalid")
+ p = ofp_packet_out()
+ if packet:
+ packet.Unpack(p)
+ else:
+ return False, Error(code=ErrorCode.INVALID_PARAMETERS,
+ reason="packet-invalid")
- return (True, self.adapter.receive_packet_out(d_id, op, p))
+ return (True, self.adapter.receive_packet_out(d_id.val, op.val, p))
+ except Exception as e:
+ log.exception("error-processing-receive_packet_out", e=e)