Update VID SO API call generation - include PNF instanceName parameter in SO API call (macro)

Creation of functionality to prepare service with PNF request which call SO.

Issue-ID: VID-695
Signed-off-by: Mateusz Goluchowski <mateusz.goluchowski@nokia.com>
Change-Id: I5285ac2ab5e95665244ca18c6549249d9330b1ed

3 files changed, 112 insertions, 1 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/Pnf.java b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/Pnf.java
new file mode 100644
index 000000000..e2bf5794e
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/Pnf.java
@@ -0,0 +1,95 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+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.*;
+
+import static java.util.stream.Collectors.toList;
+
+/**
+ * The Class VNF.
+ */
+public class Pnf extends BaseResource implements JobAdapter.AsyncJobRequest {
+
+	private final String productFamilyId;
+
+	private final String platformName;
+
+	private final String lineOfBusiness;
+
+	public Pnf(@JsonProperty("modelInfo") ModelInfo modelInfo,
+               @JsonProperty("productFamilyId") String productFamilyId,
+               @JsonProperty("instanceName") String instanceName,
+               @JsonProperty("action") String action,
+               @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("trackById") String trackById,
+               @JsonProperty("isFailed") Boolean isFailed,
+               @JsonProperty("statusMessage") String statusMessage,
+               @JsonProperty("position") Integer position,
+               @JsonProperty("originalName") String originalName) {
+
+		super(modelInfo, instanceName, action, lcpCloudRegionId, legacyRegion, tenantId, instanceParams, rollbackOnFailure, instanceId, trackById, isFailed, statusMessage,
+			position, null, originalName);
+		this.productFamilyId = productFamilyId;
+		this.platformName = platformName;
+		this.lineOfBusiness = lineOfBusiness;
+	}
+
+	public String getProductFamilyId() {
+		return productFamilyId;
+	}
+
+	public String getPlatformName() {
+		return platformName;
+	}
+
+	public String getLineOfBusiness() {
+		return lineOfBusiness;
+	}
+
+	@Override
+	protected String getModelType() {
+		return "pnf";
+	}
+
+	@Override
+	public Collection<? extends BaseResource> getChildren() {
+		return null;
+	}
+
+	@Override
+	public JobType getJobType() {
+		return JobType.VnfInstantiation;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiation.java b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiation.java
index cae28f7a3..4f47d7b1a 100644
--- a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiation.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiation.java
@@ -59,6 +59,8 @@ public class ServiceInstantiation extends BaseResource implements JobAdapter.Asy
 
     private final Map<String, Vnf> vnfs;
 
+    private final Map<String, Pnf> pnfs;
+
     private final Map<String, Network> networks;
 
     private final Map<String, InstanceGroup> vnfGroups;
@@ -90,6 +92,7 @@ public class ServiceInstantiation extends BaseResource implements JobAdapter.Asy
                                 @JsonProperty("aicZoneId") String aicZoneId,
                                 @JsonProperty("aicZoneName") String aicZoneName,
                                 @JsonProperty("vnfs") Map<String, Vnf> vnfs,
+                                @JsonProperty("pnfs") Map<String, Pnf> pnfs,
                                 @JsonProperty("networks") Map<String, Network> networks,
                                 @JsonProperty("vnfGroups") Map<String, InstanceGroup> vnfGroups,
                                 @JsonProperty("vrfs") Map<String, VrfEntry> vrfs,
@@ -119,6 +122,7 @@ public class ServiceInstantiation extends BaseResource implements JobAdapter.Asy
         this.aicZoneId = aicZoneId;
         this.aicZoneName = aicZoneName;
         this.vnfs = vnfs;
+        this.pnfs = pnfs;
         this.networks = networks;
         this.vnfGroups = vnfGroups;
         this.vrfs = vrfs;
@@ -181,6 +185,10 @@ public class ServiceInstantiation extends BaseResource implements JobAdapter.Asy
         return emptyMapIfNull(vnfs);
     }
 
+    public Map<String, Pnf> getPnfs() {
+        return emptyMapIfNull(pnfs);
+    }
+
     public Map<String, Network> getNetworks() {
         return emptyMapIfNull(networks);
     }
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiationTemplate.java b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiationTemplate.java
index 9499beb50..ed2ed1610 100644
--- a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiationTemplate.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiationTemplate.java
@@ -29,6 +29,7 @@ import org.onap.vid.model.aaiTree.ExistingElementsCounterMaps;
 public class ServiceInstantiationTemplate extends ServiceInstantiation implements ExistingElementsCounterMaps {
 
     private final Map<String, Long> existingVNFCounterMap;
+    private final Map<String, Long> existingPNFCounterMap;
     private final Map<String, Long> existingNetworksCounterMap;
     private final Map<String, Long> existingVnfGroupCounterMap;
     private final Map<String, Long> existingVRFCounterMap;
@@ -37,6 +38,7 @@ public class ServiceInstantiationTemplate extends ServiceInstantiation implement
     public ServiceInstantiationTemplate(
         ServiceInstantiation baseService,
         Map<String, Long> vnfCounterMap,
+        Map<String, Long> pnfCounterMap,
         Map<String, Long> networksCounterMap,
         Map<String, Long> vnfGroupCounterMap,
         Map<String, Long> VRFCounterMap
@@ -47,7 +49,7 @@ public class ServiceInstantiationTemplate extends ServiceInstantiation implement
             baseService.getProductFamilyId(), baseService.getInstanceName(), baseService.getSubscriptionServiceType(),
             baseService.getLcpCloudRegionId(), baseService.getLcpCloudRegionId(), baseService.getTenantId(),
             baseService.getTenantName(), baseService.getAicZoneId(), baseService.getAicZoneName(),
-            baseService.getVnfs(), baseService.getNetworks(), baseService.getVnfGroups(), baseService.getVrfs(),
+            baseService.getVnfs(), baseService.getPnfs(), baseService.getNetworks(), baseService.getVnfGroups(), baseService.getVrfs(),
             baseService.getInstanceParams(), baseService.isPause(), baseService.getBulkSize(),
             baseService.isRollbackOnFailure(), baseService.isALaCarte(), baseService.getTestApi(),
             baseService.getInstanceId(), Objects.toString(baseService.getAction(), null),
@@ -57,6 +59,7 @@ public class ServiceInstantiationTemplate extends ServiceInstantiation implement
         );
 
         this.existingVNFCounterMap = vnfCounterMap;
+        this.existingPNFCounterMap = pnfCounterMap;
         this.existingNetworksCounterMap = networksCounterMap;
         this.existingVnfGroupCounterMap = vnfGroupCounterMap;
         this.existingVRFCounterMap = VRFCounterMap;
@@ -68,6 +71,11 @@ public class ServiceInstantiationTemplate extends ServiceInstantiation implement
     }
 
     @Override
+    public Map<String, Long> getExistingPNFCounterMap() {
+        return existingPNFCounterMap;
+    }
+
+    @Override
     public Map<String, Long> getExistingNetworksCounterMap() {
         return existingNetworksCounterMap;
     }