@JsonProperty(value = "modelVersionId")
private String modelVersionId;
+ @JsonProperty(value = "modelCustomizationId")
+ private String modelCustomizationId;
+
@JsonProperty(value = "k8sRBInstanceReleaseName")
private String k8sRBInstanceReleaseName;
@JsonProperty(value = "k8sRBProfileName")
private String k8sRBProfileName;
+ @JsonProperty("k8sRBInstanceStatusCheck")
+ private Boolean k8sRBInstanceStatusCheck = false;
+
@JsonProperty(value = "cloudRegionId")
private String cloudRegionId;
this.modelVersionId = modelVersionId;
}
+ public String getModelCustomizationId() {
+ return modelCustomizationId;
+ }
+
+ public void setModelCustomizationId(String modelCustomizationId) {
+ this.modelCustomizationId = modelCustomizationId;
+ }
+
public String getK8sRBProfileName() {
return k8sRBProfileName;
}
this.k8sRBInstanceReleaseName = k8sRBInstanceReleaseName;
}
+ public Boolean getK8sRBInstanceStatusCheck() { return k8sRBInstanceStatusCheck; }
+
+ public void setK8sRBInstanceStatusCheck(Boolean k8sRBInstanceStatusCheck) {
+ this.k8sRBInstanceStatusCheck = k8sRBInstanceStatusCheck;
+ }
+
public String getCloudRegionId() {
return cloudRegionId;
}
// for configuration
String endpoint = UriBuilder.fromUri(uri).path(HEALTH_CHECK).build().toString();
HttpEntity<?> requestEntity = new HttpEntity<>(getHttpHeaders());
+ logger.info("request: " + requestEntity);
result = restTemplate.exchange(endpoint, HttpMethod.GET, requestEntity, String.class);
+ logger.info("response: " + result);
return result.getBody();
} catch (HttpClientErrorException e) {
logger.error("Error Calling Multicloud, e");
multicloudInstanceRequest.setOverrideValues(bpmnInstanceRequest.getOverrideValues());
multicloudInstanceRequest.setProfileName(bpmnInstanceRequest.getK8sRBProfileName());
multicloudInstanceRequest.setRbName(bpmnInstanceRequest.getModelInvariantId());
- multicloudInstanceRequest.setRbVersion(bpmnInstanceRequest.getModelVersionId());
+ if (bpmnInstanceRequest.getModelCustomizationId() != null) {
+ multicloudInstanceRequest.setRbVersion(bpmnInstanceRequest.getModelCustomizationId());
+ logger.info("vfModuleModelCustomizationId used for rb-version: " + multicloudInstanceRequest.getRbVersion());
+ } else {
+ multicloudInstanceRequest.setRbVersion(bpmnInstanceRequest.getModelVersionId());
+ logger.info("vfModuleModelUUID used for rb-version: " + multicloudInstanceRequest.getRbVersion());
+ }
- if (bpmnInstanceRequest.getK8sRBInstanceReleaseName() != null)
+ if (bpmnInstanceRequest.getK8sRBInstanceReleaseName() != null) {
multicloudInstanceRequest.setReleaseName(bpmnInstanceRequest.getK8sRBInstanceReleaseName());
- else
+ logger.info("Specified release name used: " + multicloudInstanceRequest.getReleaseName());
+ } else {
multicloudInstanceRequest.setReleaseName(
- bpmnInstanceRequest.getK8sRBProfileName() + "-" + bpmnInstanceRequest.getVfModuleUUID());
+ bpmnInstanceRequest.getK8sRBProfileName() + "-" + bpmnInstanceRequest.getVfModuleUUID());
+ logger.info("Generated release name used: " + multicloudInstanceRequest.getReleaseName());
+ }
} else {
logger.error("k8sProfileName should not be null");
// return instanceResponse;
// for configuration
String endpoint = UriBuilder.fromUri(uri).path(INSTANCE_CREATE_PATH).build().toString();
HttpEntity<?> entity = getHttpEntity(multicloudInstanceRequest);
+ logger.info("request: " + entity);
instanceResponse = restTemplate.exchange(endpoint, HttpMethod.POST, entity, String.class);
+ logger.info("response: " + instanceResponse);
return instanceResponse.getBody();
} catch (HttpClientErrorException e) {
logger.error("Error Calling Multicloud, e");
String path = "/v1/instance/" + instanceId;
String endpoint = UriBuilder.fromUri(uri).path(path).build().toString();
HttpEntity<?> requestEntity = new HttpEntity<>(getHttpHeaders());
+ logger.info("request: " + requestEntity);
instanceResponse = restTemplate.exchange(endpoint, HttpMethod.GET, requestEntity, String.class);
+ logger.info("response: " + instanceResponse);
return instanceResponse.getBody();
} catch (HttpClientErrorException e) {
logger.error("Error Calling Multicloud, e");
String path = "/v1/instance/" + instanceId + "/status";
String endpoint = UriBuilder.fromUri(uri).path(path).build().toString();
HttpEntity<?> requestEntity = new HttpEntity<>(getHttpHeaders());
+ logger.info("request: " + requestEntity);
instanceResponse = restTemplate.exchange(endpoint, HttpMethod.GET, requestEntity, String.class);
+ logger.info("response: " + instanceResponse);
return instanceResponse.getBody();
} catch (HttpClientErrorException e) {
logger.error("Error Calling Multicloud, e");
String path = "/v1/instance/" + instanceId + "/query";
String endpoint = UriBuilder.fromUri(uri).path(path).build().toString();
HttpEntity<?> requestEntity = new HttpEntity<>(getHttpHeaders());
+ logger.info("request: " + requestEntity);
instanceResponse = restTemplate.exchange(endpoint, HttpMethod.GET, requestEntity, String.class);
+ logger.info("response: " + instanceResponse);
return instanceResponse.getBody();
} catch (HttpClientErrorException e) {
if (HttpStatus.SC_NOT_FOUND == e.getStatusCode().value()) {
String path = "/v1/instance/" + instanceId;
String endpoint = UriBuilder.fromUri(uri).path(path).build().toString();
HttpEntity<?> requestEntity = new HttpEntity<>(getHttpHeaders());
+ logger.info("request: " + requestEntity);
result = restTemplate.exchange(endpoint, HttpMethod.DELETE, requestEntity, String.class);
+ logger.info("response: " + result);
return result.getBody();
} catch (HttpClientErrorException e) {
logger.error("Error Calling Multicloud, e");