Merge "edit activity workflow plan for NS INIT"

[vfc/nfvo/lcm.git] / lcm / workflows / views.py

diff --git a/lcm/workflows/views.py b/lcm/workflows/views.py
index 221cc5f..8e48acb 100644 (file)
--- a/lcm/workflows/views.py
+++ b/lcm/workflows/views.py
@@ -37,7 +37,10 @@ def deploy_workflow(request, *args, **kwargs):
         force_deploy = ignore_case_get(request.data, "forceDeploy")
         logger.debug("file_path is %s, force_deploy is %s", file_path, force_deploy)
         if force_deploy.upper() == "TRUE":
-            WFPlanModel.objects.filter().delete()
+            plans = WFPlanModel.objects.filter()
+            if len(plans) > 0:
+                activiti.undeploy_workflow(plans[0].deployed_id)
+                plans.delete()
         else:
             if WFPlanModel.objects.filter():
                 logger.warn("Already deployed.")
@@ -54,8 +57,3 @@ def deploy_workflow(request, *args, **kwargs):
         return Response(data={'error': str(sys.exc_info())}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
     logger.debug("Leave %s", fun_name())
     return Response(data={'msg': 'OK'}, status=status.HTTP_202_ACCEPTED)
-
-
-
-
-