From 77177465215cbda013352cd3afda02a2cfdc24f7 Mon Sep 17 00:00:00 2001 From: Sebastien Premont-Tendland Date: Thu, 9 Apr 2020 10:07:56 -0400 Subject: Fix transition states for the BB workflow. Deleted the versioned flyway file in favor of the repeatable one for MacroData. I know deleting a versioned file could mess up upgrade but given no release has been done with those new versioned files it should be ok and cleaner. This is a list of transition states that were added internally at Bell when working with the BB workflow and post instantiation. Those are to support Rollback and Delete even if the VNF is in the status ConfigAssigned, Configure or Configured. The missing transition states was causing the Rollback or Delete to fail. Issue-ID: SO-2798 Signed-off-by: Sebastien Premont-Tendland Change-Id: I21c11298a456a472cedc7a8733c6dbc3a071f3a6 (cherry picked from commit b1e92221cbed0131b0788e993ee224a42283a8a2) --- .../src/main/resources/db/migration/R__MacroData.sql | 12 +++++++++++- .../V9.0__AddConfiguredForVnfOrchestrationStatus.sql | 2 -- 2 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 adapters/mso-catalog-db-adapter/src/main/resources/db/migration/V9.0__AddConfiguredForVnfOrchestrationStatus.sql (limited to 'adapters/mso-catalog-db-adapter/src/main/resources') diff --git a/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/R__MacroData.sql b/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/R__MacroData.sql index b4366b365b..e27ec2ef27 100644 --- a/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/R__MacroData.sql +++ b/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/R__MacroData.sql @@ -624,7 +624,17 @@ VALUES ('VOLUME_GROUP', 'PENDING', 'DELETE', 'SILENT_SUCCESS'), ('VF_MODULE', 'PENDING', 'DELETE', 'FAIL'), -('NETWORK', 'PENDING', 'DELETE', 'FAIL'); +('NETWORK', 'PENDING', 'DELETE', 'FAIL'), + +('VNF', 'CONFIGURED', 'ACTIVATE', 'CONTINUE'), +('VNF', 'CONFIGURED', 'UNASSIGN', 'CONTINUE'), +('VNF', 'CONFIGURED', 'DESACTIVATE', 'SILENT_SUCCESS'), + +('VNF', 'CONFIGURE', 'UNASSIGN', 'CONTINUE'), +('VNF', 'CONFIGURE', 'DESACTIVATE', 'SILENT_SUCCESS'), + +('VNF', 'CONFIGASSIGNED', 'UNASSIGN', 'CONTINUE'), +('VNF', 'CONFIGASSIGNED', 'DESACTIVATE', 'SILENT_SUCCESS'); UPDATE orchestration_flow_reference SET FLOW_NAME = 'HomingBB' WHERE FLOW_NAME = 'SniroHoming'; diff --git a/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/V9.0__AddConfiguredForVnfOrchestrationStatus.sql b/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/V9.0__AddConfiguredForVnfOrchestrationStatus.sql deleted file mode 100644 index 81e6092f5f..0000000000 --- a/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/V9.0__AddConfiguredForVnfOrchestrationStatus.sql +++ /dev/null @@ -1,2 +0,0 @@ -INSERT INTO orchestration_status_state_transition_directive(RESOURCE_TYPE, ORCHESTRATION_STATUS, TARGET_ACTION, FLOW_DIRECTIVE) -VALUES ('VNF', 'CONFIGURED', 'ACTIVATE', 'CONTINUE'); -- cgit 1.2.3-korg