Implant vid-app-common org.onap.vid.job (main and test)

Issue-ID: VID-378

Change-Id: I41b0bdc2c4e3635f3f3319b1cd63cefc61912dfc
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 29 insertions, 13 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/Network.java b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/Network.java
index addd7e1ee..797e28a02 100644
--- a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/Network.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/Network.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * VID
  * ================================================================================
- * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,8 +22,11 @@ package org.onap.vid.model.serviceInstantiation;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.onap.vid.job.JobAdapter;
+import org.onap.vid.job.JobType;
 import org.onap.vid.mso.model.ModelInfo;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -36,19 +39,22 @@ public class Network extends BaseResource implements JobAdapter.AsyncJobRequest
 	private final String lineOfBusiness;
 
 	public Network(@JsonProperty("modelInfo") ModelInfo modelInfo,
-                   @JsonProperty("productFamilyId") String productFamilyId,
-                   @JsonProperty("instanceName") String instanceName,
+				   @JsonProperty("productFamilyId") String productFamilyId,
+				   @JsonProperty("instanceName") String instanceName,
 				   @JsonProperty("action") String action,
-                   @JsonProperty("platformName") String platformName,
-                   @JsonProperty("lcpCloudRegionId") String lcpCloudRegionId,
+				   @JsonProperty("platformName") String platformName,
+				   @JsonProperty("lcpCloudRegionId") String lcpCloudRegionId,
 				   @JsonProperty("legacyRegion") String legacyRegion,
-                   @JsonProperty("tenantId") String tenantId,
-                   @JsonProperty("instanceParams") List<Map<String, String>> instanceParams,
-                   @JsonProperty("lineOfBusinessName") String lineOfBusiness,
-                   @JsonProperty("rollbackOnFailure") boolean rollbackOnFailure,
-				   @JsonProperty("instanceId") String instanceId) {
+				   @JsonProperty("tenantId") String tenantId,
+				   @JsonProperty("instanceParams") List<Map<String, String>> instanceParams,
+				   @JsonProperty("lineOfBusinessName") String lineOfBusiness,
+				   @JsonProperty("rollbackOnFailure") boolean rollbackOnFailure,
+				   @JsonProperty("instanceId") String instanceId,
+				   @JsonProperty("trackById") String trackById,
+				   @JsonProperty("isFailed") Boolean isFailed,
+				   @JsonProperty("statusMessage") String statusMessage) {
 
-		super(modelInfo, instanceName, action, lcpCloudRegionId, legacyRegion, tenantId, instanceParams, rollbackOnFailure, instanceId);
+		super(modelInfo, instanceName, action, lcpCloudRegionId, legacyRegion, tenantId, instanceParams, rollbackOnFailure, instanceId, trackById, isFailed, statusMessage);
 		this.productFamilyId = productFamilyId;
 		this.platformName = platformName;
 		this.lineOfBusiness = lineOfBusiness;
@@ -71,4 +77,14 @@ public class Network extends BaseResource implements JobAdapter.AsyncJobRequest
 		return "network";
 	}
 
+	@Override
+	public Collection<BaseResource> getChildren() {
+		return Collections.emptyList();
+	}
+
+	@Override
+	public JobType getJobType() {
+		return JobType.NetworkInstantiation;
+	}
+
 }