Merge "Changed certain external task to use the long"

4 files changed, 24 insertions, 6 deletions

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/inventory/delete/DeleteInventoryService.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/inventory/delete/DeleteInventoryService.java
index 4d8c74dbfe..4e5e880f80 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/inventory/delete/DeleteInventoryService.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/inventory/delete/DeleteInventoryService.java
@@ -44,7 +44,7 @@ public class DeleteInventoryService {
     public void auditAAIInventory() throws Exception {
         for (int i = 0; i < externalTaskServiceUtils.getMaxClients(); i++) {
             externalTaskServiceUtils.createExternalTaskClient().subscribe("InventoryDelete")
-                    .lockDuration(Long.parseLong(env.getProperty("mso.audit.lock-time", "60000")))
+                    .lockDuration(externalTaskServiceUtils.getLockDurationMedium())
                     .handler(deleteInventory::executeExternalTask).open();
         }
     }
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/TaskServices.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/TaskServices.java
index db9a7cefae..d4a4bb792f 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/TaskServices.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/TaskServices.java
@@ -70,7 +70,7 @@ public class TaskServices {
     public void auditAddAAIInventory() throws Exception {
         for (int i = 0; i < externalTaskServiceUtils.getMaxClients(); i++) {
             ExternalTaskClient client = externalTaskServiceUtils.createExternalTaskClient();
-            client.subscribe("InventoryAddAudit").lockDuration(externalTaskServiceUtils.getLockDuration())
+            client.subscribe("InventoryAddAudit").lockDuration(externalTaskServiceUtils.getLockDurationLong())
                     .handler(auditCreateStack::executeExternalTask).open();
         }
     }
@@ -79,7 +79,7 @@ public class TaskServices {
     public void auditDeleteAAIInventory() throws Exception {
         for (int i = 0; i < externalTaskServiceUtils.getMaxClients(); i++) {
             ExternalTaskClient client = externalTaskServiceUtils.createExternalTaskClient();
-            client.subscribe("InventoryDeleteAudit").lockDuration(externalTaskServiceUtils.getLockDuration())
+            client.subscribe("InventoryDeleteAudit").lockDuration(externalTaskServiceUtils.getLockDurationLong())
                     .handler(auditDeleteStack::executeExternalTask).open();
         }
     }
diff --git a/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml b/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml
index 42955c35c9..ac45f85711 100644
--- a/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml
+++ b/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml
@@ -64,8 +64,6 @@ mso:
   adapters:
     requestDb:
       endpoint: http://localhost:${wiremock.server.port}
-  audit:
-    lock-time: 240000
   logPath: logs
   msb-ip: localhost
   msb-port: ${wiremock.server.port}
diff --git a/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java b/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java
index 7ae7de2ece..fff82ea5bc 100644
--- a/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java
+++ b/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java
@@ -22,8 +22,16 @@ public class ExternalTaskServiceUtils {
     @Autowired
     public Environment env;
 
-    protected Set<ExternalTaskClient> taskClients = ConcurrentHashMap.newKeySet();
 
+    private static final long DEFAULT_LOCK_DURATION_LONG = 2700000;
+    private static final long DEFAULT_LOCK_DURATION_MEDIUM = 900000;
+    private static final long DEFAULT_LOCK_DURATION_SHORT = 300000;
+
+    private static final String LOCK_DURATION_LONG = "mso.workflow.topics.lockDurationLong";
+    private static final String LOCK_DURATION_MEDIUM = "mso.workflow.topics.lockDurationMedium";
+    private static final String LOCK_DURATION_SHORT = "mso.workflow.topics.lockDurationShort";
+
+    protected Set<ExternalTaskClient> taskClients = ConcurrentHashMap.newKeySet();
 
     private static final Logger logger = LoggerFactory.getLogger(ExternalTaskServiceUtils.class);
 
@@ -74,4 +82,16 @@ public class ExternalTaskServiceUtils {
         return taskClients;
     }
 
+    public long getLockDurationLong() {
+        return env.getProperty(LOCK_DURATION_LONG, Long.class, new Long(DEFAULT_LOCK_DURATION_LONG));
+    }
+
+    public long getLockDurationMedium() {
+        return env.getProperty(LOCK_DURATION_MEDIUM, Long.class, new Long(DEFAULT_LOCK_DURATION_MEDIUM));
+    }
+
+    public long getLockDurationShort() {
+        return env.getProperty(LOCK_DURATION_SHORT, Long.class, new Long(DEFAULT_LOCK_DURATION_SHORT));
+    }
+
 }