From 9bdfc3c75bdb2dc7ad493272565436150cfb4f34 Mon Sep 17 00:00:00 2001
From: carcel <jose.carcel@atos.net>
Date: Fri, 22 Mar 2024 09:40:51 +0000
Subject: [PATCH] Update - Morpheus Client Extension
---
src/device/service/drivers/smartnic/SmartnicDriver.py | 4 ++--
src/device/service/drivers/smartnic/Tools.py | 2 +-
.../rest_server/nbi_plugins/agent_probes/Resources.py | 7 ++++++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/device/service/drivers/smartnic/SmartnicDriver.py b/src/device/service/drivers/smartnic/SmartnicDriver.py
index f827bbbff..35d05edde 100644
--- a/src/device/service/drivers/smartnic/SmartnicDriver.py
+++ b/src/device/service/drivers/smartnic/SmartnicDriver.py
@@ -104,9 +104,9 @@ class SmartnicDriver(_Driver):
with self.__lock:
for resource in resources:
LOGGER.info('resource = {:s}'.format(str(resource)))
- config_rules = find_key(resource, 'config_rules')
+ #config_rules = find_key(resource, 'config_rules')
results.extend(delete_connectivity_service(
- self.__tapi_root, config_rules, timeout=self.__timeout))
+ self.__tapi_root, resource[1], timeout=self.__timeout))
return results
@metered_subclass_method(METRICS_POOL)
diff --git a/src/device/service/drivers/smartnic/Tools.py b/src/device/service/drivers/smartnic/Tools.py
index bd155441c..13345b618 100644
--- a/src/device/service/drivers/smartnic/Tools.py
+++ b/src/device/service/drivers/smartnic/Tools.py
@@ -99,7 +99,7 @@ def delete_connectivity_service(root_url, config_rules, timeout : Optional[int]
url = '{:s}/manage-probe/configure'.format(root_url)
results = []
try:
- response = requests.delete(url=url, timeout=timeout, verify=False)
+ response = requests.delete(url=url, data=config_rules, timeout=timeout, verify=False)
except Exception as e: # pylint: disable=broad-except
LOGGER.exception('Exception deleting ConfigRule')
results.append(e)
diff --git a/src/nbi/service/rest_server/nbi_plugins/agent_probes/Resources.py b/src/nbi/service/rest_server/nbi_plugins/agent_probes/Resources.py
index daafd79ab..50e8e77af 100644
--- a/src/nbi/service/rest_server/nbi_plugins/agent_probes/Resources.py
+++ b/src/nbi/service/rest_server/nbi_plugins/agent_probes/Resources.py
@@ -201,7 +201,12 @@ class Device(_Resource):
def delete(self, device_uuid : str):
device = request.get_json()['devices'][0]
return format_grpc_to_json(self.device_client.DeleteDevice(grpc_device(
- device_uuid = device['device_id']['device_uuid']['uuid']
+ device_uuid = device['device_id']['device_uuid']['uuid'],
+ device_type = device['device_type'],
+ status = device['device_operational_status'],
+ endpoints = device['device_endpoints'],
+ config_rules = device['device_config']['config_rules'],
+ drivers = device['device_drivers']
)))
class LinkIds(_Resource):
--
GitLab