summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Benjamin <max.benjamin@att.com>2019-09-04 15:29:25 +0000
committerGerrit Code Review <gerrit@onap.org>2019-09-04 15:29:25 +0000
commit4c81727a226d80c4ac07df61302dca3540f507d0 (patch)
tree923ea570e94e47516bf93ee3c8ad0f48652aa718
parent3ba5abf2d76c3d76339f67d933c2d095686c99f1 (diff)
parentf6c7baeb06def81024995f94b8a98dc33f907106 (diff)
Merge "Fix rollback for ConfigAssignBB"
-rw-r--r--bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java12
-rw-r--r--docs/release-notes.rst6
2 files changed, 9 insertions, 9 deletions
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
index 100f81a0c7..d5798150d1 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
@@ -290,12 +290,12 @@ public class WorkflowActionBBTasks {
flowsToExecute.remove(i);
} else {
String flowName = flowsToExecute.get(i).getBuildingBlock().getBpmnFlowName();
- if (flowName.contains("Assign")) {
- flowName = "Unassign" + flowName.substring(6, flowName.length());
- } else if (flowName.contains("Create")) {
- flowName = "Delete" + flowName.substring(6, flowName.length());
- } else if (flowName.contains("Activate")) {
- flowName = "Deactivate" + flowName.substring(8, flowName.length());
+ if (flowName.startsWith("Assign")) {
+ flowName = flowName.replaceFirst("Assign", "Unassign");
+ } else if (flowName.startsWith("Create")) {
+ flowName = flowName.replaceFirst("Create", "Delete");
+ } else if (flowName.startsWith("Activate")) {
+ flowName = flowName.replaceFirst("Activate", "Deactivate");
} else {
continue;
}
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index cdb20c246b..3b2649361e 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -26,6 +26,7 @@ Version: 1.4.4
- onap/so/sdnc-adapter,1.4.4
- onap/so/so-monitoring,1.4.4
- onap/so/vfc-adapter,1.4.4
+ - onap/so/vnfm-adapter,1.4.4
**Release Purpose**
@@ -37,7 +38,7 @@ The main goal of the Dublin release was to:
- Support BroadBand Service Usecase
- SO SOL003 plugin support
- Improve PNF PnP
-
+ - Improve SO internal modularity
**Epics**
@@ -50,7 +51,6 @@ The main goal of the Dublin release was to:
- [`SO-1273 <https://jira.onap.org/browse/SO-1273>`__\ ] - PNF PnP Dublin updates & improvements
- [`SO-1271 <https://jira.onap.org/browse/SO-1271>`__\ ] - PNF PnP Casablanca MR updates
- [`SO-677 <https://jira.onap.org/browse/SO-677>`__\ ] - Improve the issues and findings of the SO Casablanca Release
-- [`SO-166 <https://jira.onap.org/browse/SO-166>`__\ ] - Non-stop operations required.
**Stories**
@@ -220,7 +220,7 @@ The main goal of the Dublin release was to:
Testing Terminate and Delete of ETSI VNFM Adapter is done and has some of the minor issues pending, it will be done in El Alto.
-- [`SO-1742 <https://jira.onap.org/browse/SO-1742>`__\ ] - Test Terminate/Delete VNF with VNFM Adapter
+- [`SO-2013 <https://jira.onap.org/browse/SO-2013>`__\ ] - Test Terminate/Delete VNF with VNFM Adapter
**Upgrade Notes**