Merge "Fix for invalid CNF release name" into guilin

diff --git a/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/BpmnInstanceRequest.java b/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/BpmnInstanceRequest.java
index 25e086c..f6691a4 100644 (file)
--- a/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/BpmnInstanceRequest.java
+++ b/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/BpmnInstanceRequest.java
@@ -13,6 +13,9 @@ public class BpmnInstanceRequest {
     @JsonProperty(value = "modelVersionId")
     private String modelVersionId;
 
+    @JsonProperty(value = "k8sRBInstanceReleaseName")
+    private String k8sRBInstanceReleaseName;
+
     @JsonProperty(value = "k8sRBProfileName")
     private String k8sRBProfileName;
 
@@ -52,6 +55,14 @@ public class BpmnInstanceRequest {
         this.k8sRBProfileName = k8sRBProfileName;
     }
 
+    public String getK8sRBInstanceReleaseName() {
+        return k8sRBInstanceReleaseName;
+    }
+
+    public void setK8sRBInstanceReleaseName(String k8sRBInstanceReleaseName) {
+        this.k8sRBInstanceReleaseName = k8sRBInstanceReleaseName;
+    }
+
     public String getCloudRegionId() {
         return cloudRegionId;
     }

diff --git a/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/MulticloudInstanceRequest.java b/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/MulticloudInstanceRequest.java
index b1719cb..20af63e 100644 (file)
--- a/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/MulticloudInstanceRequest.java
+++ b/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/MulticloudInstanceRequest.java
@@ -26,7 +26,7 @@ public class MulticloudInstanceRequest {
     private Map<String, String> overrideValues;
 
     @JsonProperty(value = "release-name")
-    private String vfModuleUuid;
+    private String releaseName;
 
     public String getCloudRegion() {
         return cloudRegion;
@@ -76,12 +76,12 @@ public class MulticloudInstanceRequest {
         this.overrideValues = overrideValues;
     }
 
-    public String getVfModuleUuid() {
-        return vfModuleUuid;
+    public String getReleaseName() {
+        return releaseName;
     }
 
-    public void setVfModuleUuid(String vfModuleUuid) {
-        this.vfModuleUuid = vfModuleUuid;
+    public void setReleaseName(String releaseName) {
+        this.releaseName = releaseName;
     }
 
 }

diff --git a/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java b/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java
index a134bac..9f02c53 100644 (file)
--- a/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java
+++ b/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java
@@ -90,7 +90,12 @@ public class CnfAdapterService {
                 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;