summaryrefslogtreecommitdiffstats
path: root/mso-catalog-db
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-10-23 14:08:57 -0400
committerRob Daugherty <rd472p@att.com>2018-10-23 16:18:55 -0400
commit6cf9ff1f1f2360a406f68f3147d86fd864d31910 (patch)
tree0df346a4222f84511ba47ac090e81d37a2c675d4 /mso-catalog-db
parent60f8f5342f1fba49373699c1466e6ca06d1adc34 (diff)
parent0116cbfe7836b05381fe5632e0e536a625789b31 (diff)
8/23: merge casablanca to master
Change-Id: I0a73fbedf8c6f22e0a37cd8f0505ddcf83250341 Issue-ID: SO-1160 Signed-off-by: Rob Daugherty <rd472p@att.com>
Diffstat (limited to 'mso-catalog-db')
-rw-r--r--mso-catalog-db/src/test/resources/data.sql4
1 files changed, 2 insertions, 2 deletions
diff --git a/mso-catalog-db/src/test/resources/data.sql b/mso-catalog-db/src/test/resources/data.sql
index 3f3aabb17e..3451011ccb 100644
--- a/mso-catalog-db/src/test/resources/data.sql
+++ b/mso-catalog-db/src/test/resources/data.sql
@@ -512,7 +512,7 @@ VALUES
('SERVICE', 'PENDING_ACTIVATION', 'ACTIVATE', 'FAIL'),
('VNF', 'PENDING_ACTIVATION', 'ACTIVATE', 'FAIL'),
('VOLUME_GROUP', 'PENDING_ACTIVATION', 'ACTIVATE', 'FAIL'),
-('VF_MODULE', 'PENDING_ACTIVATION', 'ACTIVATE', 'FAIL'),
+('VF_MODULE', 'PENDING_ACTIVATION', 'ACTIVATE', 'SILENT_SUCCESS'),
('NETWORK', 'PENDING_ACTIVATION', 'ACTIVATE', 'FAIL'),
('SERVICE', 'PENDING', 'ACTIVATE', 'FAIL'),
('VNF', 'PENDING', 'ACTIVATE', 'FAIL'),
@@ -613,7 +613,7 @@ VALUES
('VF_MODULE', 'PENDING_DELETE', 'CREATE', 'CONTINUE'),
('NETWORK', 'PENDING_DELETE', 'CREATE', 'CONTINUE'),
('VOLUME_GROUP', 'PENDING_ACTIVATION', 'CREATE', 'FAIL'),
-('VF_MODULE', 'PENDING_ACTIVATION', 'CREATE', 'FAIL'),
+('VF_MODULE', 'PENDING_ACTIVATION', 'CREATE', 'SILENT_SUCCESS'),
('NETWORK', 'PENDING_ACTIVATION', 'CREATE', 'FAIL'),
('VOLUME_GROUP', 'PENDING', 'CREATE', 'CONTINUE'),
('VF_MODULE', 'PENDING', 'CREATE', 'FAIL'),