From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 31 Dec 2018 17:21:27 +0200
Subject: Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../src/main/java/org/onap/vid/job/Job.java        | 28 ++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'vid-app-common/src/main/java/org/onap/vid/job/Job.java')

diff --git a/vid-app-common/src/main/java/org/onap/vid/job/Job.java b/vid-app-common/src/main/java/org/onap/vid/job/Job.java
index 77f348dc6..144c96ca4 100644
--- a/vid-app-common/src/main/java/org/onap/vid/job/Job.java
+++ b/vid-app-common/src/main/java/org/onap/vid/job/Job.java
@@ -1,6 +1,7 @@
 package org.onap.vid.job;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.onap.vid.job.impl.JobSharedData;
 
 import java.util.Map;
 import java.util.UUID;
@@ -18,30 +19,49 @@ public interface Job {
     @JsonIgnore
     Map<String, Object> getData();
 
+    JobSharedData getSharedData();
+
     void setTypeAndData(JobType jobType, Map<String, Object> data);
 
     UUID getTemplateId();
 
     void setTemplateId(UUID templateId);
 
+    Integer getIndexInBulk();
+
     void setIndexInBulk(Integer indexInBulk);
 
     JobType getType();
 
     enum JobStatus {
-        COMPLETED(true),
-        FAILED(true),
+        COMPLETED(true, false),
+        FAILED(true, true),
         IN_PROGRESS(false),
+        RESOURCE_IN_PROGRESS(false),
         PAUSE(false),
         PENDING(false),
-        STOPPED(true);
+        STOPPED(true, true),
+        COMPLETED_WITH_ERRORS(true, true),
+        COMPLETED_WITH_NO_ACTION(true, false),
+        CREATING(false);
 
         private final Boolean finalStatus;
         public Boolean isFinal(){return finalStatus;}
 
+        private final Boolean failure;
+        public Boolean isFailure() {
+            return failure;
+        }
+
         JobStatus(Boolean finalStatus)
         {
-            this.finalStatus = finalStatus ;
+            this(finalStatus, false);
         }
+
+        JobStatus(Boolean finalStatus, boolean failure) {
+            this.finalStatus = finalStatus;
+            this.failure = failure;
+        }
+
     }
 }
-- 
cgit 1.2.3-korg