X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2dms%2Fapi%2Fdms_lcm_nfdeployment.py;fp=o2dms%2Fapi%2Fdms_lcm_nfdeployment.py;h=ef6cb8c52b469deb2f3b51c4a2fd55686f5afa47;hb=a6392b46c7b808b8adeede97c4dd69c5032e0d11;hp=97eb12acee3b98e04f0589030e27e834c7ebaf0d;hpb=f3aaeb6d1dcf62b7ebb0554aa2004e8f46f8a72a;p=pti%2Fo2.git

diff --git a/o2dms/api/dms_lcm_nfdeployment.py b/o2dms/api/dms_lcm_nfdeployment.py
index 97eb12a..ef6cb8c 100644
--- a/o2dms/api/dms_lcm_nfdeployment.py
+++ b/o2dms/api/dms_lcm_nfdeployment.py
@@ -56,7 +56,7 @@ def lcm_nfdeployment_create(
             id, input['name'], deploymentManagerId, input['description'],
             input['descriptorId'], input['parentDeploymentId'])
         uow.nfdeployments.add(entity)
-        entity.transit_state(NfDeploymentState.NotInstalled)
+        # entity.transit_state(NfDeploymentState.NotInstalled)
 
         # to be refactor later according to O2 DMS API design
         entity.transit_state(NfDeploymentState.Installing)
@@ -98,8 +98,20 @@ def lcm_nfdeployment_uninstall(
     uow = bus.uow
     with uow:
         entity: NfDeployment = uow.nfdeployments.get(nfdeploymentid)
-        if entity.status == NfDeploymentState.Installed:
+        if not entity:
+            pass
+        elif entity.status == NfDeploymentState.Initial:
+            bus.uow.nfdeployments.delete(nfdeploymentid)
+        # elif entity.status == NfDeploymentState.NotInstalled:
+        #     bus.uow.nfdeployments.delete(nfdeploymentid)
+        elif entity.status == NfDeploymentState.Installing:
+            entity.transit_state(NfDeploymentState.Uninstalling)
+        elif entity.status == NfDeploymentState.Installed:
+            entity.transit_state(NfDeploymentState.Uninstalling)
+        elif entity.status == NfDeploymentState.Updating:
             entity.transit_state(NfDeploymentState.Uninstalling)
+        elif entity.status == NfDeploymentState.Uninstalling:
+            pass
         elif entity.status == NfDeploymentState.Abnormal:
             bus.uow.nfdeployments.delete(nfdeploymentid)
         else:
@@ -121,7 +133,7 @@ def lcm_nfdeployment_uninstall(
 #                 "NfDeployment {} is not in status to delete".format(
 #                     nfdeploymentid))
 #         uow.nfdeployments.delete(nfdeploymentid)
-#         entity.transit_state(NfDeploymentState.Deleted)
+#         entity.transit_state(NfDeploymentState.Deleting)
 #         uow.commit()
 #     return True