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/rw_core/core/device_manager.go b/rw_core/core/device_manager.go
index c4ac343..6f4a874 100644
--- a/rw_core/core/device_manager.go
+++ b/rw_core/core/device_manager.go
@@ -36,19 +36,19 @@
deviceAgents map[string]*DeviceAgent
adapterProxy *AdapterProxy
logicalDeviceMgr *LogicalDeviceManager
- kafkaProxy *kafka.KafkaMessagingProxy
+ kafkaICProxy *kafka.InterContainerProxy
stateTransitions *TransitionMap
clusterDataProxy *model.Proxy
exitChannel chan int
lockDeviceAgentsMap sync.RWMutex
}
-func newDeviceManager(kafkaProxy *kafka.KafkaMessagingProxy, cdProxy *model.Proxy) *DeviceManager {
+func newDeviceManager(kafkaICProxy *kafka.InterContainerProxy, cdProxy *model.Proxy) *DeviceManager {
var deviceMgr DeviceManager
deviceMgr.exitChannel = make(chan int, 1)
deviceMgr.deviceAgents = make(map[string]*DeviceAgent)
- deviceMgr.adapterProxy = NewAdapterProxy(kafkaProxy)
- deviceMgr.kafkaProxy = kafkaProxy
+ deviceMgr.adapterProxy = NewAdapterProxy(kafkaICProxy)
+ deviceMgr.kafkaICProxy = kafkaICProxy
deviceMgr.clusterDataProxy = cdProxy
deviceMgr.lockDeviceAgentsMap = sync.RWMutex{}
return &deviceMgr
@@ -327,7 +327,7 @@
//Get parent device type
parent, err := dMgr.GetDevice(parentDeviceId)
if err != nil {
- log.Error("no-parent-found", log.Fields{"parentId":parentDeviceId})
+ log.Error("no-parent-found", log.Fields{"parentId": parentDeviceId})
return status.Errorf(codes.NotFound, "%s", parentDeviceId)
}
@@ -350,7 +350,7 @@
// This will be triggered on every update to the device.
handlers := dMgr.stateTransitions.GetTransitionHandler(previous, current)
if handlers == nil {
- log.Debugw("handlers-not-found", log.Fields{"deviceId": current.Id})
+ log.Debugw("no-op-transition", log.Fields{"deviceId": current.Id})
return nil
}
for _, handler := range handlers {
@@ -379,7 +379,7 @@
log.Errorw("device-not-found", log.Fields{"deviceId": deviceId})
return err
}
- if !device.Root{
+ if !device.Root {
log.Errorw("device-not-root", log.Fields{"deviceId": deviceId})
return status.Errorf(codes.FailedPrecondition, "%s", deviceId)
}