diff options
Diffstat (limited to 'mso-api-handlers/mso-api-handler-common/src/main/java')
4 files changed, 60 insertions, 73 deletions
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java index 5cf859d..71fddd8 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -44,53 +44,53 @@ public class CamundaVIDRequest { @JsonProperty(CommonConstants.CAMUNDA_SERVICE_INPUT) private CamundaInput serviceInput; - + @JsonProperty(CommonConstants.CAMUNDA_HOST) private CamundaInput host; - + @JsonProperty(CommonConstants.REQUEST_ID_VARIABLE) private CamundaInput requestId; - + @JsonProperty(CommonConstants.REQUEST_ID_HEADER) - private CamundaInput attMsoRequestId; - - + private CamundaInput msoRequestId; + + @JsonProperty(CommonConstants.IS_BASE_VF_MODULE_VARIABLE) private CamundaBooleanInput isBaseVfModule; - + @JsonProperty(CommonConstants.RECIPE_TIMEOUT_VARIABLE) private CamundaIntegerInput recipeTimeout; - + @JsonProperty(CommonConstants.REQUEST_ACTION_VARIABLE) private CamundaInput requestAction; - + @JsonProperty(CommonConstants.SERVICE_INSTANCE_ID_VARIABLE) private CamundaInput serviceInstanceId; - + @JsonProperty(CommonConstants.VNF_ID_VARIABLE) private CamundaInput vnfId; - + @JsonProperty(CommonConstants.VF_MODULE_ID_VARIABLE) private CamundaInput vfModuleId; - + @JsonProperty(CommonConstants.VOLUME_GROUP_ID_VARIABLE) private CamundaInput volumeGroupId; - + @JsonProperty(CommonConstants.NETWORK_ID_VARIABLE) private CamundaInput networkId; - + @JsonProperty(CommonConstants.SERVICE_TYPE_VARIABLE) private CamundaInput serviceType; - + @JsonProperty(CommonConstants.VNF_TYPE_VARIABLE) private CamundaInput vnfType; - + @JsonProperty(CommonConstants.VF_MODULE_TYPE_VARIABLE) private CamundaInput vfModuleType; - + @JsonProperty(CommonConstants.NETWORK_TYPE_VARIABLE) private CamundaInput networkType; - + @JsonProperty(CommonConstants.CAMUNDA_SERVICE_INPUT) public CamundaInput getServiceInput() { return serviceInput; @@ -100,7 +100,7 @@ public class CamundaVIDRequest { public void setServiceInput(CamundaInput serviceInput) { this.serviceInput = serviceInput; } - + @JsonProperty(CommonConstants.CAMUNDA_HOST) public CamundaInput getHost() { return host; @@ -120,17 +120,17 @@ public class CamundaVIDRequest { public void setRequestId(CamundaInput requestId) { this.requestId = requestId; } - + @JsonProperty(CommonConstants.REQUEST_ID_HEADER) - public CamundaInput getAttMsoRequestId() { - return attMsoRequestId; + public CamundaInput getMsoRequestId() { + return msoRequestId; } @JsonProperty(CommonConstants.REQUEST_ID_HEADER) - public void setAttMsoRequestId(CamundaInput attMsoRequestId) { - this.attMsoRequestId = attMsoRequestId; + public void setMsoRequestId(CamundaInput msoRequestIdp) { + this.msoRequestId = msoRequestIdp; } - + @JsonProperty(CommonConstants.IS_BASE_VF_MODULE_VARIABLE) public CamundaBooleanInput getIsBaseVfModule() { return isBaseVfModule; @@ -140,7 +140,7 @@ public class CamundaVIDRequest { public void setIsBaseVfModule(CamundaBooleanInput isBaseVfModule) { this.isBaseVfModule = isBaseVfModule; } - + @JsonProperty(CommonConstants.RECIPE_TIMEOUT_VARIABLE) public CamundaIntegerInput getRecipeTimeout() { return recipeTimeout; @@ -150,7 +150,7 @@ public class CamundaVIDRequest { public void setRecipeTimeout(CamundaIntegerInput recipeTimeout) { this.recipeTimeout = recipeTimeout; } - + @JsonProperty(CommonConstants.REQUEST_ACTION_VARIABLE) public CamundaInput getRequestAction() { return requestAction; @@ -169,7 +169,7 @@ public class CamundaVIDRequest { public void setServiceInstanceId(CamundaInput serviceInstanceId) { this.serviceInstanceId = serviceInstanceId; } - + @JsonProperty(CommonConstants.VNF_ID_VARIABLE) public CamundaInput getVnfId() { return vnfId; @@ -179,7 +179,7 @@ public class CamundaVIDRequest { public void setVnfId(CamundaInput vnfId) { this.vnfId = vnfId; } - + @JsonProperty(CommonConstants.VF_MODULE_ID_VARIABLE) public CamundaInput getVfModuleId() { return vfModuleId; @@ -189,7 +189,7 @@ public class CamundaVIDRequest { public void setVfModuleId(CamundaInput vfModuleId) { this.vfModuleId = vfModuleId; } - + @JsonProperty(CommonConstants.VOLUME_GROUP_ID_VARIABLE) public CamundaInput getVolumeGroupId() { return volumeGroupId; @@ -199,7 +199,7 @@ public class CamundaVIDRequest { public void setVolumeGroupId(CamundaInput volumeGroupId) { this.volumeGroupId = volumeGroupId; } - + @JsonProperty(CommonConstants.NETWORK_ID_VARIABLE) public CamundaInput getNetworkId() { return networkId; @@ -209,7 +209,7 @@ public class CamundaVIDRequest { public void setNetworkId(CamundaInput networkId) { this.networkId = networkId; } - + @JsonProperty(CommonConstants.SERVICE_TYPE_VARIABLE) public CamundaInput getServiceType() { return serviceType; @@ -219,7 +219,7 @@ public class CamundaVIDRequest { public void setServiceType(CamundaInput serviceType) { this.serviceType = serviceType; } - + @JsonProperty(CommonConstants.VNF_TYPE_VARIABLE) public CamundaInput getVnfType() { return vnfType; @@ -229,7 +229,7 @@ public class CamundaVIDRequest { public void setVnfType(CamundaInput vnfType) { this.vnfType = vnfType; } - + @JsonProperty(CommonConstants.VF_MODULE_TYPE_VARIABLE) public CamundaInput getVfModuleType() { return vfModuleType; @@ -239,7 +239,7 @@ public class CamundaVIDRequest { public void setVfModuleType(CamundaInput vfModuleType) { this.vfModuleType = vfModuleType; } - + @JsonProperty(CommonConstants.NETWORK_TYPE_VARIABLE) public CamundaInput getNetworkType() { return networkType; @@ -249,14 +249,14 @@ public class CamundaVIDRequest { public void setNetworkType(CamundaInput networkType) { this.networkType = networkType; } - - + + @Override public String toString() { //return "CamundaRequest [requestId=" + + ", host=" // + host + ", schema=" + schema + ", reqid=" + reqid + ", svcid=" // + svcid + ", timeout=" + timeout + "]"; return "CamundaRequest"; - } - + } + } diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaClient.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaClient.java index dd83d24..d893a12 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaClient.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaClient.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -38,7 +38,7 @@ public class CamundaClient extends RequestClient{ private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.APIH); public CamundaClient() { - super(CommonConstants.CAMUNDA); + super(CommonConstants.CAMUNDA); } @@ -141,8 +141,8 @@ public class CamundaClient extends RequestClient{ if(schemaVersion == null){ schemaVersion = ""; } - - + + try{ CamundaRequest camundaRequest = new CamundaRequest(); CamundaInput camundaInput = new CamundaInput(); @@ -221,7 +221,6 @@ public class CamundaClient extends RequestClient{ try{ CamundaVIDRequest camundaRequest = new CamundaVIDRequest(); - BpmnRequest bpmnRequest = new BpmnRequest(); CamundaInput serviceInput = new CamundaInput(); CamundaInput host = new CamundaInput(); CamundaInput requestIdInput= new CamundaInput(); @@ -253,26 +252,11 @@ public class CamundaClient extends RequestClient{ vfModuleTypeInput.setValue(vfModuleType); networkTypeInput.setValue(networkType); - bpmnRequest.setRequestId(requestIdInput); - bpmnRequest.setIsBaseVfModule(isBaseVfModuleInput); - bpmnRequest.setRecipeTimeout(recipeTimeoutInput); - bpmnRequest.setRequestAction(requestActionInput); - bpmnRequest.setServiceInstanceId(serviceInstanceIdInput); - bpmnRequest.setVnfId(vnfIdInput); - bpmnRequest.setVfModuleId(vfModuleIdInput); - bpmnRequest.setVolumeGroupId(volumeGroupIdInput); - bpmnRequest.setNetworkId(networkIdInput); - bpmnRequest.setServiceType(serviceTypeInput); - bpmnRequest.setVnfType(vnfTypeInput); - bpmnRequest.setVfModuleType(vfModuleTypeInput); - bpmnRequest.setNetworkType(networkTypeInput); - //bpmnRequest.setRequestDetails(requestDetailsInput); - serviceInput.setValue(requestDetails); camundaRequest.setServiceInput(serviceInput); camundaRequest.setHost(host); camundaRequest.setRequestId(requestIdInput); - camundaRequest.setAttMsoRequestId(requestIdInput); + camundaRequest.setMsoRequestId(requestIdInput); camundaRequest.setIsBaseVfModule(isBaseVfModuleInput); camundaRequest.setRecipeTimeout(recipeTimeoutInput); camundaRequest.setRequestAction(requestActionInput); diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CommonConstants.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CommonConstants.java index 3a9ad60..187e0ed 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CommonConstants.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CommonConstants.java @@ -26,11 +26,11 @@ public final class CommonConstants { public static final String DEFAULT_BPEL_AUTH = "admin:admin"; public static final String ENCRYPTION_KEY = "aa3871669d893c7fb8abbcda31b88b4f"; - public static final String REQUEST_ID_HEADER = "att-mso-request-id"; - public static final String REQUEST_TIMEOUT_HEADER = "att-mso-service-request-timeout"; - public static final String SCHEMA_VERSION_HEADER = "att-mso-schema-version"; - public static final String SERVICE_INSTANCE_ID_HEADER = "att-mso-service-instance-id"; - public static final String ACTION_HEADER = "att-mso-action"; + public static final String REQUEST_ID_HEADER = "mso-request-id"; + public static final String REQUEST_TIMEOUT_HEADER = "mso-service-request-timeout"; + public static final String SCHEMA_VERSION_HEADER = "mso-schema-version"; + public static final String SERVICE_INSTANCE_ID_HEADER = "mso-service-instance-id"; + public static final String ACTION_HEADER = "mso-action"; public static final String CAMUNDA_SERVICE_INPUT = "bpmnRequest"; public static final String CAMUNDA_ROOT_INPUT = "variables"; @@ -45,7 +45,7 @@ public final class CommonConstants { public static final int BPEL = 0; public static final int CAMUNDA = 1; public static final String CAMUNDA_HOST = "host"; - public static final String SDNC_UUID_HEADER = "att-mso-sdnc-request-id"; + public static final String SDNC_UUID_HEADER = "mso-sdnc-request-id"; public static final String REQUEST_ID_VARIABLE = "requestId"; public static final String IS_BASE_VF_MODULE_VARIABLE = "isBaseVfModule"; diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ValidationException.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ValidationException.java index 0136a2d..eb7a012 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ValidationException.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ValidationException.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,12 +26,13 @@ public class ValidationException extends Exception { /** * This class simply extends Exception (without addition additional functionality) * to provide an identifier for RequestsDB related exceptions on create, delete, query. - * + * * **/ private static final long serialVersionUID = 1L; private static final String validationFailMessage = "No valid $ELEMENT is specified"; + private static final String invalidElementMessage = "$ELEMENT is not valid in the $VERSION version"; public ValidationException (String msg) { super (validationFailMessage.replaceAll ("\\$ELEMENT", msg)); @@ -40,5 +41,7 @@ public class ValidationException extends Exception { public ValidationException (String msg, Exception cause) { super (validationFailMessage.replaceAll ("\\$ELEMENT", msg), cause); } - + public ValidationException(String msg, String version) { + super(invalidElementMessage.replaceAll("\\$ELEMENT", msg).replaceAll("\\$VERSION", version)); + } } |