X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vid-app-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fvid%2Fmso%2Fmodel%2FServiceInstantiationRequestDetails.java;fp=vid-app-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fvid%2Fmso%2Fmodel%2FServiceInstantiationRequestDetails.java;h=d769aac54c487b8f21c3bcb0c195b4fcfa7512a4;hb=164596ffc56c1f9a4418a2f3b8f3941896b124f7;hp=acbf778ea23fb73db9d6de7fe1434da029de1496;hpb=3e558222d300ff70ff490914cc2245cf2a59e72a;p=vid.git

diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/model/ServiceInstantiationRequestDetails.java b/vid-app-common/src/main/java/org/onap/vid/mso/model/ServiceInstantiationRequestDetails.java
index acbf778ea..d769aac54 100644
--- a/vid-app-common/src/main/java/org/onap/vid/mso/model/ServiceInstantiationRequestDetails.java
+++ b/vid-app-common/src/main/java/org/onap/vid/mso/model/ServiceInstantiationRequestDetails.java
@@ -175,8 +175,8 @@ public class ServiceInstantiationRequestDetails {
     public static class ServiceInstantiationService implements UserParamTypes {
         private final ServiceInstantiationServiceInner serviceInstantiationServiceInner;
 
-        public ServiceInstantiationService(ModelInfo modelInfo, String instanceName, List<Map<String, String>> instanceParams, ServiceInstantiationVnfList vnfs) {
-            serviceInstantiationServiceInner = new ServiceInstantiationServiceInner(modelInfo, instanceName, instanceParams, vnfs);
+        public ServiceInstantiationService(ModelInfo modelInfo, String instanceName, List<Map<String, String>> instanceParams, List<ServiceInstantiationVnf> vnfs, List<ServiceInstantiationPnf> pnfs) {
+            serviceInstantiationServiceInner = new ServiceInstantiationServiceInner(modelInfo, instanceName, instanceParams, vnfs, pnfs);
         }
 
         @JsonProperty("service")
@@ -189,15 +189,15 @@ public class ServiceInstantiationRequestDetails {
             @JsonInclude(NON_EMPTY)
             public String instanceName;
             public List<Map<String, String>> instanceParams;
-            public ServiceInstantiationVnfList resources;
+            public Resources resources;
 
-            public ServiceInstantiationServiceInner(ModelInfo modelInfo, String instanceName, List<Map<String, String>> instanceParams, ServiceInstantiationVnfList vnfs) {
+            public ServiceInstantiationServiceInner(ModelInfo modelInfo, String instanceName, List<Map<String, String>> instanceParams, List<ServiceInstantiationVnf> vnfs, List<ServiceInstantiationPnf> pnfs) {
                 this.modelInfo.setModelType(modelInfo.getModelType());
                 this.modelInfo.setModelName(modelInfo.getModelName());
                 this.modelInfo.setModelVersionId(modelInfo.getModelVersionId());
                 this.instanceName = instanceName;
                 this.instanceParams = instanceParams;
-                this.resources = vnfs;
+                this.resources = new Resources(vnfs, pnfs);
             }
         }
     }
@@ -210,6 +210,15 @@ public class ServiceInstantiationRequestDetails {
         }
     }
 
+    public static class ServiceInstantiationPnfList{
+
+        public final List<ServiceInstantiationPnf> pnfs;
+
+        public ServiceInstantiationPnfList(List<ServiceInstantiationPnf> pnfList) {
+            this.pnfs = pnfList;
+        }
+    }
+
     public static class ServiceInstantiationVnf{
         public final ModelInfo modelInfo;
         public final CloudConfiguration cloudConfiguration;
@@ -232,6 +241,25 @@ public class ServiceInstantiationRequestDetails {
         }
     }
 
+    public static class ServiceInstantiationPnf{
+
+        public final ModelInfo modelInfo;
+        public final Platform platform;
+        public final LineOfBusiness lineOfBusiness;
+        public final String productFamilyId;
+        public final List<Map<String, String>>  instanceParams;
+        @JsonInclude(NON_EMPTY) public final String instanceName;
+
+        public ServiceInstantiationPnf(ModelInfo modelInfo, String platform, String lineOfBusiness, String productFamilyId, List<Map<String, String>>  instanceParams, String instanceName) {
+            this.modelInfo = modelInfo;
+            this.platform = new Platform(platform);
+            this.lineOfBusiness = new LineOfBusiness(lineOfBusiness);
+            this.productFamilyId = productFamilyId;
+            this.instanceParams = instanceParams;
+            this.instanceName = instanceName;
+        }
+    }
+
     public static class Platform{
         public final String platformName;