\r
import org.apache.commons.lang3.*\r
import org.camunda.bpm.engine.delegate.BpmnError\r
-import org.camunda.bpm.engine.delegate.DelegateExecution\r\r
+import org.camunda.bpm.engine.delegate.DelegateExecution\r
+\r
import org.openecomp.mso.bpmn.core.WorkflowException\r
import org.openecomp.mso.bpmn.core.json.JsonUtils;\r
import org.springframework.web.util.UriUtils\r
this.taskProcessor = taskProcessor\r
}\r
\r
- String SDNCAdapterFeatureRequest(DelegateExecution execution, String requestName, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {\r\r
+ String SDNCAdapterFeatureRequest(DelegateExecution execution, String requestName, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {\r
+\r
def utils=new MsoUtils()\r
\r
def prefix = execution.getVariable('prefix')\r
return sdncAdapterFeatureRequest\r
}\r
\r
- String SDNCAdapterActivateVnfRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String msoAction, String timeoutValueInMinutes) {\r\r
+ String SDNCAdapterActivateVnfRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String msoAction, String timeoutValueInMinutes) {\r
+\r
def utils=new MsoUtils()\r
\r
def prefix = execution.getVariable('prefix')\r
return sdncAdapterActivateVnfRequest\r
}\r
\r
- String SDNCAdapterL3ToHigherLayerRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {\r\r
+ String SDNCAdapterL3ToHigherLayerRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {\r
+\r
def utils=new MsoUtils()\r
\r
def prefix = execution.getVariable('prefix')\r
\r
\r
\r
- private void SDNCAdapterActivateRequest(DelegateExecution execution, String resultVar, String svcAction,\r\r
+ private void SDNCAdapterActivateRequest(DelegateExecution execution, String resultVar, String svcAction,\r
+\r
String svcOperation, String additionalData) {\r
def utils=new MsoUtils()\r
\r
* @param resultVar the execution variable in which the result will be stored\r
* @param isAic3 boolean to indicate whether request is for AIC3.0\r
*/\r
- public void sdncReservePrep(DelegateExecution execution, String action, String resultVar, boolean isAic3) {\r\r
+ public void sdncReservePrep(DelegateExecution execution, String action, String resultVar, boolean isAic3) {\r
+\r
sdncPrep(execution, resultVar, action , 'service-configuration-operation', null, isAic3, this.taskProcessor)\r
}\r
\r
* @param additionalData additional XML content to be inserted into the RequestData element (may be null)\r
* @param isAic3 boolean to indicate whether request is for AIC3.0\r
*/\r
- public void sdncPrep(DelegateExecution execution, String resultVar, String svcAction,\r\r
+ public void sdncPrep(DelegateExecution execution, String resultVar, String svcAction,\r
+\r
String svcOperation, String additionalData, boolean isAic3, AbstractServiceTaskProcessor taskProcessor) {\r
def method = getClass().getSimpleName() + '.sdncPrep(' +\r
'execution=' + execution.getId() +\r
* @param additionalData additional XML content to be inserted into the\r
* RequestData element (may be null)\r
*/\r
- public String sdncTopologyRequestV2 (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String queryAAIResponse, String additionalData) {\r\r
+ public String sdncTopologyRequestV2 (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String queryAAIResponse, String additionalData) {\r
+\r
def utils=new MsoUtils()\r
\r
// SNDC is expecting request Id for header as unique each call.\r
* @param additionalData additional XML content to be inserted into the\r
* RequestData element (may be null)\r
*/\r
- public String sdncTopologyRequestRsrc (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String additionalData) {\r\r
+ public String sdncTopologyRequestRsrc (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String additionalData) {\r
+\r
def utils=new MsoUtils()\r
\r
// SNDC is expecting request Id for header as unique each call.\r
<service-information>\r
<service-id>${serviceId}</service-id>\r
<subscription-service-type>${subscriptionServiceType}</subscription-service-type>\r
- <ecomp-model-information>\r
+ <onap-model-information>\r
<model-invariant-uuid>${serviceModelInvariantUuid}</model-invariant-uuid>\r
<model-uuid>${serviceModelUuid}</model-uuid>\r
<model-version>${serviceModelVersion}</model-version>\r
<model-name>${serviceModelName}</model-name>\r
- </ecomp-model-information>\r
+ </onap-model-information>\r
<service-instance-id>${serviceInstanceId}</service-instance-id>\r
<global-customer-id>${globalCustomerId}</global-customer-id>\r
<subscriber-name>${subscriberName}</subscriber-name>\r
<network-information>\r
<network-id>${networkId}</network-id>\r
<network-type>${networkType}</network-type>\r
- <ecomp-model-information>\r
+ <onap-model-information>\r
<model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>\r
<model-customization-uuid>${modelCustomizationUuid}</model-customization-uuid>\r
<model-uuid>${modelUuid}</model-uuid>\r
<model-version>${modelVersion}</model-version>\r
<model-name>${modelName}</model-name>\r
- </ecomp-model-information>\r
+ </onap-model-information>\r
</network-information>\r
<network-request-input>\r
<network-name>${networkName}</network-name>\r
* @param responseVar the execution variable in which the response is stored\r
* @param workflowException the WorkflowException Object returned from sdnc call\r
*/\r
- public void validateSDNCResponse(DelegateExecution execution, String response, WorkflowException workflowException, boolean successIndicator){\r\r
+ public void validateSDNCResponse(DelegateExecution execution, String response, WorkflowException workflowException, boolean successIndicator){\r
+\r
def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')\r
taskProcessor.utils.log("DEBUG", "SDNC Response is: " + response, isDebugLogEnabled)\r
taskProcessor.utils.log("DEBUG", "SuccessIndicator is: " + successIndicator, isDebugLogEnabled)\r
* @param responseCodeVar the execution variable in which the response code is stored\r
* @param errorResponseVar the execution variable in which the error response is stored\r
*/\r
- public void validateL3BondingSDNCResp(DelegateExecution execution, String response, WorkflowException workflowException, boolean success) {\r\r
+ public void validateL3BondingSDNCResp(DelegateExecution execution, String response, WorkflowException workflowException, boolean success) {\r
+\r
def method = getClass().getSimpleName() + '.validateL3BondingSDNCResp(' +\r
'execution=' + execution.getId() +\r
', response=' + response +\r
} \r
String modelName = jsonUtil.getJsonValue(jsonModelInfo, "modelName")\r
String ecompModelInformation =\r
- """<ecomp-model-information>\r
+ """<onap-model-information>\r
<model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>\r
<model-uuid>${modelUuid}</model-uuid>\r
${modelCustomizationString}\r
<model-version>${modelVersion}</model-version>\r
<model-name>${modelName}</model-name>\r
- </ecomp-model-information>"""\r
+ </onap-model-information>"""\r
\r
return ecompModelInformation \r
} \r