summaryrefslogtreecommitdiffstats
path: root/vid-automation/src
diff options
context:
space:
mode:
authorKruthi Bhat <krutbhat@att.com>2020-10-29 22:15:04 +0530
committerKruthi Bhat <krutbhat@att.com>2020-10-29 22:15:13 +0530
commit5ecb6d93b05f1cecb95604b057a1894293a6b687 (patch)
tree3201e456c252897ede213fd43745342c613cba2e /vid-automation/src
parent08a553f12102f39dd2b643d63d59c07850de03aa (diff)
VID-913 : Addition of Instance IDs in Audit Info screen
Change-Id: I7a440c6797f63588c68d490715272992e626424f Issue-ID: VID-913 Signed-off-by: Kruthi Bhat <krutbhat@att.com>
Diffstat (limited to 'vid-automation/src')
-rw-r--r--vid-automation/src/main/java/org/onap/vid/model/asyncInstantiation/JobAuditStatus.java11
-rw-r--r--vid-automation/src/test/resources/a-la-carte/auditInfoMSOALaCarteNew.json12
2 files changed, 19 insertions, 4 deletions
diff --git a/vid-automation/src/main/java/org/onap/vid/model/asyncInstantiation/JobAuditStatus.java b/vid-automation/src/main/java/org/onap/vid/model/asyncInstantiation/JobAuditStatus.java
index df9d505c0..8fed370b9 100644
--- a/vid-automation/src/main/java/org/onap/vid/model/asyncInstantiation/JobAuditStatus.java
+++ b/vid-automation/src/main/java/org/onap/vid/model/asyncInstantiation/JobAuditStatus.java
@@ -47,6 +47,7 @@ public class JobAuditStatus {
this.startTime = startTime;
this.finishTime = finishTime;
this.jobStatus = jobStatus;
+ this.instanceId = instanceId;
this.additionalInfo = additionalInfo;
}
@@ -64,6 +65,7 @@ public class JobAuditStatus {
private String additionalInfo;
private String instanceName;
private String instanceType;
+ private String instanceId;
public String getInstanceType() {return instanceType;}
@@ -71,6 +73,15 @@ public class JobAuditStatus {
private Boolean isFinal;
+
+ public String getInstanceId() {
+ return instanceId;
+ }
+
+ public void setInstanceId(String instanceId) {
+ this.instanceId = instanceId;
+ }
+
public String getJobStatus() {
return jobStatus;
}
diff --git a/vid-automation/src/test/resources/a-la-carte/auditInfoMSOALaCarteNew.json b/vid-automation/src/test/resources/a-la-carte/auditInfoMSOALaCarteNew.json
index 0f13a4db3..d9b9aa49d 100644
--- a/vid-automation/src/test/resources/a-la-carte/auditInfoMSOALaCarteNew.json
+++ b/vid-automation/src/test/resources/a-la-carte/auditInfoMSOALaCarteNew.json
@@ -2,7 +2,8 @@
{
"requestId": "7ba7900c-3e51-4d87-b1b4-3c53bdfaaa7d",
"instanceName" : "zrdm54cfmgw01_svc",
- "modelType": "service",
+ "instanceId":"de46c407-9f9b-4f2f-b1c3-be1c6599b957",
+ "modelType": "service",
"instanceType": "createInstance",
"startTime": "Mon, 24 Aug 2020 22:37:53 GMT",
"finishTime": "Mon, 24 Aug 2020 22:38:10 GMT",
@@ -12,7 +13,8 @@
{
"requestId": "f1aa7175-c237-4b56-ba64-7cb728a38ff2",
"instanceName" : "zrdm54cfmgw01",
- "modelType": "vnf",
+ "instanceId":"f5c72b2c-8e32-43db-9c42-f2b7901c69d8",
+ "modelType": "vnf",
"instanceType": "createInstance",
"startTime": "Mon, 24 Aug 2020 22:38:18 GMT",
"finishTime": "Mon, 24 Aug 2020 22:44:24 GMT",
@@ -22,7 +24,8 @@
{
"requestId": "a4e43d9e-4813-42e4-94bf-c5c6f22ed0bc",
"instanceName" : "zrdm54cfmgw01_base",
- "modelType": "vfModule",
+ "instanceId":"5fd7eb77-34c6-4cb9-adf7-03297d85e9cc",
+ "modelType": "vfModule",
"instanceType": "createInstance",
"startTime": "Mon, 24 Aug 2020 22:44:42 GMT",
"finishTime": "Mon, 24 Aug 2020 22:54:17 GMT",
@@ -32,7 +35,8 @@
{
"requestId": "1fc2ef3b-26f0-4e62-a00a-6a31502d39e2",
"instanceName" : "zrdm54cfmgw01_sup_1",
- "modelType": "vfModule",
+ "instanceId":"5fd7eb77-34c6-4cb9-adf7-03297d85e7ed",
+ "modelType": "vfModule",
"instanceType": "createInstance",
"startTime": "Mon, 24 Aug 2020 22:54:29 GMT",
"finishTime": "Mon, 24 Aug 2020 22:56:35 GMT",