AT&T 1712 and 1802 release code

[so.git] / bpmn / MSOInfrastructureBPMN / src / test / java / org / openecomp / mso / bpmn / infrastructure / DoUpdateVfModuleTest.java

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoUpdateVfModuleTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoUpdateVfModuleTest.java
index 9fa9323..a955c4e 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoUpdateVfModuleTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoUpdateVfModuleTest.java
@@ -37,6 +37,7 @@ import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchGenericVnf;
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchVfModuleId;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutVfModuleIdNoResponse;\r
+import static org.openecomp.mso.bpmn.mock.StubResponseDatabase.MockGetServiceResourcesCatalogData;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseSDNCAdapter.mockSDNCAdapter;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseVNFAdapter.mockVNFPut;\r
 \r
@@ -98,6 +99,8 @@ public class DoUpdateVfModuleTest extends WorkflowTest {
                mockVNFPut("skask", "/supercool", 202);\r
                MockPutGenericVnf("skask");\r
                MockGetGenericVnfByIdWithPriority("skask", "supercool", 200, "VfModularity/VfModule-supercool.xml", 1);\r
+               //Catalog DB\r
+               MockGetServiceResourcesCatalogData("aa5256d2-5a33-55df-13ab-12abad84e7ff","InfrastructureFlows/DoCreateServiceInstance_request.json");\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
                Map<String, Object> variables = new HashMap<>();\r
@@ -144,6 +147,8 @@ public class DoUpdateVfModuleTest extends WorkflowTest {
                MockPatchVfModuleId("skask", ".*");\r
                MockSDNCAdapterVfModule();\r
                MockVNFAdapterRestVfModule();\r
+               //Catalog DB\r
+               MockGetServiceResourcesCatalogData("aa5256d2-5a33-55df-13ab-12abad84e7ff","InfrastructureFlows/DoCreateServiceInstance_request.json");\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
                Map<String, Object> variables = new HashMap<>();\r
@@ -181,6 +186,14 @@ public class DoUpdateVfModuleTest extends WorkflowTest {
                                "\"modelVersion\": \"1\"," + \r
                                "\"modelCustomizationUuid\": \"VNF-MODEL-123\"" + "}";\r
        variables.put("vnfModelInfo", vnfModelInfo);\r
+       \r
+       String serviceModelInfo = "{ "+ "\"modelType\": \"service\"," +\r
+                       "\"modelInvariantUuid\": \"aa5256d2-5a33-55df-13ab-12abad84e7ff\"," + \r
+                       "\"modelUuid\": \"bb6478e5-ea33-3346-ac12-ab121484a3fe\"," +\r
+                       "\"modelName\": \"SVC-STMTN5MMSC21-MMSC::model-1-0\"," +\r
+                       "\"modelVersion\": \"1\"," + \r
+                        "}";\r
+       variables.put("serviceModelInfo", serviceModelInfo);\r
                \r
                invokeSubProcess("DoUpdateVfModule", businessKey, variables);\r
                \r