From d4d15c5d709c7c1932f1b555eb81fbe47921c2d6 Mon Sep 17 00:00:00 2001
From: Armingol <pablo.armingolrobles@telefonica.com>
Date: Fri, 29 Sep 2023 15:05:09 +0200
Subject: [PATCH] Code cleanup and fix bug in context/device.py
---
src/context/service/ContextServiceServicerImpl.py | 4 +---
src/context/service/database/Device.py | 1 +
src/device/service/drivers/openconfig/templates/Namespace.py | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/context/service/ContextServiceServicerImpl.py b/src/context/service/ContextServiceServicerImpl.py
index 6854d4ff8..93f078e75 100644
--- a/src/context/service/ContextServiceServicerImpl.py
+++ b/src/context/service/ContextServiceServicerImpl.py
@@ -124,9 +124,7 @@ class ContextServiceServicerImpl(ContextServiceServicer, ContextPolicyServiceSer
@safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
def ListDevices(self, request : Empty, context : grpc.ServicerContext) -> DeviceList:
- devices = device_list_objs(self.db_engine)
- LOGGER.info('DEVICES: {:s}'.format(str(devices)))
- return DeviceList(devices=devices)
+ return device_list_objs(self.db_engine)
@safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
def GetDevice(self, request : ContextId, context : grpc.ServicerContext) -> Device:
diff --git a/src/context/service/database/Device.py b/src/context/service/database/Device.py
index 6da7c91bb..c4f2b3d95 100644
--- a/src/context/service/database/Device.py
+++ b/src/context/service/database/Device.py
@@ -64,6 +64,7 @@ def device_get(db_engine : Engine, request : DeviceId) -> Device:
obj : Optional[DeviceModel] = session.query(DeviceModel)\
.options(selectinload(DeviceModel.endpoints))\
.options(selectinload(DeviceModel.config_rules))\
+ .options(selectinload(DeviceModel.components))\
.filter_by(device_uuid=device_uuid).one_or_none()
return None if obj is None else obj.dump()
obj = run_transaction(sessionmaker(bind=db_engine), callback)
diff --git a/src/device/service/drivers/openconfig/templates/Namespace.py b/src/device/service/drivers/openconfig/templates/Namespace.py
index b70d5c327..bdc27a1ff 100644
--- a/src/device/service/drivers/openconfig/templates/Namespace.py
+++ b/src/device/service/drivers/openconfig/templates/Namespace.py
@@ -45,5 +45,5 @@ NAMESPACES = {
'ocpt2': NAMESPACE_POLICY_TYPES_2,
'ocrp' : NAMESPACE_ROUTING_POLICY,
'ocv' : NAMESPACE_VLAN,
- 'ocptr' : NAMESPACE_PLATFORM_TRANSCEIVER,
+ 'ocptr': NAMESPACE_PLATFORM_TRANSCEIVER,
}
--
GitLab