This update addresses the following:
1. Decouple the kafka messaging proxy from the kafka client. This
will allow us to try out different kafka clients as well as test
the client separately.
2. Create unique device topics for the core, olt adapter and onu
adapters. This will ensure only cores and adapters handling these
devices will listens to the device messages.
3. Update the core with the latest device model APIs and changes.
While most of the model issues have been fixed, there is still an
issue with updating a child branch. This will be dealt in a separate
update.
Change-Id: I622ef5c636d7466bb3adefaa4ac4c85d7c450bea
diff --git a/python/adapters/kafka/adapter_request_facade.py b/python/adapters/kafka/adapter_request_facade.py
index cbae56d..978f57d 100644
--- a/python/adapters/kafka/adapter_request_facade.py
+++ b/python/adapters/kafka/adapter_request_facade.py
@@ -21,12 +21,15 @@
from twisted.internet.defer import inlineCallbacks
from zope.interface import implementer
+from twisted.internet import reactor
from python.adapters.interface import IAdapterInterface
from python.protos.core_adapter_pb2 import IntType, InterAdapterMessage, StrType, Error, ErrorCode
from python.protos.device_pb2 import Device
from python.protos.openflow_13_pb2 import FlowChanges, FlowGroups, Flows, \
FlowGroupChanges, ofp_packet_out
+from python.adapters.kafka.kafka_inter_container_library import IKafkaMessagingProxy, \
+ get_messaging_proxy
class MacAddressError(BaseException):
@@ -62,11 +65,26 @@
def stop(self):
self.log.debug('stopping')
+
+ def createKafkaDeviceTopic(self, deviceId):
+ kafka_proxy = get_messaging_proxy()
+ device_topic = kafka_proxy.get_default_topic() + "_" + deviceId
+ kafka_proxy.subscribe(topic=device_topic, target_cls=self)
+
def adopt_device(self, device):
d = Device()
if device:
device.Unpack(d)
- return True, self.adapter.adopt_device(d)
+
+ result = self.adapter.adopt_device(d)
+ # return True, self.adapter.adopt_device(d)
+
+ # Before we return, create a device specific topic to handle all
+ # subsequent requests from the Core. This adapter instance will
+ # handle all requests for that device
+ reactor.callLater(0, self.createKafkaDeviceTopic, d.id)
+
+ return True, result
else:
return False, Error(code=ErrorCode.INVALID_PARAMETERS,
reason="device-invalid")
@@ -151,7 +169,16 @@
d = Device()
if device:
device.Unpack(d)
- return (True, self.adapter.delete_device(d))
+ result = self.adapter.delete_device(d)
+ # return (True, self.adapter.delete_device(d))
+
+ # Before we return, delete the device specific topic as we will no
+ # longer receive requests from the Core for that device
+ kafka_proxy = get_messaging_proxy()
+ device_topic = kafka_proxy.get_default_topic() + "/" + d.id
+ kafka_proxy.unsubscribe(topic=device_topic)
+
+ return (True, result)
else:
return False, Error(code=ErrorCode.INVALID_PARAMETERS,
reason="device-invalid")