val serviceInstantiationServiceList = generateMacroServiceInstantiationRequestParams(payload, serviceInstanceName, jobId)
-
val requestParameters = ServiceInstantiationRequestDetails.RequestParameters(payload.subscriptionServiceType, false, serviceInstantiationServiceList)
val requestDetails = generateServiceInstantiationRequestDetails(payload, requestParameters, serviceInstanceName, userId)
return !aaiClient.isNodeTypeExistsByName(name, resourceType)
}
- private fun generateServiceInstantiationServicesList(payload: ServiceInstantiation, serviceInstanceName: String?, vnfList: ServiceInstantiationRequestDetails.ServiceInstantiationVnfList): List<ServiceInstantiationRequestDetails.ServiceInstantiationService> {
+ private fun generateServiceInstantiationServicesList(payload: ServiceInstantiation, serviceInstanceName: String?, vnfList: List<ServiceInstantiationRequestDetails.ServiceInstantiationVnf>, pnfList: List<ServiceInstantiationRequestDetails.ServiceInstantiationPnf>): List<ServiceInstantiationRequestDetails.ServiceInstantiationService> {
val serviceInstantiationServiceList = LinkedList<ServiceInstantiationRequestDetails.ServiceInstantiationService>()
val unFilteredInstanceParams = defaultIfNull<List<MutableMap<String, String>>>(payload.instanceParams, emptyList())
val filteredInstanceParams = removeUnNeededParams(unFilteredInstanceParams)
payload.modelInfo,
serviceInstanceName,
filteredInstanceParams,
- vnfList
+ vnfList,
+ pnfList
)
serviceInstantiationServiceList.add(serviceInstantiationService)
return serviceInstantiationServiceList
return if (result.isEmpty()) emptyList() else listOf(result)
}
- private fun createServiceInstantiationVnfList(jobId: UUID?, payload: ServiceInstantiation): ServiceInstantiationRequestDetails.ServiceInstantiationVnfList {
+ private fun createServiceInstantiationVnfList(jobId: UUID?, payload: ServiceInstantiation): List<ServiceInstantiationRequestDetails.ServiceInstantiationVnf> {
val cloudConfiguration = generateCloudConfiguration(payload.lcpCloudRegionId, payload.tenantId)
val isBulk = asyncInstantiationBL.isPartOfBulk(jobId)
vnfList.add(serviceInstantiationVnf)
}
- return ServiceInstantiationRequestDetails.ServiceInstantiationVnfList(vnfList)
+ return vnfList;
+ }
+
+ private fun createServiceInstantiationPnfList(jobId: UUID?, payload: ServiceInstantiation): List<ServiceInstantiationRequestDetails.ServiceInstantiationPnf> {
+ val isBulk = asyncInstantiationBL.isPartOfBulk(jobId)
+
+ val pnfs = payload.pnfs
+ val pnfList = mutableListOf<ServiceInstantiationRequestDetails.ServiceInstantiationPnf>()
+ for (pnf in pnfs.values) {
+ val serviceInstantiationPnf = ServiceInstantiationRequestDetails.ServiceInstantiationPnf(
+ pnf.modelInfo,
+ pnf.platformName,
+ pnf.lineOfBusiness,
+ payload.productFamilyId,
+ buildPnfInstanceParams(pnf.instanceParams),
+ getUniqueNameIfNeeded(pnf.instanceName, ResourceType.PNF, isBulk)
+ )
+ pnfList.add(serviceInstantiationPnf)
+ }
+
+ return pnfList;
}
private fun convertVfModuleMapToList(vfModules: Map<String, Map<String, VfModule>>): List<VfModuleMacro> {
return if (vnfInstanceParams.isEmpty()) emptyList() else ImmutableList.of(vnfInstanceParams)
}
+ fun buildPnfInstanceParams(currentPnfInstanceParams: List<MutableMap<String, String>>): List<Map<String, String>> {
+ val filteredPnfInstanceParams = removeUnNeededParams(currentPnfInstanceParams)
+
+ val pnfInstanceParams = extractActualInstanceParams(filteredPnfInstanceParams)
+ return if (pnfInstanceParams.isEmpty()) emptyList() else ImmutableList.of(pnfInstanceParams)
+ }
+
private fun generateServiceInstantiationRequestDetails(payload: ServiceInstantiation, requestParameters: ServiceInstantiationRequestDetails.RequestParameters, serviceInstanceName: String?, userId: String): ServiceInstantiationRequestDetails {
val requestInfo = ServiceInstantiationRequestDetails.RequestInfo(serviceInstanceName,
payload.productFamilyId,
}
private fun generateMacroServiceInstantiationRequestParams(payload: ServiceInstantiation, serviceInstanceName: String?, jobId: UUID?): List<UserParamTypes> {
- val userParams = generateServiceInstantiationServicesList(payload, serviceInstanceName, createServiceInstantiationVnfList(jobId, payload))
+ val userParams = generateServiceInstantiationServicesList(
+ payload,
+ serviceInstanceName,
+ createServiceInstantiationVnfList(jobId, payload),
+ createServiceInstantiationPnfList(jobId, payload)
+ )
return userParams.plus(homingSolution())
}