commit 14406d2258d8925f3b3f7deadf6c503a676a04f6
author Patricia Reinoso <patricia.reinoso@canonical.com> Tue Jul 11 15:17:49 2023 +0000
committer Mark Beierl <mark.beierl@canonical.com> Thu Jul 20 18:29:55 2023 +0000
tree 09b8ac47e1112571e46e12840442a5e646a7991a
parent dfd1ad5e4121e9a74b212b47ee0362ab49677328

Activity Delete VNF record

Change-Id: I8c557ebc00833a64041e1c70cc9c6fec4c1a769c
Signed-off-by: Patricia Reinoso <patricia.reinoso@canonical.com>
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>

osm_lcm/nglcm.py

diff --git a/osm_lcm/nglcm.py b/osm_lcm/nglcm.py
index 1d60e6e..680ffe6 100644
--- a/osm_lcm/nglcm.py
+++ b/osm_lcm/nglcm.py
@@ -61,6 +61,7 @@
     VimUpdateWorkflowImpl,
 )
 from osm_lcm.temporal.vnf_activities import (
+    DeleteVnfRecordImpl,
     GetTaskQueueImpl,
     GetVnfDescriptorImpl,
     GetVnfRecordImpl,
@@ -195,6 +196,7 @@
             DeleteVimRecordImpl(self.db),
             ChangeVnfStateImpl(self.db),
             ChangeVnfInstantiationStateImpl(self.db),
+            DeleteVnfRecordImpl(self.db),
             GetTaskQueueImpl(self.db),
             GetVimCloudImpl(self.db),
             GetVnfDescriptorImpl(self.db),

osm_lcm/temporal/vnf_activities.py

diff --git a/osm_lcm/temporal/vnf_activities.py b/osm_lcm/temporal/vnf_activities.py
index 3ea8c64..dea0551 100644
--- a/osm_lcm/temporal/vnf_activities.py
+++ b/osm_lcm/temporal/vnf_activities.py
@@ -17,6 +17,7 @@
 from typing import List, Any
 
 from osm_common.temporal.activities.vnf import (
+    DeleteVnfRecord,
     GetTaskQueue,
     GetVimCloud,
     GetVnfDescriptor,
@@ -174,6 +175,13 @@
         self.logger.debug("Send notification for VNF not implemented.")
 
 
+@activity.defn(name=DeleteVnfRecord.__name__)
+class DeleteVnfRecordImpl(DeleteVnfRecord):
+    async def __call__(self, activity_input: DeleteVnfRecord.Input) -> None:
+        self.db.del_one("vnfrs", {"_id": activity_input.vnfr_uuid}, fail_on_empty=False)
+        self.logger.debug(f"VNF {activity_input.vnfr_uuid} record deleted from DB.")
+
+
 @activity.defn(name=GetModelNames.__name__)
 class GetModelNamesImpl(GetModelNames):
     async def __call__(

osm_lcm/tests/test_vnf_activities.py

diff --git a/osm_lcm/tests/test_vnf_activities.py b/osm_lcm/tests/test_vnf_activities.py
index 374a648..64d9caf 100644
--- a/osm_lcm/tests/test_vnf_activities.py
+++ b/osm_lcm/tests/test_vnf_activities.py
@@ -22,6 +22,7 @@
 from osm_common.dbbase import DbException
 from osm_common.temporal_task_queues.task_queues_mappings import LCM_TASK_QUEUE
 from osm_lcm.temporal.vnf_activities import (
+    DeleteVnfRecordImpl,
     ChangeVnfInstantiationStateImpl,
     ChangeVnfStateImpl,
     GetModelNamesImpl,
@@ -269,6 +270,31 @@
             )
 
 
+class TestDeleteVnfRecord(asynctest.TestCase):
+    async def setUp(self):
+        self.db = Mock()
+        self.delete_vnf_record = DeleteVnfRecordImpl(self.db)
+        self.env = ActivityEnvironment()
+
+    async def test_activity__succeeded__expected_record_is_deleted(self):
+        self.db.del_one.return_value = None
+        await self.env.run(
+            self.delete_vnf_record,
+            DeleteVnfRecordImpl.Input(vnfr_uuid=vnfr_uuid),
+        )
+        self.db.del_one.assert_called_with(
+            "vnfrs", {"_id": vnfr_uuid}, fail_on_empty=False
+        )
+
+    async def test_activity__failed__raise_db_exception(self):
+        self.db.del_one.side_effect = DbException("Can not connect to Database.")
+        with self.assertRaises(DbException):
+            await self.env.run(
+                self.delete_vnf_record,
+                DeleteVnfRecordImpl.Input(vnfr_uuid=vnfr_uuid),
+            )
+
+
 class TestGetVimCloud(asynctest.TestCase):
     async def setUp(self):
         self.db = Mock()