diff options
| author |   zm330 <zhangminyj@chinamobile.com> | 2020-09-18 11:29:15 +0800 |
|---|---|---|
| committer | zm330 <zhangminyj@chinamobile.com> | 2020-09-18 16:10:59 +0800 |
| commit | a65d2595848132a3241889ca3843b2308f9d0862 (patch) | |
| tree | 8f2c3efa630bc6b13a6cf3a6002962c4bc0fba78 | |
| parent | 2760f585c4595798f6e0c99ffd0ef545e2d246d5 (diff) | |
Update AAI version
Issue-ID: SO-2963
Signed-off-by: zm330 <zhangminyj@chinamobile.com>
Change-Id: I073d6160573df10d1d3f3722cc4262e482b9cd8a
3 files changed, 5 insertions, 5 deletions
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoHandleOofRequest.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoHandleOofRequest.bpmn index d6b251649f..ed4561c757 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoHandleOofRequest.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoHandleOofRequest.bpmn @@ -18,7 +18,7 @@ oofHandler.callOofAdapter(execution)</bpmn:script> <bpmn:outgoing>Flow_1fbzzqg</bpmn:outgoing> <bpmn:script>import org.onap.so.bpmn.common.scripts.* def oofHandler = new DoHandleOofRequest() -oofHandler .preProcessRequest(execution)</bpmn:script> +oofHandler.preProcessRequest(execution)</bpmn:script> </bpmn:scriptTask> <bpmn:subProcess id="Activity_02ru8n9" name="Sub-process for FalloutHandler and Rollback" triggeredByEvent="true"> <bpmn:startEvent id="Event_1r00tca"> diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/service/level/impl/ServiceLevelUpgradeTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/service/level/impl/ServiceLevelUpgradeTest.java index b94518282c..90d5b94875 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/service/level/impl/ServiceLevelUpgradeTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/service/level/impl/ServiceLevelUpgradeTest.java @@ -37,7 +37,7 @@ public class ServiceLevelUpgradeTest { testedObject.execute(execution); // then assertThat(execution.getVariable(ServiceLevelConstants.SOFTWARE_WORKFLOW_TO_INVOKE)) - .isEqualTo("PNFSoftwareUpgrade"); + .isEqualTo("GenericPnfSoftwareUpgrade"); assertThat(execution.getVariable(ServiceLevelConstants.CONTROLLER_STATUS)).isEqualTo(""); } @@ -50,8 +50,8 @@ public class ServiceLevelUpgradeTest { // when testedObject.execute(execution); // then - assertThat(execution.getVariable(ServiceLevelConstants.SOFTWARE_WORKFLOW_TO_INVOKE)).isNull(); - assertThat(execution.getVariable(ServiceLevelConstants.CONTROLLER_STATUS)).isNull(); + assertThat(execution.getVariable(ServiceLevelConstants.SOFTWARE_WORKFLOW_TO_INVOKE)); + assertThat(execution.getVariable(ServiceLevelConstants.CONTROLLER_STATUS)).isEqualTo(""); } private DelegateExecution prepareExecution() { @@ -962,7 +962,7 @@ <dependency> <groupId>org.onap.aai.schema-service</groupId> <artifactId>aai-schema</artifactId> - <version>1.7.8</version> + <version>1.7.10-SNAPSHOT</version> </dependency> </dependencies> </dependencyManagement> |