summaryrefslogtreecommitdiffstats
path: root/bpmn
diff options
context:
space:
mode:
authorLukasz Rajewski <lukasz.rajewski@orange.com>2021-07-28 02:19:42 +0200
committerLukasz Rajewski <lukasz.rajewski@orange.com>2021-07-28 12:38:18 +0200
commitf459a2f8c66b31772fcec27f0676502dd0a5afee (patch)
tree48b8ba4304bbfbaf295552400e6deeff7807af6b /bpmn
parent34b0436df1ad8a11e29c588842ac491a6a6d7b26 (diff)
Change rb-definition-version identifier
Change rb-definition-version identifier. As a consequnece the vf-module-model-customization-uuid will be used to identify the version of the rb definition. Also cleaned property setup for CNFAdapter create instance request Issue-ID: MULTICLOUD-1377 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com> Change-Id: Ieafc7be91a6b25df3bec89701fa2c26c6d7a47d8
Diffstat (limited to 'bpmn')
-rw-r--r--bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfAdapterCreateTasks.java7
-rw-r--r--bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/cnf/entities/InstanceRequest.java56
2 files changed, 36 insertions, 27 deletions
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfAdapterCreateTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfAdapterCreateTasks.java
index 1220dc05c1..f49cf48ff5 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfAdapterCreateTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfAdapterCreateTasks.java
@@ -109,12 +109,15 @@ public class CnfAdapterCreateTasks {
protected InstanceRequest createInstanceRequest(VfModule vfModule, CloudRegion cloudRegion,
Map<String, String> sdncDirectives) {
InstanceRequest request = new InstanceRequest();
- request.setRbName(vfModule.getModelInfoVfModule().getModelInvariantUUID());
- request.setRbVersion(vfModule.getModelInfoVfModule().getModelUUID());
+ request.setModelInvariantId(vfModule.getModelInfoVfModule().getModelInvariantUUID());
+ request.setModelVersionId(vfModule.getModelInfoVfModule().getModelUUID());
+ request.setModelCustomizationId(vfModule.getModelInfoVfModule().getModelCustomizationUUID());
request.setCloudRegion(cloudRegion.getLcpCloudRegionId());
request.setVfModuleUUID(vfModule.getVfModuleId());
request.setProfileName(sdncDirectives.get("k8s-rb-profile-name"));
request.setReleaseName(sdncDirectives.get("k8s-rb-instance-release-name"));
+ if (sdncDirectives.containsKey("k8s-rb-instance-status-check"))
+ request.setStatusCheck(sdncDirectives.get("k8s-rb-instance-status-check").equalsIgnoreCase("true"));
request.setOverrideValues(sdncDirectives);
return request;
}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/cnf/entities/InstanceRequest.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/cnf/entities/InstanceRequest.java
index f4b2a8b4b1..c4fbdc5359 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/cnf/entities/InstanceRequest.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/cnf/entities/InstanceRequest.java
@@ -7,83 +7,89 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"rb-name", "rb-version", "profile-name", "release-name", "cloud-region", "labels",
- "override-values"})
public class InstanceRequest {
@JsonProperty("modelInvariantId")
- private String rbName;
+ private String modelInvariantId;
@JsonProperty("modelVersionId")
- private String rbVersion;
+ private String modelVersionId;
+ @JsonProperty("modelCustomizationId")
+ private String modelCustomizationId;
@JsonProperty("k8sRBProfileName")
private String profileName;
@JsonProperty("k8sRBInstanceReleaseName")
private String releaseName;
+ @JsonProperty("k8sRBInstanceStatusCheck")
+ private Boolean statusCheck = false;
@JsonProperty("vfModuleUUID")
private String vfModuleUUID;
@JsonProperty("cloudRegionId")
private String cloudRegion;
@JsonProperty("labels")
private Map<String, String> labels;
- @JsonProperty(value = "override-values")
+ @JsonProperty("override-values")
private Map<String, String> overrideValues;
- @JsonProperty("rb-name")
- public String getRbName() {
- return rbName;
+ public String getModelInvariantId() {
+ return modelInvariantId;
}
- @JsonProperty("rb-name")
- public void setRbName(String rbName) {
- this.rbName = rbName;
+ public void setModelInvariantId(String modelInvariantId) {
+ this.modelInvariantId = modelInvariantId;
}
- @JsonProperty("rb-version")
- public String getRbVersion() {
- return rbVersion;
+ public String getModelVersionId() {
+ return modelVersionId;
}
- @JsonProperty("rb-version")
- public void setRbVersion(String rbVersion) {
- this.rbVersion = rbVersion;
+ public void setModelVersionId(String modelVersionId) {
+ this.modelVersionId = modelVersionId;
+ }
+
+ public String getModelCustomizationId() {
+ return modelCustomizationId;
+ }
+
+ public void setModelCustomizationId(String modelCustomizationId) {
+ this.modelCustomizationId = modelCustomizationId;
}
- @JsonProperty("profile-name")
public String getProfileName() {
return profileName;
}
- @JsonProperty("profile-name")
public void setProfileName(String profileName) {
this.profileName = profileName;
}
- @JsonProperty("release-name")
+ public Boolean getStatusCheck() {
+ return statusCheck;
+ }
+
+ public void setStatusCheck(Boolean statusCheck) {
+ this.statusCheck = statusCheck;
+ }
+
public String getReleaseName() {
return releaseName;
}
- @JsonProperty("release-name")
public void setReleaseName(String releaseName) {
this.releaseName = releaseName;
}
- @JsonProperty("cloud-region")
public String getCloudRegion() {
return cloudRegion;
}
- @JsonProperty("cloud-region")
public void setCloudRegion(String cloudRegion) {
this.cloudRegion = cloudRegion;
}
- @JsonProperty("labels")
public Map<String, String> getLabels() {
return labels;
}
- @JsonProperty("labels")
public void setLabels(Map<String, String> labels) {
this.labels = labels;
}