[VOL-2262] Fix list logical devices in single core deployment
Change-Id: I5b0416a19e119f40ae4e4fdee46eea393f251a3c
diff --git a/rw_core/core/grpc_nbi_api_handler.go b/rw_core/core/grpc_nbi_api_handler.go
index 0aa74f5..34e9058 100755
--- a/rw_core/core/grpc_nbi_api_handler.go
+++ b/rw_core/core/grpc_nbi_api_handler.go
@@ -378,11 +378,11 @@
} else {
defer txn.Close()
}
- }
- if handler.isOFControllerRequest(ctx) {
- // Since an OF controller is only interested in the set of logical devices managed by thgis Core then return
- // only logical devices managed/monitored by this Core.
- return handler.logicalDeviceMgr.listManagedLogicalDevices()
+ if handler.isOFControllerRequest(ctx) {
+ // Since an OF controller is only interested in the set of logical devices managed by thgis Core then return
+ // only logical devices managed/monitored by this Core.
+ return handler.logicalDeviceMgr.listManagedLogicalDevices()
+ }
}
return handler.logicalDeviceMgr.listLogicalDevices()
}
diff --git a/rw_core/core/logical_device_manager.go b/rw_core/core/logical_device_manager.go
index 0331ecb..ebe72b3 100644
--- a/rw_core/core/logical_device_manager.go
+++ b/rw_core/core/logical_device_manager.go
@@ -145,7 +145,7 @@
func (ldMgr *LogicalDeviceManager) listLogicalDevices() (*voltha.LogicalDevices, error) {
log.Debug("ListAllLogicalDevices")
result := &voltha.LogicalDevices{}
- if logicalDevices := ldMgr.clusterDataProxy.List(context.Background(), "/logical_devices", 0, false, ""); logicalDevices != nil {
+ if logicalDevices := ldMgr.clusterDataProxy.List(context.Background(), "/logical_devices", 0, true, ""); logicalDevices != nil {
for _, logicalDevice := range logicalDevices.([]interface{}) {
result.Items = append(result.Items, logicalDevice.(*voltha.LogicalDevice))
}