diff options
Diffstat (limited to 'so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java')
-rw-r--r-- | so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java index a134bac..d1314dd 100644 --- a/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java @@ -83,14 +83,19 @@ public class CnfAdapterService { logger.info("CnfAdapterService createInstance called"); MulticloudInstanceRequest multicloudInstanceRequest = new MulticloudInstanceRequest(); ResponseEntity<String> instanceResponse = null; - if (bpmnInstanceRequest.getK8sRBProfileName() != null) { + if (bpmnInstanceRequest.getK8sRBProfileName() != null) { multicloudInstanceRequest.setCloudRegion(bpmnInstanceRequest.getCloudRegionId()); multicloudInstanceRequest.setLabels(bpmnInstanceRequest.getLabels()); multicloudInstanceRequest.setOverrideValues(bpmnInstanceRequest.getOverrideValues()); multicloudInstanceRequest.setProfileName(bpmnInstanceRequest.getK8sRBProfileName()); multicloudInstanceRequest.setRbName(bpmnInstanceRequest.getModelInvariantId()); multicloudInstanceRequest.setRbVersion(bpmnInstanceRequest.getModelVersionId()); - multicloudInstanceRequest.setVfModuleUuid(bpmnInstanceRequest.getVfModuleUUID()); + + if (bpmnInstanceRequest.getK8sRBInstanceReleaseName() != null) + multicloudInstanceRequest.setReleaseName(bpmnInstanceRequest.getK8sRBInstanceReleaseName()); + else + multicloudInstanceRequest.setReleaseName( + bpmnInstanceRequest.getK8sRBProfileName() + "-" + bpmnInstanceRequest.getVfModuleUUID()); } else { logger.error("k8sProfileName should not be null"); // return instanceResponse; |