summaryrefslogtreecommitdiffstats
path: root/bpmn/MSOInfrastructureBPMN/src/test/resources
diff options
context:
space:
mode:
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/test/resources')
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateAllottedResourceBRG.bpmn54
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateAllottedResourceBRGRollback.bpmn55
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateAllottedResourceTXC.bpmn38
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateServiceInstanceRollback.bpmn53
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateVnfAndModules.bpmn53
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateVnfAndModulesRollback.bpmn53
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoDeleteVnfAndModules.bpmn37
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/Homing.bpmn35
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_defaultCloudRegionByCloudRegionId.json12
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_genericVnfGet.json9
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_genericVnfsByVnfId.json435
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_pserverByVnfId.json72
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/mockObject.json10
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/APPC/appc_error.json21
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf107
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf2Net165
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackNoSolutionFound15
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackPolicyException9
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackServiceException12
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml20
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/cloudRegion30_AAIResponse_Success.xml20
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetworkResponse_400.xml6
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetworkResponse_500.xml80
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetworkResponse_Success.xml24
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryInstance_Success.xml4
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryName2_AAIResponse_Success.xml62
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNameActive_AAIResponse_Success.xml74
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryName_AAIResponse_404.xml19
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryName_AAIResponse_Success.xml62
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_404.xml19
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml73
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_Success.xml110
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkPolicy_AAIResponse_Success.xml21
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkTableRef1_AAIResponse_Success.xml20
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkTableRef2_AAIResponse_Success.xml20
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryVpnBindingList_AAIResponse_Success.xml57
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryVpnBinding_AAIResponse_Success.xml46
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_updateContrail_AAIResponse_Success.xml11
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2mock/sdncCreateNetworkTopologyRsrcAssignResponse.xml17
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2mock/sdncCreateNetworkTopologySimResponse.xml19
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/DoCreateServiceInstanceInput.json42
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/SetupServiceDecompJson.json33
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_createServiceInstance_AAIResponse_Success.xml11
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_queryGlobalCustomerId_AAIResponse_Success.xml62
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/CreateVfModuleCallbackException.xml7
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/CreateVfModuleVolumeCallbackResponse.xml53
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/CreateVfModuleVolumeRequest.xml24
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/GenericVnf.xml38
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/RollbackVfModuleVolumeCallbackResponse.xml5
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request.json72
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request_noreqparm.json45
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_createVolumeName_AAIResponse_Success.xml49
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_deleteVolumeName_AAIResponse_Success.xml24
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_queryVolumeName_AAIResponse_404.xml31
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml50
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_updateVolumeName_AAIResponse_Success.xml24
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/getSIUrlById.xml6
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_HasVfModRelationship.xml62
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request.json72
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request_noPreloads.json79
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request_userParam.json77
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DBUpdateResponse.xml4
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Database/DBAdapter.xml1
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Database/DBUpdateResponse.xml4
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteGenericVNFV1/sdncAdapterResponse.xml7
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/cloudRegion25_AAIResponse_Success.xml20
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/cloudRegion30_AAIResponse_Success.xml20
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/deleteAAIResponse_Failure500_RESTFault.xml19
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/deleteNetworkAAIResponse_Success.xml61
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/deleteNetworkAAIResponse_withRelationship_Success.xml73
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse.xml19
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse_noExtraTag.xml17
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleCallbackResponse.xml21
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/DeleteVfModuleVolumeCallbackResponse.xml5
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/deleteVfModuleVolume_VID_request_st.json17
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_Success.xml42
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleRollback/GenericVnf.xml26
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleRollback/GenericVnfVfModule.xml26
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeCallbackResponse.xml53
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeNoRollbackRequest.xml24
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeRequest.xml24
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/GenericVnf.xml38
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/RollbackVfModuleVolumeCallbackResponse.xml5
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_VID_request.json104
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_createVolumeName_AAIResponse_Success.xml49
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_deleteVolumeName_AAIResponse_Success.xml24
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml49
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_updateVolumeName_AAIResponse_Success.xml24
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModule_getVnfResponse.xml26
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/MsoCompletionRequest.xml11
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/SDNCDeleteResponse.xml212
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/aaiGetResponse.xml33
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getARUrlById.xml6
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml23
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml90
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml90
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getNotFound.xml2
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getParentSIUrlById.xml6
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getParentServiceInstance.xml30
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getSINoRelations.xml6
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml6
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getSIUrlByIdVipr.xml7
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml30
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ConfigVnf_VID_request.json40
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/CreateVnfInfraRequest.json46
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DeleteCustomE2EService.json5
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DeleteVnfInfraRequestCascadeDelete.json39
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DoCreateServiceInstance_request.json186
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DoScaleE2EServiceInstance.json38
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ReplaceVnf_VID_request.json50
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVfModule_VID_request.json62
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVnf_VID_request.json58
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/VnfInPlaceUpdate_VID_request.json17
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Policy/policyAbortResponse.json1
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Policy/policySkipResponse.json1
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_400.xml6
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_500.xml80
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_Success.xml24
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryInstance_Success.xml4
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml73
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml95
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkPolicy_AAIResponse_Success.xml21
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml20
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml20
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryVpnBindingList_AAIResponse_Success.xml57
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml46
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_updateContrail_AAIResponse_Success.xml11
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_Success.xml44
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/updateVfModuleVolume_VID_request.json64
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/updateVfModuleVolume_VID_request_2.json64
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/vf_module_aai_response.xml29
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml37
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml24
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml31
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json127
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json11
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCustomer.xml7
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json54
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json53
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json53
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetBRGById.xml31
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetTXCById.xml31
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getBRGArUrlById.xml6
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml35
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSIAfterDelArs.xml8
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getTXCArUrlById.xml6
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json40
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml36
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml37
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getAR.xml8
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getArBrg.xml31
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getArBrg2.xml31
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getSIandAR.xml38
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml31
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml51
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml51
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml51
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml24
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getAR.xml8
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getArTxc.xml31
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getArTxc2.xml31
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getSIandAR.xml38
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml31
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml51
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml51
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml51
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceBRG/arGetById.xml31
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceTXC/arGetById.xml31
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesData.json94
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesDataForReplaceVnfInfra.json98
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesDataForUpdateVnfInfra.json110
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogVnfData.json44
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogVnfNoTwoPhasedForVfModule.json44
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogVnfYesTwoPhasedForVfModule.json44
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/serviceDecompositionATMFW.json110
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/AddNetworkPolicy_AAIResponse_Success.xml21
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/DBUpdateResponse.xml4
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/DoUpdateVfModuleRequest.xml29
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenerateVfModuleName_AAIResponse_Success.xml51
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml38
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml21
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCSITopologyAssignCallback.xml11
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyActivateCallback.xml13
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyAssignCallback.xml16
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyChangeAssignCallback.xml13
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyCreateCallback.xml16
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallback.xml13
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallbackNotFound.xml8
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeleteCallback.xml16
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml315
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml141
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml82
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml82
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyUnassignCallback.xml16
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/StandardSDNCSynchResponse.xml5
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestCreateCallback.xml55
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestUpdateCallback.xml16
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestVolumeGroupCallback.xml15
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml10
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-new-PendingActivation.xml9
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml9
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml27
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VolumeGroup.xml25
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/deleteNetworkResponse_Success.xml3
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/applicationContext_forPnfTesting.xml70
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/camunda.cfg.xml46
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/log4j.properties8
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/logging.properties2
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.properties3
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties130
210 files changed, 0 insertions, 8630 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateAllottedResourceBRG.bpmn b/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateAllottedResourceBRG.bpmn
deleted file mode 100644
index b33aad7443..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateAllottedResourceBRG.bpmn
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_DkzPAHB4EeaJwpcpVN5gXw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.9.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
- <bpmn2:process id="DoCreateAllottedResourceBRG" name="DoCreateAllottedResourceBRG" isExecutable="true">
- <bpmn2:startEvent id="StartEvent_1">
- <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
- </bpmn2:startEvent>
- <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="initialization" />
- <bpmn2:scriptTask id="initialization" name="set rollbackData">
- <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
- <bpmn2:outgoing>SequenceFlow_1v2f9n5</bpmn2:outgoing>
- <bpmn2:script><![CDATA[#{execution.setVariable("rollbackData", true)}]]></bpmn2:script>
- </bpmn2:scriptTask>
- <bpmn2:endEvent id="EndEvent_1">
- <bpmn2:incoming>SequenceFlow_1v2f9n5</bpmn2:incoming>
- <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" errorRef="Error_2" />
- </bpmn2:endEvent>
- <bpmn2:sequenceFlow id="SequenceFlow_1v2f9n5" sourceRef="initialization" targetRef="EndEvent_1" />
- </bpmn2:process>
- <bpmn2:error id="Error_1" name="Java Lang Exception" errorCode="java.lang.Exception" />
- <bpmn2:error id="Error_2" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
- <bpmndi:BPMNDiagram id="BPMNDiagram_1">
- <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateAllottedResourceBRG">
- <bpmndi:BPMNShape id="_BPMNShape_StartEvent_68" bpmnElement="StartEvent_1">
- <dc:Bounds x="-91" y="222" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="-73" y="263" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_285" bpmnElement="initialization">
- <dc:Bounds x="35" y="200" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_68" targetElement="_BPMNShape_ScriptTask_285">
- <di:waypoint xsi:type="dc:Point" x="-55" y="240" />
- <di:waypoint xsi:type="dc:Point" x="35" y="241" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="-55" y="225.5" width="90" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="_BPMNShape_EndEvent_225" bpmnElement="EndEvent_1">
- <dc:Bounds x="235" y="222" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="208" y="263" width="90" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1v2f9n5_di" bpmnElement="SequenceFlow_1v2f9n5">
- <di:waypoint xsi:type="dc:Point" x="135" y="240" />
- <di:waypoint xsi:type="dc:Point" x="235" y="240" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="140" y="219" width="90" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- </bpmndi:BPMNPlane>
- </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateAllottedResourceBRGRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateAllottedResourceBRGRollback.bpmn
deleted file mode 100644
index 807efae1af..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateAllottedResourceBRGRollback.bpmn
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_DkzPAHB4EeaJwpcpVN5gXw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.9.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
- <bpmn2:process id="DoCreateAllottedResourceBRGRollback" name="DoCreateAllottedResourceBRGRollback" isExecutable="true">
- <bpmn2:startEvent id="StartEvent_1">
- <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
- </bpmn2:startEvent>
- <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_03yvb82" />
- <bpmn2:endEvent id="EndEvent_1sn21jr">
- <bpmn2:incoming>SequenceFlow_1epm19d</bpmn2:incoming>
- </bpmn2:endEvent>
- <bpmn2:scriptTask id="ScriptTask_03yvb82" name="set Success">
- <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
- <bpmn2:outgoing>SequenceFlow_1epm19d</bpmn2:outgoing>
- <bpmn2:script><![CDATA[#{execution.setVariable("rolledBack", true)}]]></bpmn2:script>
- </bpmn2:scriptTask>
- <bpmn2:sequenceFlow id="SequenceFlow_1epm19d" sourceRef="ScriptTask_03yvb82" targetRef="EndEvent_1sn21jr" />
- </bpmn2:process>
- <bpmn2:error id="Error_1" name="Java Lang Exception" errorCode="java.lang.Exception" />
- <bpmn2:error id="Error_2" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
- <bpmndi:BPMNDiagram id="BPMNDiagram_1">
- <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateAllottedResourceBRGRollback">
- <bpmndi:BPMNShape id="_BPMNShape_StartEvent_68" bpmnElement="StartEvent_1">
- <dc:Bounds x="66" y="392" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="84" y="433" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_68" targetElement="ScriptTask_03yvb82_di">
- <di:waypoint xsi:type="dc:Point" x="101" y="412" />
- <di:waypoint xsi:type="dc:Point" x="207" y="410" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="109" y="396" width="90" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="EndEvent_1sn21jr_di" bpmnElement="EndEvent_1sn21jr">
- <dc:Bounds x="413" y="392" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="386" y="432" width="90" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ScriptTask_03yvb82_di" bpmnElement="ScriptTask_03yvb82">
- <dc:Bounds x="207" y="370" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1epm19d_di" bpmnElement="SequenceFlow_1epm19d">
- <di:waypoint xsi:type="dc:Point" x="307" y="410" />
- <di:waypoint xsi:type="dc:Point" x="377" y="410" />
- <di:waypoint xsi:type="dc:Point" x="377" y="410" />
- <di:waypoint xsi:type="dc:Point" x="413" y="410" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="392" y="404" width="0" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- </bpmndi:BPMNPlane>
- </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateAllottedResourceTXC.bpmn b/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateAllottedResourceTXC.bpmn
deleted file mode 100644
index b2f280d7e9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateAllottedResourceTXC.bpmn
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_DkzPAHB4EeaJwpcpVN5gXw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.9.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
- <bpmn2:process id="DoCreateAllottedResourceTXC" name="DoCreateAllottedResourceTXC" isExecutable="true">
- <bpmn2:startEvent id="StartEvent_1">
- <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
- </bpmn2:startEvent>
- <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="EndEvent_1" />
- <bpmn2:endEvent id="EndEvent_1">
- <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
- <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" errorRef="Error_2" />
- </bpmn2:endEvent>
- </bpmn2:process>
- <bpmn2:error id="Error_1" name="Java Lang Exception" errorCode="java.lang.Exception" />
- <bpmn2:error id="Error_2" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
- <bpmndi:BPMNDiagram id="BPMNDiagram_1">
- <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateAllottedResourceTXC">
- <bpmndi:BPMNShape id="_BPMNShape_StartEvent_68" bpmnElement="StartEvent_1">
- <dc:Bounds x="-91" y="222" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="-73" y="263" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_68" targetElement="_BPMNShape_EndEvent_225">
- <di:waypoint xsi:type="dc:Point" x="-55" y="240" />
- <di:waypoint xsi:type="dc:Point" x="139" y="240" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="-3" y="225" width="90" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="_BPMNShape_EndEvent_225" bpmnElement="EndEvent_1">
- <dc:Bounds x="139" y="222" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="112" y="263" width="90" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- </bpmndi:BPMNPlane>
- </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateServiceInstanceRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateServiceInstanceRollback.bpmn
deleted file mode 100644
index 532ca867bb..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateServiceInstanceRollback.bpmn
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.9.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
- <bpmn2:process id="DoCreateServiceInstanceRollback" name="DoCreateServiceInstanceRollback" isExecutable="true">
- <bpmn2:startEvent id="createSIRollback_startEvent" name="Start Flow">
- <bpmn2:outgoing>SequenceFlow_1ipu8um</bpmn2:outgoing>
- </bpmn2:startEvent>
- <bpmn2:endEvent id="EndEvent_3">
- <bpmn2:incoming>SequenceFlow_1l4c4k0</bpmn2:incoming>
- </bpmn2:endEvent>
- <bpmn2:scriptTask id="ScriptTask_05ltxyj" name="set Success">
- <bpmn2:incoming>SequenceFlow_1ipu8um</bpmn2:incoming>
- <bpmn2:outgoing>SequenceFlow_1l4c4k0</bpmn2:outgoing>
- <bpmn2:script><![CDATA[#{execution.setVariable("rolledBack", true)}]]></bpmn2:script>
- </bpmn2:scriptTask>
- <bpmn2:sequenceFlow id="SequenceFlow_1ipu8um" sourceRef="createSIRollback_startEvent" targetRef="ScriptTask_05ltxyj" />
- <bpmn2:sequenceFlow id="SequenceFlow_1l4c4k0" sourceRef="ScriptTask_05ltxyj" targetRef="EndEvent_3" />
- </bpmn2:process>
- <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
- <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
- <bpmndi:BPMNDiagram id="BPMNDiagram_1">
- <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateServiceInstanceRollback">
- <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSIRollback_startEvent">
- <dc:Bounds x="151" y="79" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="146" y="120" width="48" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
- <dc:Bounds x="484" y="79" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="457" y="120" width="90" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ScriptTask_05ltxyj_di" bpmnElement="ScriptTask_05ltxyj">
- <dc:Bounds x="287" y="57" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1ipu8um_di" bpmnElement="SequenceFlow_1ipu8um">
- <di:waypoint xsi:type="dc:Point" x="187" y="97" />
- <di:waypoint xsi:type="dc:Point" x="287" y="97" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="237" y="76" width="0" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_1l4c4k0_di" bpmnElement="SequenceFlow_1l4c4k0">
- <di:waypoint xsi:type="dc:Point" x="387" y="97" />
- <di:waypoint xsi:type="dc:Point" x="484" y="97" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="435.5" y="76" width="0" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- </bpmndi:BPMNPlane>
- </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateVnfAndModules.bpmn
deleted file mode 100644
index 5e4400e9bd..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateVnfAndModules.bpmn
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.9.0">
- <bpmn:process id="DoCreateVnfAndModules" name="DoCreateVnfAndModules" isExecutable="true">
- <bpmn:startEvent id="StartEvent_1">
- <bpmn:outgoing>SequenceFlow_11sp3s9</bpmn:outgoing>
- </bpmn:startEvent>
- <bpmn:sequenceFlow id="SequenceFlow_11sp3s9" sourceRef="StartEvent_1" targetRef="ScriptTask_0y5wsgy" />
- <bpmn:scriptTask id="ScriptTask_0y5wsgy" name="set rollbackData">
- <bpmn:incoming>SequenceFlow_11sp3s9</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0q1lfmf</bpmn:outgoing>
- <bpmn:script><![CDATA[#{execution.setVariable("rollbackData", true)}]]></bpmn:script>
- </bpmn:scriptTask>
- <bpmn:sequenceFlow id="SequenceFlow_0q1lfmf" sourceRef="ScriptTask_0y5wsgy" targetRef="EndEvent_0vgtf5f" />
- <bpmn:endEvent id="EndEvent_0vgtf5f">
- <bpmn:incoming>SequenceFlow_0q1lfmf</bpmn:incoming>
- </bpmn:endEvent>
- </bpmn:process>
- <bpmn:error id="Error_1" name="Java Lang Exception" errorCode="java.lang.Exception" />
- <bpmn:error id="Error_2" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
- <bpmndi:BPMNDiagram id="BPMNDiagram_1">
- <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVnfAndModules">
- <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
- <dc:Bounds x="152" y="147" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="170" y="183" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_11sp3s9_di" bpmnElement="SequenceFlow_11sp3s9">
- <di:waypoint xsi:type="dc:Point" x="188" y="165" />
- <di:waypoint xsi:type="dc:Point" x="268" y="165" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="183" y="144" width="90" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="ScriptTask_0y5wsgy_di" bpmnElement="ScriptTask_0y5wsgy">
- <dc:Bounds x="268" y="125" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_0q1lfmf_di" bpmnElement="SequenceFlow_0q1lfmf">
- <di:waypoint xsi:type="dc:Point" x="368" y="165" />
- <di:waypoint xsi:type="dc:Point" x="447" y="165" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="362.5" y="144" width="90" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="EndEvent_0vgtf5f_di" bpmnElement="EndEvent_0vgtf5f">
- <dc:Bounds x="447" y="147" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="420" y="187" width="90" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- </bpmndi:BPMNPlane>
- </bpmndi:BPMNDiagram>
-</bpmn:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateVnfAndModulesRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateVnfAndModulesRollback.bpmn
deleted file mode 100644
index 2867a671b6..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoCreateVnfAndModulesRollback.bpmn
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_Wblj8GyfEeWUWLTvug7ZOg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.9.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
- <bpmn2:process id="DoCreateVnfAndModulesRollback" name="DoCreateVnfAndModulesRollback" isExecutable="true">
- <bpmn2:startEvent id="StartEvent_1gai4qr">
- <bpmn2:outgoing>SequenceFlow_1537b7m</bpmn2:outgoing>
- </bpmn2:startEvent>
- <bpmn2:endEvent id="EndEvent_1seag7u">
- <bpmn2:incoming>SequenceFlow_1mz2mgf</bpmn2:incoming>
- </bpmn2:endEvent>
- <bpmn2:sequenceFlow id="SequenceFlow_1537b7m" sourceRef="StartEvent_1gai4qr" targetRef="ScriptTask_0fpaoo0" />
- <bpmn2:scriptTask id="ScriptTask_0fpaoo0" name="set Success">
- <bpmn2:incoming>SequenceFlow_1537b7m</bpmn2:incoming>
- <bpmn2:outgoing>SequenceFlow_1mz2mgf</bpmn2:outgoing>
- <bpmn2:script><![CDATA[#{execution.setVariable("rolledBack", true)}]]></bpmn2:script>
- </bpmn2:scriptTask>
- <bpmn2:sequenceFlow id="SequenceFlow_1mz2mgf" sourceRef="ScriptTask_0fpaoo0" targetRef="EndEvent_1seag7u" />
- </bpmn2:process>
- <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
- <bpmn2:message id="Message_1" name="DoCreateVfModuleRollbackRequest" />
- <bpmndi:BPMNDiagram id="BPMNDiagram_1">
- <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVnfAndModulesRollback">
- <bpmndi:BPMNShape id="StartEvent_1gai4qr_di" bpmnElement="StartEvent_1gai4qr">
- <dc:Bounds x="-91" y="655" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="-73" y="691" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="EndEvent_1seag7u_di" bpmnElement="EndEvent_1seag7u">
- <dc:Bounds x="248" y="655" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="660" y="676" width="90" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1537b7m_di" bpmnElement="SequenceFlow_1537b7m">
- <di:waypoint xsi:type="dc:Point" x="-55" y="673" />
- <di:waypoint xsi:type="dc:Point" x="55" y="673" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="-45" y="658" width="90" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="ScriptTask_0fpaoo0_di" bpmnElement="ScriptTask_0fpaoo0">
- <dc:Bounds x="55" y="633" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1mz2mgf_di" bpmnElement="SequenceFlow_1mz2mgf">
- <di:waypoint xsi:type="dc:Point" x="155" y="673" />
- <di:waypoint xsi:type="dc:Point" x="248" y="673" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="201.5" y="652" width="0" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- </bpmndi:BPMNPlane>
- </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoDeleteVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoDeleteVnfAndModules.bpmn
deleted file mode 100644
index 517df36c74..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/DoDeleteVnfAndModules.bpmn
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_9MhrcHqVEea26OhQB97uCQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.9.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
- <bpmn2:process id="DoDeleteVnfAndModules" name="DoDeleteVnfAndModules" isExecutable="true">
- <bpmn2:startEvent id="StartEvent_1">
- <bpmn2:outgoing>SequenceFlow_0qi7pl3</bpmn2:outgoing>
- </bpmn2:startEvent>
- <bpmn2:sequenceFlow id="SequenceFlow_0qi7pl3" sourceRef="StartEvent_1" targetRef="EndEvent_11dfyam" />
- <bpmn2:endEvent id="EndEvent_11dfyam">
- <bpmn2:incoming>SequenceFlow_0qi7pl3</bpmn2:incoming>
- </bpmn2:endEvent>
- </bpmn2:process>
- <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
- <bpmn2:error id="Error_2" name="Java Lang Exception" errorCode="java.lang.Exception" />
- <bpmndi:BPMNDiagram id="BPMNDiagram_1">
- <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteVnfAndModules">
- <bpmndi:BPMNShape id="_BPMNShape_StartEvent_79" bpmnElement="StartEvent_1">
- <dc:Bounds x="238" y="209" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="256" y="250" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_0qi7pl3_di" bpmnElement="SequenceFlow_0qi7pl3">
- <di:waypoint xsi:type="dc:Point" x="274" y="227" />
- <di:waypoint xsi:type="dc:Point" x="387" y="227" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="285.5" y="206" width="90" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="EndEvent_11dfyam_di" bpmnElement="EndEvent_11dfyam">
- <dc:Bounds x="387" y="209" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="360" y="249" width="90" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- </bpmndi:BPMNPlane>
- </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/Homing.bpmn b/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/Homing.bpmn
deleted file mode 100644
index ad4c3c816d..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/VCPE/stubprocess/Homing.bpmn
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_vwRmIBsREeeIQtzUKIjH4g" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.9.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
- <bpmn2:process id="Homing" name="Homing" isExecutable="true">
- <bpmn2:startEvent id="StartEvent_1">
- <bpmn2:outgoing>SequenceFlow_0tyavm9</bpmn2:outgoing>
- </bpmn2:startEvent>
- <bpmn2:endEvent id="EndEvent_0n56tas">
- <bpmn2:incoming>SequenceFlow_0tyavm9</bpmn2:incoming>
- <bpmn2:terminateEventDefinition />
- </bpmn2:endEvent>
- <bpmn2:sequenceFlow id="SequenceFlow_0tyavm9" sourceRef="StartEvent_1" targetRef="EndEvent_0n56tas" />
- </bpmn2:process>
- <bpmn2:error id="Error_10hit0u" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
- <bpmn2:error id="Error_1lwpypa" name="Java Lang Exception" errorCode="java.lang.Exception" />
- <bpmndi:BPMNDiagram id="BPMNDiagram_1">
- <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Homing">
- <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
- <dc:Bounds x="147" y="275" width="36" height="36" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="EndEvent_0ougemc_di" bpmnElement="EndEvent_0n56tas">
- <dc:Bounds x="263" y="275" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="236" y="311" width="90" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_0tyavm9_di" bpmnElement="SequenceFlow_0tyavm9">
- <di:waypoint xsi:type="dc:Point" x="183" y="293" />
- <di:waypoint xsi:type="dc:Point" x="263" y="293" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="223" y="272" width="0" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- </bpmndi:BPMNPlane>
- </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_defaultCloudRegionByCloudRegionId.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_defaultCloudRegionByCloudRegionId.json
deleted file mode 100644
index 364afed8ce..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_defaultCloudRegionByCloudRegionId.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "cloud-owner": "att-aic",
- "cloud-region-id": "mdt1",
- "cloud-type": "openstack",
- "owner-defined-type": "lcp",
- "cloud-region-version": "aic3.0",
- "identity-url": "https://identity-aic.mdt1.cci.att.com:5000/v2.0",
- "cloud-zone": "z1",
- "complex-name": "c1",
- "sriov-automation": false,
- "resource-version": "1503072127235"
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_genericVnfGet.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_genericVnfGet.json
deleted file mode 100644
index 09d7758f04..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_genericVnfGet.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "vnf-id": "msoVnf123",
- "vnf-name": "MSO-Test-VNF-123",
- "vnf-type": "vnf-type",
- "orchestration-status": "active",
- "in-maint": false,
- "is-closed-loop-disabled": false,
- "resource-version": "1525360206136"
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_genericVnfsByVnfId.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_genericVnfsByVnfId.json
deleted file mode 100644
index dd352fa480..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_genericVnfsByVnfId.json
+++ /dev/null
@@ -1,435 +0,0 @@
-{
- "vnf-id": "example-vnf-id-val-90603",
- "vnf-name": "example-vnf-name-val-56838",
- "vnf-name2": "example-vnf-name2-val-56319",
- "vnf-type": "example-vnf-type-val-30533",
- "service-id": "example-service-id-val-28290",
- "regional-resource-zone": "example-regional-resource-zone-val-11059",
- "prov-status": "example-prov-status-val-59777",
- "operational-status": "example-operational-status-val-22513",
- "in-maint": true,
-
- "equipment-role": "example-equipment-role-val-23396",
- "orchestration-status": "example-orchestration-status-val-59435",
- "heat-stack-id": "example-heat-stack-id-val-96869",
- "mso-catalog-key": "example-mso-catalog-key-val-30721",
- "management-option": "example-management-option-val-61927",
- "ipv4-oam-address": "135.25.10.14",
- "ipv4-loopback0-address": "example-ipv4-loopback0-address-val-87072",
- "nm-lan-v6-address": "example-nm-lan-v6-address-val-91063",
- "management-v6-address": "example-management-v6-address-val-80466",
- "vcpu": 45837298,
- "vcpu-units": "example-vcpu-units-val-86249",
- "vmemory": 57288956,
- "vmemory-units": "example-vmemory-units-val-13291",
- "vdisk": 16937143,
- "vdisk-units": "example-vdisk-units-val-73197",
-
- "is-closed-loop-disabled": true,
- "summary-status": "example-summary-status-val-86438",
- "encrypted-access-flag": true,
-
-
-
-
- "model-invariant-id": "example-model-invariant-id-val-14704",
- "model-version-id": "example-model-version-id-val-47847",
- "model-customization-id": "example-model-customization-id-val-52688",
- "widget-model-id": "example-widget-model-id-val-20939",
- "widget-model-version": "example-widget-model-version-val-72210",
- "as-number": "example-as-number-val-68358",
- "regional-resource-subzone": "example-regional-resource-subzone-val-34391",
- "nf-type": "example-nf-type-val-54866",
- "nf-function": "example-nf-function-val-24790",
- "nf-role": "example-nf-role-val-4780",
- "nf-naming-code": "example-nf-naming-code-val-25118",
- "selflink": "example-selflink-val-68404",
-
- "relationship-list": {"relationship": [
- {
- "related-to": "service-instance",
- "relationship-label": "org.onap.relationships.inventory.ComposedOf",
- "related-link": "/aai/v12/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/2c323333-af4f-4849-af03-c862c0e93e3b",
- "relationship-data": [
- {
- "relationship-key": "customer.global-customer-id",
- "relationship-value": "e433710f-9217-458d-a79d-1c7aff376d89"
- },
- {
- "relationship-key": "service-subscription.service-type",
- "relationship-value": "VIRTUAL USP"
- },
- {
- "relationship-key": "service-instance.service-instance-id",
- "relationship-value": "2c323333-af4f-4849-af03-c862c0e93e3b"
- }
- ],
- "related-to-property": [ {
- "property-key": "service-instance.service-instance-name",
- "property-value": "kjhgfd1"
- }]
- },
- {
- "related-to": "vserver",
- "relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23a/tenants/tenant/e6beab145f6b49098277ac163ac1b4f3/vservers/vserver/1b3f44e5-d96d-4aac-bd9a-310e8cfb0af5",
- "relationship-data": [
- {
- "relationship-key": "cloud-region.cloud-owner",
- "relationship-value": "att-aic"
- },
- {
- "relationship-key": "cloud-region.cloud-region-id",
- "relationship-value": "mtn23a"
- },
- {
- "relationship-key": "tenant.tenant-id",
- "relationship-value": "e6beab145f6b49098277ac163ac1b4f3"
- },
- {
- "relationship-key": "vserver.vserver-id",
- "relationship-value": "1b3f44e5-d96d-4aac-bd9a-310e8cfb0af5"
- }
- ],
- "related-to-property": [ {
- "property-key": "vserver.vserver-name",
- "property-value": "comx5000vm003"
- }]
- },
- {
- "related-to": "vserver",
- "relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23a/tenants/tenant/e6beab145f6b49098277ac163ac1b4f3/vservers/vserver/14551849-1e70-45cd-bc5d-a256d49548a2",
- "relationship-data": [
- {
- "relationship-key": "cloud-region.cloud-owner",
- "relationship-value": "att-aic"
- },
- {
- "relationship-key": "cloud-region.cloud-region-id",
- "relationship-value": "mtn23a"
- },
- {
- "relationship-key": "tenant.tenant-id",
- "relationship-value": "e6beab145f6b49098277ac163ac1b4f3"
- },
- {
- "relationship-key": "vserver.vserver-id",
- "relationship-value": "14551849-1e70-45cd-bc5d-a256d49548a2"
- }
- ],
- "related-to-property": [ {
- "property-key": "vserver.vserver-name",
- "property-value": "comx5000vm002"
- }]
- },
- {
- "related-to": "vserver",
- "relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23a/tenants/tenant/e6beab145f6b49098277ac163ac1b4f3/vservers/vserver/48bd7f11-408f-417c-b834-b41c1b98f7d7",
- "relationship-data": [
- {
- "relationship-key": "cloud-region.cloud-owner",
- "relationship-value": "att-aic"
- },
- {
- "relationship-key": "cloud-region.cloud-region-id",
- "relationship-value": "mtn23a"
- },
- {
- "relationship-key": "tenant.tenant-id",
- "relationship-value": "e6beab145f6b49098277ac163ac1b4f3"
- },
- {
- "relationship-key": "vserver.vserver-id",
- "relationship-value": "48bd7f11-408f-417c-b834-b41c1b98f7d7"
- }
- ],
- "related-to-property": [ {
- "property-key": "vserver.vserver-name",
- "property-value": "comx5000vm001"
- }]
- }
- ]},
-
-
-
- "l-interfaces": {
- "l-interface": [
- {
- "interface-name": "example-interface-name-val-50593",
- "interface-role": "example-interface-role-val-23375",
- "v6-wan-link-ip": "example-v6-wan-link-ip-val-5921",
- "selflink": "example-selflink-val-75663",
- "interface-id": "example-interface-id-val-37465",
- "macaddr": "example-macaddr-val-62657",
- "network-name": "example-network-name-val-7252",
- "management-option": "example-management-option-val-32963",
- "interface-description": "example-interface-description-val-89453",
- "is-port-mirrored": true,
- "vlans": {
- "vlan": [
- {
- "vlan-interface": "example-vlan-interface-val-16684",
- "vlan-id-inner": 8602916,
- "vlan-id-outer": 97348542,
- "speed-value": "example-speed-value-val-90330",
- "speed-units": "example-speed-units-val-15849",
- "vlan-description": "example-vlan-description-val-46942",
- "backdoor-connection": "example-backdoor-connection-val-78445",
-
- "orchestration-status": "example-orchestration-status-val-44994",
-
-
-
- "l3-interface-ipv4-address-list": [
- {
- "l3-interface-ipv4-address": "example-l3-interface-ipv4-address-val-90277",
- "l3-interface-ipv4-prefix-length": 3364150,
- "vlan-id-inner": 44021171,
- "vlan-id-outer": 55708677,
- "is-floating": true,
- "neutron-network-id": "example-neutron-network-id-val-43267",
- "neutron-subnet-id": "example-neutron-subnet-id-val-62870"
- }
- ],
- "l3-interface-ipv6-address-list": [
- {
- "l3-interface-ipv6-address": "example-l3-interface-ipv6-address-val-45323",
- "l3-interface-ipv6-prefix-length": 56688923,
- "vlan-id-inner": 5703071,
- "vlan-id-outer": 86682265,
- "is-floating": true,
- "neutron-network-id": "example-neutron-network-id-val-28366",
- "neutron-subnet-id": "example-neutron-subnet-id-val-53034"
- }
- ]
- }
- ]
- },
- "sriov-vfs": {
- "sriov-vf": [
- {
- "pci-id": "example-pci-id-val-4720",
- "vf-vlan-filter": "example-vf-vlan-filter-val-42594",
- "vf-mac-filter": "example-vf-mac-filter-val-13375",
- "vf-vlan-strip": true,
- "vf-vlan-anti-spoof-check": true,
- "vf-mac-anti-spoof-check": true,
- "vf-mirrors": "example-vf-mirrors-val-6057",
- "vf-broadcast-allow": true,
- "vf-unknown-multicast-allow": true,
- "vf-unknown-unicast-allow": true,
- "vf-insert-stag": true,
- "vf-link-status": "example-vf-link-status-val-81448",
- "neutron-network-id": "example-neutron-network-id-val-9504"
- }
- ]
- },
- "l-interfaces": {
- "l-interface": [
- {
- "interface-name": "example-interface-name-val-16738",
- "interface-role": "example-interface-role-val-13943",
- "v6-wan-link-ip": "example-v6-wan-link-ip-val-63173",
- "selflink": "example-selflink-val-43085",
- "interface-id": "example-interface-id-val-51379",
- "macaddr": "example-macaddr-val-16195",
- "network-name": "example-network-name-val-45683",
- "management-option": "example-management-option-val-78983",
- "interface-description": "example-interface-description-val-34414",
- "is-port-mirrored": true
- }
- ]
- },
- "l3-interface-ipv4-address-list": [
- {
- "l3-interface-ipv4-address": "example-l3-interface-ipv4-address-val-99078",
- "l3-interface-ipv4-prefix-length": 55755841,
- "vlan-id-inner": 81525473,
- "vlan-id-outer": 90908072,
- "is-floating": true,
- "neutron-network-id": "example-neutron-network-id-val-47919",
- "neutron-subnet-id": "example-neutron-subnet-id-val-84236"
- }
- ],
- "l3-interface-ipv6-address-list": [
- {
- "l3-interface-ipv6-address": "example-l3-interface-ipv6-address-val-21939",
- "l3-interface-ipv6-prefix-length": 50057584,
- "vlan-id-inner": 75774660,
- "vlan-id-outer": 4421090,
- "is-floating": true,
- "neutron-network-id": "example-neutron-network-id-val-46377",
- "neutron-subnet-id": "example-neutron-subnet-id-val-16585"
- }
- ]
- }
- ]
- },
- "lag-interfaces": {
- "lag-interface": [
- {
- "interface-name": "example-interface-name-val-39234",
- "interface-description": "example-interface-description-val-1037",
- "speed-value": "example-speed-value-val-1929",
- "speed-units": "example-speed-units-val-74937",
- "interface-id": "example-interface-id-val-91265",
- "interface-role": "example-interface-role-val-19613",
-
-
- "l-interfaces": {
- "l-interface": [
- {
- "interface-name": "example-interface-name-val-10722",
- "interface-role": "example-interface-role-val-95194",
- "v6-wan-link-ip": "example-v6-wan-link-ip-val-24328",
- "selflink": "example-selflink-val-24987",
- "interface-id": "example-interface-id-val-75726",
- "macaddr": "example-macaddr-val-36940",
- "network-name": "example-network-name-val-65359",
- "management-option": "example-management-option-val-49521",
- "interface-description": "example-interface-description-val-70528",
- "is-port-mirrored": true,
- "vlans": {
- "vlan": [
- {
- "vlan-interface": "example-vlan-interface-val-70827",
- "vlan-id-inner": 55659612,
- "vlan-id-outer": 90335612,
- "speed-value": "example-speed-value-val-54761",
- "speed-units": "example-speed-units-val-91398",
- "vlan-description": "example-vlan-description-val-17018",
- "backdoor-connection": "example-backdoor-connection-val-4021",
-
- "orchestration-status": "example-orchestration-status-val-18315",
-
-
- "l3-interface-ipv4-address-list": [
- {
- "l3-interface-ipv4-address": "example-l3-interface-ipv4-address-val-59336",
- "l3-interface-ipv4-prefix-length": 57636053,
- "vlan-id-inner": 34068397,
- "vlan-id-outer": 48570286,
- "is-floating": true,
- "neutron-network-id": "example-neutron-network-id-val-69862",
- "neutron-subnet-id": "example-neutron-subnet-id-val-75795"
- }
- ],
- "l3-interface-ipv6-address-list": [
- {
- "l3-interface-ipv6-address": "example-l3-interface-ipv6-address-val-15038",
- "l3-interface-ipv6-prefix-length": 42694503,
- "vlan-id-inner": 15929806,
- "vlan-id-outer": 87413856,
- "is-floating": true,
- "neutron-network-id": "example-neutron-network-id-val-52519",
- "neutron-subnet-id": "example-neutron-subnet-id-val-24471"
- }
- ]
- }
- ]
- },
- "sriov-vfs": {
- "sriov-vf": [
- {
- "pci-id": "example-pci-id-val-44669",
- "vf-vlan-filter": "example-vf-vlan-filter-val-53436",
- "vf-mac-filter": "example-vf-mac-filter-val-71902",
- "vf-vlan-strip": true,
- "vf-vlan-anti-spoof-check": true,
- "vf-mac-anti-spoof-check": true,
- "vf-mirrors": "example-vf-mirrors-val-54963",
- "vf-broadcast-allow": true,
- "vf-unknown-multicast-allow": true,
- "vf-unknown-unicast-allow": true,
- "vf-insert-stag": true,
- "vf-link-status": "example-vf-link-status-val-1546",
- "neutron-network-id": "example-neutron-network-id-val-92159"
- }
- ]
- },
- "l-interfaces": {
- "l-interface": [
- {
- "interface-name": "example-interface-name-val-9327",
- "interface-role": "example-interface-role-val-21859",
- "v6-wan-link-ip": "example-v6-wan-link-ip-val-21445",
- "selflink": "example-selflink-val-6085",
- "interface-id": "example-interface-id-val-39854",
- "macaddr": "example-macaddr-val-14433",
- "network-name": "example-network-name-val-3722",
- "management-option": "example-management-option-val-64739",
- "interface-description": "example-interface-description-val-5814",
- "is-port-mirrored": true
-
-
-
- }
- ]
- },
- "l3-interface-ipv4-address-list": [
- {
- "l3-interface-ipv4-address": "example-l3-interface-ipv4-address-val-64531",
- "l3-interface-ipv4-prefix-length": 66545882,
- "vlan-id-inner": 12194134,
- "vlan-id-outer": 29589286,
- "is-floating": true,
- "neutron-network-id": "example-neutron-network-id-val-91108",
- "neutron-subnet-id": "example-neutron-subnet-id-val-56984"
- }
- ],
- "l3-interface-ipv6-address-list": [
- {
- "l3-interface-ipv6-address": "example-l3-interface-ipv6-address-val-37408",
- "l3-interface-ipv6-prefix-length": 5116459,
- "vlan-id-inner": 39229896,
- "vlan-id-outer": 15091934,
- "is-floating": true,
- "neutron-network-id": "example-neutron-network-id-val-87700",
- "neutron-subnet-id": "example-neutron-subnet-id-val-37352"
- }
- ]
- }
- ]
- }
- }
- ]
- },
- "vf-modules": {
- "vf-module": [
- {
- "vf-module-id": "example-vf-module-id-val-56249",
- "vf-module-name": "example-vf-module-name-val-18987",
- "heat-stack-id": "example-heat-stack-id-val-80110",
- "orchestration-status": "example-orchestration-status-val-8226",
- "is-base-vf-module": true,
- "model-invariant-id": "example-model-invariant-id-val-5071",
- "model-version-id": "example-model-version-id-val-80793",
- "model-customization-id": "example-model-customization-id-val-83277",
- "widget-model-id": "example-widget-model-id-val-99814",
- "widget-model-version": "example-widget-model-version-val-22799",
- "contrail-service-instance-fqdn": "example-contrail-service-instance-fqdn-val-52133",
- "module-index": 1933,
- "selflink": "example-selflink-val-69992"
- }
- ]
- },
- "licenses": {
- "license": [
- {
- "group-uuid": "example-group-uuid-val-73012",
- "resource-uuid": "example-resource-uuid-val-80045"
- }
- ]
- },
- "entitlements": {
- "entitlement": [
- {
- "group-uuid": "example-group-uuid-val-14874",
- "resource-uuid": "example-resource-uuid-val-49146"
- }
- ]
- }
-
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_pserverByVnfId.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_pserverByVnfId.json
deleted file mode 100644
index 1059d8c9a9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/AAI_pserverByVnfId.json
+++ /dev/null
@@ -1,72 +0,0 @@
- {
-
- "result": [{
-
- "hostname": "8862-PserverHOSTNAME-LB1113",
- "equipType": "JUNIPER UCPE",
- "equipVendor": "JUNIPER",
- "equipModel": "QFX51010-PNF",
- "ipv4OamAddress": "190.8.5.199",
- "serialNumber": "VX986001PNF",
- "pserverId": "5715CE4F-8600-58E103FE60C79",
- "internetTopology": "WAN",
- "inMaint": false,
- "resourceVersion": "1500495668780",
- "pserverName2": "test81600",
- "relationshipList": {
- "relationship": [
- {
- "relatedTo": "vserver",
- "relatedLink": "/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/8862-tenantl-LB1113/vservers/vserver/8862-Lvserver-LB1113",
- "relationshipData": [
- {
- "relationshipKey": "cloud-region.cloud-owner",
- "relationshipValue": "att-aic"
- },
- {
- "relationshipKey": "cloud-region.cloud-region-id",
- "relationshipValue": "AAIAIC25"
- },
- {
- "relationshipKey": "tenant.tenant-id",
- "relationshipValue": "8862-tenantl-LB1113"
- },
- {
- "relationshipKey": "vserver.vserver-id",
- "relationshipValue": "8862-Lvserver-LB1113"
- }
- ],
- "relatedToProperty": [
- {
- "propertyKey": "vserver.vserver-name",
- "propertyValue": "hjZAYKyl5LO"
- }
- ]
- }
- ]
- },
- "pinterfaces": {
- "pinterface": [
- {
- "interfaceName": "ge-0/5/8",
- "speedValue": "1",
- "speedUnits": "GBPS",
- "resourceVersion": "1500495668784",
- "inMaint": false
- },
- {
- "interfaceName": "ge-1/5/8",
- "speedValue": "1",
- "speedUnits": "GBPS",
- "resourceVersion": "1500495668788",
- "inMaint": false
- }
- ]
- }
- }
-
-
-
- ]
-}
- \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/mockObject.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/mockObject.json
deleted file mode 100644
index 2f97b47dd3..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/AAI/mockObject.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "id" : "something",
- "resource-version" : "1234",
- "plural" : {
- "singular" : [{
- "id" : "something2",
- "resource-version" : "5678"
- }]
- }
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/APPC/appc_error.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/APPC/appc_error.json
deleted file mode 100644
index e28878d1aa..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/APPC/appc_error.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "output": {
- "status": {
- "code": 200,
- "message": "RESULT_MESSAGE"
- },
- "common-header": {
- "api-ver": "API_VERSION",
- "request-id": "ECOMP_REQUEST_ID",
- "originator-id": "ECOMP_SYSTEM_ID",
- "sub-request-id": "ECOMP_SUBREQUEST_ID",
- "timestamp": "2016-08-08T23:09:00.11Z",
- "flags": {
- "ttl": 1000,
- "force": "TRUE",
- "mode": "EXCLUSIVE"
- }
- },
- "locked": "TRUE"
- }
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf
deleted file mode 100644
index 19f18cce52..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "transactionId": "testRequestId",
- "requestId": "testRequestId",
- "requestState": "complete",
- "statusMessage": "",
- "solutionInfo": {
- "licenseInfo": [
- {
- "entitlementPoolList": [
- "f1d563e8-e714-4393-8f99-cc480144a05e",
- "j1d563e8-e714-4393-8f99-cc480144a05e"
- ],
- "licenseKeyGroupList": [
- "s1d563e8-e714-4393-8f99-cc480144a05e",
- "b1d563e8-e714-4393-8f99-cc480144a05e"
- ],
- "resourceModuleName": "vHNPortalaaS_primary_1",
- "serviceResourceId": "testResourceIdAR"
- },
- {
- "entitlementPoolList": [
- "91d563e8-e714-4393-8f99-cc480144a05e",
- "21d563e8-e714-4393-8f99-cc480144a05e"
- ],
- "licenseKeyGroupList": [
- "31d563e8-e714-4393-8f99-cc480144a05e",
- "71d563e8-e714-4393-8f99-cc480144a05e"
- ],
- "resourceModuleName": "vHNPortalaaS_secondary_1",
- "serviceResourceId": "testResourceIdVNF"
- }
- ],
- "placement": [
- {
- "assignmentInfo": [
- {
- "variableName": "cloudOwner",
- "variableValue": "aic"
- },
- {
- "variableName": "vnfHostName",
- "variableValue": "MDTNJ01"
- },
- {
- "variableName": "aicClli",
- "variableValue": "KDTNJ01"
- },
- {
- "variableName": "aicVersion",
- "variableValue": "3.0"
- }
- ],
- "cloudRegionId": "dfwtx",
- "inventoryType": "service",
- "resourceModuleName": "ALLOTTED_RESOURCE",
- "serviceInstanceId": "testSIID1",
- "serviceResourceId": "testResourceIdAR"
- },
- {
- "assignmentInfo": [
- {
- "variableName": "cloudOwner",
- "variableValue": "aic"
- },
- {
- "variableName": "vnfHostName",
- "variableValue": "testVnfHostname2"
- },
- {
- "variableName": "aicClli",
- "variableValue": "testAicClli2"
- },
- {
- "variableName": "aicVersion",
- "variableValue": "3.0"
- }
- ],
- "cloudRegionId": "testCloudRegionId2",
- "inventoryType": "service",
- "resourceModuleName": "ALLOTTED_RESOURCE",
- "serviceInstanceId": "testSIID2",
- "serviceResourceId": "testResourceIdAR2"
- },
- {
- "assignmentInfo": [
- {
- "variableName": "cloudOwner",
- "variableValue": "aic"
- },
- {
- "variableName": "aicClli",
- "variableValue": "testAicClli3"
- },
- {
- "variableName": "aicVersion",
- "variableValue": "3.0"
- }
- ],
- "cloudRegionId": "testCloudRegionId3",
- "inventoryType": "cloud",
- "resourceModuleName": "VNF",
- "serviceInstanceId": "",
- "serviceResourceId": "testResourceIdVNF"
- }
- ]
- }
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf2Net b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf2Net
deleted file mode 100644
index 5a9ef4b4f9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf2Net
+++ /dev/null
@@ -1,165 +0,0 @@
-{
- "transactionId": "testRequestId",
- "requestId": "testRequestId",
- "requestState": "complete",
- "statusMessage": "",
- "solutionInfo": {
- "licenseInfo": [
- {
- "entitlementPoolList": [
- "f1d563e8-e714-4393-8f99-cc480144a05e",
- "j1d563e8-e714-4393-8f99-cc480144a05e"
- ],
- "licenseKeyGroupList": [
- "s1d563e8-e714-4393-8f99-cc480144a05e",
- "b1d563e8-e714-4393-8f99-cc480144a05e"
- ],
- "resourceModuleName": "vHNPortalaaS_primary_1",
- "serviceResourceId": "testResourceIdAR"
- },
- {
- "entitlementPoolList": [
- "f1d563e8-e714-4393-8f99-cc480144a05n",
- "j1d563e8-e714-4393-8f99-cc480144a05n"
- ],
- "licenseKeyGroupList": [
- "s1d563e8-e714-4393-8f99-cc480144a05n",
- "b1d563e8-e714-4393-8f99-cc480144a05n"
- ],
- "resourceModuleName": "net",
- "serviceResourceId": "testResourceIdNet2"
- },
- {
- "entitlementPoolList": [
- "91d563e8-e714-4393-8f99-cc480144a05e",
- "21d563e8-e714-4393-8f99-cc480144a05e"
- ],
- "licenseKeyGroupList": [
- "31d563e8-e714-4393-8f99-cc480144a05e",
- "71d563e8-e714-4393-8f99-cc480144a05e"
- ],
- "resourceModuleName": "vHNPortalaaS_secondary_1",
- "serviceResourceId": "testResourceIdVNF"
- }
- ],
- "placement": [
- {
- "assignmentInfo": [
- {
- "variableName": "cloudOwner",
- "variableValue": "aic"
- },
- {
- "variableName": "vnfHostName",
- "variableValue": "MDTNJ01"
- },
- {
- "variableName": "aicClli",
- "variableValue": "KDTNJ01"
- },
- {
- "variableName": "aicVersion",
- "variableValue": "3.0"
- }
- ],
- "cloudRegionId": "dfwtx",
- "inventoryType": "service",
- "resourceModuleName": "ALLOTTED_RESOURCE",
- "serviceInstanceId": "testSIID1",
- "serviceResourceId": "testResourceIdAR"
- },
- {
- "assignmentInfo": [
- {
- "variableName": "cloudOwner",
- "variableValue": "aic"
- },
- {
- "variableName": "vnfHostName",
- "variableValue": "testVnfHostname2"
- },
- {
- "variableName": "aicClli",
- "variableValue": "testAicClli2"
- },
- {
- "variableName": "aicVersion",
- "variableValue": "3.0"
- }
- ],
- "cloudRegionId": "testCloudRegionId2",
- "inventoryType": "service",
- "resourceModuleName": "ALLOTTED_RESOURCE",
- "serviceInstanceId": "testSIID2",
- "serviceResourceId": "testResourceIdAR2"
- },
- {
- "assignmentInfo": [
- {
- "variableName": "cloudOwner",
- "variableValue": "aic"
- },
- {
- "variableName": "vnfHostName",
- "variableValue": "testVnfHostNameNet"
- },
- {
- "variableName": "aicClli",
- "variableValue": "testAicClliNet"
- },
- {
- "variableName": "aicVersion",
- "variableValue": "3.0"
- }
- ],
- "cloudRegionId": "testCloudRegionIdNet",
- "inventoryType": "service",
- "resourceModuleName": "NETWORK",
- "serviceInstanceId": "testServiceInstanceIdNet",
- "serviceResourceId": "testResourceIdNet"
- },
- {
- "assignmentInfo": [
- {
- "variableName": "cloudOwner",
- "variableValue": "aic"
- },
- {
- "variableName": "aicClli",
- "variableValue": "testAicClliNet2"
- },
- {
- "variableName": "aicVersion",
- "variableValue": "3.0"
- }
- ],
- "cloudRegionId": "testCloudRegionIdNet2",
- "inventoryType": "cloud",
- "resourceModuleName": "NETWORK",
- "serviceInstanceId": "",
- "serviceResourceId": "testResourceIdNet2"
- },
- {
- "assignmentInfo": [
- {
- "variableName": "cloudOwner",
- "variableValue": "aic"
- },
- {
- "variableName": "aicClli",
- "variableValue": "testAicClli3"
- },
- {
- "variableName": "aicVersion",
- "variableValue": "3.0"
- }
- ],
- "cloudRegionId": "testCloudRegionId3",
- "inventoryType": "cloud",
- "resourceModuleName": "VNF",
- "serviceInstanceId": "",
- "serviceResourceId": "testResourceIdVNF"
- }
- ]
- }
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackNoSolutionFound b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackNoSolutionFound
deleted file mode 100644
index 5cb748ae9d..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackNoSolutionFound
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "requestState": "",
- "responseTime": "",
- "solutionInfo": {
- "placement": [],
- "licenseInfo": {
- "featureGroupId": ""
- }
- },
- "percentProgress": "",
- "requestId": "02c2e322-5839-4c97-9d46-0a5fa6bb642e",
- "startTime": "",
- "statusMessage": "No solution found for plan 08e1b8cf-144a-4bac-b293-d5e2eedc97e8",
- "requestType": ""
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackPolicyException b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackPolicyException
deleted file mode 100644
index b82688428e..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackPolicyException
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "requestError": {
- "policyException": {
- "requestId": "ae81d9a8-c949-493a-999c-f76c80503233",
- "text": "Message content size exceeds the allowable limit",
- "messageId": "SVC0001"
- }
- }
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackServiceException b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackServiceException
deleted file mode 100644
index 6cc78a7cdb..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackServiceException
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "requestError": {
- "serviceException": {
- "variables": [
- "severity", 400
- ],
- "requestId": "ae81d9a8-c949-493a-999c-f76c80503233",
- "text": "SNIROPlacementError: requests.exceptions.HTTPError: 404 Client Error: Not Found for url: http://135.21.171.200:8091/v1/plans/97b4e303-5f75-492c-8fb2-21098281c8b8",
- "messageId": "SVC0001"
- }
- }
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml
deleted file mode 100644
index 40eca5a038..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <l3-network xmlns="http://org.openecomp.aai.inventory/v8">
- <cloud-owner>att-aic</cloud-owner>
- <cloud-region-id>RDM2WAGPLCP</cloud-region-id>
- <cloud-region-version>2.5</cloud-region-version>
- <complex-name>RDM2WAGPLCP</complex-name>
- </l3-network>
- </rest:payload>
-</rest:RESTResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/cloudRegion30_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/cloudRegion30_AAIResponse_Success.xml
deleted file mode 100644
index 1bf6df0d1f..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/cloudRegion30_AAIResponse_Success.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <l3-network xmlns="http://org.openecomp.aai.inventory/v8">
- <cloud-owner>att-aic</cloud-owner>
- <cloud-region-id>RDM2WAGPLCP</cloud-region-id>
- <cloud-region-version>3.0</cloud-region-version>
- <complex-name>RDM2WAGPLCP</complex-name>
- </l3-network>
- </rest:payload>
-</rest:RESTResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetworkResponse_400.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetworkResponse_400.xml
deleted file mode 100644
index a5640b2b26..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetworkResponse_400.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<createNetworkError>
-<messageId>680bd458-5ec1-4a16-b77c-509022e53450</messageId><category>INTERNAL</category>
-<message>400 Bad Request: The server could not comply with the request since it is either malformed or otherwise incorrect., error.type=StackValidationFailed, error.message=Property error: : resources.network.properties: : Unknown Property network_ipam_refs_data</message>
-<rolledBack>true</rolledBack>
-</createNetworkError>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetworkResponse_500.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetworkResponse_500.xml
deleted file mode 100644
index 07730e2df9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetworkResponse_500.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<html>
- <head>
- <title>JBoss Web/7.2.2.Final-redhat-1 - JBWEB000064: Error report
- </title>
- <style><!--H1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;}
- H2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;}
- H3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;}
- BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;}
- B {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;}
- P {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;}A
- {color : black;}A.name {color : black;}HR {color : #525D76;} -->
- </style>
- </head>
- <body>
- <h1>JBWEB000065: HTTP Status 500 - java.lang.NullPointerException</h1>
- <HR size="1" noshade="noshade" />
- <p>
- <b>JBWEB000309: type</b>
- JBWEB000066: Exception report
- </p>
- <p>
- <b>JBWEB000068: message</b>
- <u>java.lang.NullPointerException</u>
- </p>
- <p>
- <b>JBWEB000069: description</b>
- <u>JBWEB000145: The server encountered an internal error that
- prevented it from fulfilling this request.
- </u>
- </p>
- <p>
- <b>JBWEB000070: exception</b>
- <pre>org.jboss.resteasy.spi.UnhandledException:
- java.lang.NullPointerException
- org.jboss.resteasy.core.SynchronousDispatcher.handleApplicationException(SynchronousDispatcher.java:365)
- org.jboss.resteasy.core.SynchronousDispatcher.handleException(SynchronousDispatcher.java:233)
- org.jboss.resteasy.core.SynchronousDispatcher.handleInvokerException(SynchronousDispatcher.java:209)
- org.jboss.resteasy.core.SynchronousDispatcher.getResponse(SynchronousDispatcher.java:557)
- org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:524)
- org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:126)
- org.jboss.resteasy.plugins.server.servlet.ServletContainerDispatcher.service(ServletContainerDispatcher.java:208)
- org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:55)
- org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:50)
- javax.servlet.http.HttpServlet.service(HttpServlet.java:847)
- org.openecomp.mso.logger.LogFilter.doFilter(LogFilter.java:35)
- </pre>
- </p>
- <p>
- <b>JBWEB000071: root cause</b>
- <pre>java.lang.NullPointerException
- org.openecomp.mso.adapters.network.NetworkAdapterRest$CreateNetworkVolumesTask.run(NetworkAdapterRest.java:128)
- org.openecomp.mso.adapters.network.NetworkAdapterRest.createNetwork(NetworkAdapterRest.java:64)
- sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- java.lang.reflect.Method.invoke(Method.java:606)
- org.jboss.resteasy.core.MethodInjectorImpl.invoke(MethodInjectorImpl.java:167)
- org.jboss.resteasy.core.ResourceMethod.invokeOnTarget(ResourceMethod.java:269)
- org.jboss.resteasy.core.ResourceMethod.invoke(ResourceMethod.java:227)
- org.jboss.resteasy.core.ResourceMethod.invoke(ResourceMethod.java:216)
- org.jboss.resteasy.core.SynchronousDispatcher.getResponse(SynchronousDispatcher.java:542)
- org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:524)
- org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:126)
- org.jboss.resteasy.plugins.server.servlet.ServletContainerDispatcher.service(ServletContainerDispatcher.java:208)
- org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:55)
- org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:50)
- javax.servlet.http.HttpServlet.service(HttpServlet.java:847)
- org.openecomp.mso.logger.LogFilter.doFilter(LogFilter.java:35)
- </pre>
- </p>
- <p>
- <b>JBWEB000072: note</b>
- <u>JBWEB000073: The full stack trace of the root cause is available
- in the JBoss Web/7.2.2.Final-redhat-1 logs.
- </u>
- </p>
- <HR size="1" noshade="noshade" />
- <h3>JBoss Web/7.2.2.Final-redhat-1</h3>
- </body>
-</html> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetworkResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetworkResponse_Success.xml
deleted file mode 100644
index b40bd07a9d..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetworkResponse_Success.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<ns2:createNetworkResponse xmlns:ns2="http://org.openecomp.mso/network"
- xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <networkId>MNS-25180-L-01-dmz_direct_net_1/2c88a3a9-69b9-43a7-ada6-1aca577c3641</networkId>
- <neutronNetworkId>c4f4e878-cde0-4b15-ae9a-bda857759cea</neutronNetworkId>
- <subnetIdMap>
- <entry>
- <key>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</key>
- <value>bd8e87c6-f4e2-41b8-b0bc-9596aa00cd73</value>
- </entry>
- </subnetIdMap>
- <rollback>
- <cloudId>RDM2WAGPLCP</cloudId>
- <msoRequest>
- <requestId>1ef47428-cade-45bd-a103-0751e8b2deb0</requestId>
- <serviceInstanceId/>
- </msoRequest>
- <networkCreated>true</networkCreated>
- <networkId>MNS-25180-L-01-dmz_direct_net_1/2c88a3a9-69b9-43a7-ada6-1aca577c3641</networkId>
- <networkType>CONTRAIL_EXTERNAL</networkType>
- <networkUpdated>false</networkUpdated>
- <neutronNetworkId>c4f4e878-cde0-4b15-ae9a-bda857759cea</neutronNetworkId>
- <tenantId>7dd5365547234ee8937416c65507d266</tenantId>
- </rollback>
-</ns2:createNetworkResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryInstance_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryInstance_Success.xml
deleted file mode 100644
index 09f01fb7ca..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryInstance_Success.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<result-data>
- <resource-type>service-instance</resource-type>
- <resource-link>https://aai-conexus-e2e.test.com:8443/aai/v8/business/customers/customer/8310000058863/service-subscriptions/service-subscription/vMOG/service-instances/service-instance/f70e927b-6087-4974-9ef8-c5e4d5847ca4</resource-link>
-</result-data> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryName2_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryName2_AAIResponse_Success.xml
deleted file mode 100644
index b2d9ce2c5d..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryName2_AAIResponse_Success.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <l3-network xmlns="http://org.openecomp.aai.inventory/v8">
- <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4_3</network-id>
- <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>
- <network-type>CONTRAIL_EXTERNAL</network-type>
- <network-role>dmz_direct</network-role>
- <network-technology>contrail</network-technology>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <network-role-instance>0</network-role-instance>
- <orchestration-status>pending-create</orchestration-status>
- <subnets>
- <subnet>
- <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>
- <gateway-address>107.239.52.1</gateway-address>
- <network-start-address>107.239.52.0</network-start-address>
- <cidr-mask>24</cidr-mask>
- <ip-version>4</ip-version>
- <orchestration-status>pending-create</orchestration-status>
- <dhcp-enabled>true</dhcp-enabled>
- <relationship-list/>
- </subnet>
- </subnets>
- <relationship-list>
- <relationship>
- <related-to>vpn-binding</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>
- <relationship-data>
- <relationship-key>vpn-binding.vpn-id</relationship-key>
- <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>vpn-binding</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>
- <relationship-data>
- <relationship-key>vpn-binding.vpn-id</relationship-key>
- <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- </l3-network>
- </rest:payload>
-</rest:RESTResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNameActive_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNameActive_AAIResponse_Success.xml
deleted file mode 100644
index 4dfd8d3f12..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNameActive_AAIResponse_Success.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <l3-network xmlns="http://org.openecomp.aai.inventory/v8">
- <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>
- <network-name>MNS-25180-L-01-dmz_direct_net_2</network-name>
- <network-type>CONTRAIL_EXTERNAL</network-type>
- <network-role>dmz_direct</network-role>
- <network-technology>contrail</network-technology>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <network-role-instance>0</network-role-instance>
- <orchestration-status>active</orchestration-status>
- <subnets>
- <subnet>
- <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>
- <gateway-address>107.239.52.1</gateway-address>
- <network-start-address>107.239.52.0</network-start-address>
- <cidr-mask>24</cidr-mask>
- <ip-version>4</ip-version>
- <orchestration-status>active</orchestration-status>
- <dhcp-enabled>true</dhcp-enabled>
- <subnet-name>subnetName</subnet-name>
- <relationship-list/>
- </subnet>
- </subnets>
- <segmentation-assignments>
- <segmentation-id>413</segmentation-id>
- <resource-version>4132176</resource-version>
- </segmentation-assignments>
- <relationship-list>
- <relationship>
- <related-to>vpn-binding</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>
- <relationship-data>
- <relationship-key>vpn-binding.vpn-id</relationship-key>
- <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>vpn-binding</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>
- <relationship-data>
- <relationship-key>vpn-binding.vpn-id</relationship-key>
- <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>route-table-reference</related-to>
- <relationship-data>
- <relationship-key>route-table-reference.route-table-reference-id</relationship-key>
- <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- </l3-network>
- </rest:payload>
-</rest:RESTResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryName_AAIResponse_404.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryName_AAIResponse_404.xml
deleted file mode 100644
index 5cda12da2f..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryName_AAIResponse_404.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<rest:RESTFault xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- errorType="transport">
- <rest:errorCode>404</rest:errorCode>
- <rest:message>HTTP method: GET Not Found </rest:message>
- <rest:messageDetails>&lt;Fault&gt;
- &lt;requestError&gt;
- &lt;serviceException&gt;
- &lt;messageId&gt;SVC3001&lt;/messageId&gt;
- &lt;text&gt;Resource not found for %1 using id %2 (msg=%3) (ec=%4)&lt;/text&gt;
- &lt;variables&gt;
- &lt;variable&gt;GETl3Networks&lt;/variable&gt;
- &lt;variable xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:nil="true"/&gt;
- &lt;variable&gt;Node Not Found:No Node of type l3Network found for properties: (network-id = null)&lt;/variable&gt;
- &lt;variable&gt;ERR.5.4.6114&lt;/variable&gt;
- &lt;/variables&gt;
- &lt;/serviceException&gt;
- &lt;/requestError&gt;
-&lt;/Fault&gt;</rest:messageDetails>
-</rest:RESTFault> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryName_AAIResponse_Success.xml
deleted file mode 100644
index 77e3a649fb..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryName_AAIResponse_Success.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <l3-network xmlns="http://org.openecomp.aai.inventory/v8">
- <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>
- <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>
- <network-type>CONTRAIL_EXTERNAL</network-type>
- <network-role>dmz_direct</network-role>
- <network-technology>contrail</network-technology>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <network-role-instance>0</network-role-instance>
- <orchestration-status>pending-create</orchestration-status>
- <subnets>
- <subnet>
- <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>
- <gateway-address>107.239.52.1</gateway-address>
- <network-start-address>107.239.52.0</network-start-address>
- <cidr-mask>24</cidr-mask>
- <ip-version>4</ip-version>
- <orchestration-status>pending-create</orchestration-status>
- <dhcp-enabled>true</dhcp-enabled>
- <relationship-list/>
- </subnet>
- </subnets>
- <relationship-list>
- <relationship>
- <related-to>vpn-binding</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>
- <relationship-data>
- <relationship-key>vpn-binding.vpn-id</relationship-key>
- <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>vpn-binding</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>
- <relationship-data>
- <relationship-key>vpn-binding.vpn-id</relationship-key>
- <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- </l3-network>
- </rest:payload>
-</rest:RESTResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_404.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_404.xml
deleted file mode 100644
index 5cda12da2f..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_404.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<rest:RESTFault xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- errorType="transport">
- <rest:errorCode>404</rest:errorCode>
- <rest:message>HTTP method: GET Not Found </rest:message>
- <rest:messageDetails>&lt;Fault&gt;
- &lt;requestError&gt;
- &lt;serviceException&gt;
- &lt;messageId&gt;SVC3001&lt;/messageId&gt;
- &lt;text&gt;Resource not found for %1 using id %2 (msg=%3) (ec=%4)&lt;/text&gt;
- &lt;variables&gt;
- &lt;variable&gt;GETl3Networks&lt;/variable&gt;
- &lt;variable xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:nil="true"/&gt;
- &lt;variable&gt;Node Not Found:No Node of type l3Network found for properties: (network-id = null)&lt;/variable&gt;
- &lt;variable&gt;ERR.5.4.6114&lt;/variable&gt;
- &lt;/variables&gt;
- &lt;/serviceException&gt;
- &lt;/requestError&gt;
-&lt;/Fault&gt;</rest:messageDetails>
-</rest:RESTFault> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml
deleted file mode 100644
index fb8c365844..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<l3-network xmlns="http://org.openecomp.aai.inventory/v8">
- <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>
- <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>
- <network-type>CONTRAIL_EXTERNAL</network-type>
- <network-role>dmz_direct</network-role>
- <network-technology>contrail</network-technology>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <network-role-instance>0</network-role-instance>
- <orchestration-status>pending-create</orchestration-status>
- <physical-network-name>networkName</physical-network-name>
- <is-provider-network>false</is-provider-network>
- <is-shared-network>true</is-shared-network>
- <is-external-network>false</is-external-network>
- <subnets>
- <subnet>
- <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>
- <gateway-address>107.239.52.1</gateway-address>
- <network-start-address>107.239.52.0</network-start-address>
- <cidr-mask>24</cidr-mask>
- <ip-version>4</ip-version>
- <orchestration-status>pending-create</orchestration-status>
- <dhcp-enabled>true</dhcp-enabled>
- <subnet-name>subnetName</subnet-name>
- <relationship-list/>
- </subnet>
- </subnets>
- <segmentation-assignments>
- <segmentation-id>413</segmentation-id>
- <resource-version>4132176</resource-version>
- </segmentation-assignments>
- <relationship-list>
- <relationship>
- <related-to>vpn-binding</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>
- <relationship-data>
- <relationship-key>vpn-binding.vpn-id</relationship-key>
- <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>vpn-binding</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>
- <relationship-data>
- <relationship-key>vpn-binding.vpn-id</relationship-key>
- <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>network-policy</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg</related-link>
- <relationship-data>
- <relationship-key>network-policy.network-policy-id</relationship-key>
- <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>route-table-reference</related-to>
- <relationship-data>
- <relationship-key>route-table-reference.route-table-reference-id</relationship-key>
- <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
-</l3-network>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_Success.xml
deleted file mode 100644
index 6e33a532af..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_Success.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <l3-network xmlns="http://org.openecomp.aai.inventory/v8">
- <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>
- <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>
- <network-type>CONTRAIL_EXTERNAL</network-type>
- <network-role>dmz_direct</network-role>
- <network-technology>contrail</network-technology>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <network-role-instance>0</network-role-instance>
- <orchestration-status>pending-create</orchestration-status>
- <physical-network-name>networkName</physical-network-name>
- <is-provider-network>false</is-provider-network>
- <is-shared-network>true</is-shared-network>
- <is-external-network>false</is-external-network>
- <subnets>
- <subnet>
- <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>
- <gateway-address>107.239.52.1</gateway-address>
- <network-start-address>107.239.52.0</network-start-address>
- <cidr-mask>24</cidr-mask>
- <ip-version>4</ip-version>
- <orchestration-status>pending-create</orchestration-status>
- <dhcp-enabled>true</dhcp-enabled>
- <subnet-name>subnetName</subnet-name>
- <ip-assignment-direction>true</ip-assignment-direction>
- <host-routes>
- <host-route>
- <host-route-id>string</host-route-id>
- <route-prefix>192.10.16.0/24</route-prefix>
- <next-hop>192.10.16.100/24</next-hop>
- <next-hop-type>ip-address</next-hop-type>
- </host-route>
- <host-route>
- <host-route-id>string</host-route-id>
- <route-prefix>192.110.17.0/24</route-prefix>
- <next-hop>192.110.17.110/24</next-hop>
- <next-hop-type>ip-address</next-hop-type>
- </host-route>
- </host-routes>
- <relationship-list/>
- </subnet>
- </subnets>
- <segmentation-assignments>
- <segmentation-id>413</segmentation-id>
- <resource-version>4132176</resource-version>
- </segmentation-assignments>
- <relationship-list>
- <relationship>
- <related-to>vpn-binding</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>
- <relationship-data>
- <relationship-key>vpn-binding.vpn-id</relationship-key>
- <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>vpn-binding</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>
- <relationship-data>
- <relationship-key>vpn-binding.vpn-id</relationship-key>
- <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>network-policy</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg</related-link>
- <relationship-data>
- <relationship-key>network-policy.network-policy-id</relationship-key>
- <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>route-table-reference</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/route-table-references/route-table-reference/refFQDN1</related-link>
- <relationship-data>
- <relationship-key>route-table-reference.route-table-reference-id</relationship-key>
- <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>route-table-reference</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/route-table-references/route-table-reference/refFQDN2</related-link>
- <relationship-data>
- <relationship-key>route-table-reference.route-table-reference-id</relationship-key>
- <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- </l3-network>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkPolicy_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkPolicy_AAIResponse_Success.xml
deleted file mode 100644
index 02a280da58..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkPolicy_AAIResponse_Success.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <network-policy xmlns="http://org.openecomp.aai.inventory/v8">
- <network-policy-id>9a7b327d9-287aa00-82c4b0-105757</network-policy-id>
- <network-policy-fqdn>GN_EVPN_Test</network-policy-fqdn>
- <heat-stack-id>13979:105757</heat-stack-id>
- <resource-version>13979:105757</resource-version>
- </network-policy>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkTableRef1_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkTableRef1_AAIResponse_Success.xml
deleted file mode 100644
index 52e9692b4d..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkTableRef1_AAIResponse_Success.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <route-table-references xmlns="http://org.openecomp.aai.inventory/v8">
- <route-table-reference-id>5938baec-03ca-2bd5-a3f1-d54x123e253a</route-table-reference-id>
- <route-table-reference-fqdn>refFQDN1</route-table-reference-fqdn>
- <resource-version>12345</resource-version>
- </route-table-references>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkTableRef2_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkTableRef2_AAIResponse_Success.xml
deleted file mode 100644
index ddae6b1182..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryNetworkTableRef2_AAIResponse_Success.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <route-table-references xmlns="http://org.openecomp.aai.inventory/v8">
- <route-table-reference-id>5938baec-03ca-2bd5-a3f1-d54x123e253a</route-table-reference-id>
- <route-table-reference-fqdn>refFQDN2</route-table-reference-fqdn>
- <resource-version>12345</resource-version>
- </route-table-references>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryVpnBindingList_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryVpnBindingList_AAIResponse_Success.xml
deleted file mode 100644
index d1b7ea7cdf..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryVpnBindingList_AAIResponse_Success.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <vpn-binding xmlns="http://org.openecomp.aai.inventory/v8">
- <vpn-id>9a7b327d9-287aa00-82c4b0-105757</vpn-id>
- <vpn-name>GN_EVPN_Test</vpn-name>
- <route-targets>
- <route-target>
- <global-route-target>13979:105708</global-route-target>
- <route-target-role>EXPORT</route-target-role>
- <resource-version>1504025599510</resource-version>
- </route-target>
- <route-target>
- <global-route-target>13979:105707</global-route-target>
- <route-target-role>IMPORT</route-target-role>
- <resource-version>1504025599519</resource-version>
- </route-target>
- </route-targets>
- <relationship-list>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/l3-networks/l3-network/689ec39e-c5fc-4462-8db2-4f760763ad28/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>689ec39e-c5fc-4462-8db2-4f760763ad28</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/l3-networks/l3-network/1a49396b-19b3-40a4-8792-aa2fbd0f0704/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>1a49396b-19b3-40a4-8792-aa2fbd0f0704</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/l3-networks/l3-network/774f3329-3c83-4771-86c7-9e6207cd50fd/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>774f3329-3c83-4771-86c7-9e6207cd50fd</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- </vpn-binding>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryVpnBinding_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryVpnBinding_AAIResponse_Success.xml
deleted file mode 100644
index 19aac50ee4..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_queryVpnBinding_AAIResponse_Success.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <vpn-binding xmlns="http://org.openecomp.aai.inventory/v8">
- <vpn-id>9a7b327d9-287aa00-82c4b0-105757</vpn-id>
- <vpn-name>GN_EVPN_Test</vpn-name>
- <global-route-target>13979:105757</global-route-target>
- <relationship-list>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/l3-networks/l3-network/689ec39e-c5fc-4462-8db2-4f760763ad28/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>689ec39e-c5fc-4462-8db2-4f760763ad28</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/l3-networks/l3-network/1a49396b-19b3-40a4-8792-aa2fbd0f0704/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>1a49396b-19b3-40a4-8792-aa2fbd0f0704</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/l3-networks/l3-network/774f3329-3c83-4771-86c7-9e6207cd50fd/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>774f3329-3c83-4771-86c7-9e6207cd50fd</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- </vpn-binding>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_updateContrail_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_updateContrail_AAIResponse_Success.xml
deleted file mode 100644
index eedbda9343..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2/createNetwork_updateContrail_AAIResponse_Success.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>
- <rest:header name="Content-Length" value="0"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:551-132672"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2mock/sdncCreateNetworkTopologyRsrcAssignResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2mock/sdncCreateNetworkTopologyRsrcAssignResponse.xml
deleted file mode 100644
index e6af14123e..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2mock/sdncCreateNetworkTopologyRsrcAssignResponse.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:v1="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
- <soapenv:Header />
- <soapenv:Body>
- <v1:SDNCAdapterCallback>
- <SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
- <CallbackHeader>
- <RequestId>79ec9006-3695-4fcc-93a8-be6f9e248beb</RequestId>
- <ResponseCode>200</ResponseCode>
- <ResponseMessage>OK</ResponseMessage>
- </CallbackHeader>
- <RequestData xsi:type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">&lt;output xmlns="com:att:sdnctl:generic-resource"&gt;&lt;response-message&gt;&lt;/response-message&gt;&lt;svc-request-id&gt;79ec9006-3695-4fcc-93a8-be6f9e248beb&lt;/svc-request-id&gt;&lt;service-response-information&gt;&lt;instance-id&gt;f805ec2b-b4d8-473e-8325-67f110139e5d&lt;/instance-id&gt;&lt;/service-response-information&gt;&lt;response-code&gt;200&lt;/response-code&gt;&lt;network-response-information&gt;&lt;instance-id&gt;49c86598-f766-46f8-84f8-8d1c1b10f9b4&lt;/instance-id&gt;&lt;object-path&gt;restconf/config/GENERIC-RESOURCE-API:services/service/f805ec2b-b4d8-473e-8325-67f110139e5d/service-data/networks/network/f7e4db56-aab5-4065-8e65-cec1cd1de24f&lt;/object-path&gt;&lt;/network-response-information&gt;&lt;ack-final-indicator&gt;Y&lt;/ack-final-indicator&gt;&lt;/output&gt;</RequestData>
- </SDNCAdapterCallbackRequest>
- </v1:SDNCAdapterCallback>
- </soapenv:Body>
-</soapenv:Envelope>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2mock/sdncCreateNetworkTopologySimResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2mock/sdncCreateNetworkTopologySimResponse.xml
deleted file mode 100644
index 40bb93bda0..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateNetworkV2mock/sdncCreateNetworkTopologySimResponse.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:v1="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
- <soapenv:Header />
- <soapenv:Body>
- <v1:SDNCAdapterCallback>
- <SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
- <CallbackHeader>
- <RequestId>testRequestId</RequestId>
- <ResponseCode>200</ResponseCode>
- <ResponseMessage>OK</ResponseMessage>
- </CallbackHeader>
- <RequestData xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:type="xs:string">&lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;output xmlns="com:att:sdnctl:vnf"&gt;&lt;svc-request-id&gt;19174929-3809-49ca-89eb-17f84a035389&lt;/svc-request-id&gt;&lt;response-code&gt;200&lt;/response-code&gt;&lt;ack-final-indicator&gt;Y&lt;/ack-final-indicator&gt;&lt;network-information&gt;&lt;network-id&gt;49c86598-f766-46f8-84f8-8d1c1b10f9b4&lt;/network-id&gt;&lt;/network-information&gt;&lt;service-information&gt;&lt;service-type&gt;a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb&lt;/service-type&gt;&lt;service-instance-id&gt;HSL_direct_net_2&lt;/service-instance-id&gt;&lt;subscriber-name&gt;notsurewecare&lt;/subscriber-name&gt;&lt;/service-information&gt;&lt;/output&gt;</RequestData>
- </SDNCAdapterCallbackRequest>
- </v1:SDNCAdapterCallback>
- </soapenv:Body>
-</soapenv:Envelope>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/DoCreateServiceInstanceInput.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/DoCreateServiceInstanceInput.json
deleted file mode 100644
index 0d8a22c920..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/DoCreateServiceInstanceInput.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-"requestDetails": {
-"modelInfo": {
-"modelType": "service",
-"modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-"modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-"modelName": "Test",
-"modelVersion": "1.0"
-},
-"cloudConfiguration": {
-"lcpCloudRegionId": "mdt1",
-"tenantId": "88a6ca3ee0394ade9403f075db23167e"
-},
-"owningEntity": {
-"owningEntityId": "a",
-"owningEntityName": "a"
-},
-"project": {
-"projectName": "temp project"
-},
-"subscriberInfo": {
-"globalSubscriberId": "some subscriber id",
-"subscriberName": "some subscriber name"
-},
-"requestInfo": {
-"productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-"source": "VID",
-"suppressRollback": true,
-"requestorId": "az2016"
-},
-"requestParameters": {
-"subscriptionServiceType": "MOG",
-"aLaCarte": false,
-"userParams": [
-{
-"name": "someUserParam",
-"value": "someValue"
-}
-]
-}
-}
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/SetupServiceDecompJson.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/SetupServiceDecompJson.json
deleted file mode 100644
index c2cc687066..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/SetupServiceDecompJson.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-"requestDetails": {
- "serviceInstance":{
- "serviceInstanceId": "MSORefactorTest1",
- "serviceInstanceName": "bensServiceInstance",
- "serviceType": "refactorServiceType",
- "serviceRole": "abc",
- "modelInvariantUuid": "9647dfc4-2083-11e7-93ae-92361f002671",
- "modelUuid": "5df8b6de-2083-11e7-93ae-92361f002671",
- "modelVersion": "1.0",
- "modelName": "MSOTADevInfra_vSAMP10a_Service",
- "environmentContext": "a",
- "workloadContext": "b"
- },
- "project":{
- "projectName": "MSORefactorTest1"
- },
- "owningEntity":{
- "owningEntityId": "MSORefactorTestId123",
- "owningEntityName": "MSORefactorTest1"
- },
- "customer":{
- "subscriptionServiceType": "refactorServiceType",
- "globalSubscriberId": "MSO_1806_Refactor"
- },
- "request":{
- "sdncRequestId": "abc",
- "callbackURL": "abc",
- "requestId": "md5621",
- "productFamilyId": "abc"
- }
-}
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_createServiceInstance_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_createServiceInstance_AAIResponse_Success.xml
deleted file mode 100644
index eedbda9343..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_createServiceInstance_AAIResponse_Success.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>
- <rest:header name="Content-Length" value="0"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:551-132672"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_queryGlobalCustomerId_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_queryGlobalCustomerId_AAIResponse_Success.xml
deleted file mode 100644
index be820b83b1..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_queryGlobalCustomerId_AAIResponse_Success.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<rest:RESTResponse
- xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked" />
- <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT" />
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC" />
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas03-20160310-00:01:18:502-132671" />
- <rest:header name="Content-Type" value="application/xml" />
- <rest:header name="Server" value="Apache-Coyote/1.1" />
- <rest:header name="Cache-Control" value="private" />
- </rest:headers>
- <rest:payload contentType="text/xml">
- <customer xmlns="http://org.openecomp.aai.inventory/v8">
- <global-customer-id>8310000058863</global-customer-id>
- <subscriber-name>Mobility</subscriber-name>
- <subscriber-type>INFRA</subscriber-type>
- <resource-version>1452288058</resource-version>
- <service-subscriptions>
- <service-subscription>
- <service-type>vMOG</service-type>
- <resource-version>1452288058</resource-version>
- <service-instances>
- <service-instance>
- <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>
- <persona-model-id>gg0e927b-6087-5574-9ef8-c5e4d5847db5</persona-model-id>
- <persona-model-version>V1.0</persona-model-version>
- <service-instance-name>vMOG-AKRON-1234</service-instance-name>
- <resource-version>1462561835</resource-version>
- <relationship-list />
- <metadata />
- </service-instance>
- </service-instances>
- <relationship-list>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-conexus-e2e.test.com:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/396d61752cf04c3b8ca2afcb4ee049e9/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>396d61752cf04c3b8ca2afcb4ee049e9</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-owner</relationship-key>
- <relationship-value>att-aic</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-region-id</relationship-key>
- <relationship-value>AAIAIC25</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>tenant.tenant-name</property-key>
- <property-value>vMOG-AKRON-PROD</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
- </service-subscription>
- </service-subscriptions>
- <relationship-list />
- </customer>
- </rest:payload>
-</rest:RESTResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/CreateVfModuleCallbackException.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/CreateVfModuleCallbackException.xml
deleted file mode 100644
index 1ede44427a..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/CreateVfModuleCallbackException.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<volumeGroupException>
- <messageId>{{MESSAGE-ID}}</messageId>
- <category>INTERNAL</category>
- <message>Exception during create VF Create VF Module: Unable to determine specific VF Module Type: Nimbus_LU2_PXMC_Svc/PXMC_09_20_2016_v2 3::Pxmc09202016V2..pxmc_base.yaml..module-2 with version = 3.0</message>
- <rolledBack>true</rolledBack>
-</volumeGroupException> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/CreateVfModuleVolumeCallbackResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/CreateVfModuleVolumeCallbackResponse.xml
deleted file mode 100644
index a421355aba..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/CreateVfModuleVolumeCallbackResponse.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<createVolumeGroupResponse>
- <messageId>{{MESSAGE-ID}}</messageId>
- <volumeGroupCreated>true</volumeGroupCreated>
- <volumeGroupId>d485ecee-957c-4a0a-8b95-27a22b90103f</volumeGroupId>
- <volumeGroupOutputs>
- <entry>
- <key>mmsc_vol_1</key>
- <value>a73e0fe9-1ce8-49c2-8fef-e2788605be29</value>
- </entry>
- <entry>
- <key>mmsc_vol_2</key>
- <value>37b6455a-5ea8-463a-89e3-0efeaf7b7c6d</value>
- </entry>
- <entry>
- <key>nemsfe_vol_1</key>
- <value>b7ff1c21-d138-49a3-bf13-4cfd91efaf48</value>
- </entry>
- <entry>
- <key>nemsbe_vol_1</key>
- <value>a5988471-cd42-44d8-b078-64f2f13d3d4c</value>
- </entry>
- <entry>
- <key>mmsc_vol_5</key>
- <value>f7b91c1e-ab8c-413a-a850-ba80a246c7e0</value>
- </entry>
- <entry>
- <key>nemsfe_vol_2</key>
- <value>957ea3f3-2d4a-4707-bfd2-ba66f42037c2</value>
- </entry>
- <entry>
- <key>mmsc_vol_3</key>
- <value>de6fccfe-d61a-48b0-b03b-87bf1bf749b3</value>
- </entry>
- <entry>
- <key>mmsc_vol_4</key>
- <value>76162310-2c38-4c32-981c-5c2880190077</value>
- </entry>
- </volumeGroupOutputs>
- <volumeGroupRollback>
- <cloudSiteId>RDM2WAGPLCP</cloudSiteId>
- <messageId>e585e4f4-9452-437a-b294-45a2d6d3b7a3</messageId>
- <msoRequest>
- <requestId>c30b9453-4b68-4c2e-aacf-58a5ba648bf5</requestId>
- <serviceInstanceId>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</serviceInstanceId>
- </msoRequest>
- <tenantId>1bbab536a19b4756926e7d0ec1eb543c</tenantId>
- <volumeGroupCreated>true</volumeGroupCreated>
- <volumeGroupId>78987</volumeGroupId>
- <volumeGroupStackId>ZRDM1MMSC01_base_vol/7f74e5e1-5fc1-4593-ac7e-cc9899a106ef</volumeGroupStackId>
- </volumeGroupRollback>
- <volumeGroupStackId>ZRDM1MMSC01_base_vol/7f74e5e1-5fc1-4593-ac7e-cc9899a106ef</volumeGroupStackId>
-</createVolumeGroupResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/CreateVfModuleVolumeRequest.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/CreateVfModuleVolumeRequest.xml
deleted file mode 100644
index 458426660e..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/CreateVfModuleVolumeRequest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<volume-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <request-info>
- <test-data-only>123abc</test-data-only> <!-- don't remove this tag. Its used for junit test -->
- <request-id>d8d4fcfa-fd7e-4413-b19d-c95aa67291b8</request-id>
- <action>CREATE_VF_MODULE_VOL</action>
- <source>SoapUI-bns-create-base-vol-1001-1</source>
- </request-info>
- <volume-inputs>
- <vnf-type>Test/vSAMP12</vnf-type>
- <vf-module-model-name>vSAMP12::base::module-0</vf-module-model-name>
- <backout-on-failure/>
- <asdc-service-model-version/>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <aic-cloud-region>MDTWNJ21</aic-cloud-region>
- <tenant-id>897deadc2b954a6bac6d3c197fb3525e</tenant-id>
- <volume-group-name>MSOTESTVOL101a-vSAMP12_base_vol_module-0</volume-group-name>
- <volume-group-id/>
- </volume-inputs>
- <volume-params>
- <param name="param1">value1</param>"
- <param name="param2">value2</param>"
- <param name="param3">value3</param>"
- </volume-params>
-</volume-request>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/GenericVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/GenericVnf.xml
deleted file mode 100644
index 4c18356bf9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/GenericVnf.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<generic-vnf xmlns="http://org.openecomp.aai.inventory/v8">
- <vnf-id>TEST-VNF-ID-0123</vnf-id>
- <vnf-name>STMTN5MMSC20</vnf-name>
- <vnf-type>pcrf-capacity</vnf-type>
- <service-id>SDN-MOBILITY</service-id>
- <equipment-role>vPCRF</equipment-role>
- <orchestration-status>pending-create</orchestration-status>
- <in-maint>false</in-maint>
- <is-closed-loop-disabled>false</is-closed-loop-disabled>
- <persona-model-id>introvert</persona-model-id>
- <persona-model-version>2.0</persona-model-version>
- <resource-version>0000020</resource-version>
- <vf-modules>
- <vf-module>
- <vf-module-id>lukewarm</vf-module-id>
- <vf-module-name>PCRF::module-0-0</vf-module-name>
- <persona-model-id>introvert</persona-model-id>
- <persona-model-version>2.0</persona-model-version>
- <is-base-vf-module>true</is-base-vf-module>
- <heat-stack-id>fastburn</heat-stack-id>
- <orchestration-status>pending-create</orchestration-status>
- <resource-version>0000074</resource-version>
- </vf-module>
- <vf-module>
- <vf-module-id>supercool</vf-module-id>
- <vf-module-name>PCRF::module-1-0</vf-module-name>
- <persona-model-id>extrovert</persona-model-id>
- <persona-model-version>2.0</persona-model-version>
- <is-base-vf-module>false</is-base-vf-module>
- <heat-stack-id>slowburn</heat-stack-id>
- <orchestration-status>pending-create</orchestration-status>
- <resource-version>0000075</resource-version>
- </vf-module>
- </vf-modules>
- <relationship-list/>
- <l-interfaces/>
- <lag-interfaces/>
-</generic-vnf> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/RollbackVfModuleVolumeCallbackResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/RollbackVfModuleVolumeCallbackResponse.xml
deleted file mode 100644
index 6ab9416617..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/RollbackVfModuleVolumeCallbackResponse.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rollbackVolumeGroupResponse>
- <messageId>{{MESSAGE-ID}}</messageId>
- <volumeGroupRolledback>true</volumeGroupRolledback>
-</rollbackVolumeGroupResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request.json
deleted file mode 100644
index 1af452143e..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "requestDetails": {
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelInvariantUuid": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12::base::module-0",
- "modelVersion": "1",
- "modelCustomizationUuid": "ee6478e5-ea33-3346-ac12-ab121484a3fe"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "MSOTESTVOL101a-vSAMP12_base_vol_module-0",
- "source": "VID",
- "suppressRollback": false
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "{service-instance-id}",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantUuid": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "Test",
- "modelVersion": "2.0"
- }
- }
- }, {
- "relatedInstance": {
- "instanceId": "{vnf-instance-id}",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantUuid": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1",
- "modelInstanceName": "vSAMP12"
- }
- }
- }
- ],
- "requestParameters": {
- "serviceId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "userParams": [
- {"name": "vnfName", "value": "STMTN5MMSC20" },
- {"name": "vnfName2", "value": "US1117MTSNJVBR0246" },
- {"name": "vnfNmInformation", "value": "" },
- {"name": "vnfType", "value": "pcrf-capacity" },
- {"name": "vnfId", "value": "skask" },
- {"name": "vnfStackId", "value": "slowburn" },
- {"name": "vnfStatus", "value": "created" },
- {"name": "aicCloudRegion", "value": "MDTWNJ21" },
- {"name": "availabilityZone", "value": "slcp3-esx-az01" },
- {"name": "oamNetworkName", "value": "VLAN-OAM-1323" },
- {"name": "vmName", "value": "slcp34246vbc246ceb" },
- {"name": "ipagNetworkId", "value": "970cd2b9-7f09-4a12-af47-182ea38ba1f0" },
- {"name": "vpeNetworkId", "value": "545cc2c3-1930-4100-b534-5d82d0e12bb6" },
- {
- "name": "vlc_sctp_b_route_prefixes",
- "value": [
- { "interface_route_table_routes_route_prefix": "107.239.41.163/32" },
- { "interface_route_table_routes_route_prefix": "107.239.41.164/32" },
- { "interface_route_table_routes_route_prefix": "107.239.41.165/32" }
- ]}
- ]
- }
- }
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request_noreqparm.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request_noreqparm.json
deleted file mode 100644
index de99a6da56..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request_noreqparm.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "requestDetails": {
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12::base::module-0",
- "modelVersion": "1"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "MSOTESTVOL101a-vSAMP12_base_vol_module-0",
- "source": "VID",
- "suppressRollback": false
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "{service-instance-id}",
- "modelInfo": {
- "modelType": "service",
- "modelId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "{parent service model name}",
- "modelVersion": "1"
- }
- }
- }, {
- "relatedInstance": {
- "instanceId": "{vnf-instance-id}",
- "modelInfo": {
- "modelType": "vnf",
- "modelId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "Test/vSAMP12",
- "modelVersion": "1"
- }
- }
- }
- ]
- }
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_createVolumeName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_createVolumeName_AAIResponse_Success.xml
deleted file mode 100644
index bff26fa78a..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_createVolumeName_AAIResponse_Success.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="X-CSI-Internal-WriteableRequest" value="true"/>
- <rest:header name="X-CSI-MethodName" value="UNKNOWN"/>
- <rest:header name="Content-Length" value="968"/>
- <rest:header name="breadcrumbId" value="ID-mtsnjv9aaas23-44965-1459957053425-0-211465"/>
- <rest:header name="X-CSI-UniqueTransactionId"
- value="AjscCsiRestful28795@mtsnjv9aaas237d4a4d21-e60a-495f-935f-cc225dc3c847"/>
- <rest:header name="User-Agent" value="Jakarta Commons-HttpClient/3.1"/>
- <rest:header name="X-TransactionID" value="3a19f95d-d63e-4a8e-8b9c-6563895628aa"/>
- <rest:header name="X-CSI-ServiceName" value="UNKNOWN"/>
- <rest:header name="Server" value="Jetty(9.2.z-SNAPSHOT)"/>
- <rest:header name="Cache-Control" value="no-cache,no-store"/>
- <rest:header name="X-FromAppId" value="MSO"/>
- <rest:header name="Date" value="Fri,08 Apr 2016 16:53:04 GMT"/>
- <rest:header name="X-CSI-ConversationId"
- value="ajscUser~CNG-CSI~c0a2bb44-2167-4e85-ad6a-483a24c0823a"/>
- <rest:header name="volume-group-name" value="simpleCinderVolume_201604071"/>
- <rest:header name="X-CSI-MessageId" value="f6d6eed4-456e-4033-be04-b17582902dc2"/>
- <rest:header name="X-AAI-TXID" value="mtsnjv9aaas23-20160408-16:53:04:592-73255"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Accept" value="application/xml"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <volume-group xmlns="http://org.openecomp.aai.inventory/v8">
- <volume-group-id>simpleCinderVolume_201604071</volume-group-id>
- <volume-group-name>simpleCinderVolume_201604071</volume-group-name>
- <heat-stack-id>simpleCinderVolume_201604071</heat-stack-id>
- <vnf-type>simple_cinder_master</vnf-type>
- <orchestration-status>Pending</orchestration-status>
- <resource-version>1460134360</resource-version>
- <relationship-list>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/897deadc2b954a6bac6d3c197fb3525e/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>897deadc2b954a6bac6d3c197fb3525e</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>tenant.tenant-name</property-key>
- <property-value>MSOTest1</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
- </volume-group>
- </rest:payload>
-</rest:RESTResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_deleteVolumeName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_deleteVolumeName_AAIResponse_Success.xml
deleted file mode 100644
index 1574310474..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_deleteVolumeName_AAIResponse_Success.xml
+++ /dev/null
@@ -1,24 +0,0 @@
- <rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="X-CSI-Internal-WriteableRequest" value="true"/>
- <rest:header name="X-CSI-MethodName" value="helloWorld-GetMethod(Logical)"/>
- <rest:header name="Content-Length" value="0"/>
- <rest:header name="breadcrumbId" value="ID-mtsnjv9aaas23-44965-1459957053425-0-211467"/>
- <rest:header name="X-CSI-UniqueTransactionId"
- value="AjscCsiRestful28795@mtsnjv9aaas23d44059bc-ef96-4af8-a28b-98044e08d7af"/>
- <rest:header name="User-Agent" value="Jakarta Commons-HttpClient/3.1"/>
- <rest:header name="X-TransactionID" value="3749995c-266b-4025-a0c4-4ce6983efc66"/>
- <rest:header name="X-CSI-ServiceName" value="helloWorld"/>
- <rest:header name="Server" value="Jetty(9.2.z-SNAPSHOT)"/>
- <rest:header name="Cache-Control" value="no-cache,no-store"/>
- <rest:header name="X-FromAppId" value="MSO"/>
- <rest:header name="Date" value="Fri,08 Apr 2016 16:53:04 GMT"/>
- <rest:header name="X-CSI-ConversationId"
- value="ajscUser~CNG-CSI~bbd0e78f-d4e7-41be-b9ad-4a6767fa660a"/>
- <rest:header name="X-CSI-MessageId" value="6ccfeb13-56da-4836-bfbd-5a42dee60939"/>
- <rest:header name="X-AAI-TXID" value="mtsnjv9aaas23-20160408-16:53:04:629-73256"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Accept" value="application/xml"/>
- </rest:headers>
- </rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_queryVolumeName_AAIResponse_404.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_queryVolumeName_AAIResponse_404.xml
deleted file mode 100644
index 152bafc0eb..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_queryVolumeName_AAIResponse_404.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume-group xmlns="http://org.openecomp.aai.inventory/v7">
- <volume-group-id>94f0f72f-4be1-49ed-8410-702396797163</volume-group-id>
- <volume-group-name>MSOTESTVOL103H-vSAMP12_base_vol_module-0</volume-group-name>
- <heat-stack-id/>
- <vnf-type>Test/vSAMP12</vnf-type>
- <orchestration-status>Pending</orchestration-status>
- <resource-version>1469203133</resource-version>
- <relationship-list>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v7/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/e444c311b27a45dc9522f2370d70f90f/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>e444c311b27a45dc9522f2370d70f90f</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-owner</relationship-key>
- <relationship-value>att-aic</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-region-id</relationship-key>
- <relationship-value>mtn6</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>tenant.tenant-name</property-key>
- <property-value>MSOCustomer1</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</volume-group>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml
deleted file mode 100644
index 8d9efb3b39..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="X-CSI-Internal-WriteableRequest" value="true"/>
- <rest:header name="X-CSI-MethodName" value="UNKNOWN"/>
- <rest:header name="Content-Length" value="968"/>
- <rest:header name="breadcrumbId" value="ID-mtsnjv9aaas23-44965-1459957053425-0-211465"/>
- <rest:header name="X-CSI-UniqueTransactionId"
- value="AjscCsiRestful28795@mtsnjv9aaas237d4a4d21-e60a-495f-935f-cc225dc3c847"/>
- <rest:header name="User-Agent" value="Jakarta Commons-HttpClient/3.1"/>
- <rest:header name="X-TransactionID" value="3a19f95d-d63e-4a8e-8b9c-6563895628aa"/>
- <rest:header name="X-CSI-ServiceName" value="UNKNOWN"/>
- <rest:header name="Server" value="Jetty(9.2.z-SNAPSHOT)"/>
- <rest:header name="Cache-Control" value="no-cache,no-store"/>
- <rest:header name="X-FromAppId" value="MSO"/>
- <rest:header name="Date" value="Fri,08 Apr 2016 16:53:04 GMT"/>
- <rest:header name="X-CSI-ConversationId"
- value="ajscUser~CNG-CSI~c0a2bb44-2167-4e85-ad6a-483a24c0823a"/>
- <rest:header name="volume-group-name" value="simpleCinderVolume_201604071"/>
- <rest:header name="X-CSI-MessageId" value="f6d6eed4-456e-4033-be04-b17582902dc2"/>
- <rest:header name="X-AAI-TXID" value="mtsnjv9aaas23-20160408-16:53:04:592-73255"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Accept" value="application/xml"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <volume-group xmlns="http://org.openecomp.aai.inventory/v8">
- <volume-group-id>8424bb3c-c3e7-4553-9662-469649ed9379</volume-group-id>
- <volume-group-name>MSOTESTVOL103W-vSAMP12_base_vol_module-0</volume-group-name>
- <heat-stack-id/>
- <vnf-type>simple_cinder_master</vnf-type>
- <orchestration-status>Pending</orchestration-status>
- <vf-module-model-customization-id>ee6478e5-ea33-3346-ac12-ab121484a3fe</vf-module-model-customization-id>
- <resource-version>1460134360</resource-version>
- <relationship-list>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/897deadc2b954a6bac6d3c197fb3525e/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>897deadc2b954a6bac6d3c197fb3525e</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>tenant.tenant-name</property-key>
- <property-value>MSOTest1</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
- </volume-group>
- </rest:payload>
-</rest:RESTResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_updateVolumeName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_updateVolumeName_AAIResponse_Success.xml
deleted file mode 100644
index 1574310474..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_updateVolumeName_AAIResponse_Success.xml
+++ /dev/null
@@ -1,24 +0,0 @@
- <rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="X-CSI-Internal-WriteableRequest" value="true"/>
- <rest:header name="X-CSI-MethodName" value="helloWorld-GetMethod(Logical)"/>
- <rest:header name="Content-Length" value="0"/>
- <rest:header name="breadcrumbId" value="ID-mtsnjv9aaas23-44965-1459957053425-0-211467"/>
- <rest:header name="X-CSI-UniqueTransactionId"
- value="AjscCsiRestful28795@mtsnjv9aaas23d44059bc-ef96-4af8-a28b-98044e08d7af"/>
- <rest:header name="User-Agent" value="Jakarta Commons-HttpClient/3.1"/>
- <rest:header name="X-TransactionID" value="3749995c-266b-4025-a0c4-4ce6983efc66"/>
- <rest:header name="X-CSI-ServiceName" value="helloWorld"/>
- <rest:header name="Server" value="Jetty(9.2.z-SNAPSHOT)"/>
- <rest:header name="Cache-Control" value="no-cache,no-store"/>
- <rest:header name="X-FromAppId" value="MSO"/>
- <rest:header name="Date" value="Fri,08 Apr 2016 16:53:04 GMT"/>
- <rest:header name="X-CSI-ConversationId"
- value="ajscUser~CNG-CSI~bbd0e78f-d4e7-41be-b9ad-4a6767fa660a"/>
- <rest:header name="X-CSI-MessageId" value="6ccfeb13-56da-4836-bfbd-5a42dee60939"/>
- <rest:header name="X-AAI-TXID" value="mtsnjv9aaas23-20160408-16:53:04:629-73256"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Accept" value="application/xml"/>
- </rest:headers>
- </rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/getSIUrlById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/getSIUrlById.xml
deleted file mode 100644
index 55fdedb66c..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/getSIUrlById.xml
+++ /dev/null
@@ -1,6 +0,0 @@
- <search-results xmlns="http://org.openecomp.aai.inventory">
- <result-data>
- <resource-type>service-instance</resource-type>
- <resource-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET</resource-link>
- </result-data>
- </search-results> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_HasVfModRelationship.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_HasVfModRelationship.xml
deleted file mode 100644
index 8d9c5c0a43..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_HasVfModRelationship.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<volume-group xmlns="http://com.att.aai.inventory/v8">
- <volume-group-id>78987</volume-group-id>
- <volume-group-name>MSOTESTVOL102a-vSAMP12_base_vol_module-0</volume-group-name>
- <heat-stack-id/>
- <vnf-type>Test/vSAMP12</vnf-type>
- <orchestration-status>Pending</orchestration-status>
- <resource-version>0000020</resource-version>
- <relationship-list>
- <relationship>
- <related-to>generic-vnf</related-to>
- <related-link>https://aai-ext1.test.att.com:8443/aai/v8/network/generic-vnfs/generic-vnf/9e48f6ea-f786-46de-800a-d480e5ccc846/</related-link>
- <relationship-data>
- <relationship-key>generic-vnf.vnf-id</relationship-key>
- <relationship-value>9e48f6ea-f786-46de-800a-d480e5ccc846</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>generic-vnf.vnf-name</property-key>
- <property-value>MSOSTSAMP12-10601</property-value>
- </related-to-property>
- </relationship>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-ext1.test.att.com:8443/aai/v7/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/fba1bd1e195a404cacb9ce17a9b2b421/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>fba1bd1e195a404cacb9ce17a9b2b421</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-owner</relationship-key>
- <relationship-value>att-aic</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-region-id</relationship-key>
- <relationship-value>mdt1</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>tenant.tenant-name</property-key>
- <property-value>ECOMP_MDT1</property-value>
- </related-to-property>
- </relationship>
- <relationship>
- <related-to>vf-module</related-to>
- <related-link>https://aai-ext1.test.att.com:8443/aai/v7/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/fba1bd1e195a404cacb9ce17a9b2b421/</related-link>
- <relationship-data>
- <relationship-key>vf-module.vf-module-id</relationship-key>
- <relationship-value>fba1bd1e195a404cacb9ce17a9b2b421</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-owner</relationship-key>
- <relationship-value>att-aic</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-region-id</relationship-key>
- <relationship-value>mdt1</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>vf-module.vf-module-name</property-key>
- <property-value>ECOMP_MDT1</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</volume-group> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request.json
deleted file mode 100644
index 3b41ff359c..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vfModule",
- "modelInvariantUuid": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "STMTN5MMSC21-MMSC::model-1-0",
- "modelVersion": "1",
- "modelCustomizationUuid": "ee6478e5-ea33-3346-ac12-ab121484a3fe"
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev_id",
- "subscriberName": "MSO_1610_dev_name"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "MDTWNJ21",
- "tenantId": "fba1bd1e195a404cacb9ce17a9b2b421"
- },
- "requestInfo": {
- "instanceName": "PCRF::module-0-2",
- "source": "VID",
- "suppressRollback": true
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c",
- "instanceName": "MSOTESTVOL103a-vSAMP12_base_module-0_vol",
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelInvariantUuid": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "123456",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantUuid": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "SERVICE_MODEL_NAME",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "skask",
- "instanceName": "skask-test",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantUuid": "skask",
- "modelUuid": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelInstanceName": "vSAMP12 1"
- }
- }
- }
- ],
- "requestParameters": {
- "usePreload": true,
- "aLaCarte": false,
- "userParams": {
- }
- }
- }
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request_noPreloads.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request_noPreloads.json
deleted file mode 100644
index e6d126eca2..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request_noPreloads.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vfModule",
- "modelInvariantUuid": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "STMTN5MMSC21-MMSC::model-1-0",
- "modelVersion": "1",
- "modelCustomizationUuid": "ee6478e5-ea33-3346-ac12-ab121484a3fe"
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev_id",
- "subscriberName": "MSO_1610_dev_name"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "MDTWNJ21",
- "tenantId": "fba1bd1e195a404cacb9ce17a9b2b421"
- },
- "requestInfo": {
- "instanceName": "PCRF::module-0-2",
- "source": "VID",
- "suppressRollback": true
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c",
- "instanceName": "MSOTESTVOL103a-vSAMP12_base_module-0_vol",
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelInvariantUuid": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "123456",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantUuid": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "SERVICE_MODEL_NAME",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "skask",
- "instanceName": "skask-test",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantUuid": "skask",
- "modelUuid": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelInstanceName": "vSAMP12 1"
- }
- }
- }
- ],
- "requestParameters": {
- "usePreload": false,
- "userParams": [
- {
- "name": "someUserParam",
- "value": "someValue"
- },
- {
- "name": "sgi_protected_subnet_id",
- "value": "thisissomefakevalue"
- }
- ]
- }
- }
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request_userParam.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request_userParam.json
deleted file mode 100644
index 68de099c16..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request_userParam.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vfModule",
- "modelInvariantUuid": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "STMTN5MMSC21-MMSC::model-1-0",
- "modelVersion": "1",
- "modelCustomizationUuid": "ee6478e5-ea33-3346-ac12-ab121484a3fe"
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev_id",
- "subscriberName": "MSO_1610_dev_name"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "MDTWNJ21",
- "tenantId": "fba1bd1e195a404cacb9ce17a9b2b421"
- },
- "requestInfo": {
- "instanceName": "PCRF::module-0-2",
- "source": "VID",
- "suppressRollback": true
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c",
- "instanceName": "MSOTESTVOL103a-vSAMP12_base_module-0_vol",
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelInvariantUuid": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "123456",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantUuid": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "SERVICE_MODEL_NAME",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "skask",
- "instanceName": "skask-test",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantUuid": "skask",
- "modelUuid": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelInstanceName": "vSAMP12 1"
- }
- }
- }
- ],
- "requestParameters": {
- "usePreload": true,
- "aLaCarte": false,
- "userParams": [{
- "name": "vlc_sctp_b_route_prefixes",
- "value": [
- { "interface_route_table_routes_route_prefix": "107.239.41.163/32" },
- { "interface_route_table_routes_route_prefix": "107.239.41.164/32" },
- { "interface_route_table_routes_route_prefix": "107.239.41.165/32" }
- ]}
- ]}
- }
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DBUpdateResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DBUpdateResponse.xml
deleted file mode 100644
index 40e2344f36..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DBUpdateResponse.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-<ns2:updateRequestResponse xmlns:ns2="http://org.openecomp/requestsdb"
- xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"/> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Database/DBAdapter.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Database/DBAdapter.xml
deleted file mode 100644
index 5a36d741d0..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Database/DBAdapter.xml
+++ /dev/null
@@ -1 +0,0 @@
-<DbTag>Notified</DbTag> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Database/DBUpdateResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Database/DBUpdateResponse.xml
deleted file mode 100644
index 7c30f75497..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Database/DBUpdateResponse.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-<ns2:updateRequestResponse xmlns:ns2="http://org.openecomp.mso/requestsdb"
- xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"/> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteGenericVNFV1/sdncAdapterResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteGenericVNFV1/sdncAdapterResponse.xml
deleted file mode 100644
index 5e0b8c6c54..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteGenericVNFV1/sdncAdapterResponse.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">
- <sdncadapterworkflow:response-data>
- <tag0:RequestData xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">
- &lt;output xmlns="org:onap:sdnctl:vnf"&gt;&lt;svc-request-id&gt;1660b8da-0a94-442d-8ed5-ea079e3c67c8&lt;/svc-request-id&gt;&lt;response-code&gt;200&lt;/response-code&gt;&lt;ack-final-indicator&gt;Y&lt;/ack-final-indicator&gt;&lt;vnf-information&gt;&lt;vnf-id&gt;8925b50d-de67-44c1-b984-e7ce7b0f4dae&lt;/vnf-id&gt;&lt;/vnf-information&gt;&lt;service-information&gt;&lt;service-type&gt;a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb&lt;/service-type&gt;&lt;service-instance-id&gt;8925b50d-de67-44c1-b984-e7ce7b0f4dae&lt;/service-instance-id&gt;&lt;subscriber-name&gt;notsurewecare&lt;/subscriber-name&gt;&lt;/service-information&gt;&lt;/output&gt;
- </tag0:RequestData>
- </sdncadapterworkflow:response-data>
-</sdncadapterworkflow:SDNCAdapterWorkflowResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/cloudRegion25_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/cloudRegion25_AAIResponse_Success.xml
deleted file mode 100644
index 90c668c576..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/cloudRegion25_AAIResponse_Success.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <l3-network xmlns="http://org.openecomp.aai.inventory/v8">
- <cloud-owner>att-aic</cloud-owner>
- <cloud-region-id>RDM2WAGPLCP</cloud-region-id>
- <cloud-region-version>2.5</cloud-region-version>
- <complex-name>RDM2WAGPLCP</complex-name>
- </l3-network>
- </rest:payload>
-</rest:RESTResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/cloudRegion30_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/cloudRegion30_AAIResponse_Success.xml
deleted file mode 100644
index 9b651f25e3..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/cloudRegion30_AAIResponse_Success.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <l3-network xmlns="http://org.openecomp.aai.inventory/v8">
- <cloud-owner>att-aic</cloud-owner>
- <cloud-region-id>RDM2WAGPLCP</cloud-region-id>
- <cloud-region-version>3.0</cloud-region-version>
- <complex-name>RDM2WAGPLCP</complex-name>
- </l3-network>
- </rest:payload>
-</rest:RESTResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/deleteAAIResponse_Failure500_RESTFault.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/deleteAAIResponse_Failure500_RESTFault.xml
deleted file mode 100644
index 4ce7048950..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/deleteAAIResponse_Failure500_RESTFault.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<rest:RESTFault xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- errorType="transport">
- <rest:errorCode>500</rest:errorCode>
- <rest:message>HTTP method: GET Internal Server Error </rest:message>
- <rest:messageDetails>&lt;Fault&gt;
- &lt;requestError&gt;
- &lt;serviceException&gt;
- &lt;messageId&gt;SVC3002&lt;/messageId&gt;
- &lt;text&gt;Error writing output performing %1 on %2 (msg=%3) (ec=%4)&lt;/text&gt;
- &lt;variables&gt;
- &lt;variable&gt;PUT customer&lt;/variable&gt;
- &lt;variable&gt;SubName32&lt;/variable&gt;
- &lt;variable&gt;Unexpected error reading/updating database:Adding this property for key [service-instance-id] and value [12312442454112] violates a uniqueness constraint [service-instance-id]&lt;/variable&gt;
- &lt;variable&gt;ERR.5.4.5105&lt;/variable&gt;
- &lt;/variables&gt;
- &lt;/serviceException&gt;
- &lt;/requestError&gt;
-&lt;/Fault&gt;</rest:messageDetails>
-</rest:RESTFault>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/deleteNetworkAAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/deleteNetworkAAIResponse_Success.xml
deleted file mode 100644
index a740caacc4..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/deleteNetworkAAIResponse_Success.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Sat,30 Jan 2016 20:09:24 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160130-20:09:24:814-165843"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <l3-network xmlns="http://org.openecomp.aai.inventory/v8">
- <network-id>bdc5efe8-404a-409b-85f6-0dcc9eebae30</network-id>
- <network-name>HSL_direct_net_2</network-name>
- <network-type>CONTRAIL_BASIC</network-type>
- <network-role>HSL_direct</network-role>
- <network-technology>contrail</network-technology>
- <neutron-network-id>8bbd3edf-b835-4610-96a2-a5cafa029042</neutron-network-id>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <orchestration-status>active</orchestration-status>
- <heat-stack-id>HSL_direct_net_2/57594a56-1c92-4a38-9caa-641c1fa3d4b6</heat-stack-id>
- <subnets>
- <subnet>
- <subnet-id>ea5f2a2c-604f-47ff-a9c5-253ee4f0ef0a</subnet-id>
- <neutron-subnet-id>5a77fdc2-7789-4649-a1b9-6eaf1db1813a</neutron-subnet-id>
- <gateway-address>172.16.34.1</gateway-address>
- <network-start-address>172.16.34.0</network-start-address>
- <cidr-mask>28</cidr-mask>
- <ip-version>4</ip-version>
- <orchestration-status>active</orchestration-status>
- <dhcp-enabled>true</dhcp-enabled>
- <relationship-list/>
- </subnet>
- </subnets>
- <relationship-list>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/e81d842d3e8b45c5a59f57cd76af3aaf/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>e81d842d3e8b45c5a59f57cd76af3aaf</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>cloud-region</related-to>
- <related-link>cloud-infrastructure/cloud-regions/cloud-region/att-aic/RDM2WAGPLCP/</related-link>
- <relationship-data>
- <relationship-key>cloud-region.cloud-owner</relationship-key>
- <relationship-value>att-aic</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-region-id</relationship-key>
- <relationship-value>RDM2WAGPLCP</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- </l3-network>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/deleteNetworkAAIResponse_withRelationship_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/deleteNetworkAAIResponse_withRelationship_Success.xml
deleted file mode 100644
index 841cae0a2b..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2/deleteNetworkAAIResponse_withRelationship_Success.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Sat,30 Jan 2016 20:09:24 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160130-20:09:24:814-165843"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <l3-network xmlns="http://org.openecomp.aai.inventory/v8">
- <network-id>bdc5efe8-404a-409b-85f6-0dcc9eebae30</network-id>
- <network-name>HSL_direct_net_2</network-name>
- <network-type>CONTRAIL_BASIC</network-type>
- <network-role>HSL_direct</network-role>
- <network-technology>contrail</network-technology>
- <neutron-network-id>8bbd3edf-b835-4610-96a2-a5cafa029042</neutron-network-id>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <orchestration-status>active</orchestration-status>
- <heat-stack-id>HSL_direct_net_2/57594a56-1c92-4a38-9caa-641c1fa3d4b6</heat-stack-id>
- <subnets>
- <subnet>
- <subnet-id>ea5f2a2c-604f-47ff-a9c5-253ee4f0ef0a</subnet-id>
- <neutron-subnet-id>5a77fdc2-7789-4649-a1b9-6eaf1db1813a</neutron-subnet-id>
- <gateway-address>172.16.34.1</gateway-address>
- <network-start-address>172.16.34.0</network-start-address>
- <cidr-mask>28</cidr-mask>
- <ip-version>4</ip-version>
- <orchestration-status>active</orchestration-status>
- <dhcp-enabled>true</dhcp-enabled>
- <relationship-list/>
- </subnet>
- </subnets>
- <relationship-list>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/e81d842d3e8b45c5a59f57cd76af3aaf/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>e81d842d3e8b45c5a59f57cd76af3aaf</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>vf-module</related-to>
- <related-link>https://aai-app-e2e.ecomp.cci.com:8443/aai/v8/network/generic-vnfs/generic-vnf/105df7e5-0b3b-49f7-a837-4864b62827c4/vf-modules/vf-module/d9217058-95a0-49ee-b9a9-949259e89349/</related-link>
- <relationship-data>
- <relationship-key>generic-vnf.vnf-id</relationship-key>
- <relationship-value>105df7e5-0b3b-49f7-a837-4864b62827c4</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>vf-module.vf-module-id</relationship-key>
- <relationship-value>d9217058-95a0-49ee-b9a9-949259e89349</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>generic-vnf</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/generic-vnfs/generic-vnf/45f822d9-73ca-4255-9844-7cef401bbf47/</related-link>
- <relationship-data>
- <relationship-key>generic-vnf.vnf-id</relationship-key>
- <relationship-value>45f822d9-73ca-4255-9844-7cef401bbf47</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>generic-vnf.vnf-name</property-key>
- <property-value>zrdm1scpx05</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
- </l3-network>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse.xml
deleted file mode 100644
index 8ec4f520c1..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:v1="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
- <soapenv:Header />
- <soapenv:Body>
- <v1:SDNCAdapterCallback>
- <SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
- <CallbackHeader>
- <RequestId>19174929-3809-49ca-89eb-17f84a035389</RequestId>
- <ResponseCode>200</ResponseCode>
- <ResponseMessage>OK</ResponseMessage>
- </CallbackHeader>
- <RequestData xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:type="xs:string">&lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;output xmlns="com:att:sdnctl:vnf"&gt;&lt;svc-request-id&gt;19174929-3809-49ca-89eb-17f84a035389&lt;/svc-request-id&gt;&lt;response-code&gt;200&lt;/response-code&gt;&lt;ack-final-indicator&gt;Y&lt;/ack-final-indicator&gt;&lt;network-information&gt;&lt;network-id&gt;bdc5efe8-404a-409b-85f6-0dcc9eebae30&lt;/network-id&gt;&lt;/network-information&gt;&lt;service-information&gt;&lt;service-type&gt;a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb&lt;/service-type&gt;&lt;service-instance-id&gt;HSL_direct_net_2&lt;/service-instance-id&gt;&lt;subscriber-name&gt;notsurewecare&lt;/subscriber-name&gt;&lt;/service-information&gt;&lt;/output&gt;</RequestData>
- </SDNCAdapterCallbackRequest>
- </v1:SDNCAdapterCallback>
- </soapenv:Body>
-</soapenv:Envelope>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse_noExtraTag.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse_noExtraTag.xml
deleted file mode 100644
index f180e61366..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse_noExtraTag.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:v1="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
- <soapenv:Header />
- <soapenv:Body>
- <SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
- <CallbackHeader>
- <RequestId>19174929-3809-49ca-89eb-17f84a035389</RequestId>
- <ResponseCode>200</ResponseCode>
- <ResponseMessage>OK</ResponseMessage>
- </CallbackHeader>
- <RequestData xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:type="xs:string">&lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;output xmlns="com:att:sdnctl:vnf"&gt;&lt;svc-request-id&gt;19174929-3809-49ca-89eb-17f84a035389&lt;/svc-request-id&gt;&lt;response-code&gt;200&lt;/response-code&gt;&lt;ack-final-indicator&gt;Y&lt;/ack-final-indicator&gt;&lt;network-information&gt;&lt;network-id&gt;bdc5efe8-404a-409b-85f6-0dcc9eebae30&lt;/network-id&gt;&lt;/network-information&gt;&lt;service-information&gt;&lt;service-type&gt;a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb&lt;/service-type&gt;&lt;service-instance-id&gt;HSL_direct_net_2&lt;/service-instance-id&gt;&lt;subscriber-name&gt;notsurewecare&lt;/subscriber-name&gt;&lt;/service-information&gt;&lt;/output&gt;</RequestData>
- </SDNCAdapterCallbackRequest>
- </soapenv:Body>
-</soapenv:Envelope>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleCallbackResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleCallbackResponse.xml
deleted file mode 100644
index 74a3beb221..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleCallbackResponse.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<deleteVfModuleResponse>
- <messageId>86651f79-057e-4245-8f5f-174db3cef553-1502888133261</messageId>
- <vfModuleDeleted>true</vfModuleDeleted>
- <vfModuleId>20928949-5230-495d-86a6-f3690b9b5d60</vfModuleId>
- <vfModuleOutputs>
- <entry>
- <key>shared_private_network_id</key>
- <value>bcd04543-b3d7-4c64-a910-1735b875ebb2</value>
- </entry>
- <entry>
- <key>server1_port</key>
- <value>d1605e82-50ba-4544-9f8d-a8a37b678046</value>
- </entry>
- <entry>
- <key>vnf_id</key>
- <value>7da56895-6be1-4bec-856b-525e0e573199</value>
- </entry>
- </vfModuleOutputs>
- <vnfId>7da56895-6be1-4bec-856b-525e0e573199</vnfId>
-</deleteVfModuleResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/DeleteVfModuleVolumeCallbackResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/DeleteVfModuleVolumeCallbackResponse.xml
deleted file mode 100644
index 25aa45afd9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/DeleteVfModuleVolumeCallbackResponse.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<deleteVolumeGroupResponse>
- <messageId>{{MESSAGE-ID}}</messageId>
- <volumeGroupDeleted>true</volumeGroupDeleted>
-</deleteVolumeGroupResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/deleteVfModuleVolume_VID_request_st.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/deleteVfModuleVolume_VID_request_st.json
deleted file mode 100644
index 52ead5f77f..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/deleteVfModuleVolume_VID_request_st.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "requestDetails": {
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelInvariantUuid": "0b01b8c2-8416-11e6-ae22-56b6b6499611",
- "modelName": "vSAMP12::base::module-0",
- "modelVersion": "1.0"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "cloudowner_MDTWNJ21",
- "tenantId": "fba1bd1e195a404cacb9ce17a9b2b421"
- },
- "requestInfo": {
- "source": "VID"
- }
- }
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_Success.xml
deleted file mode 100644
index c02c35f9c9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_Success.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<volume-group xmlns="http://org.openecomp.aai.inventory/v8">
- <volume-group-id>78987</volume-group-id>
- <volume-group-name>MSOTESTVOL102a-vSAMP12_base_vol_module-0</volume-group-name>
- <heat-stack-id/>
- <vnf-type>Test/vSAMP12</vnf-type>
- <orchestration-status>Pending</orchestration-status>
- <resource-version>0000020</resource-version>
- <relationship-list>
- <relationship>
- <related-to>generic-vnf</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v8/network/generic-vnfs/generic-vnf/9e48f6ea-f786-46de-800a-d480e5ccc846/</related-link>
- <relationship-data>
- <relationship-key>generic-vnf.vnf-id</relationship-key>
- <relationship-value>9e48f6ea-f786-46de-800a-d480e5ccc846</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>generic-vnf.vnf-name</property-key>
- <property-value>MSOSTSAMP12-10601</property-value>
- </related-to-property>
- </relationship>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v7/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/fba1bd1e195a404cacb9ce17a9b2b421/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>fba1bd1e195a404cacb9ce17a9b2b421</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-owner</relationship-key>
- <relationship-value>att-aic</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-region-id</relationship-key>
- <relationship-value>mdt1</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>tenant.tenant-name</property-key>
- <property-value>ECOMP_MDT1</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</volume-group> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleRollback/GenericVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleRollback/GenericVnf.xml
deleted file mode 100644
index 5e8a62b25b..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleRollback/GenericVnf.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<generic-vnf xmlns="http://org.openecomp.aai.inventory/v7">
- <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c721</vnf-id>
- <vnf-name>STMTN5MMSC21</vnf-name>
- <vnf-type>mmsc-capacity</vnf-type>
- <service-id>SDN-MOBILITY</service-id>
- <equipment-role>vMMSC</equipment-role>
- <orchestration-status>pending-create</orchestration-status>
- <in-maint>false</in-maint>
- <is-closed-loop-disabled>false</is-closed-loop-disabled>
- <resource-version>1508691</resource-version>
- <vf-modules>
- <vf-module>
- <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</vf-module-id>
- <vf-module-name>STMTN5MMSC21-MMSC::module-0-0</vf-module-name>
- <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</persona-model-id>
- <persona-model-version>1.0</persona-model-version>
- <is-base-vf-module>true</is-base-vf-module>
- <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>
- <orchestration-status>pending-create</orchestration-status>
- <resource-version>1508692</resource-version>
- </vf-module>
- </vf-modules>
- <relationship-list/>
- <l-interfaces/>
- <lag-interfaces/>
-</generic-vnf> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleRollback/GenericVnfVfModule.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleRollback/GenericVnfVfModule.xml
deleted file mode 100644
index 586e0a620a..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleRollback/GenericVnfVfModule.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<generic-vnf xmlns="http://org.openecomp.aai.inventory/v7">
- <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c721</vnf-id>
- <vnf-name>STMTN5MMSC21</vnf-name>
- <vnf-type>mmsc-capacity</vnf-type>
- <service-id>SDN-MOBILITY</service-id>
- <equipment-role>vMMSC</equipment-role>
- <orchestration-status>pending-create</orchestration-status>
- <in-maint>false</in-maint>
- <is-closed-loop-disabled>false</is-closed-loop-disabled>
- <resource-version>0000021</resource-version>
- <vf-modules>
- <vf-module>
- <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</vf-module-id>
- <vf-module-name>STMTN5MMSC21-MMSC::module-0-0</vf-module-name>
- <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</persona-model-id>
- <persona-model-version>1.0</persona-model-version>
- <is-base-vf-module>true</is-base-vf-module>
- <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>
- <orchestration-status>pending-create</orchestration-status>
- <resource-version>0000073</resource-version>
- </vf-module>
- </vf-modules>
- <relationship-list/>
- <l-interfaces/>
- <lag-interfaces/>
-</generic-vnf> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeCallbackResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeCallbackResponse.xml
deleted file mode 100644
index a421355aba..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeCallbackResponse.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<createVolumeGroupResponse>
- <messageId>{{MESSAGE-ID}}</messageId>
- <volumeGroupCreated>true</volumeGroupCreated>
- <volumeGroupId>d485ecee-957c-4a0a-8b95-27a22b90103f</volumeGroupId>
- <volumeGroupOutputs>
- <entry>
- <key>mmsc_vol_1</key>
- <value>a73e0fe9-1ce8-49c2-8fef-e2788605be29</value>
- </entry>
- <entry>
- <key>mmsc_vol_2</key>
- <value>37b6455a-5ea8-463a-89e3-0efeaf7b7c6d</value>
- </entry>
- <entry>
- <key>nemsfe_vol_1</key>
- <value>b7ff1c21-d138-49a3-bf13-4cfd91efaf48</value>
- </entry>
- <entry>
- <key>nemsbe_vol_1</key>
- <value>a5988471-cd42-44d8-b078-64f2f13d3d4c</value>
- </entry>
- <entry>
- <key>mmsc_vol_5</key>
- <value>f7b91c1e-ab8c-413a-a850-ba80a246c7e0</value>
- </entry>
- <entry>
- <key>nemsfe_vol_2</key>
- <value>957ea3f3-2d4a-4707-bfd2-ba66f42037c2</value>
- </entry>
- <entry>
- <key>mmsc_vol_3</key>
- <value>de6fccfe-d61a-48b0-b03b-87bf1bf749b3</value>
- </entry>
- <entry>
- <key>mmsc_vol_4</key>
- <value>76162310-2c38-4c32-981c-5c2880190077</value>
- </entry>
- </volumeGroupOutputs>
- <volumeGroupRollback>
- <cloudSiteId>RDM2WAGPLCP</cloudSiteId>
- <messageId>e585e4f4-9452-437a-b294-45a2d6d3b7a3</messageId>
- <msoRequest>
- <requestId>c30b9453-4b68-4c2e-aacf-58a5ba648bf5</requestId>
- <serviceInstanceId>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</serviceInstanceId>
- </msoRequest>
- <tenantId>1bbab536a19b4756926e7d0ec1eb543c</tenantId>
- <volumeGroupCreated>true</volumeGroupCreated>
- <volumeGroupId>78987</volumeGroupId>
- <volumeGroupStackId>ZRDM1MMSC01_base_vol/7f74e5e1-5fc1-4593-ac7e-cc9899a106ef</volumeGroupStackId>
- </volumeGroupRollback>
- <volumeGroupStackId>ZRDM1MMSC01_base_vol/7f74e5e1-5fc1-4593-ac7e-cc9899a106ef</volumeGroupStackId>
-</createVolumeGroupResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeNoRollbackRequest.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeNoRollbackRequest.xml
deleted file mode 100644
index 803a847bbc..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeNoRollbackRequest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<volume-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <request-info>
- <test-data-only>123abc</test-data-only> <!-- don't remove this tag. Its used for junit test -->
- <request-id>d8d4fcfa-fd7e-4413-b19d-c95aa67291b8</request-id>
- <action>CREATE_VF_MODULE_VOL</action>
- <source>SoapUI-bns-create-base-vol-1001-1</source>
- </request-info>
- <volume-inputs>
- <vnf-type>Test/vSAMP12</vnf-type>
- <vf-module-model-name>vSAMP12::base::module-0</vf-module-model-name>
- <backout-on-failure>false</backout-on-failure>
- <asdc-service-model-version/>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <aic-cloud-region>MDTWNJ21</aic-cloud-region>
- <tenant-id>897deadc2b954a6bac6d3c197fb3525e</tenant-id>
- <volume-group-name>MSOTESTVOL101a-vSAMP12_base_vol_module-0</volume-group-name>
- <volume-group-id/>
- </volume-inputs>
- <volume-params>
- <param name="param1">value1</param>"
- <param name="param2">value2</param>"
- <param name="param3">value3</param>"
- </volume-params>
-</volume-request>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeRequest.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeRequest.xml
deleted file mode 100644
index e6ada9c826..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeRequest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<volume-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <request-info>
- <test-data-only>123abc</test-data-only> <!-- don't remove this tag. Its used for junit test -->
- <request-id>d8d4fcfa-fd7e-4413-b19d-c95aa67291b8</request-id>
- <action>CREATE_VF_MODULE_VOL</action>
- <source>SoapUI-bns-create-base-vol-1001-1</source>
- </request-info>
- <volume-inputs>
- <vnf-type>Test/vSAMP12</vnf-type>
- <vf-module-model-name>vSAMP12::base::module-0</vf-module-model-name>
- <backout-on-failure>true</backout-on-failure>
- <asdc-service-model-version/>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <aic-cloud-region>MDTWNJ21</aic-cloud-region>
- <tenant-id>897deadc2b954a6bac6d3c197fb3525e</tenant-id>
- <volume-group-name>MSOTESTVOL101a-vSAMP12_base_vol_module-0</volume-group-name>
- <volume-group-id/>
- </volume-inputs>
- <volume-params>
- <param name="param1">value1</param>"
- <param name="param2">value2</param>"
- <param name="param3">value3</param>"
- </volume-params>
-</volume-request>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/GenericVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/GenericVnf.xml
deleted file mode 100644
index 4c18356bf9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/GenericVnf.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<generic-vnf xmlns="http://org.openecomp.aai.inventory/v8">
- <vnf-id>TEST-VNF-ID-0123</vnf-id>
- <vnf-name>STMTN5MMSC20</vnf-name>
- <vnf-type>pcrf-capacity</vnf-type>
- <service-id>SDN-MOBILITY</service-id>
- <equipment-role>vPCRF</equipment-role>
- <orchestration-status>pending-create</orchestration-status>
- <in-maint>false</in-maint>
- <is-closed-loop-disabled>false</is-closed-loop-disabled>
- <persona-model-id>introvert</persona-model-id>
- <persona-model-version>2.0</persona-model-version>
- <resource-version>0000020</resource-version>
- <vf-modules>
- <vf-module>
- <vf-module-id>lukewarm</vf-module-id>
- <vf-module-name>PCRF::module-0-0</vf-module-name>
- <persona-model-id>introvert</persona-model-id>
- <persona-model-version>2.0</persona-model-version>
- <is-base-vf-module>true</is-base-vf-module>
- <heat-stack-id>fastburn</heat-stack-id>
- <orchestration-status>pending-create</orchestration-status>
- <resource-version>0000074</resource-version>
- </vf-module>
- <vf-module>
- <vf-module-id>supercool</vf-module-id>
- <vf-module-name>PCRF::module-1-0</vf-module-name>
- <persona-model-id>extrovert</persona-model-id>
- <persona-model-version>2.0</persona-model-version>
- <is-base-vf-module>false</is-base-vf-module>
- <heat-stack-id>slowburn</heat-stack-id>
- <orchestration-status>pending-create</orchestration-status>
- <resource-version>0000075</resource-version>
- </vf-module>
- </vf-modules>
- <relationship-list/>
- <l-interfaces/>
- <lag-interfaces/>
-</generic-vnf> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/RollbackVfModuleVolumeCallbackResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/RollbackVfModuleVolumeCallbackResponse.xml
deleted file mode 100644
index 6ab9416617..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/RollbackVfModuleVolumeCallbackResponse.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rollbackVolumeGroupResponse>
- <messageId>{{MESSAGE-ID}}</messageId>
- <volumeGroupRolledback>true</volumeGroupRolledback>
-</rollbackVolumeGroupResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_VID_request.json
deleted file mode 100644
index 6cc84c79b6..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_VID_request.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
- "requestDetails": {
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12::base::module-0",
- "modelVersion": "1"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "MSOTESTVOL103W-vSAMP12_base_vol_module-0",
- "source": "VID",
- "callbackUrl": "{do we support this???}"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "{service-instance-id}",
- "modelInfo": {
- "modelType": "service",
- "modelId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "{parent service model name}",
- "modelVersion": "1"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "{vnf-instance-id}",
- "modelInfo": {
- "modelType": "vnf",
- "modelId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "Test/vSAMP12",
- "modelVersion": "1"
- }
- }
- }
- ],
- "requestParameters": {
- "backoutOnFailure": true,
- "serviceId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "userParams": [
- {
- "name": "vnfName",
- "value": "STMTN5MMSC20"
- },
- {
- "name": "vnfName2",
- "value": "US1117MTSNJVBR0246"
- },
- {
- "name": "vnfNmInformation",
- "value": ""
- },
- {
- "name": "vnfType",
- "value": "pcrf-capacity"
- },
- {
- "name": "vnfId",
- "value": "skask"
- },
- {
- "name": "vnfStackId",
- "value": "slowburn"
- },
- {
- "name": "vnfStatus",
- "value": "created"
- },
- {
- "name": "aicCloudRegion",
- "value": "MDTWNJ21"
- },
- {
- "name": "availabilityZone",
- "value": "slcp3-esx-az01"
- },
- {
- "name": "oamNetworkName",
- "value": "VLAN-OAM-1323"
- },
- {
- "name": "vmName",
- "value": "slcp34246vbc246ceb"
- },
- {
- "name": "ipagNetworkId",
- "value": "970cd2b9-7f09-4a12-af47-182ea38ba1f0"
- },
- {
- "name": "vpeNetworkId",
- "value": "545cc2c3-1930-4100-b534-5d82d0e12bb6"
- }
- ]
- }
- }
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_createVolumeName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_createVolumeName_AAIResponse_Success.xml
deleted file mode 100644
index bff26fa78a..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_createVolumeName_AAIResponse_Success.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="X-CSI-Internal-WriteableRequest" value="true"/>
- <rest:header name="X-CSI-MethodName" value="UNKNOWN"/>
- <rest:header name="Content-Length" value="968"/>
- <rest:header name="breadcrumbId" value="ID-mtsnjv9aaas23-44965-1459957053425-0-211465"/>
- <rest:header name="X-CSI-UniqueTransactionId"
- value="AjscCsiRestful28795@mtsnjv9aaas237d4a4d21-e60a-495f-935f-cc225dc3c847"/>
- <rest:header name="User-Agent" value="Jakarta Commons-HttpClient/3.1"/>
- <rest:header name="X-TransactionID" value="3a19f95d-d63e-4a8e-8b9c-6563895628aa"/>
- <rest:header name="X-CSI-ServiceName" value="UNKNOWN"/>
- <rest:header name="Server" value="Jetty(9.2.z-SNAPSHOT)"/>
- <rest:header name="Cache-Control" value="no-cache,no-store"/>
- <rest:header name="X-FromAppId" value="MSO"/>
- <rest:header name="Date" value="Fri,08 Apr 2016 16:53:04 GMT"/>
- <rest:header name="X-CSI-ConversationId"
- value="ajscUser~CNG-CSI~c0a2bb44-2167-4e85-ad6a-483a24c0823a"/>
- <rest:header name="volume-group-name" value="simpleCinderVolume_201604071"/>
- <rest:header name="X-CSI-MessageId" value="f6d6eed4-456e-4033-be04-b17582902dc2"/>
- <rest:header name="X-AAI-TXID" value="mtsnjv9aaas23-20160408-16:53:04:592-73255"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Accept" value="application/xml"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <volume-group xmlns="http://org.openecomp.aai.inventory/v8">
- <volume-group-id>simpleCinderVolume_201604071</volume-group-id>
- <volume-group-name>simpleCinderVolume_201604071</volume-group-name>
- <heat-stack-id>simpleCinderVolume_201604071</heat-stack-id>
- <vnf-type>simple_cinder_master</vnf-type>
- <orchestration-status>Pending</orchestration-status>
- <resource-version>1460134360</resource-version>
- <relationship-list>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/897deadc2b954a6bac6d3c197fb3525e/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>897deadc2b954a6bac6d3c197fb3525e</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>tenant.tenant-name</property-key>
- <property-value>MSOTest1</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
- </volume-group>
- </rest:payload>
-</rest:RESTResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_deleteVolumeName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_deleteVolumeName_AAIResponse_Success.xml
deleted file mode 100644
index 1574310474..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_deleteVolumeName_AAIResponse_Success.xml
+++ /dev/null
@@ -1,24 +0,0 @@
- <rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="X-CSI-Internal-WriteableRequest" value="true"/>
- <rest:header name="X-CSI-MethodName" value="helloWorld-GetMethod(Logical)"/>
- <rest:header name="Content-Length" value="0"/>
- <rest:header name="breadcrumbId" value="ID-mtsnjv9aaas23-44965-1459957053425-0-211467"/>
- <rest:header name="X-CSI-UniqueTransactionId"
- value="AjscCsiRestful28795@mtsnjv9aaas23d44059bc-ef96-4af8-a28b-98044e08d7af"/>
- <rest:header name="User-Agent" value="Jakarta Commons-HttpClient/3.1"/>
- <rest:header name="X-TransactionID" value="3749995c-266b-4025-a0c4-4ce6983efc66"/>
- <rest:header name="X-CSI-ServiceName" value="helloWorld"/>
- <rest:header name="Server" value="Jetty(9.2.z-SNAPSHOT)"/>
- <rest:header name="Cache-Control" value="no-cache,no-store"/>
- <rest:header name="X-FromAppId" value="MSO"/>
- <rest:header name="Date" value="Fri,08 Apr 2016 16:53:04 GMT"/>
- <rest:header name="X-CSI-ConversationId"
- value="ajscUser~CNG-CSI~bbd0e78f-d4e7-41be-b9ad-4a6767fa660a"/>
- <rest:header name="X-CSI-MessageId" value="6ccfeb13-56da-4836-bfbd-5a42dee60939"/>
- <rest:header name="X-AAI-TXID" value="mtsnjv9aaas23-20160408-16:53:04:629-73256"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Accept" value="application/xml"/>
- </rest:headers>
- </rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml
deleted file mode 100644
index cb20a41ca0..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="X-CSI-Internal-WriteableRequest" value="true"/>
- <rest:header name="X-CSI-MethodName" value="UNKNOWN"/>
- <rest:header name="Content-Length" value="968"/>
- <rest:header name="breadcrumbId" value="ID-mtsnjv9aaas23-44965-1459957053425-0-211465"/>
- <rest:header name="X-CSI-UniqueTransactionId"
- value="AjscCsiRestful28795@mtsnjv9aaas237d4a4d21-e60a-495f-935f-cc225dc3c847"/>
- <rest:header name="User-Agent" value="Jakarta Commons-HttpClient/3.1"/>
- <rest:header name="X-TransactionID" value="3a19f95d-d63e-4a8e-8b9c-6563895628aa"/>
- <rest:header name="X-CSI-ServiceName" value="UNKNOWN"/>
- <rest:header name="Server" value="Jetty(9.2.z-SNAPSHOT)"/>
- <rest:header name="Cache-Control" value="no-cache,no-store"/>
- <rest:header name="X-FromAppId" value="MSO"/>
- <rest:header name="Date" value="Fri,08 Apr 2016 16:53:04 GMT"/>
- <rest:header name="X-CSI-ConversationId"
- value="ajscUser~CNG-CSI~c0a2bb44-2167-4e85-ad6a-483a24c0823a"/>
- <rest:header name="volume-group-name" value="simpleCinderVolume_201604071"/>
- <rest:header name="X-CSI-MessageId" value="f6d6eed4-456e-4033-be04-b17582902dc2"/>
- <rest:header name="X-AAI-TXID" value="mtsnjv9aaas23-20160408-16:53:04:592-73255"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Accept" value="application/xml"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <volume-group xmlns="http://org.openecomp.aai.inventory/v8">
- <volume-group-id>8424bb3c-c3e7-4553-9662-469649ed9379</volume-group-id>
- <volume-group-name>MSOTESTVOL103W-vSAMP12_base_vol_module-0</volume-group-name>
- <heat-stack-id/>
- <vnf-type>simple_cinder_master</vnf-type>
- <orchestration-status>Pending</orchestration-status>
- <resource-version>1460134360</resource-version>
- <relationship-list>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/897deadc2b954a6bac6d3c197fb3525e/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>897deadc2b954a6bac6d3c197fb3525e</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>tenant.tenant-name</property-key>
- <property-value>MSOTest1</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
- </volume-group>
- </rest:payload>
-</rest:RESTResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_updateVolumeName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_updateVolumeName_AAIResponse_Success.xml
deleted file mode 100644
index 1574310474..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModuleVolumeV1/createVfModuleVolume_updateVolumeName_AAIResponse_Success.xml
+++ /dev/null
@@ -1,24 +0,0 @@
- <rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="X-CSI-Internal-WriteableRequest" value="true"/>
- <rest:header name="X-CSI-MethodName" value="helloWorld-GetMethod(Logical)"/>
- <rest:header name="Content-Length" value="0"/>
- <rest:header name="breadcrumbId" value="ID-mtsnjv9aaas23-44965-1459957053425-0-211467"/>
- <rest:header name="X-CSI-UniqueTransactionId"
- value="AjscCsiRestful28795@mtsnjv9aaas23d44059bc-ef96-4af8-a28b-98044e08d7af"/>
- <rest:header name="User-Agent" value="Jakarta Commons-HttpClient/3.1"/>
- <rest:header name="X-TransactionID" value="3749995c-266b-4025-a0c4-4ce6983efc66"/>
- <rest:header name="X-CSI-ServiceName" value="helloWorld"/>
- <rest:header name="Server" value="Jetty(9.2.z-SNAPSHOT)"/>
- <rest:header name="Cache-Control" value="no-cache,no-store"/>
- <rest:header name="X-FromAppId" value="MSO"/>
- <rest:header name="Date" value="Fri,08 Apr 2016 16:53:04 GMT"/>
- <rest:header name="X-CSI-ConversationId"
- value="ajscUser~CNG-CSI~bbd0e78f-d4e7-41be-b9ad-4a6767fa660a"/>
- <rest:header name="X-CSI-MessageId" value="6ccfeb13-56da-4836-bfbd-5a42dee60939"/>
- <rest:header name="X-AAI-TXID" value="mtsnjv9aaas23-20160408-16:53:04:629-73256"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Accept" value="application/xml"/>
- </rest:headers>
- </rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModule_getVnfResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModule_getVnfResponse.xml
deleted file mode 100644
index 021a8a73d1..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DoCreateVfModule_getVnfResponse.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<generic-vnf xmlns="http://org.openecomp.aai.inventory/v7">
- <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c721</vnf-id>
- <vnf-name>STMTN5MMSC21</vnf-name>
- <vnf-type>mmsc-capacity</vnf-type>
- <service-id>SDN-MOBILITY</service-id>
- <equipment-role>vMMSC</equipment-role>
- <orchestration-status>pending-create</orchestration-status>
- <in-maint>false</in-maint>
- <is-closed-loop-disabled>false</is-closed-loop-disabled>
- <resource-version>1508691</resource-version>
- <vf-modules>
- <vf-module>
- <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</vf-module-id>
- <vf-module-name>STMTN5MMSC21-MMSC::module-0-0</vf-module-name>
- <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</persona-model-id>
- <persona-model-version>1.0</persona-model-version>
- <is-base-vf-module>true</is-base-vf-module>
- <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>
- <orchestration-status>pending-create</orchestration-status>
- <resource-version>1508692</resource-version>
- </vf-module>
- </vf-modules>
- <relationship-list/>
- <l-interfaces/>
- <lag-interfaces/>
- </generic-vnf> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/MsoCompletionRequest.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/MsoCompletionRequest.xml
deleted file mode 100644
index 37b17121ae..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/MsoCompletionRequest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
- xmlns:ns="http://org.openecomp/mso/request/types/v1"
- xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
- <request-info>
- <request-id>null</request-id>
- <action>DELETE</action>
- <source>null</source>
- </request-info>
- <aetgt:status-message>E2E Service Instance was deleted successfully.</aetgt:status-message>
- <aetgt:mso-bpel-name>DeleteCustomE2EServiceInstance</aetgt:mso-bpel-name>
-</aetgt:MsoCompletionRequest> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/SDNCDeleteResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/SDNCDeleteResponse.xml
deleted file mode 100644
index fd719ff443..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/SDNCDeleteResponse.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sdncadapterworkflow:SDNCAdapterWorkflowResponse
- xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">
- <sdncadapterworkflow:response-data>
- <tag0:RequestData
- xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">
- <output xmlns="com:att:sdnctl:nbncapi">
- <ack-final-indicator>Y</ack-final-indicator>
- <svc-request-id>SK-2016-10-22-001</svc-request-id>
- <nbnc-response-information>
- <response-info>
- <result>SUCCESS</result>
- <aai-status>ERROR</aai-status>
- </response-info>
- <virtual-datacenter-list>
- <vdc-id>15001417</vdc-id>
- <router-list>
- <router-name>ALPRTR2</router-name>
- <ipe-loopback-address>1.1.1.2</ipe-loopback-address>
- <vlan-list>
- <vlan-id>1255.ae81</vlan-id>
- <border-element-type>VDBE</border-element-type>
- <border-element-tangibility>VIRTUAL</border-element-tangibility>
- <port-id></port-id>
- <border-element-id>ALPVDBE1</border-element-id>
- <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
- <lag-id>ae81</lag-id>
- <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
- </vlan-list>
- <vlan-list>
- <vlan-id>1995.ae81</vlan-id>
- <border-element-type>ASBG</border-element-type>
- <border-element-tangibility>VIRTUAL</border-element-tangibility>
- <port-id></port-id>
- <border-element-id>ALPASBG1</border-element-id>
- <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
- <lag-id>ae81</lag-id>
- <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
- </vlan-list>
- <vlan-list>
- <vlan-id>85.xe-10/0/2</vlan-id>
- <border-element-type>BGF2</border-element-type>
- <border-element-tangibility>PHYSICAL</border-element-tangibility>
- <port-id>xe-10/0/2</port-id>
- <border-element-id>ALPBGF2</border-element-id>
- <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
- <lag-id></lag-id>
- <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
- </vlan-list>
- <vlan-list>
- <vlan-id>85.xe-10/0/1</vlan-id>
- <border-element-type>BGF1</border-element-type>
- <border-element-tangibility>PHYSICAL</border-element-tangibility>
- <port-id>xe-10/0/1</port-id>
- <border-element-id>ALPBGF1</border-element-id>
- <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
- <lag-id></lag-id>
- <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
- </vlan-list>
- <ipe-id>2</ipe-id>
- </router-list>
- <router-list>
- <router-name>ALPRTR1</router-name>
- <ipe-loopback-address>1.1.1.1</ipe-loopback-address>
- <vlan-list>
- <vlan-id>1255.ae81</vlan-id>
- <border-element-type>VDBE</border-element-type>
- <border-element-tangibility>VIRTUAL</border-element-tangibility>
- <port-id></port-id>
- <border-element-id>ALPVDBE1</border-element-id>
- <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
- <lag-id>ae81</lag-id>
- <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
- </vlan-list>
- <vlan-list>
- <vlan-id>1995.ae81</vlan-id>
- <border-element-type>ASBG</border-element-type>
- <border-element-tangibility>VIRTUAL</border-element-tangibility>
- <port-id></port-id>
- <border-element-id>ALPASBG1</border-element-id>
- <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
- <lag-id>ae81</lag-id>
- <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
- </vlan-list>
- <vlan-list>
- <vlan-id>85.xe-10/0/2</vlan-id>
- <border-element-type>BGF2</border-element-type>
- <border-element-tangibility>PHYSICAL</border-element-tangibility>
- <port-id>xe-10/0/2</port-id>
- <border-element-id>ALPBGF2</border-element-id>
- <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
- <lag-id></lag-id>
- <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
- </vlan-list>
- <vlan-list>
- <vlan-id>85.xe-10/0/1</vlan-id>
- <border-element-type>BGF1</border-element-type>
- <border-element-tangibility>PHYSICAL</border-element-tangibility>
- <port-id>xe-10/0/1</port-id>
- <border-element-id>ALPBGF1</border-element-id>
- <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
- <lag-id></lag-id>
- <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
- </vlan-list>
- <ipe-id>1</ipe-id>
- </router-list>
- </virtual-datacenter-list>
- <virtual-datacenter-list>
- <vdc-id>15001418</vdc-id>
- <router-list>
- <router-name>SANRTR1</router-name>
- <ipe-loopback-address>2.1.1.1</ipe-loopback-address>
- <vlan-list>
- <vlan-id>1255.ae81</vlan-id>
- <border-element-type>VDBE</border-element-type>
- <border-element-tangibility>VIRTUAL</border-element-tangibility>
- <port-id></port-id>
- <border-element-id>SANVDBE1</border-element-id>
- <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
- <lag-id>ae81</lag-id>
- <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
- </vlan-list>
- <vlan-list>
- <vlan-id>1995.ae81</vlan-id>
- <border-element-type>ASBG</border-element-type>
- <border-element-tangibility>VIRTUAL</border-element-tangibility>
- <port-id></port-id>
- <border-element-id>SANASBG1</border-element-id>
- <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
- <lag-id>ae81</lag-id>
- <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
- </vlan-list>
- <vlan-list>
- <vlan-id>85.xe-10/0/2</vlan-id>
- <border-element-type>BGF2</border-element-type>
- <border-element-tangibility>PHYSICAL</border-element-tangibility>
- <port-id>xe-10/0/2</port-id>
- <border-element-id>SANBGF2</border-element-id>
- <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
- <lag-id></lag-id>
- <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
- </vlan-list>
- <vlan-list>
- <vlan-id>85.xe-10/0/1</vlan-id>
- <border-element-type>BGF1</border-element-type>
- <border-element-tangibility>PHYSICAL</border-element-tangibility>
- <port-id>xe-10/0/1</port-id>
- <border-element-id>SANBGF1</border-element-id>
- <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
- <lag-id></lag-id>
- <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
- </vlan-list>
- <ipe-id>1</ipe-id>
- </router-list>
- <router-list>
- <router-name>SANRTR2</router-name>
- <ipe-loopback-address>2.1.1.2</ipe-loopback-address>
- <vlan-list>
- <vlan-id>1255.ae81</vlan-id>
- <border-element-type>VDBE</border-element-type>
- <border-element-tangibility>VIRTUAL</border-element-tangibility>
- <port-id></port-id>
- <border-element-id>SANVDBE1</border-element-id>
- <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
- <lag-id>ae81</lag-id>
- <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
- </vlan-list>
- <vlan-list>
- <vlan-id>1995.ae81</vlan-id>
- <border-element-type>ASBG</border-element-type>
- <border-element-tangibility>VIRTUAL</border-element-tangibility>
- <port-id></port-id>
- <border-element-id>SANASBG1</border-element-id>
- <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
- <lag-id>ae81</lag-id>
- <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
- </vlan-list>
- <vlan-list>
- <vlan-id>85.xe-10/0/2</vlan-id>
- <border-element-type>BGF2</border-element-type>
- <border-element-tangibility>PHYSICAL</border-element-tangibility>
- <port-id>xe-10/0/2</port-id>
- <border-element-id>SANBGF2</border-element-id>
- <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
- <lag-id></lag-id>
- <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
- </vlan-list>
- <vlan-list>
- <vlan-id>85.xe-10/0/1</vlan-id>
- <border-element-type>BGF1</border-element-type>
- <border-element-tangibility>PHYSICAL</border-element-tangibility>
- <port-id>xe-10/0/1</port-id>
- <border-element-id>SANBGF1</border-element-id>
- <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
- <lag-id></lag-id>
- <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
- </vlan-list>
- <ipe-id>2</ipe-id>
- </router-list>
- </virtual-datacenter-list>
- <service-type>COLLABORATE</service-type>
- <interface-status>DISABLE</interface-status>
- <customer-id>custid-888</customer-id>
- <service-instance-id>SII-2016-10-22-001</service-instance-id>
- <provision-type>CUSTOMER</provision-type>
- <vni-id>100668</vni-id>
- </nbnc-response-information>
- </output>
- </tag0:RequestData>
- </sdncadapterworkflow:response-data>
-</sdncadapterworkflow:SDNCAdapterWorkflowResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/aaiGetResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/aaiGetResponse.xml
deleted file mode 100644
index c367b5c959..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/aaiGetResponse.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<service-instance xmlns="http://org.openecomp.aai.inventory/v11">
- <service-instance-id>1234</service-instance-id>
- <service-instance-name>volte-service</service-instance-name>
- <service-type>testservicetype</service-type>
- <service-role>testservicerole</service-role>
- <description>volte service</description>
- <model-invariant-id>c1d4305f-cdbd-4bbe-9069-a2f4978fd89e</model-invariant-id>
- <model-version-id>d4df5c27-98a1-4812-a8aa-c17f055b7a3f</model-version-id>
- <resource-version>1508838121849</resource-version>
- <orchestration-status>create</orchestration-status>
- <relationship-list>
- <relationship>
- <related-to>service-instance</related-to>
- <related-link>/aai/v11/business/customers/customer/test_customer/service-subscription/example-service-type/service-instance/1234_1</related-link>
- <relationship-data>
- <relationship-key>customer.global-customer-id</relationship-key>
- <relationship-value>test_customer</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-subscription.service-type</relationship-key>
- <relationship-value>test_customer</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-instance.service-instance-id</relationship-key>
- <relationship-value>1234_1</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>service-instance.service-instance-name</property-key>
- <property-value>volte-service_vEPC</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</service-instance> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getARUrlById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getARUrlById.xml
deleted file mode 100644
index e178583a34..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getARUrlById.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<search-results xmlns="http://org.openecomp.aai.inventory">
- <result-data>
- <resource-type>allotted-resource</resource-type>
- <resource-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</resource-link>
- </result-data>
-</search-results> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml
deleted file mode 100644
index a472996121..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<generic-vnfs xmlns="http://org.openecomp.aai.inventory/v3">
- <generic-vnf>
- <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>
- <vnf-name>testVnfName123</vnf-name>
- <vnf-type>mmsc-capacity</vnf-type>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <equipment-role>vMMSC</equipment-role>
- <orchestration-status>pending-create</orchestration-status>
- <resource-version>testReVer123</resource-version>
- <relationship-list>
- <relationship>
- <related-to>nothing</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- <l-interfaces/>
- <lag-interfaces/>
- </generic-vnf>
- </generic-vnfs> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml
deleted file mode 100644
index 8ba178cc1c..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<generic-vnfs xmlns="http://org.openecomp.aai.inventory/v3">
- <generic-vnf>
- <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>
- <vnf-name>testVnfName123</vnf-name>
- <vnf-type>mmsc-capacity</vnf-type>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <equipment-role>vMMSC</equipment-role>
- <orchestration-status>pending-create</orchestration-status>
- <relationship-list>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- <l-interfaces/>
- <lag-interfaces/>
- </generic-vnf>
- <generic-vnf>
- <vnf-id>802767b3-18a6-4432-96db-25522786aee0</vnf-id>
- <vnf-name>ZRDM1MMSC03</vnf-name>
- <vnf-type>mmsc-capacity</vnf-type>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <equipment-role>vMMSC</equipment-role>
- <orchestration-status>pending-create</orchestration-status>
- <relationship-list>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- <l-interfaces/>
- <lag-interfaces/>
- </generic-vnf>
- </generic-vnfs> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml
deleted file mode 100644
index 8ba178cc1c..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<generic-vnfs xmlns="http://org.openecomp.aai.inventory/v3">
- <generic-vnf>
- <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>
- <vnf-name>testVnfName123</vnf-name>
- <vnf-type>mmsc-capacity</vnf-type>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <equipment-role>vMMSC</equipment-role>
- <orchestration-status>pending-create</orchestration-status>
- <relationship-list>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- <l-interfaces/>
- <lag-interfaces/>
- </generic-vnf>
- <generic-vnf>
- <vnf-id>802767b3-18a6-4432-96db-25522786aee0</vnf-id>
- <vnf-name>ZRDM1MMSC03</vnf-name>
- <vnf-type>mmsc-capacity</vnf-type>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <equipment-role>vMMSC</equipment-role>
- <orchestration-status>pending-create</orchestration-status>
- <relationship-list>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- <l-interfaces/>
- <lag-interfaces/>
- </generic-vnf>
- </generic-vnfs> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getNotFound.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getNotFound.xml
deleted file mode 100644
index f66c9c4fb8..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getNotFound.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<search-results xmlns="http://org.openecomp.aai.inventory">
-</search-results> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getParentSIUrlById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getParentSIUrlById.xml
deleted file mode 100644
index c29133e539..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getParentSIUrlById.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<search-results xmlns="http://org.openecomp.aai.inventory">
- <result-data>
- <resource-type>service-instance</resource-type>
- <resource-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0027%252FSW_INTERNET</resource-link>
- </result-data>
-</search-results> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getParentServiceInstance.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getParentServiceInstance.xml
deleted file mode 100644
index bc810c6014..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getParentServiceInstance.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<service-instance>
- <service-instance-id>MIS/1604/0027/SW_INTERNET</service-instance-id>
- <resource-version>123456789</resource-version>
- <relationship-list>
- <relationship>
- <related-to>cvlan-tag</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>
- <relationship-data>
- <relationship-key>cvlan-tag.cvlan-tag</relationship-key>
- <relationship-value>2003</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>port-group.interface-id</relationship-key>
- <relationship-value>slcp1447vbc.ipag</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>vce.vnf-id</relationship-key>
- <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>vce</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>
- <relationship-data>
- <relationship-key>vce.vnf-id</relationship-key>
- <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
-</service-instance>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getSINoRelations.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getSINoRelations.xml
deleted file mode 100644
index adb7aab35f..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getSINoRelations.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<service-instance>
- <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
- <resource-version>123456789</resource-version>
- <relationship-list/>
- <metadata/>
-</service-instance> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml
deleted file mode 100644
index 416689e10c..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml
+++ /dev/null
@@ -1,6 +0,0 @@
- <search-results xmlns="http://org.openecomp.aai.inventory">
- <result-data>
- <resource-type>service-instance</resource-type>
- <resource-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET</resource-link>
- </result-data>
- </search-results> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getSIUrlByIdVipr.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getSIUrlByIdVipr.xml
deleted file mode 100644
index 80b035979a..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getSIUrlByIdVipr.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<search-results xmlns="http://org.openecomp.aai.inventory/v8">
- <result-data>
- <resource-type>service-instance</resource-type>
- <resource-link>https://aai-int1.test.com:8443/aai/v8/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/aa8428ac-7dd2-441f-aa3e-e175802574fb</resource-link>
- </result-data>
-</search-results> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml
deleted file mode 100644
index e377c70474..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<service-instance>
- <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
- <resource-version>123456789</resource-version>
- <relationship-list>
- <relationship>
- <related-to>cvlan-tag</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>
- <relationship-data>
- <relationship-key>cvlan-tag.cvlan-tag</relationship-key>
- <relationship-value>2003</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>port-group.interface-id</relationship-key>
- <relationship-value>slcp1447vbc.ipag</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>vce.vnf-id</relationship-key>
- <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>vce</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>
- <relationship-data>
- <relationship-key>vce.vnf-id</relationship-key>
- <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- </service-instance> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ConfigVnf_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ConfigVnf_VID_request.json
deleted file mode 100644
index 3fc25944f2..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ConfigVnf_VID_request.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-"requestDetails": {
-"modelInfo": {
-"modelType": "vnf",
-"modelInvariantUuid": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
-"modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
-"modelName": "vSAMP12",
-"modelVersion": "1.0",
-"modelCustomizationUuid": "MODEL-ID-1234"
-},
-"cloudConfiguration": {
-"lcpCloudRegionId": "mdt1",
-"tenantId": "fba1bd1e195a404cacb9ce17a9b2b421"
-},
-"requestInfo": {
-"instanceName": "STMTN",
-"instanceId": "skask",
-"source": "VID",
-"suppressRollback": true
-},
-"relatedInstanceList": [
-{
-"relatedInstance": {
-"instanceId": "MIS%2F1604%2F0026%2FSW_INTERNET",
-"modelInfo": {
-"modelType": "service",
-"modelInvariantUuid": "995256d2-5a33-55df-13ab-12abad84e7ff",
-"modelUuid": "ab6478e5-ea33-3346-ac12-ab121484a3fe",
-"modelName": "ServicevSAMP12",
-"modelVersion": "1.0"
-}
-}
-}
-],
-"requestParameters": {
-"controllerType" : "appc",
-"payload": "{\"request-parameters\":{\"host-ip-address\":\"10.10.10.10\"},\"configuration- parameters\":{\"name1\":\"value1\",\"name2\":\"value2\"}}"
-}
-}
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/CreateVnfInfraRequest.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/CreateVnfInfraRequest.json
deleted file mode 100644
index c1491d128b..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/CreateVnfInfraRequest.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantUuid": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelInstanceName": "vSAMP12 1",
- "modelCustomizationUuid": "customizationId123"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "testVnfName123",
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "source": "VID",
- "suppressRollback": false
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "{serviceInstanceId}",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantUuid": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "{parent service model name}",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- },
- "platform": {
- "platformName": "platform name"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "line of business names"
- }
- }
-
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DeleteCustomE2EService.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DeleteCustomE2EService.json
deleted file mode 100644
index 00663fddc5..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DeleteCustomE2EService.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "globalSubscriberId" : "38829939920000",
- "operationId" : "59960003992",
- "serviceType" : "VoLTE"
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DeleteVnfInfraRequestCascadeDelete.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DeleteVnfInfraRequestCascadeDelete.json
deleted file mode 100644
index e8d9fc29b1..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DeleteVnfInfraRequestCascadeDelete.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantUuid": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelInstanceName": "vSAMP12 1"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "testVnfName123",
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "source": "VID",
- "suppressRollback": false
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "{serviceInstanceId}",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantUuid": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "{parent service model name}",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "cascadeDelete": true
- }
- }
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DoCreateServiceInstance_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DoCreateServiceInstance_request.json
deleted file mode 100644
index 640e16b634..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DoCreateServiceInstance_request.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{ "serviceResources" : {
- "modelInfo" : {
- "modelName" : "MSOTADevInfra_vSAMP10a_Service",
- "modelUuid" : "5df8b6de-2083-11e7-93ae-92361f002671",
- "modelInvariantUuid" : "9647dfc4-2083-11e7-93ae-92361f002671",
- "modelVersion" : "1.0"
- },
- "serviceType" : "PortMirroring",
- "serviceRole" : "InfraRole",
- "environmentContext" : "Luna",
- "workloadContext" : "Oxygen",
- "serviceVnfs": [
-
- { "modelInfo" : {
- "modelName" : "vSAMP10a",
- "modelUuid" : "ff2ae348-214a-11e7-93ae-92361f002671",
- "modelInvariantUuid" : "2fff5b20-214b-11e7-93ae-92361f002671",
- "modelVersion" : "1.0",
- "modelCustomizationUuid" : "68dc9a92-214c-11e7-93ae-92361f002671",
- "modelInstanceName" : "vSAMP10a 1"
- },
- "toscaNodeType" : "VF",
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : null,
- "nfNamingCode" : null,
- "multiStageDesign" : null,
- "vfModules": [
- {
- "modelInfo" : {
- "modelName" : "NetworkFqdnTest4",
- "modelUuid" : "025606c1-4223-11e7-9252-005056850d2e",
- "modelInvariantUuid" : "06bd0a18-65c0-4418-83c7-5b0d13cba01a",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "06bd0a18-65c0-4418-83c7-5b0d13cba01a"
- }, "isBase" : true,
- "vfModuleLabel" : "label",
- "initialCount" : 0,
- "hasVolumeGroup" : true
- },
- {
- "modelInfo" : {
- "modelName" : "NetworkFqdnTest3",
- "modelUuid" : "02560575-4223-11e7-9252-005056850d2e",
- "modelInvariantUuid" : "06bd0a18-65c0-4418-83c7-5b0d13cba0bb",
- "modelVersion" : "1.0",
- "modelCustomizationUuid" : "06bd0a18-65c0-4418-83c7-5b0d13cba0bb"
- }, "isBase" : true,
- "vfModuleLabel" : "label",
- "initialCount" : 0,
- "hasVolumeGroup" : false
- },
- {
- "modelInfo" : {
- "modelName" : "NetworkFqdnTest5",
- "modelUuid" : "025607e4-4223-11e7-9252-005056850d2e",
- "modelInvariantUuid" : "06bd0a18-65c0-4418-83c7-5b0d14cba01a",
- "modelVersion" : "1.0",
- "modelCustomizationUuid" : "06bd0a18-65c0-4418-83c7-5b0d14cba01a"
- }, "isBase" : false,
- "vfModuleLabel" : "label",
- "initialCount" : 0,
- "hasVolumeGroup" : false
- },
- {
- "modelInfo" : {
- "modelName" : "vSAMP10aDEV::PCM::module-2",
- "modelUuid" : "7774b4e4-7d37-11e7-bb31-be2e44b06b34",
- "modelInvariantUuid" : "93e9c1d2-7d37-11e7-bb31-be2e44b06b34",
- "modelVersion" : "2",
- "modelCustomizationUuid" : "6728bee8-7d3a-11e7-bb31-be2e44b06b34"
- }, "isBase" : false,
- "vfModuleLabel" : "PCM",
- "initialCount" : 0,
- "hasVolumeGroup" : true
- },
- {
- "modelInfo" : {
- "modelName" : "vSAMP10aDEV::PCM::module-1",
- "modelUuid" : "066de97e-253e-11e7-93ae-92361f002671",
- "modelInvariantUuid" : "64efd51a-2544-11e7-93ae-92361f002671",
- "modelVersion" : "2",
- "modelCustomizationUuid" : "b4ea86b4-253f-11e7-93ae-92361f002671"
- }, "isBase" : false,
- "vfModuleLabel" : "PCM",
- "initialCount" : 0,
- "hasVolumeGroup" : true
- },
- {
- "modelInfo" : {
- "modelName" : "vSAMP10aDEV::base::module-0",
- "modelUuid" : "20c4431c-246d-11e7-93ae-92361f002671",
- "modelInvariantUuid" : "78ca26d0-246d-11e7-93ae-92361f002671",
- "modelVersion" : "2",
- "modelCustomizationUuid" : "cb82ffd8-252a-11e7-93ae-92361f002671"
- }, "isBase" : true,
- "vfModuleLabel" : "base",
- "initialCount" : 1,
- "hasVolumeGroup" : true
- },
- {
- "modelInfo" : {
- "modelName" : "vSAMP10a::base::module-0",
- "modelUuid" : "02560de2-4223-11e7-9252-005056850d2e",
- "modelInvariantUuid" : null,
- "modelVersion" : "2",
- "modelCustomizationUuid" : "MIGRATED_36e76920-ef30-4793-9979-cbd7d4b2bfc4"
- }, "isBase" : true,
- "vfModuleLabel" : "base",
- "initialCount" : 1,
- "hasVolumeGroup" : true
- },
- {
- "modelInfo" : {
- "modelName" : "base::module-0",
- "modelUuid" : "02561381-4223-11e7-9252-005056850d2e",
- "modelInvariantUuid" : null,
- "modelVersion" : "1",
- "modelCustomizationUuid" : "MIGRATED_51baae4c-b7c7-4f57-b77e-6e01acca89e5"
- }, "isBase" : true,
- "vfModuleLabel" : "module-0",
- "initialCount" : 1,
- "hasVolumeGroup" : false
- },
- {
- "modelInfo" : {
- "modelName" : "vSAMP10a::PCM::module-1",
- "modelUuid" : "02560f1b-4223-11e7-9252-005056850d2e",
- "modelInvariantUuid" : null,
- "modelVersion" : "1",
- "modelCustomizationUuid" : "MIGRATED_e9be2ed7-45b6-479c-b06e-9093899f8ce8"
- }, "isBase" : true,
- "vfModuleLabel" : "PCM",
- "initialCount" : 1,
- "hasVolumeGroup" : true
- }
- ]
- }
- ],
- "serviceNetworks": [],
- "serviceAllottedResources": [
- {
- "modelInfo" : {
- "modelName" : "Tunnel_Xconn",
- "modelUuid" : "f6b7d4c6-e8a4-46e2-81bc-31cad5072842",
- "modelInvariantUuid" : "b7a1b78e-6b6b-4b36-9698-8c9530da14af",
- "modelVersion" : "1.0",
- "modelCustomizationUuid" : "5b9bee43-f537-4fb3-9e8b-4de9f714d28a",
- "modelInstanceName" : "Pri_Tunnel_Xconn 9"
- },
- "toscaNodeType" : null,
- "allottedResourceType" : null,
- "allottedResourceRole" : null,
- "providingServiceModelInvariantUuid" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : null,
- "nfNamingCode" : null
- }
- ],
- "serviceConfigs": [
- {
- "modelInfo" : {
- "modelName" : "Mulder",
- "modelUuid" : "025606c1-4fff-11e7-9252-005056850d2e",
- "modelInvariantUuid" : "025606c1-4eee-11e7-9252-005056850d2e",
- "modelVersion" : "1.0",
- "modelCustomizationUuid" : "025606c1-4ddd-11e7-9252-005056850d2e",
- "modelInstanceName" : "X_FILES_001"
- },
- "toscaNodeType" : "Scully"
- },
- {
- "modelInfo" : {
- "modelName" : "Krychuk",
- "modelUuid" : "025606c1-5fff-11e7-9252-005056850d2e",
- "modelInvariantUuid" : "025606c1-5eee-11e7-9252-005056850d2e",
- "modelVersion" : "1.0",
- "modelCustomizationUuid" : "025606c1-5ddd-11e7-9252-005056850d2e",
- "modelInstanceName" : "X_FILES_002"
- },
- "toscaNodeType" : "Skinner"
- }
- ]
- }}
-
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DoScaleE2EServiceInstance.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DoScaleE2EServiceInstance.json
deleted file mode 100644
index dd3ff6841e..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DoScaleE2EServiceInstance.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "service":
- {
- "serviceType":"example-service-type",
- "globalSubscriberId":"test_custormer",
- "resources":
- [
- {
- "resourceInstanceId":"ns111",
- "scaleType":"SCALE_NS",
- "scaleNsData":
- {
- "scaleNsByStepsData":
- {
- "numberOfSteps":"4",
- "aspectId":"TIC_EDGE_HW",
- "scalingDirection":"UP"
- }
- }
- },
- {
- "resourceInstanceId":"ns333",
- "scaleType":"SCALE_NS",
- "scaleNsData":
- {
- "scaleNsByStepsData":
- {
- "numberOfSteps":"4",
- "aspectId":"TIC_EDGE_HW",
- "scalingDirection":"UP"
- }
- }
- }
- ],
- "serviceInstanceName":"service1"
- },
- "operationId":"15c01683-4f15-45e7-b213-dcbfe6f42a1b"
- } \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ReplaceVnf_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ReplaceVnf_VID_request.json
deleted file mode 100644
index a018f50355..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ReplaceVnf_VID_request.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-"requestDetails": {
-"modelInfo": {
-"modelType": "vnf",
-"modelInvariantUuid": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
-"modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
-"modelName": "vSAMP12",
-"modelVersion": "1.0",
-"modelCustomizationUuid": "MODEL-ID-1234"
-},
-"cloudConfiguration": {
-"lcpCloudRegionId": "mdt1",
-"tenantId": "88a6ca3ee0394ade9403f075db23167e"
-},
-"requestInfo": {
-"instanceName": "STMTN",
-"instanceId": "a27ce5a9-29c4-4c22-a017-6615ac73c721",
-"source": "VID",
-"suppressRollback": true
-},
-"relatedInstanceList": [
-{
-"relatedInstance": {
-"instanceId": "MIS%2F1604%2F0026%2FSW_INTERNET",
-"modelInfo": {
-"modelType": "service",
-"modelInvariantUuid": "995256d2-5a33-55df-13ab-12abad84e7ff",
-"modelUuid": "ab6478e5-ea33-3346-ac12-ab121484a3fe",
-"modelName": "ServicevSAMP12",
-"modelVersion": "1.0"
-}
-}
-}
-],
-"requestParameters": {
-"usePreload": false,
-"controllerType" : "appc",
-"userParams" : [
- {
- "name" : "someUserParam",
- "value" : "someValue"
- },
- {
- "name": "sgi_protected_subnet_id",
- "value": "thisissomefakevalue"
- }
-]
-}
-}
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVfModule_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVfModule_VID_request.json
deleted file mode 100644
index 9564f705ae..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVfModule_VID_request.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vfModule",
- "modelInvariantUuid": "introvert",
- "modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "STMTN5MMSC21-MMSC::model-1-0",
- "modelVersion": "1",
- "modelCustomizationUuid": "MODEL12345"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "MDTWNJ21",
- "tenantId": "fba1bd1e195a404cacb9ce17a9b2b421"
- },
- "requestInfo": {
- "instanceName": "PCRF::module-0",
- "instanceId": "supercool",
- "source": "VID",
- "suppressRollback": true
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "123456",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantUuid": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "SERVICE_MODEL_NAME",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "skask",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantUuid": "skask",
- "modelUuid": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelInstanceName": "vSAMP12 1"
- }
- }
- }
- ],
- "requestParameters": {
- "usePreload": false,
- "userParams": [
- {
- "name": "someUserParam",
- "value": "someValue"
- },
- {
- "name": "sgi_protected_subnet_id",
- "value": "thisissomefakevalue"
- }
- ]
- }
- }
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVnf_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVnf_VID_request.json
deleted file mode 100644
index e6d3e97a5c..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVnf_VID_request.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-"requestDetails": {
-"modelInfo": {
-"modelType": "vnf",
-"modelInvariantUuid": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
-"modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
-"modelName": "vSAMP12",
-"modelVersion": "1.0",
-"modelCustomizationUuid": "MODEL-ID-1234"
-},
-"cloudConfiguration": {
-"lcpCloudRegionId": "mdt1",
-"tenantId": "fba1bd1e195a404cacb9ce17a9b2b421"
-},
-"requestInfo": {
-"instanceName": "STMTN",
-"instanceId": "skask",
-"source": "VID",
-"suppressRollback": true
-},
-"relatedInstanceList": [
-{
-"relatedInstance": {
-"instanceId": "MIS%2F1604%2F0026%2FSW_INTERNET",
-"modelInfo": {
-"modelType": "service",
-"modelInvariantUuid": "995256d2-5a33-55df-13ab-12abad84e7ff",
-"modelUuid": "ab6478e5-ea33-3346-ac12-ab121484a3fe",
-"modelName": "ServicevSAMP12",
-"modelVersion": "1.0"
-}
-}
-}
-],
-"requestParameters": {
-"usePreload": false,
-"controllerType" : "appc",
-"userParams" : [
- {
- "name" : "someUserParam",
- "value" : "someValue"
- },
- {
- "name": "sgi_protected_subnet_id",
- "value": "thisissomefakevalue"
- },
- {
- "name": "vlc_sctp_b_route_prefixes",
- "value": [
- { "interface_route_table_routes_route_prefix": "107.239.41.163/32" },
- { "interface_route_table_routes_route_prefix": "107.239.41.164/32" },
- { "interface_route_table_routes_route_prefix": "107.239.41.165/32" }
- ]
- }
-]
-}
-}
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/VnfInPlaceUpdate_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/VnfInPlaceUpdate_VID_request.json
deleted file mode 100644
index 588ef1cbec..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/VnfInPlaceUpdate_VID_request.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-"requestDetails": {
-"cloudConfiguration": {
-"lcpCloudRegionId": "mdt1",
-"tenantId": "fba1bd1e195a404cacb9ce17a9b2b421"
-},
-"requestInfo": {
-"source": "VID",
-"requestorId": "ab1234"
-},
-"requestParameters": {
-"controllerType": "",
-"payload":
-"{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"
-}
-}
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Policy/policyAbortResponse.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Policy/policyAbortResponse.json
deleted file mode 100644
index c315b1ed1d..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Policy/policyAbortResponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{"decision":"PERMIT","details":"Abort"} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Policy/policySkipResponse.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Policy/policySkipResponse.json
deleted file mode 100644
index 7cbdebb6b3..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/Policy/policySkipResponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{"decision":"PERMIT","details":"Skip"} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_400.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_400.xml
deleted file mode 100644
index a5640b2b26..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_400.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<createNetworkError>
-<messageId>680bd458-5ec1-4a16-b77c-509022e53450</messageId><category>INTERNAL</category>
-<message>400 Bad Request: The server could not comply with the request since it is either malformed or otherwise incorrect., error.type=StackValidationFailed, error.message=Property error: : resources.network.properties: : Unknown Property network_ipam_refs_data</message>
-<rolledBack>true</rolledBack>
-</createNetworkError>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_500.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_500.xml
deleted file mode 100644
index 07730e2df9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_500.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<html>
- <head>
- <title>JBoss Web/7.2.2.Final-redhat-1 - JBWEB000064: Error report
- </title>
- <style><!--H1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;}
- H2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;}
- H3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;}
- BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;}
- B {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;}
- P {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;}A
- {color : black;}A.name {color : black;}HR {color : #525D76;} -->
- </style>
- </head>
- <body>
- <h1>JBWEB000065: HTTP Status 500 - java.lang.NullPointerException</h1>
- <HR size="1" noshade="noshade" />
- <p>
- <b>JBWEB000309: type</b>
- JBWEB000066: Exception report
- </p>
- <p>
- <b>JBWEB000068: message</b>
- <u>java.lang.NullPointerException</u>
- </p>
- <p>
- <b>JBWEB000069: description</b>
- <u>JBWEB000145: The server encountered an internal error that
- prevented it from fulfilling this request.
- </u>
- </p>
- <p>
- <b>JBWEB000070: exception</b>
- <pre>org.jboss.resteasy.spi.UnhandledException:
- java.lang.NullPointerException
- org.jboss.resteasy.core.SynchronousDispatcher.handleApplicationException(SynchronousDispatcher.java:365)
- org.jboss.resteasy.core.SynchronousDispatcher.handleException(SynchronousDispatcher.java:233)
- org.jboss.resteasy.core.SynchronousDispatcher.handleInvokerException(SynchronousDispatcher.java:209)
- org.jboss.resteasy.core.SynchronousDispatcher.getResponse(SynchronousDispatcher.java:557)
- org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:524)
- org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:126)
- org.jboss.resteasy.plugins.server.servlet.ServletContainerDispatcher.service(ServletContainerDispatcher.java:208)
- org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:55)
- org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:50)
- javax.servlet.http.HttpServlet.service(HttpServlet.java:847)
- org.openecomp.mso.logger.LogFilter.doFilter(LogFilter.java:35)
- </pre>
- </p>
- <p>
- <b>JBWEB000071: root cause</b>
- <pre>java.lang.NullPointerException
- org.openecomp.mso.adapters.network.NetworkAdapterRest$CreateNetworkVolumesTask.run(NetworkAdapterRest.java:128)
- org.openecomp.mso.adapters.network.NetworkAdapterRest.createNetwork(NetworkAdapterRest.java:64)
- sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- java.lang.reflect.Method.invoke(Method.java:606)
- org.jboss.resteasy.core.MethodInjectorImpl.invoke(MethodInjectorImpl.java:167)
- org.jboss.resteasy.core.ResourceMethod.invokeOnTarget(ResourceMethod.java:269)
- org.jboss.resteasy.core.ResourceMethod.invoke(ResourceMethod.java:227)
- org.jboss.resteasy.core.ResourceMethod.invoke(ResourceMethod.java:216)
- org.jboss.resteasy.core.SynchronousDispatcher.getResponse(SynchronousDispatcher.java:542)
- org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:524)
- org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:126)
- org.jboss.resteasy.plugins.server.servlet.ServletContainerDispatcher.service(ServletContainerDispatcher.java:208)
- org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:55)
- org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:50)
- javax.servlet.http.HttpServlet.service(HttpServlet.java:847)
- org.openecomp.mso.logger.LogFilter.doFilter(LogFilter.java:35)
- </pre>
- </p>
- <p>
- <b>JBWEB000072: note</b>
- <u>JBWEB000073: The full stack trace of the root cause is available
- in the JBoss Web/7.2.2.Final-redhat-1 logs.
- </u>
- </p>
- <HR size="1" noshade="noshade" />
- <h3>JBoss Web/7.2.2.Final-redhat-1</h3>
- </body>
-</html> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_Success.xml
deleted file mode 100644
index 7a00744103..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_Success.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<ns2:updateNetworkContrailResponse xmlns:ns2="http://org.openecomp.mso/network"
- xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <networkId>MNS-25180-L-01-dmz_direct_net_1/2c88a3a9-69b9-43a7-ada6-1aca577c3641</networkId>
- <neutronNetworkId>c4f4e878-cde0-4b15-ae9a-bda857759cea</neutronNetworkId>
- <subnetIdMap>
- <entry>
- <key>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</key>
- <value>bd8e87c6-f4e2-41b8-b0bc-9596aa00cd73</value>
- </entry>
- </subnetIdMap>
- <rollback>
- <cloudId>RDM2WAGPLCP</cloudId>
- <msoRequest>
- <requestId>1ef47428-cade-45bd-a103-0751e8b2deb0</requestId>
- <serviceInstanceId/>
- </msoRequest>
- <networkCreated>true</networkCreated>
- <networkId>MNS-25180-L-01-dmz_direct_net_1/2c88a3a9-69b9-43a7-ada6-1aca577c3641</networkId>
- <networkType>CONTRAIL_EXTERNAL</networkType>
- <networkUpdated>false</networkUpdated>
- <neutronNetworkId>c4f4e878-cde0-4b15-ae9a-bda857759cea</neutronNetworkId>
- <tenantId>7dd5365547234ee8937416c65507d266</tenantId>
- </rollback>
-</ns2:updateNetworkContrailResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryInstance_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryInstance_Success.xml
deleted file mode 100644
index ca5145c226..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryInstance_Success.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<result-data>
- <resource-type>service-instance</resource-type>
- <resource-link>https://aai-conexus-e2e.test.com:8443/aai/v8/business/customers/customer/8310000058863/service-subscriptions/service-subscription/vMOG/service-instances/service-instance/f70e927b-6087-4974-9ef8-c5e4d5847ca4</resource-link>
-</result-data> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml
deleted file mode 100644
index e06d27ea88..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<l3-network xmlns="http://org.openecomp.aai.inventory/v8">
- <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>
- <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>
- <network-type>CONTRAIL_EXTERNAL</network-type>
- <network-role>dmz_direct</network-role>
- <network-technology>contrail</network-technology>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <network-role-instance>0</network-role-instance>
- <orchestration-status>pending-create</orchestration-status>
- <physical-network-name>networkName</physical-network-name>
- <is-provider-network>false</is-provider-network>
- <is-shared-network>true</is-shared-network>
- <is-external-network>false</is-external-network>
- <subnets>
- <subnet>
- <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>
- <gateway-address>107.239.52.1</gateway-address>
- <network-start-address>107.239.52.0</network-start-address>
- <cidr-mask>24</cidr-mask>
- <ip-version>4</ip-version>
- <orchestration-status>pending-create</orchestration-status>
- <dhcp-enabled>true</dhcp-enabled>
- <subnet-name>subnetName</subnet-name>
- <relationship-list/>
- </subnet>
- </subnets>
- <segmentation-assignments>
- <segmentation-id>413</segmentation-id>
- <resource-version>4132176</resource-version>
- </segmentation-assignments>
- <relationship-list>
- <relationship>
- <related-to>vpn-binding</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>
- <relationship-data>
- <relationship-key>vpn-binding.vpn-id</relationship-key>
- <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>vpn-binding</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>
- <relationship-data>
- <relationship-key>vpn-binding.vpn-id</relationship-key>
- <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>network-policy</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg</related-link>
- <relationship-data>
- <relationship-key>network-policy.network-policy-id</relationship-key>
- <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>route-table-reference</related-to>
- <relationship-data>
- <relationship-key>route-table-reference.route-table-reference-id</relationship-key>
- <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
-</l3-network>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml
deleted file mode 100644
index 24ee1df9c8..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <l3-network xmlns="http://org.openecomp.aai.inventory/v8">
- <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>
- <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>
- <network-type>CONTRAIL_EXTERNAL</network-type>
- <network-role>dmz_direct</network-role>
- <network-technology>contrail</network-technology>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- <network-role-instance>0</network-role-instance>
- <orchestration-status>pending-create</orchestration-status>
- <physical-network-name>networkName</physical-network-name>
- <is-provider-network>false</is-provider-network>
- <is-shared-network>true</is-shared-network>
- <is-external-network>false</is-external-network>
- <subnets>
- <subnet>
- <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>
- <gateway-address>107.239.52.1</gateway-address>
- <network-start-address>107.239.52.0</network-start-address>
- <cidr-mask>24</cidr-mask>
- <ip-version>4</ip-version>
- <orchestration-status>pending-create</orchestration-status>
- <dhcp-enabled>true</dhcp-enabled>
- <subnet-name>subnetName</subnet-name>
- <relationship-list/>
- </subnet>
- </subnets>
- <segmentation-assignments>
- <segmentation-id>413</segmentation-id>
- <resource-version>4132176</resource-version>
- </segmentation-assignments>
- <relationship-list>
- <relationship>
- <related-to>vpn-binding</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>
- <relationship-data>
- <relationship-key>vpn-binding.vpn-id</relationship-key>
- <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>vpn-binding</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>
- <relationship-data>
- <relationship-key>vpn-binding.vpn-id</relationship-key>
- <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>network-policy</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg</related-link>
- <relationship-data>
- <relationship-key>network-policy.network-policy-id</relationship-key>
- <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>route-table-reference</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/route-table-references/route-table-reference/refFQDN1</related-link>
- <relationship-data>
- <relationship-key>route-table-reference.route-table-reference-id</relationship-key>
- <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>route-table-reference</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/route-table-references/route-table-reference/refFQDN2</related-link>
- <relationship-data>
- <relationship-key>route-table-reference.route-table-reference-id</relationship-key>
- <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- </l3-network>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkPolicy_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkPolicy_AAIResponse_Success.xml
deleted file mode 100644
index 686ac1667f..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkPolicy_AAIResponse_Success.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <network-policy xmlns="http://org.openecomp.aai.inventory/v8">
- <network-policy-id>9a7b327d9-287aa00-82c4b0-105757</network-policy-id>
- <network-policy-fqdn>GN_EVPN_Test</network-policy-fqdn>
- <heat-stack-id>13979:105757</heat-stack-id>
- <resource-version>13979:105757</resource-version>
- </network-policy>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml
deleted file mode 100644
index b01e469cbf..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <route-table-references xmlns="http://org.openecomp.aai.inventory/v8">
- <route-table-reference-id>5938baec-03ca-2bd5-a3f1-d54x123e253a</route-table-reference-id>
- <route-table-reference-fqdn>refFQDN1</route-table-reference-fqdn>
- <resource-version>12345</resource-version>
- </route-table-references>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml
deleted file mode 100644
index a19f9412c8..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <route-table-references xmlns="http://org.openecomp.aai.inventory/v8">
- <route-table-reference-id>5938baec-03ca-2bd5-a3f1-d54x123e253a</route-table-reference-id>
- <route-table-reference-fqdn>refFQDN2</route-table-reference-fqdn>
- <resource-version>12345</resource-version>
- </route-table-references>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryVpnBindingList_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryVpnBindingList_AAIResponse_Success.xml
deleted file mode 100644
index 671da0c9e2..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryVpnBindingList_AAIResponse_Success.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <vpn-binding xmlns="http://org.openecomp.aai.inventory/v8">
- <vpn-id>9a7b327d9-287aa00-82c4b0-105757</vpn-id>
- <vpn-name>GN_EVPN_Test</vpn-name>
- <route-targets>
- <route-target>
- <global-route-target>13979:105708</global-route-target>
- <route-target-role>EXPORT</route-target-role>
- <resource-version>1504025599510</resource-version>
- </route-target>
- <route-target>
- <global-route-target>13979:105707</global-route-target>
- <route-target-role>IMPORT</route-target-role>
- <resource-version>1504025599519</resource-version>
- </route-target>
- </route-targets>
- <relationship-list>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/l3-networks/l3-network/689ec39e-c5fc-4462-8db2-4f760763ad28/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>689ec39e-c5fc-4462-8db2-4f760763ad28</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/l3-networks/l3-network/1a49396b-19b3-40a4-8792-aa2fbd0f0704/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>1a49396b-19b3-40a4-8792-aa2fbd0f0704</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/l3-networks/l3-network/774f3329-3c83-4771-86c7-9e6207cd50fd/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>774f3329-3c83-4771-86c7-9e6207cd50fd</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- </vpn-binding>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml
deleted file mode 100644
index c35faef27f..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <vpn-binding xmlns="http://org.openecomp.aai.inventory/v8">
- <vpn-id>9a7b327d9-287aa00-82c4b0-105757</vpn-id>
- <vpn-name>GN_EVPN_Test</vpn-name>
- <global-route-target>13979:105757</global-route-target>
- <relationship-list>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/l3-networks/l3-network/689ec39e-c5fc-4462-8db2-4f760763ad28/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>689ec39e-c5fc-4462-8db2-4f760763ad28</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/l3-networks/l3-network/1a49396b-19b3-40a4-8792-aa2fbd0f0704/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>1a49396b-19b3-40a4-8792-aa2fbd0f0704</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/l3-networks/l3-network/774f3329-3c83-4771-86c7-9e6207cd50fd/</related-link>
- <relationship-data>
- <relationship-key>l3-network.network-id</relationship-key>
- <relationship-value>774f3329-3c83-4771-86c7-9e6207cd50fd</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- </vpn-binding>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_updateContrail_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_updateContrail_AAIResponse_Success.xml
deleted file mode 100644
index eedbda9343..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_updateContrail_AAIResponse_Success.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>
- <rest:header name="Content-Length" value="0"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:551-132672"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_Success.xml
deleted file mode 100644
index c48c6a661f..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_Success.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volume-group xmlns="http://org.openecomp.aai.inventory/v8">
- <volume-group-id>78987</volume-group-id>
- <volume-group-name>MSOTESTVOL102a-vSAMP12_base_vol_module-0</volume-group-name>
- <heat-stack-id/>
- <vnf-type>Test/vSAMP12</vnf-type>
- <orchestration-status>Pending</orchestration-status>
- <resource-version>0000020</resource-version>
- <relationship-list>
- <relationship>
- <related-to>tenant</related-to>
- <related-link>/aai/v7/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/fba1bd1e195a404cacb9ce17a9b2b421/</related-link>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>fba1bd1e195a404cacb9ce17a9b2b421</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-owner</relationship-key>
- <relationship-value>att-aic</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-region-id</relationship-key>
- <relationship-value>mdt1</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>tenant.tenant-name</property-key>
- <property-value>ECOMP_MDT1</property-value>
- </related-to-property>
- </relationship>
- <relationship>
- <related-to>vf-module</related-to>
- <related-link>/aai/v8/network/generic-vnfs/generic-vnf/9e48f6ea-f786-46de-800a-d480e5ccc846/vf-modules/vf-module/6a1dc898-b590-47b9-bbf0-34424a7a2ec3/</related-link>
- <relationship-data>
- <relationship-key>generic-vnf.vnf-id</relationship-key>
- <relationship-value>9e48f6ea-f786-46de-800a-d480e5ccc846</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>vf-module.vf-module-id</relationship-key>
- <relationship-value>6a1dc898-b590-47b9-bbf0-34424a7a2ec3</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
-</volume-group>
- \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/updateVfModuleVolume_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/updateVfModuleVolume_VID_request.json
deleted file mode 100644
index 603c1f452f..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/updateVfModuleVolume_VID_request.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
- "requestDetails": {
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelInvariantUuid": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12::base::module-0",
- "modelVersion": "1"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "fba1bd1e195a404cacb9ce17a9b2b421"
- },
- "requestInfo": {
- "instanceName": "MSOTESTVOL101a-vSAMP12_base_vol_module-0",
- "source": "VID",
- "suppressRollback": false
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "{service-instance-id}",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantUuid": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "Test",
- "modelVersion": "2.0"
- }
- }
- }, {
- "relatedInstance": {
- "instanceId": "{vnf-instance-id}",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantUuid": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "Test/vSAMP12",
- "modelVersion": "1",
- "modelInstanceName": "vSAMP12"
- }
- }
- }
- ],
- "requestParameters": {
- "serviceId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "userParams": [
- {"name": "vnfName", "value": "STMTN5MMSC20" },
- {"name": "vnfName2", "value": "US1117MTSNJVBR0246" },
- {"name": "vnfNmInformation", "value": "" },
- {"name": "vnfType", "value": "pcrf-capacity" },
- {"name": "vnfId", "value": "skask" },
- {"name": "vnfStackId", "value": "slowburn" },
- {"name": "vnfStatus", "value": "created" },
- {"name": "aicCloudRegion", "value": "MDTWNJ21" },
- {"name": "availabilityZone", "value": "slcp3-esx-az01" },
- {"name": "oamNetworkName", "value": "VLAN-OAM-1323" },
- {"name": "vmName", "value": "slcp34246vbc246ceb" },
- {"name": "ipagNetworkId", "value": "970cd2b9-7f09-4a12-af47-182ea38ba1f0" },
- {"name": "vpeNetworkId", "value": "545cc2c3-1930-4100-b534-5d82d0e12bb6" }
- ]
- }
- }
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/updateVfModuleVolume_VID_request_2.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/updateVfModuleVolume_VID_request_2.json
deleted file mode 100644
index f32ba2994b..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/updateVfModuleVolume_VID_request_2.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
- "requestDetails": {
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelInvariantUuid": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12::base::module-0",
- "modelVersion": "1"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "fba1bd1e195a404cacb9ce17a9b2b421"
- },
- "requestInfo": {
- "instanceName": "MSOTESTVOL101a-vSAMP12_base_vol_module-0",
- "source": "VID",
- "suppressRollback": false
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "{service-instance-id}",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantUuid": "ff3514e3-5a33-55df-13ab-12abad84e7ff-x",
- "modelUuid": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "Test",
- "modelVersion": "2.0"
- }
- }
- }, {
- "relatedInstance": {
- "instanceId": "{vnf-instance-id}",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantUuid": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelUuid": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "Test/vSAMP12",
- "modelVersion": "1",
- "modelInstanceName": "vSAMP12"
- }
- }
- }
- ],
- "requestParameters": {
- "serviceId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "userParams": [
- {"name": "vnfName", "value": "STMTN5MMSC20" },
- {"name": "vnfName2", "value": "US1117MTSNJVBR0246" },
- {"name": "vnfNmInformation", "value": "" },
- {"name": "vnfType", "value": "pcrf-capacity" },
- {"name": "vnfId", "value": "skask" },
- {"name": "vnfStackId", "value": "slowburn" },
- {"name": "vnfStatus", "value": "created" },
- {"name": "aicCloudRegion", "value": "MDTWNJ21" },
- {"name": "availabilityZone", "value": "slcp3-esx-az01" },
- {"name": "oamNetworkName", "value": "VLAN-OAM-1323" },
- {"name": "vmName", "value": "slcp34246vbc246ceb" },
- {"name": "ipagNetworkId", "value": "970cd2b9-7f09-4a12-af47-182ea38ba1f0" },
- {"name": "vpeNetworkId", "value": "545cc2c3-1930-4100-b534-5d82d0e12bb6" }
- ]
- }
- }
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/vf_module_aai_response.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/vf_module_aai_response.xml
deleted file mode 100644
index 85773cdb07..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/UpdateVfModuleVolumeInfraV1/vf_module_aai_response.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<vf-module xmlns="http://org.openecomp.aai.inventory/v8">
- <vf-module-id>6a1dc898-b590-47b9-bbf0-34424a7a2ec3</vf-module-id>
- <vf-module-name>MSOST10606-vSAMP12_MTN6_base_module-0</vf-module-name>
- <heat-stack-id>MSOST10606-vSAMP12_MTN6_base_module-0/81b01583-690c-4ec3-9c58-0eafa7a90be7</heat-stack-id>
- <orchestration-status>active</orchestration-status>
- <is-base-vf-module>true</is-base-vf-module>
- <resource-version>1475077639</resource-version>
- <model-invariant-id>ff5256d2-5a33-55df-13ab-12abad84e7ff</model-invariant-id>
- <model-version-id>1.0</model-version-id>
- <relationship-list>
- <relationship>
- <related-to>volume-group</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/volume-groups/volume-group/064bd1c6-e377-4009-a744-e958eec6e727/</related-link>
- <relationship-data>
- <relationship-key>cloud-region.cloud-owner</relationship-key>
- <relationship-value>att-aic</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-region-id</relationship-key>
- <relationship-value>mtn6</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>volume-group.volume-group-id</relationship-key>
- <relationship-value>064bd1c6-e377-4009-a744-e958eec6e727</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
-
-</vf-module> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml
deleted file mode 100644
index d81b7e8f50..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<output xmlns="org:onap:sdnctl:vnf">
-<brg-topology xmlns="org:onap:sdnctl:vnf">
- <ecomp-model-information>
- <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>
- <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>
- <model-version>1.0</model-version>
- <model-name>BRGmodelname</model-name>
- <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>
- </ecomp-model-information>
- <allotted-resource-identifiers>
- <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>
- <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>
- <allotted-resource-name>namefromrequest</allotted-resource-name>
- <allotted-resource-type>brg</allotted-resource-type>
- <allotted-resource-id>allottedresourceidfromrequest</allotted-resource-id>
- </allotted-resource-identifiers>
- <brg-assignments>
- <fq-name>fq-name</fq-name>
- <dest-network>
- <network-id>d1</network-id>
- <network-role>drole</network-role>
- </dest-network>
- <vlan-tag>vlan-tag</vlan-tag>
- <source-network>
- <network-id>s2</network-id>
- <network-role>srole</network-role>
- </source-network>
- <txc-id>txc-id</txc-id>
- <txc-applied-service>
- <service-instance-id>1</service-instance-id>
- <vnf-id>123</vnf-id>
- <txc-fqdn>a.b.c.d</txc-fqdn>
- </txc-applied-service>
- </brg-assignments>
-</brg-topology>
-
-</output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml
deleted file mode 100644
index f74e51e9d5..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<output xmlns="org:onap:sdnctl:vnf">
-<tunnelxconn-topology xmlns="org:onap:sdnctl:vnf">
- <ecomp-model-information>
- <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>
- <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>
- <model-version>1.0</model-version>
- <model-name>TXCmodelname</model-name>
- <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>
- </ecomp-model-information>
- <allotted-resource-identifiers>
- <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>
- <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>
- <allotted-resource-name>namefromrequest</allotted-resource-name>
- <allotted-resource-type>tunnelxconn</allotted-resource-type>
- <allotted-resource-id>allottedresourceidfromrequest</allotted-resource-id>
- </allotted-resource-identifiers>
- <tunnelxconn-assignments>
- <vni>my-vni</vni>
- <vgmux-bearer-ip>my-bearer-ip</vgmux-bearer-ip>
- <vgmux-lan-ip>my-lan-ip</vgmux-lan-ip>
- </tunnelxconn-assignments>
-</tunnelxconn-topology>
-
-</output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml
deleted file mode 100644
index f2063442d6..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
- <id>ar-1</id>
- <orchestration-status>Active</orchestration-status>
- <role>Tunnel XConn</role>
- <type>Tunnel XConn</type>
- <description>Tunnel XConn</description>
- <selflink/>
- <resource-version>1490627351232</resource-version>
- <relationship-list>
- <relationship>
- <related-to>service-instance</related-to>
- <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- <relationship-data>
- <relationship-key>customer.global-customer-id</relationship-key>
- <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-subscription.service-type</relationship-key>
- <relationship-value>123456789</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-instance.service-instance-id</relationship-key>
- <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>service-instance.service-instance-name</property-key>
- <property-value>vcpe-1702-m010904-name4</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json
deleted file mode 100644
index e99dd9ccda..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{ "serviceResources" : {
- "modelInfo" : {
- "modelName" : "MSO Test Network",
- "modelUuid" : "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e",
- "modelInvariantUuid" : "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f",
- "modelVersion" : null
- },
- "serviceVnfs": [
- { "modelInfo" : {
- "modelName" : "vHNF for DHV Test",
- "modelUuid" : "7097d8bb-f6ad-4cf7-866e-6a04c8f1b332",
- "modelInvariantUuid" : "6ea0b528-e303-4686-aa77-aa2fcbdccb96",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "da86dd87-43c5-458c-b226-5315b7be9ad5",
- "modelInstanceName" : "vHNF for DHV Test 17"
- },
- "toscaNodeType" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : null,
- "nfNamingCode" : null,
- "vfModules": [
- {
- "modelInfo" : {
- "modelName" : "VhnfForDhvTest..base_TEST..module-0",
- "modelUuid" : "ebc3d18c-3e62-4c24-bcd6-961e98701a0a",
- "modelInvariantUuid" : "f5696ec0-ec71-4916-bf3b-93a654efcba4",
- "modelVersion" : "1",
- "modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a787"
- }, "isBase" : true,
- "vfModuleLabel" : "base_TEST",
- "initialCount" : 1,
- "hasVolumeGroup" : true
- }
- ]
- }
- ],
- "serviceNetworks": [
- {
- "modelInfo" : {
- "modelName" : "CONTRAIL_BASIC",
- "modelUuid" : "fe5be3a6-dbe0-46d6-bcac-44dc841a7edc",
- "modelInvariantUuid" : "ab07fbd8-185a-45ac-be45-db3eb02e98d5",
- "modelVersion" : null,
- "modelCustomizationUuid" : "0cb9b26a-9820-48a7-86e5-16c510e993d9",
- "modelInstanceName" : "CONTRAIL_BASIC 5"
- },
- "toscaNodeType" : null,
- "networkType" : null,
- "networkTechnology" : null,
- "networkRole" : null,
- "networkScope" : null
- }
- ],
- "serviceAllottedResources": [
- {
- "modelInfo" : {
- "modelName" : "IP_MUX_Demux",
- "modelUuid" : "64a1a718-556b-48ce-b3b7-ed3237ccc94f",
- "modelInvariantUuid" : "f110ef53-a0a6-4d72-ab91-fd88a835e8c4",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "4bab0880-2f06-4aeb-87cb-3734c8e8bf93",
- "modelInstanceName" : "Pri_IP_MUX_Demux 1"
- },
- "toscaNodeType" : null,
- "allottedResourceType" : "Tunnel XConn",
- "allottedResourceRole" : "Tunnel XConn",
- "providingServiceModelInvariantUuid" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : null,
- "nfNamingCode" : null,
- "homingSolution": {
- "inventoryType": "service",
- "serviceInstanceId": "MIS%252F1604%252F0027%252FSW_INTERNET",
- "vnfHostname": "MDTNJ01",
- "cloudOwner": "aic",
- "cloudRegionId": "dfwtx",
- "aicClli": "KDTNJ01",
- "aicVersion": "3.0",
- "entitlementPoolList": [
- "f1d563e8-e714-4393-8f99-cc480144a05e",
- "j1d563e8-e714-4393-8f99-cc480144a05e"
- ],
- "licenseKeyGroupList": [
- "s1d563e8-e714-4393-8f99-cc480144a05e",
- "b1d563e8-e714-4393-8f99-cc480144a05e"
- ]
- }
- },
- {
- "modelInfo" : {
- "modelName" : "Service_Admin",
- "modelUuid" : "73501e03-ee76-4509-a8ce-96d2a9f33ee9",
- "modelInvariantUuid" : "462edf71-1a3c-487b-bf55-497460ab7de3",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "a896ffad-c8f9-404e-a527-7a8d0cc99ce6",
- "modelInstanceName" : "Pri_Service_Admin 5"
- },
- "toscaNodeType" : null,
- "allottedResourceType" : "BRG",
- "allottedResourceRole" : "BRG",
- "providingServiceModelInvariantUuid" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : null,
- "nfNamingCode" : null,
- "homingSolution": {
- "inventoryType": "service",
- "serviceInstanceId": "MIS%252F1604%252F0027%252FSW_INTERNET",
- "vnfHostname": "MDTNJ01",
- "cloudOwner": "aic",
- "cloudRegionId": "dfwtx",
- "aicClli": "KDTNJ01",
- "aicVersion": "3.0",
- "entitlementPoolList": [
- "f1d563e8-e714-4393-8f99-cc480144a05e",
- "j1d563e8-e714-4393-8f99-cc480144a05e"
- ],
- "licenseKeyGroupList": [
- "s1d563e8-e714-4393-8f99-cc480144a05e",
- "b1d563e8-e714-4393-8f99-cc480144a05e"
- ]
- }
- }
- ]
- }} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json
deleted file mode 100644
index 80692b27f5..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{ "serviceResources" : {
- "modelInfo" : {
- "modelName" : "MSO Test Network",
- "modelUuid" : "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e",
- "modelInvariantUuid" : "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f",
- "modelVersion" : null
- },
- "serviceVnfs": [],
- "serviceNetworks": [],
- "serviceAllottedResources": []
- }} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCustomer.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCustomer.xml
deleted file mode 100644
index b9d88d15db..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCustomer.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<customer xmlns="http://org.openecomp.aai.inventory/v8">
- <global-customer-id>SDN-ETHERNET-INTERNET</global-customer-id>
- <subscriber-name>SDN-ETHERNET-INTERNET</subscriber-name>
- <resource-version>1490627351232</resource-version>
- <service-subscriptions/>
- <relationship-list/>
-</customer>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json
deleted file mode 100644
index bc0a1ef491..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
- "requestDetails":
- {
- "modelInfo":
- {
- "modelType":"service",
- "modelInvariantUuid":"uuid-miu-svc-011-abcdef",
- "modelVersionId":"ASDC_TOSCA_UUID",
- "modelName":"SIModelName1",
- "modelVersion":"2"
- },
- "subscriberInfo":
- {
- "globalSubscriberId":"SDN-ETHERNET-INTERNET",
- "subscriberName":"Kaneohe"
- },
- "requestInfo":
- {
- "instanceName":"VCPE1",
- "source":"VID",
- "suppressRollback":"false",
- "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"
- },
- "cloudConfiguration":
- {
- "lcpCloudRegionId":"cloudowner_mdt1",
- "tenantId":"8b1df54faa3b49078e3416e21370a3ba"
- },
- "requestParameters":
- {
- "subscriptionServiceType":"123456789",
- "aLaCarte":"false",
- "userParams":
- [
- {
- "name":"BRG_WAN_MAC_Address",
- "value":"brgmac"
- },
- {
- "name": "Customer_Location",
- "value": {
- "customerLatitude": "32.897480",
- "customerLongitude": "-97.040443",
- "customerName": "some_company"
- }
- },
- {
- "name":"Homing_Solution",
- "value":"sniro"
- }
- ]
- }
- }
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json
deleted file mode 100644
index 4100ec76de..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
- "requestDetails":
- {
- "modelInfo":
- {
- "modelType":"service",
- "modelInvariantUuid":"uuid-miu-svc-011-abcdef",
- "modelVersionId":"ASDC_TOSCA_UUID",
- "modelName":"SIModelName1",
- "modelVersion":"2"
- },
- "subscriberInfo":
- {
- "globalSubscriberId":"SDN-ETHERNET-INTERNET",
- "subscriberName":"Kaneohe"
- },
- "requestInfo":
- {
- "source":"VID",
- "suppressRollback":"false",
- "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"
- },
- "cloudConfiguration":
- {
- "lcpCloudRegionId":"cloudowner_mdt1",
- "tenantId":"8b1df54faa3b49078e3416e21370a3ba"
- },
- "requestParameters":
- {
- "subscriptionServiceType":"123456789",
- "aLaCarte":"false",
- "userParams":
- [
- {
- "name":"BRG_WAN_MAC_Address",
- "value":"brgmac"
- },
- {
- "name": "Customer_Location",
- "value": {
- "customerLatitude": "32.897480",
- "customerLongitude": "-97.040443",
- "customerName": "some_company"
- }
- },
- {
- "name":"Homing_Solution",
- "value":"sniro"
- }
- ]
- }
- }
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json
deleted file mode 100644
index 5fc0b04180..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
- "requestDetails":
- {
- "modelInfo":
- {
- "modelType":"service",
- "modelInvariantUuid":"uuid-miu-svc-011-abcdef",
- "modelVersionId":"ASDC_TOSCA_UUID",
- "modelName":"SIModelName1",
- "modelVersion":"2"
- },
- "subscriberInfo":
- {
- "globalSubscriberId":"SDN-ETHERNET-INTERNET",
- "subscriberName":"Kaneohe"
- },
- "requestInfo":
- {
- "source":"VID",
- "suppressRollback":"true",
- "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"
- },
- "cloudConfiguration":
- {
- "lcpCloudRegionId":"cloudowner_mdt1",
- "tenantId":"8b1df54faa3b49078e3416e21370a3ba"
- },
- "requestParameters":
- {
- "subscriptionServiceType":"123456789",
- "aLaCarte":"false",
- "userParams":
- [
- {
- "name":"BRG_WAN_MAC_Address",
- "value":"brgmac"
- },
- {
- "name": "Customer_Location",
- "value": {
- "customerLatitude": "32.897480",
- "customerLongitude": "-97.040443",
- "customerName": "some_company"
- }
- },
- {
- "name":"Homing_Solution",
- "value":"sniro"
- }
- ]
- }
- }
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetBRGById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetBRGById.xml
deleted file mode 100644
index 3cb31464d5..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetBRGById.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
- <id>ar-brgB</id>
- <orchestration-status>Active</orchestration-status>
- <role>BRG</role>
- <type>BRG</type>
- <description>BRG</description>
- <selflink/>
- <resource-version>1490627351232</resource-version>
- <relationship-list>
- <relationship>
- <related-to>service-instance</related-to>
- <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- <relationship-data>
- <relationship-key>customer.global-customer-id</relationship-key>
- <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-subscription.service-type</relationship-key>
- <relationship-value>123456789</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-instance.service-instance-id</relationship-key>
- <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>service-instance.service-instance-name</property-key>
- <property-value>vcpe-1702-m010904-name4</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetTXCById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetTXCById.xml
deleted file mode 100644
index 97992fc00b..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetTXCById.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
- <id>ar-txcA</id>
- <orchestration-status>Active</orchestration-status>
- <role>Tunnel XConn</role>
- <type>Tunnel XConn</type>
- <description>Tunnel XConn</description>
- <selflink/>
- <resource-version>1490627351232</resource-version>
- <relationship-list>
- <relationship>
- <related-to>service-instance</related-to>
- <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- <relationship-data>
- <relationship-key>customer.global-customer-id</relationship-key>
- <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-subscription.service-type</relationship-key>
- <relationship-value>123456789</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-instance.service-instance-id</relationship-key>
- <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>service-instance.service-instance-name</property-key>
- <property-value>vcpe-1702-m010904-name4</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getBRGArUrlById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getBRGArUrlById.xml
deleted file mode 100644
index 932dbfb2ca..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getBRGArUrlById.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<search-results xmlns="http://org.openecomp.aai.inventory">
- <result-data>
- <resource-type>allotted-resource</resource-type>
- <resource-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/ar-brgB</resource-link>
- </result-data>
-</search-results> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml
deleted file mode 100644
index e0511873b6..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<service-instance>
-
- <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
- <resource-version>123456789</resource-version>
- <relationship-list>
- <relationship>
- <related-to>generic-vnf</related-to>
- <related-link>/aai/v7/generic-vnf/vnfX</related-link>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>/aai/v7/l3-network/netA</related-link>
- </relationship>
- <relationship>
- <related-to>generic-vnf</related-to>
- <related-link>/aai/v7/generic-vnf/vnfY</related-link>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>/aai/v7/l3-network/netB</related-link>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>/aai/v7/l3-network/netC</related-link>
- </relationship>
- <relationship>
- <related-to>allotted-resource</related-to>
- <related-link>/aai/v11/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/ar-txcA</related-link>
- </relationship>
- <relationship>
- <related-to>allotted-resource</related-to>
- <related-link>/aai/v11/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/ar-brgB</related-link>
- </relationship>
- </relationship-list>
-</service-instance>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSIAfterDelArs.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSIAfterDelArs.xml
deleted file mode 100644
index feb535c238..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSIAfterDelArs.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<service-instance>
- <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
- <service-type>SDN-MOBILITY</service-type>
- <resource-version>123456789</resource-version>
-
- <relationship-list>
- </relationship-list>
-</service-instance>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getTXCArUrlById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getTXCArUrlById.xml
deleted file mode 100644
index 1c4f13d642..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getTXCArUrlById.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<search-results xmlns="http://org.openecomp.aai.inventory">
- <result-data>
- <resource-type>allotted-resource</resource-type>
- <resource-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/ar-txcA</resource-link>
- </result-data>
-</search-results> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json
deleted file mode 100644
index dc4669e8d9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "requestDetails":
- {
- "modelInfo":
- {
- "modelType":"service",
- "modelInvariantUuid":"uuid-miu-svc-011-abcdef",
- "modelVersionId":"ASDC_TOSCA_UUID",
- "modelName":"SIModelName1",
- "modelVersion":"2"
- },
- "subscriberInfo":
- {
- "globalSubscriberId":"SDN-ETHERNET-INTERNET",
- "subscriberName":"Kaneohe"
- },
- "requestInfo":
- {
- "instanceName":"VCPE1",
- "source":"VID",
- "suppressRollback":"false",
- "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"
- },
- "cloudConfiguration":
- {
- "lcpCloudRegionId":"mdt1",
- "tenantId":"8b1df54faa3b49078e3416e21370a3ba"
- },
- "requestParameters":
- {
- "subscriptionServiceType":"123456789",
- "aLaCarte":"false",
- "userParams":
- {
- "BRG_WAN_MAC_Address" : "brgmac"
- }
- }
-
- }
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml
deleted file mode 100644
index 8b8863e29c..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<service xmlns="http://org.openecomp.aai.inventory/v9">
- <relationship-list>
- <relationship>
- <related-to>generic-vnf</related-to>
- <related-link>/aai/v7/generic-vnf/vnfX</related-link>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>/aai/v7/l3-network/netA</related-link>
- </relationship>
- <relationship>
- <related-to>generic-vnf</related-to>
- <related-link>/aai/v7/generic-vnf/vnfY/</related-link>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>/aai/v7/l3-network/netB</related-link>
- </relationship>
- <relationship>
- <related-to>l3-network</related-to>
- <related-link>/aai/v7/l3-network/netC</related-link>
- </relationship>
- <relationship>
- <related-to>allotted-resource</related-to>
- <related-link>/aai/v11/anytxc</related-link>
- </relationship>
- <relationship>
- <related-to>allotted-resource</related-to>
- <related-link>/aai/v11/anybrg</related-link>
- </relationship>
- <relationship>
- <related-to>allotted-resource</related-to>
- <related-link>/aai/v11/other</related-link>
- </relationship>
- </relationship-list>
-</service>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml
deleted file mode 100644
index d81b7e8f50..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<output xmlns="org:onap:sdnctl:vnf">
-<brg-topology xmlns="org:onap:sdnctl:vnf">
- <ecomp-model-information>
- <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>
- <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>
- <model-version>1.0</model-version>
- <model-name>BRGmodelname</model-name>
- <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>
- </ecomp-model-information>
- <allotted-resource-identifiers>
- <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>
- <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>
- <allotted-resource-name>namefromrequest</allotted-resource-name>
- <allotted-resource-type>brg</allotted-resource-type>
- <allotted-resource-id>allottedresourceidfromrequest</allotted-resource-id>
- </allotted-resource-identifiers>
- <brg-assignments>
- <fq-name>fq-name</fq-name>
- <dest-network>
- <network-id>d1</network-id>
- <network-role>drole</network-role>
- </dest-network>
- <vlan-tag>vlan-tag</vlan-tag>
- <source-network>
- <network-id>s2</network-id>
- <network-role>srole</network-role>
- </source-network>
- <txc-id>txc-id</txc-id>
- <txc-applied-service>
- <service-instance-id>1</service-instance-id>
- <vnf-id>123</vnf-id>
- <txc-fqdn>a.b.c.d</txc-fqdn>
- </txc-applied-service>
- </brg-assignments>
-</brg-topology>
-
-</output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getAR.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getAR.xml
deleted file mode 100644
index e352ff8f1f..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getAR.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
- <relationship-list>
- <relationship>
- <related-to>allotted-resource</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- </relationship>
- </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getArBrg.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getArBrg.xml
deleted file mode 100644
index 8c3976b828..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getArBrg.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
- <id>ar-1</id>
- <orchestration-status>Active</orchestration-status>
- <role>BRGr</role>
- <type>BRGt</type>
- <description>BRG</description>
- <selflink/>
- <resource-version>1490627351232</resource-version>
- <relationship-list>
- <relationship>
- <related-to>service-instance</related-to>
- <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- <relationship-data>
- <relationship-key>customer.global-customer-id</relationship-key>
- <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-subscription.service-type</relationship-key>
- <relationship-value>123456789</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-instance.service-instance-id</relationship-key>
- <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>service-instance.service-instance-name</property-key>
- <property-value>vcpe-1702-m010904-name4</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getArBrg2.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getArBrg2.xml
deleted file mode 100644
index 650d608fb0..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getArBrg2.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
- <id>ar-1</id>
- <orchestration-status>Active</orchestration-status>
- <role>txc</role>
- <type>BRG</type>
- <description>BRG</description>
- <selflink/>
- <resource-version>1490627351232</resource-version>
- <relationship-list>
- <relationship>
- <related-to>service-instance</related-to>
- <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- <relationship-data>
- <relationship-key>customer.global-customer-id</relationship-key>
- <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-subscription.service-type</relationship-key>
- <relationship-value>123456789</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-instance.service-instance-id</relationship-key>
- <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>service-instance.service-instance-name</property-key>
- <property-value>vcpe-1702-m010904-name4</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getSIandAR.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getSIandAR.xml
deleted file mode 100644
index 14c7410995..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/getSIandAR.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<service-instance>
- <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
- <resource-version>123456789</resource-version>
-
- <orchestration-status>Active</orchestration-status>
-
- <relationship-list>
- <relationship>
- <related-to>allotted-resource</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- </relationship>
-
- <relationship>
- <related-to>cvlan-tag</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>
- <relationship-data>
- <relationship-key>cvlan-tag.cvlan-tag</relationship-key>
- <relationship-value>2003</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>port-group.interface-id</relationship-key>
- <relationship-value>slcp1447vbc.ipag</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>vce.vnf-id</relationship-key>
- <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>vce</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>
- <relationship-data>
- <relationship-key>vce.vnf-id</relationship-key>
- <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
-</service-instance>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml
deleted file mode 100644
index 8ed991608a..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/arGetById.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
- <id>ar-1</id>
- <orchestration-status>Active</orchestration-status>
- <role>BRG</role>
- <type>BRG</type>
- <description>BRG</description>
- <selflink/>
- <resource-version>1490627351232</resource-version>
- <relationship-list>
- <relationship>
- <related-to>service-instance</related-to>
- <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- <relationship-data>
- <relationship-key>customer.global-customer-id</relationship-key>
- <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-subscription.service-type</relationship-key>
- <relationship-value>123456789</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-instance.service-instance-id</relationship-key>
- <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>service-instance.service-instance-name</property-key>
- <property-value>vcpe-1702-m010904-name4</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml
deleted file mode 100644
index 6f86e0fb86..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
- xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
- xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
- <sdncadapter:RequestHeader>
- <sdncadapter:RequestId>b043d290-140d-4a38-a9b6-95d3b8bd27d1</sdncadapter:RequestId>
- <sdncadapter:SvcInstanceId>MIS%252F1604%252F0026%252FSW_INTERNET</sdncadapter:SvcInstanceId>
- <sdncadapter:SvcAction>deactvate</sdncadapter:SvcAction>
- <sdncadapter:SvcOperation>brg-topology-operation</sdncadapter:SvcOperation>
- <sdncadapter:CallbackUrl>http://localhost:28090/mso/SDNCAdapterCallbackService</sdncadapter:CallbackUrl>
- </sdncadapter:RequestHeader>
- <sdncadapterworkflow:SDNCRequestData>
- <request-information>
- <request-id>RaaTestRequestId1</request-id>
- <request-action>DeleteBRGInstance</request-action>
- <source>MSO</source>
- <notification-url/>
- <order-number/>
- <order-version/>
- </request-information>
- <service-information>
- <service-id></service-id>
- <subscription-service-type></subscription-service-type>
- <ecomp-model-information></ecomp-model-information>
- <service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
- <subscriber-name/>
- <global-customer-id></global-customer-id>
- </service-information>
- <allotted-resource-information>
- <allotted-resource-id>arId-1</allotted-resource-id>
- <allotted-resource-type>brg</allotted-resource-type>
- <parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
- <ecomp-model-information>
- <model-invariant-uuid></model-invariant-uuid>
- <model-uuid></model-uuid>
- <model-customization-uuid></model-customization-uuid>
- <model-version></model-version>
- <model-name></model-name>
- </ecomp-model-information>
- </allotted-resource-information>
- <brg-request-input>
- <source-network>
- <network-id>${sourceNetworkId}</network-id>
- <network-role>${sourceNetworkRole}</network-role>
- </source-network>
- <dest-network>
- <network-id/>
- <network-role></network-role>
- </dest-network>
- </brg-request-input>
- </sdncadapterworkflow:SDNCRequestData>
-</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml
deleted file mode 100644
index 30d4c7ae49..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
- xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
- xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
- <sdncadapter:RequestHeader>
- <sdncadapter:RequestId>b043d290-140d-4a38-a9b6-95d3b8bd27d3</sdncadapter:RequestId>
- <sdncadapter:SvcInstanceId>MIS%252F1604%252F0026%252FSW_INTERNET</sdncadapter:SvcInstanceId>
- <sdncadapter:SvcAction>unassign</sdncadapter:SvcAction>
- <sdncadapter:SvcOperation>brg-topology-operation</sdncadapter:SvcOperation>
- <sdncadapter:CallbackUrl>http://localhost:28090/mso/SDNCAdapterCallbackService</sdncadapter:CallbackUrl>
- </sdncadapter:RequestHeader>
- <sdncadapterworkflow:SDNCRequestData>
- <request-information>
- <request-id>RaaTestRequestId1</request-id>
- <request-action>DeleteBRGInstance</request-action>
- <source>MSO</source>
- <notification-url/>
- <order-number/>
- <order-version/>
- </request-information>
- <service-information>
- <service-id></service-id>
- <subscription-service-type></subscription-service-type>
- <ecomp-model-information></ecomp-model-information>
- <service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
- <subscriber-name/>
- <global-customer-id></global-customer-id>
- </service-information>
- <allotted-resource-information>
- <allotted-resource-id>arId-1</allotted-resource-id>
- <allotted-resource-type>brg</allotted-resource-type>
- <parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
- <ecomp-model-information>
- <model-invariant-uuid></model-invariant-uuid>
- <model-uuid></model-uuid>
- <model-customization-uuid></model-customization-uuid>
- <model-version></model-version>
- <model-name></model-name>
- </ecomp-model-information>
- </allotted-resource-information>
- <brg-request-input>
- <source-network>
- <network-id>${sourceNetworkId}</network-id>
- <network-role>${sourceNetworkRole}</network-role>
- </source-network>
- <dest-network>
- <network-id/>
- <network-role></network-role>
- </dest-network>
- </brg-request-input>
- </sdncadapterworkflow:SDNCRequestData>
-</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml
deleted file mode 100644
index e20850a7b9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
- xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
- xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
- <sdncadapter:RequestHeader>
- <sdncadapter:RequestId>b043d290-140d-4a38-a9b6-95d3b8bd27d2</sdncadapter:RequestId>
- <sdncadapter:SvcInstanceId>MIS%252F1604%252F0026%252FSW_INTERNET</sdncadapter:SvcInstanceId>
- <sdncadapter:SvcAction>delete</sdncadapter:SvcAction>
- <sdncadapter:SvcOperation>brg-topology-operation</sdncadapter:SvcOperation>
- <sdncadapter:CallbackUrl>http://localhost:28090/mso/SDNCAdapterCallbackService</sdncadapter:CallbackUrl>
- </sdncadapter:RequestHeader>
- <sdncadapterworkflow:SDNCRequestData>
- <request-information>
- <request-id>RaaTestRequestId1</request-id>
- <request-action>DeleteBRGInstance</request-action>
- <source>MSO</source>
- <notification-url/>
- <order-number/>
- <order-version/>
- </request-information>
- <service-information>
- <service-id></service-id>
- <subscription-service-type></subscription-service-type>
- <ecomp-model-information></ecomp-model-information>
- <service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
- <subscriber-name/>
- <global-customer-id></global-customer-id>
- </service-information>
- <allotted-resource-information>
- <allotted-resource-id>arId-1</allotted-resource-id>
- <allotted-resource-type>brg</allotted-resource-type>
- <parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
- <ecomp-model-information>
- <model-invariant-uuid></model-invariant-uuid>
- <model-uuid></model-uuid>
- <model-customization-uuid></model-customization-uuid>
- <model-version></model-version>
- <model-name></model-name>
- </ecomp-model-information>
- </allotted-resource-information>
- <brg-request-input>
- <source-network>
- <network-id>${sourceNetworkId}</network-id>
- <network-role>${sourceNetworkRole}</network-role>
- </source-network>
- <dest-network>
- <network-id/>
- <network-role></network-role>
- </dest-network>
- </brg-request-input>
- </sdncadapterworkflow:SDNCRequestData>
-</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml
deleted file mode 100644
index f74e51e9d5..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<output xmlns="org:onap:sdnctl:vnf">
-<tunnelxconn-topology xmlns="org:onap:sdnctl:vnf">
- <ecomp-model-information>
- <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>
- <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>
- <model-version>1.0</model-version>
- <model-name>TXCmodelname</model-name>
- <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>
- </ecomp-model-information>
- <allotted-resource-identifiers>
- <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>
- <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>
- <allotted-resource-name>namefromrequest</allotted-resource-name>
- <allotted-resource-type>tunnelxconn</allotted-resource-type>
- <allotted-resource-id>allottedresourceidfromrequest</allotted-resource-id>
- </allotted-resource-identifiers>
- <tunnelxconn-assignments>
- <vni>my-vni</vni>
- <vgmux-bearer-ip>my-bearer-ip</vgmux-bearer-ip>
- <vgmux-lan-ip>my-lan-ip</vgmux-lan-ip>
- </tunnelxconn-assignments>
-</tunnelxconn-topology>
-
-</output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getAR.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getAR.xml
deleted file mode 100644
index e352ff8f1f..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getAR.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
- <relationship-list>
- <relationship>
- <related-to>allotted-resource</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- </relationship>
- </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getArTxc.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getArTxc.xml
deleted file mode 100644
index dfb7d46a68..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getArTxc.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
- <id>ar-1</id>
- <orchestration-status>Active</orchestration-status>
- <role>TXCr</role>
- <type>TXCt</type>
- <description>TXC</description>
- <selflink/>
- <resource-version>1490627351232</resource-version>
- <relationship-list>
- <relationship>
- <related-to>service-instance</related-to>
- <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- <relationship-data>
- <relationship-key>customer.global-customer-id</relationship-key>
- <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-subscription.service-type</relationship-key>
- <relationship-value>123456789</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-instance.service-instance-id</relationship-key>
- <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>service-instance.service-instance-name</property-key>
- <property-value>vcpe-1702-m010904-name4</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getArTxc2.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getArTxc2.xml
deleted file mode 100644
index 59c503036a..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getArTxc2.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
- <id>ar-1</id>
- <orchestration-status>Active</orchestration-status>
- <role>brg</role>
- <type>TXC</type>
- <description>TXC</description>
- <selflink/>
- <resource-version>1490627351232</resource-version>
- <relationship-list>
- <relationship>
- <related-to>service-instance</related-to>
- <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- <relationship-data>
- <relationship-key>customer.global-customer-id</relationship-key>
- <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-subscription.service-type</relationship-key>
- <relationship-value>123456789</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-instance.service-instance-id</relationship-key>
- <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>service-instance.service-instance-name</property-key>
- <property-value>vcpe-1702-m010904-name4</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getSIandAR.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getSIandAR.xml
deleted file mode 100644
index 14c7410995..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/getSIandAR.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<service-instance>
- <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
- <resource-version>123456789</resource-version>
-
- <orchestration-status>Active</orchestration-status>
-
- <relationship-list>
- <relationship>
- <related-to>allotted-resource</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- </relationship>
-
- <relationship>
- <related-to>cvlan-tag</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>
- <relationship-data>
- <relationship-key>cvlan-tag.cvlan-tag</relationship-key>
- <relationship-value>2003</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>port-group.interface-id</relationship-key>
- <relationship-value>slcp1447vbc.ipag</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>vce.vnf-id</relationship-key>
- <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
- </relationship-data>
- </relationship>
- <relationship>
- <related-to>vce</related-to>
- <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>
- <relationship-data>
- <relationship-key>vce.vnf-id</relationship-key>
- <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
-</service-instance>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml
deleted file mode 100644
index f2063442d6..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
- <id>ar-1</id>
- <orchestration-status>Active</orchestration-status>
- <role>Tunnel XConn</role>
- <type>Tunnel XConn</type>
- <description>Tunnel XConn</description>
- <selflink/>
- <resource-version>1490627351232</resource-version>
- <relationship-list>
- <relationship>
- <related-to>service-instance</related-to>
- <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- <relationship-data>
- <relationship-key>customer.global-customer-id</relationship-key>
- <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-subscription.service-type</relationship-key>
- <relationship-value>123456789</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-instance.service-instance-id</relationship-key>
- <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>service-instance.service-instance-name</property-key>
- <property-value>vcpe-1702-m010904-name4</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml
deleted file mode 100644
index efec7eb001..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
- xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
- xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
- <sdncadapter:RequestHeader>
- <sdncadapter:RequestId>b043d290-140d-4a38-a9b6-95d3b8bd27d1</sdncadapter:RequestId>
- <sdncadapter:SvcInstanceId>MIS%252F1604%252F0026%252FSW_INTERNET</sdncadapter:SvcInstanceId>
- <sdncadapter:SvcAction>deactvate</sdncadapter:SvcAction>
- <sdncadapter:SvcOperation>tunnelxconn-topology-operation</sdncadapter:SvcOperation>
- <sdncadapter:CallbackUrl>http://localhost:8080/mso/SDNCAdapterCallbackService</sdncadapter:CallbackUrl>
- </sdncadapter:RequestHeader>
- <sdncadapterworkflow:SDNCRequestData>
- <request-information>
- <request-id>RaaTestRequestId1</request-id>
- <request-action>DeleteTunnelXConnInstance</request-action>
- <source>MSO</source>
- <notification-url/>
- <order-number/>
- <order-version/>
- </request-information>
- <service-information>
- <service-id></service-id>
- <subscription-service-type></subscription-service-type>
- <ecomp-model-information></ecomp-model-information>
- <service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
- <subscriber-name/>
- <global-customer-id></global-customer-id>
- </service-information>
- <allotted-resource-information>
- <allotted-resource-id>arId-1</allotted-resource-id>
- <allotted-resource-type>tunnelxconn</allotted-resource-type>
- <parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
- <ecomp-model-information>
- <model-invariant-uuid></model-invariant-uuid>
- <model-uuid></model-uuid>
- <model-customization-uuid></model-customization-uuid>
- <model-version></model-version>
- <model-name></model-name>
- </ecomp-model-information>
- </allotted-resource-information>
- <tunnelxconn-request-input>
- <source-network>
- <network-id>${sourceNetworkId}</network-id>
- <network-role>${sourceNetworkRole}</network-role>
- </source-network>
- <dest-network>
- <network-id/>
- <network-role></network-role>
- </dest-network>
- </tunnelxconn-request-input>
- </sdncadapterworkflow:SDNCRequestData>
-</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml
deleted file mode 100644
index 9f52758750..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
- xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
- xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
- <sdncadapter:RequestHeader>
- <sdncadapter:RequestId>b043d290-140d-4a38-a9b6-95d3b8bd27d3</sdncadapter:RequestId>
- <sdncadapter:SvcInstanceId>MIS%252F1604%252F0026%252FSW_INTERNET</sdncadapter:SvcInstanceId>
- <sdncadapter:SvcAction>unassign</sdncadapter:SvcAction>
- <sdncadapter:SvcOperation>tunnelxconn-topology-operation</sdncadapter:SvcOperation>
- <sdncadapter:CallbackUrl>http://localhost:8080/mso/SDNCAdapterCallbackService</sdncadapter:CallbackUrl>
- </sdncadapter:RequestHeader>
- <sdncadapterworkflow:SDNCRequestData>
- <request-information>
- <request-id>RaaTestRequestId1</request-id>
- <request-action>DeleteTunnelXConnInstance</request-action>
- <source>MSO</source>
- <notification-url/>
- <order-number/>
- <order-version/>
- </request-information>
- <service-information>
- <service-id></service-id>
- <subscription-service-type></subscription-service-type>
- <ecomp-model-information></ecomp-model-information>
- <service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
- <subscriber-name/>
- <global-customer-id></global-customer-id>
- </service-information>
- <allotted-resource-information>
- <allotted-resource-id>arId-1</allotted-resource-id>
- <allotted-resource-type>tunnelxconn</allotted-resource-type>
- <parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
- <ecomp-model-information>
- <model-invariant-uuid></model-invariant-uuid>
- <model-uuid></model-uuid>
- <model-customization-uuid></model-customization-uuid>
- <model-version></model-version>
- <model-name></model-name>
- </ecomp-model-information>
- </allotted-resource-information>
- <tunnelxconn-request-input>
- <source-network>
- <network-id>${sourceNetworkId}</network-id>
- <network-role>${sourceNetworkRole}</network-role>
- </source-network>
- <dest-network>
- <network-id/>
- <network-role></network-role>
- </dest-network>
- </tunnelxconn-request-input>
- </sdncadapterworkflow:SDNCRequestData>
-</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml
deleted file mode 100644
index 025195e326..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
- xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
- xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
- <sdncadapter:RequestHeader>
- <sdncadapter:RequestId>b043d290-140d-4a38-a9b6-95d3b8bd27d2</sdncadapter:RequestId>
- <sdncadapter:SvcInstanceId>MIS%252F1604%252F0026%252FSW_INTERNET</sdncadapter:SvcInstanceId>
- <sdncadapter:SvcAction>delete</sdncadapter:SvcAction>
- <sdncadapter:SvcOperation>tunnelxconn-topology-operation</sdncadapter:SvcOperation>
- <sdncadapter:CallbackUrl>http://localhost:8080/mso/SDNCAdapterCallbackService</sdncadapter:CallbackUrl>
- </sdncadapter:RequestHeader>
- <sdncadapterworkflow:SDNCRequestData>
- <request-information>
- <request-id>RaaTestRequestId1</request-id>
- <request-action>DeleteTunnelXConnInstance</request-action>
- <source>MSO</source>
- <notification-url/>
- <order-number/>
- <order-version/>
- </request-information>
- <service-information>
- <service-id></service-id>
- <subscription-service-type></subscription-service-type>
- <ecomp-model-information></ecomp-model-information>
- <service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
- <subscriber-name/>
- <global-customer-id></global-customer-id>
- </service-information>
- <allotted-resource-information>
- <allotted-resource-id>arId-1</allotted-resource-id>
- <allotted-resource-type>tunnelxconn</allotted-resource-type>
- <parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
- <ecomp-model-information>
- <model-invariant-uuid></model-invariant-uuid>
- <model-uuid></model-uuid>
- <model-customization-uuid></model-customization-uuid>
- <model-version></model-version>
- <model-name></model-name>
- </ecomp-model-information>
- </allotted-resource-information>
- <tunnelxconn-request-input>
- <source-network>
- <network-id>${sourceNetworkId}</network-id>
- <network-role>${sourceNetworkRole}</network-role>
- </source-network>
- <dest-network>
- <network-id/>
- <network-role></network-role>
- </dest-network>
- </tunnelxconn-request-input>
- </sdncadapterworkflow:SDNCRequestData>
-</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceBRG/arGetById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceBRG/arGetById.xml
deleted file mode 100644
index 8ed991608a..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceBRG/arGetById.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
- <id>ar-1</id>
- <orchestration-status>Active</orchestration-status>
- <role>BRG</role>
- <type>BRG</type>
- <description>BRG</description>
- <selflink/>
- <resource-version>1490627351232</resource-version>
- <relationship-list>
- <relationship>
- <related-to>service-instance</related-to>
- <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- <relationship-data>
- <relationship-key>customer.global-customer-id</relationship-key>
- <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-subscription.service-type</relationship-key>
- <relationship-value>123456789</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-instance.service-instance-id</relationship-key>
- <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>service-instance.service-instance-name</property-key>
- <property-value>vcpe-1702-m010904-name4</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceTXC/arGetById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceTXC/arGetById.xml
deleted file mode 100644
index f2063442d6..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceTXC/arGetById.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
- <id>ar-1</id>
- <orchestration-status>Active</orchestration-status>
- <role>Tunnel XConn</role>
- <type>Tunnel XConn</type>
- <description>Tunnel XConn</description>
- <selflink/>
- <resource-version>1490627351232</resource-version>
- <relationship-list>
- <relationship>
- <related-to>service-instance</related-to>
- <related-link>http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1</related-link>
- <relationship-data>
- <relationship-key>customer.global-customer-id</relationship-key>
- <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-subscription.service-type</relationship-key>
- <relationship-value>123456789</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>service-instance.service-instance-id</relationship-key>
- <relationship-value>88819355-9a71-4ddc-9e22-373f0644b40b</relationship-value>
- </relationship-data>
- <related-to-property>
- <property-key>service-instance.service-instance-name</property-key>
- <property-value>vcpe-1702-m010904-name4</property-value>
- </related-to-property>
- </relationship>
- </relationship-list>
-</allotted-resource>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesData.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesData.json
deleted file mode 100644
index d05fccf98a..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesData.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{ "serviceResources" : {
- "modelInfo" : {
- "modelName" : "MSO Test Network",
- "modelUuid" : "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e",
- "modelInvariantUuid" : "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f",
- "modelVersion" : null
- },
- "serviceVnfs": [
- { "modelInfo" : {
- "modelName" : "vHNF for DHV Test",
- "modelUuid" : "7097d8bb-f6ad-4cf7-866e-6a04c8f1b332",
- "modelInvariantUuid" : "6ea0b528-e303-4686-aa77-aa2fcbdccb96",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "da86dd87-43c5-458c-b226-5315b7be9ad5",
- "modelInstanceName" : "vHNF for DHV Test 17"
- },
- "toscaNodeType" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : null,
- "nfNamingCode" : null,
- "multiStageDesign" : null,
- "vfModules": [
- {
- "modelInfo" : {
- "modelName" : "VhnfForDhvTest..base_TEST..module-0",
- "modelUuid" : "ebc3d18c-3e62-4c24-bcd6-961e98701a0a",
- "modelInvariantUuid" : "f5696ec0-ec71-4916-bf3b-93a654efcba4",
- "modelVersion" : "1",
- "modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a787"
- }, "isBase" : true,
- "vfModuleLabel" : "base_TEST",
- "initialCount" : 1,
- "hasVolumeGroup" : true
- }
- ]
- }
- ],
- "serviceNetworks": [
- {
- "modelInfo" : {
- "modelName" : "CONTRAIL_BASIC",
- "modelUuid" : "fe5be3a6-dbe0-46d6-bcac-44dc841a7edc",
- "modelInvariantUuid" : "ab07fbd8-185a-45ac-be45-db3eb02e98d5",
- "modelVersion" : null,
- "modelCustomizationUuid" : "0cb9b26a-9820-48a7-86e5-16c510e993d9",
- "modelInstanceName" : "CONTRAIL_BASIC 5"
- },
- "toscaNodeType" : null,
- "networkType" : null,
- "networkTechnology" : null,
- "networkRole" : null,
- "networkScope" : null
- }
- ],
- "serviceAllottedResources": [
- {
- "modelInfo" : {
- "modelName" : "IP_MUX_Demux",
- "modelUuid" : "64a1a718-556b-48ce-b3b7-ed3237ccc94f",
- "modelInvariantUuid" : "f110ef53-a0a6-4d72-ab91-fd88a835e8c4",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "4bab0880-2f06-4aeb-87cb-3734c8e8bf93",
- "modelInstanceName" : "Pri_IP_MUX_Demux 1"
- },
- "toscaNodeType" : null,
- "allottedResourceType" : "ContrailRoute",
- "allottedResourceRole" : null,
- "providingServiceModelInvariantUuid" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : null,
- "nfNamingCode" : null
- },
- {
- "modelInfo" : {
- "modelName" : "Service_Admin",
- "modelUuid" : "73501e03-ee76-4509-a8ce-96d2a9f33ee9",
- "modelInvariantUuid" : "462edf71-1a3c-487b-bf55-497460ab7de3",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "a896ffad-c8f9-404e-a527-7a8d0cc99ce6",
- "modelInstanceName" : "Pri_Service_Admin 5"
- },
- "toscaNodeType" : null,
- "allottedResourceType" : "SecurityZone",
- "allottedResourceRole" : null,
- "providingServiceModelInvariantUuid" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : null,
- "nfNamingCode" : null
- }
- ]
- }} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesDataForReplaceVnfInfra.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesDataForReplaceVnfInfra.json
deleted file mode 100644
index b6e8a94888..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesDataForReplaceVnfInfra.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{ "serviceResources" : {
- "serviceType" : "PortMirroring",
- "serviceRole" : "InfraRole",
- "environmentContext" : "Luna",
- "workloadContext" : "Oxygen",
- "modelInfo" : {
- "modelName" : "MSO Test Network",
- "modelUuid" : "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e",
- "modelInvariantUuid" : "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f",
- "modelVersion" : null
- },
- "serviceVnfs": [
- { "modelInfo" : {
- "modelName" : "vHNF for DHV Test",
- "modelUuid" : "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelInvariantUuid" : "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersion" : "1.0",
- "modelCustomizationUuid" : "MODEL-ID-1234",
- "modelInstanceName" : "vHNF for DHV Test 17"
- },
- "toscaNodeType" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : "vSCP",
- "nfNamingCode" : null,
- "multiStageDesign" : null,
- "vfModules": [
- {
- "modelInfo" : {
- "modelName" : "VhnfForDhvTest..base_TEST..module-0",
- "modelUuid" : "ebc3d18c-3e62-4c24-bcd6-961e98701a0a",
- "modelInvariantUuid" : "introvert",
- "modelVersion" : "1",
- "modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a787"
- }, "isBase" : true,
- "vfModuleLabel" : "base_TEST",
- "initialCount" : 1,
- "hasVolumeGroup" : true
- }
- ]
- }
- ],
- "serviceNetworks": [
- {
- "modelInfo" : {
- "modelName" : "CONTRAIL_BASIC",
- "modelUuid" : "fe5be3a6-dbe0-46d6-bcac-44dc841a7edc",
- "modelInvariantUuid" : "ab07fbd8-185a-45ac-be45-db3eb02e98d5",
- "modelVersion" : null,
- "modelCustomizationUuid" : "0cb9b26a-9820-48a7-86e5-16c510e993d9",
- "modelInstanceName" : "CONTRAIL_BASIC 5"
- },
- "toscaNodeType" : null,
- "networkType" : null,
- "networkTechnology" : null,
- "networkRole" : null,
- "networkScope" : null
- }
- ],
- "serviceAllottedResources": [
- {
- "modelInfo" : {
- "modelName" : "IP_MUX_Demux",
- "modelUuid" : "64a1a718-556b-48ce-b3b7-ed3237ccc94f",
- "modelInvariantUuid" : "f110ef53-a0a6-4d72-ab91-fd88a835e8c4",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "4bab0880-2f06-4aeb-87cb-3734c8e8bf93",
- "modelInstanceName" : "Pri_IP_MUX_Demux 1"
- },
- "toscaNodeType" : null,
- "allottedResourceType" : "ContrailRoute",
- "allottedResourceRole" : null,
- "providingServiceModelInvariantUuid" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : null,
- "nfNamingCode" : null
- },
- {
- "modelInfo" : {
- "modelName" : "Service_Admin",
- "modelUuid" : "73501e03-ee76-4509-a8ce-96d2a9f33ee9",
- "modelInvariantUuid" : "462edf71-1a3c-487b-bf55-497460ab7de3",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "a896ffad-c8f9-404e-a527-7a8d0cc99ce6",
- "modelInstanceName" : "Pri_Service_Admin 5"
- },
- "toscaNodeType" : null,
- "allottedResourceType" : "SecurityZone",
- "allottedResourceRole" : null,
- "providingServiceModelInvariantUuid" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : null,
- "nfNamingCode" : null
- }
- ]
- }} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesDataForUpdateVnfInfra.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesDataForUpdateVnfInfra.json
deleted file mode 100644
index 5597abbc78..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesDataForUpdateVnfInfra.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{ "serviceResources" : {
- "serviceType" : "PortMirroring",
- "serviceRole" : "InfraRole",
- "environmentContext" : "Luna",
- "workloadContext" : "Oxygen",
- "modelInfo" : {
- "modelName" : "MSO Test Network",
- "modelUuid" : "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e",
- "modelInvariantUuid" : "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f",
- "modelVersion" : null
- },
- "serviceVnfs": [
- { "modelInfo" : {
- "modelName" : "vHNF for DHV Test",
- "modelUuid" : "7097d8bb-f6ad-4cf7-866e-6a04c8f1b332",
- "modelInvariantUuid" : "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "da86dd87-43c5-458c-b226-5315b7be9ad5",
- "modelInstanceName" : "vHNF for DHV Test 17"
- },
- "toscaNodeType" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : "vSCP",
- "nfNamingCode" : null,
- "multiStageDesign" : null,
- "vfModules": [
- {
- "modelInfo" : {
- "modelName" : "VhnfForDhvTest..base_TEST..module-0",
- "modelUuid" : "ebc3d18c-3e62-4c24-bcd6-961e98701a0a",
- "modelInvariantUuid" : "introvert",
- "modelVersion" : "1",
- "modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a787"
- }, "isBase" : true,
- "vfModuleLabel" : "base_TEST",
- "initialCount" : 1,
- "hasVolumeGroup" : true
- },
- {
- "modelInfo" : {
- "modelName" : "VhnfForDhvTest..base_TEST..module-1",
- "modelUuid" : "ebc3d18c-3e62-4c24-bcd6-961e98701a0b",
- "modelInvariantUuid" : "extrovert",
- "modelVersion" : "1",
- "modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a788"
- }, "isBase" : false,
- "vfModuleLabel" : "addon_TEST",
- "initialCount" : 1,
- "hasVolumeGroup" : true
- }
- ]
- }
- ],
- "serviceNetworks": [
- {
- "modelInfo" : {
- "modelName" : "CONTRAIL_BASIC",
- "modelUuid" : "fe5be3a6-dbe0-46d6-bcac-44dc841a7edc",
- "modelInvariantUuid" : "ab07fbd8-185a-45ac-be45-db3eb02e98d5",
- "modelVersion" : null,
- "modelCustomizationUuid" : "0cb9b26a-9820-48a7-86e5-16c510e993d9",
- "modelInstanceName" : "CONTRAIL_BASIC 5"
- },
- "toscaNodeType" : null,
- "networkType" : null,
- "networkTechnology" : null,
- "networkRole" : null,
- "networkScope" : null
- }
- ],
- "serviceAllottedResources": [
- {
- "modelInfo" : {
- "modelName" : "IP_MUX_Demux",
- "modelUuid" : "64a1a718-556b-48ce-b3b7-ed3237ccc94f",
- "modelInvariantUuid" : "f110ef53-a0a6-4d72-ab91-fd88a835e8c4",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "4bab0880-2f06-4aeb-87cb-3734c8e8bf93",
- "modelInstanceName" : "Pri_IP_MUX_Demux 1"
- },
- "toscaNodeType" : null,
- "allottedResourceType" : "ContrailRoute",
- "allottedResourceRole" : null,
- "providingServiceModelInvariantUuid" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : null,
- "nfNamingCode" : null
- },
- {
- "modelInfo" : {
- "modelName" : "Service_Admin",
- "modelUuid" : "73501e03-ee76-4509-a8ce-96d2a9f33ee9",
- "modelInvariantUuid" : "462edf71-1a3c-487b-bf55-497460ab7de3",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "a896ffad-c8f9-404e-a527-7a8d0cc99ce6",
- "modelInstanceName" : "Pri_Service_Admin 5"
- },
- "toscaNodeType" : null,
- "allottedResourceType" : "SecurityZone",
- "allottedResourceRole" : null,
- "providingServiceModelInvariantUuid" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : null,
- "nfNamingCode" : null
- }
- ]
- }} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogVnfData.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogVnfData.json
deleted file mode 100644
index c7938d1af6..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogVnfData.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{"serviceVnfs": [
- { "modelInfo" : {
- "modelName" : "vHNF for DHV Test",
- "modelUuid" : "7097d8bb-f6ad-4cf7-866e-6a04c8f1b332",
- "modelInvariantUuid" : "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "da86dd87-43c5-458c-b226-5315b7be9ad5",
- "modelInstanceName" : "vHNF for DHV Test 17"
- },
- "toscaNodeType" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : "vSCP",
- "nfNamingCode" : null,
- "multiStageDesign" : null,
- "vfModules": [
- {
- "modelInfo" : {
- "modelName" : "VhnfForDhvTest..base_TEST..module-0",
- "modelUuid" : "ebc3d18c-3e62-4c24-bcd6-961e98701a0a",
- "modelInvariantUuid" : "introvert",
- "modelVersion" : "1",
- "modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a787"
- }, "isBase" : true,
- "vfModuleLabel" : "base_TEST",
- "initialCount" : 1,
- "hasVolumeGroup" : true
- },
- {
- "modelInfo" : {
- "modelName" : "VhnfForDhvTest..base_TEST..module-1",
- "modelUuid" : "ebc3d18c-3e62-4c24-bcd6-961e98701a0b",
- "modelInvariantUuid" : "extrovert",
- "modelVersion" : "1",
- "modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a788"
- }, "isBase" : false,
- "vfModuleLabel" : "addon_TEST",
- "initialCount" : 1,
- "hasVolumeGroup" : true
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogVnfNoTwoPhasedForVfModule.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogVnfNoTwoPhasedForVfModule.json
deleted file mode 100644
index 3067d124c3..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogVnfNoTwoPhasedForVfModule.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{"serviceVnfs": [
- { "modelInfo" : {
- "modelName" : "vSAMP12",
- "modelUuid" : "7097d8bb-f6ad-4cf7-866e-6a04c8f1b332",
- "modelInvariantUuid" : "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "MODEL-123",
- "modelInstanceName" : "VNF for VF Module Create Test Two Phased"
- },
- "toscaNodeType" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : "vSCP",
- "nfNamingCode" : null,
- "multiStageDesign" : null,
- "vfModules": [
- {
- "modelInfo" : {
- "modelName" : "STMTN5MMSC21-MMSC::model-1-0",
- "modelUuid" : "ebc3d18c-3e62-4c24-bcd6-961e98701a0a",
- "modelInvariantUuid" : "introvert",
- "modelVersion" : "1",
- "modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a787"
- }, "isBase" : true,
- "vfModuleLabel" : "base_TEST",
- "initialCount" : 1,
- "hasVolumeGroup" : true
- },
- {
- "modelInfo" : {
- "modelName" : "VhnfForDhvTest..base_TEST..module-1",
- "modelUuid" : "ebc3d18c-3e62-4c24-bcd6-961e98701a0b",
- "modelInvariantUuid" : "extrovert",
- "modelVersion" : "1",
- "modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a788"
- }, "isBase" : false,
- "vfModuleLabel" : "addon_TEST",
- "initialCount" : 1,
- "hasVolumeGroup" : true
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogVnfYesTwoPhasedForVfModule.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogVnfYesTwoPhasedForVfModule.json
deleted file mode 100644
index a9b3226483..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogVnfYesTwoPhasedForVfModule.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{"serviceVnfs": [
- { "modelInfo" : {
- "modelName" : "vSAMP12",
- "modelUuid" : "7097d8bb-f6ad-4cf7-866e-6a04c8f1b332",
- "modelInvariantUuid" : "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersion" : "2.0",
- "modelCustomizationUuid" : "MODEL-123",
- "modelInstanceName" : "VNF for VF Module Create Test Two Phased"
- },
- "toscaNodeType" : null,
- "nfFunction" : null,
- "nfType" : null,
- "nfRole" : "vSCP",
- "nfNamingCode" : null,
- "multiStageDesign" : "true",
- "vfModules": [
- {
- "modelInfo" : {
- "modelName" : "STMTN5MMSC21-MMSC::model-1-0",
- "modelUuid" : "ebc3d18c-3e62-4c24-bcd6-961e98701a0a",
- "modelInvariantUuid" : "introvert",
- "modelVersion" : "1",
- "modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a787"
- }, "isBase" : true,
- "vfModuleLabel" : "base_TEST",
- "initialCount" : 1,
- "hasVolumeGroup" : true
- },
- {
- "modelInfo" : {
- "modelName" : "VhnfForDhvTest..base_TEST..module-1",
- "modelUuid" : "ebc3d18c-3e62-4c24-bcd6-961e98701a0b",
- "modelInvariantUuid" : "extrovert",
- "modelVersion" : "1",
- "modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a788"
- }, "isBase" : false,
- "vfModuleLabel" : "addon_TEST",
- "initialCount" : 1,
- "hasVolumeGroup" : true
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/serviceDecompositionATMFW.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/serviceDecompositionATMFW.json
deleted file mode 100644
index 94c1152204..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/serviceDecompositionATMFW.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-"serviceResources" : {
- "modelInfo" : {
- "modelName" : "CMW_Service",
- "modelUuid" : "",
- "modelInvariantId" : "cmw-123-456-789",
- "modelVersion" : "",
- "modelCustomizationUuid" : "",
- "modelInstanceName" : "",
- "modelCustomizationName" : "",
- "modelVersionId" : "Cmw_123",
- "modelType" : ""
- },
- "serviceInstanceData" : {
- "instanceId" : "ff5256d2-5a33-55df-13ab-12abad84e7ff"
- },
- "serviceNetworks" : [ {
- "modelInfo" : {
- "modelName" : "CONTRAIL30_BASIC",
- "modelUuid" : "",
- "modelInvariantId" : "not yet implemented",
- "modelVersion" : "1.0",
- "modelCustomizationUuid" : "z_network_123",
- "modelInstanceName" : "",
- "modelCustomizationName" : "",
- "modelVersionId" : "mod-inst-uuid-123",
- "modelType" : "network"
- },
- "instanceData" : { },
- "networkType" : "CONTRAIL30_BASIC"
- } ],
- "serviceVnfs" : [ {
- "modelInfo" : {
- "modelName" : "vSAMP12",
- "modelUuid" : "",
- "modelInvariantId" : "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersion" : "1.0",
- "modelCustomizationUuid" : "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelInstanceName" : "",
- "modelCustomizationName" : "",
- "modelVersionId" : "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelType" : "vnf"
- },
- "instanceData" : { },
- "vfModules" : [ {
- "modelInfo" : {
- "modelName" : "vSAMP12::base::module-0",
- "modelUuid" : "",
- "modelInvariantId" : "miu-1001",
- "modelVersion" : "1",
- "modelCustomizationUuid" : "1001",
- "modelInstanceName" : "",
- "modelCustomizationName" : "",
- "modelVersionId" : "",
- "modelType" : "vfModule"
- },
- "instanceData" : { },
- "hasVolumeGroup" : false,
- "isBase" : true,
- "initialCount" : 1
- }, {
- "modelInfo" : {
- "modelName" : "base::module-0",
- "modelUuid" : "",
- "modelInvariantId" : "miu-1002",
- "modelVersion" : "1",
- "modelCustomizationUuid" : "1002",
- "modelInstanceName" : "",
- "modelCustomizationName" : "",
- "modelVersionId" : "",
- "modelType" : "vfModule"
- },
- "instanceData" : { },
- "hasVolumeGroup" : false,
- "isBase" : true,
- "initialCount" : 1
- }, {
- "modelInfo" : {
- "modelName" : "vSAMP12DEV::base::module-0",
- "modelUuid" : "",
- "modelInvariantId" : "miu-1003",
- "modelVersion" : "1",
- "modelCustomizationUuid" : "f86e8800-7629-427f-b284-3dbfd04db01f",
- "modelInstanceName" : "",
- "modelCustomizationName" : "",
- "modelVersionId" : "",
- "modelType" : "vfModule"
- },
- "instanceData" : { },
- "hasVolumeGroup" : false,
- "isBase" : true,
- "initialCount" : 0
- } ]
- } ],
- "serviceAllottedResources" : [ {
- "modelInfo" : {
- "modelName" : "Bruce Wayne",
- "modelUuid" : "",
- "modelInvariantId" : "not yet implemented",
- "modelVersion" : "1.0",
- "modelCustomizationUuid" : "ar-mod-custid-456-456",
- "modelInstanceName" : "Clark Kent",
- "modelCustomizationName" : "",
- "modelVersionId" : "123-123",
- "modelType" : "allottedResource"
- },
- "instanceData" : { }
- } ]
- }
-} \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/AddNetworkPolicy_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/AddNetworkPolicy_AAIResponse_Success.xml
deleted file mode 100644
index 0ec1e30022..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/AddNetworkPolicy_AAIResponse_Success.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <network-policy xmlns="http://org.openecomp.aai.inventory/v8">
- <network-policy-id>9a7b327d9-287aa00-82c4b0-105757</network-policy-id>
- <network-policy-fqdn>fqdn123</network-policy-fqdn>
- <heat-stack-id>slowburn</heat-stack-id>
- <resource-version>145878989</resource-version>
- </network-policy>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/DBUpdateResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/DBUpdateResponse.xml
deleted file mode 100644
index 7c30f75497..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/DBUpdateResponse.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-<ns2:updateRequestResponse xmlns:ns2="http://org.openecomp.mso/requestsdb"
- xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"/> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/DoUpdateVfModuleRequest.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/DoUpdateVfModuleRequest.xml
deleted file mode 100644
index d041565ac7..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/DoUpdateVfModuleRequest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<vnf-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
- <request-info>
- <request-id>DEV-VF-0011</request-id>
- <action>UPDATE_VF_MODULE</action>
- <source>PORTAL</source>
- </request-info>
- <vnf-inputs>
- <vnf-id>skask</vnf-id> <!-- Required -->
- <vf-module-id>supercool</vf-module-id> <!-- Required -->
- <vnf-type>pcrf-capacity</vnf-type> <!-- Optional -->
- <vf-module-model-name>PCRF::module-0</vf-module-model-name> <!-- Required -->
- <asdc-service-model-version></asdc-service-model-version> <!-- Optional -->
- <service-id>serviceIdUUID</service-id> <!-- Required -->
- <aic-cloud-region>MDTWNJ21</aic-cloud-region> <!-- Required -->
- <tenant-id>fba1bd1e195a404cacb9ce17a9b2b421</tenant-id> <!-- Required -->
- <volume-group-id>78987</volume-group-id> <!-- Optional -->
- <persona-model-id>introvert</persona-model-id> <!-- Optional -->
- <persona-model-version>3.14</persona-model-version> <!-- Optional -->
- <contrail-service-instance-fqdn>myhost.appl.edu</contrail-service-instance-fqdn> <!-- Optional -->
- <vnf-persona-model-id>introvert</vnf-persona-model-id> <!-- Optional -->
- <vnf-persona-model-version>3.14</vnf-persona-model-version> <!-- Optional -->
- </vnf-inputs>
- <vnf-params>
- <param name="oam_network_name">VLAN-OAM-1323</param>
- <param name="vm_name">slcp34246vbc246ceb</param>
- <param name="ipag_network">970cd2b9-7f09-4a12-af47-182ea38ba1f0</param>
- <param name="vpe_network">545cc2c3-1930-4100-b534-5d82d0e12bb6</param>
- </vnf-params>
-</vnf-request>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenerateVfModuleName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenerateVfModuleName_AAIResponse_Success.xml
deleted file mode 100644
index fe874717a8..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenerateVfModuleName_AAIResponse_Success.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<generic-vnf xmlns="http://org.openecomp.aai.inventory/v7">
- <vnf-id>12345678-f41f-4822-9323-b75962763d74</vnf-id>
- <vnf-name>STMTN5MMSC20</vnf-name>
- <vnf-type>pcrf-capacity</vnf-type>
- <service-id>SDN-MOBILITY</service-id>
- <equipment-role>vPCRF</equipment-role>
- <orchestration-status>pending-create</orchestration-status>
- <in-maint>false</in-maint>
- <is-closed-loop-disabled>false</is-closed-loop-disabled>
- <model-invariant-id>introvert</model-invariant-id>
- <model-version-id>2.0</model-version-id>
- <resource-version>0000020</resource-version>
- <vf-modules>
- <vf-module>
- <vf-module-id>lukewarm</vf-module-id>
- <vf-module-name>PCRF::module-0-0</vf-module-name>
- <model-invariant-id>extrovert</model-invariant-id>
- <model-version-id>2.0</model-version-id>
- <is-base-vf-module>true</is-base-vf-module>
- <heat-stack-id>fastburn</heat-stack-id>
- <module-index>2</module-index>
- <orchestration-status>pending-create</orchestration-status>
- <resource-version>0000074</resource-version>
- </vf-module>
- <vf-module>
- <vf-module-id>supercool</vf-module-id>
- <vf-module-name>PCRF::module-1-0</vf-module-name>
- <model-invariant-id>extrovert</model-invariant-id>
- <model-version-id>2.0</model-version-id>
- <is-base-vf-module>false</is-base-vf-module>
- <heat-stack-id>slowburn</heat-stack-id>
- <module-index>0</module-index>
- <orchestration-status>pending-create</orchestration-status>
- <resource-version>0000075</resource-version>
- </vf-module>
- <vf-module>
- <vf-module-id>supercool</vf-module-id>
- <vf-module-name>PCRF::module-1-0</vf-module-name>
- <model-invariant-id>introvert</model-invariant-id>
- <model-version-id>2.0</model-version-id>
- <is-base-vf-module>false</is-base-vf-module>
- <heat-stack-id>slowburn</heat-stack-id>
- <module-index>1</module-index>
- <orchestration-status>pending-create</orchestration-status>
- <resource-version>0000075</resource-version>
- </vf-module>
- </vf-modules>
- <relationship-list/>
- <l-interfaces/>
- <lag-interfaces/>
-</generic-vnf>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml
deleted file mode 100644
index 4712a5a464..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<generic-vnf xmlns="http://org.openecomp.aai.inventory/v7">
- <vnf-id>skask</vnf-id>
- <vnf-name>STMTN5MMSC20</vnf-name>
- <vnf-type>pcrf-capacity</vnf-type>
- <service-id>SDN-MOBILITY</service-id>
- <equipment-role>vPCRF</equipment-role>
- <orchestration-status>pending-create</orchestration-status>
- <in-maint>false</in-maint>
- <is-closed-loop-disabled>false</is-closed-loop-disabled>
- <model-invariant-id>introvert</model-invariant-id>
- <model-version-id>2.0</model-version-id>
- <resource-version>0000020</resource-version>
- <vf-modules>
- <vf-module>
- <vf-module-id>lukewarm</vf-module-id>
- <vf-module-name>PCRF::module-0-0</vf-module-name>
- <model-invariant-id>introvert</model-invariant-id>
- <model-version-id>2.0</model-version-id>
- <is-base-vf-module>true</is-base-vf-module>
- <heat-stack-id>fastburn</heat-stack-id>
- <orchestration-status>pending-create</orchestration-status>
- <resource-version>0000074</resource-version>
- </vf-module>
- <vf-module>
- <vf-module-id>supercool</vf-module-id>
- <vf-module-name>PCRF::module-1-0</vf-module-name>
- <model-invariant-id>extrovert</model-invariant-id>
- <model-version-id>2.0</model-version-id>
- <is-base-vf-module>false</is-base-vf-module>
- <heat-stack-id>slowburn</heat-stack-id>
- <orchestration-status>pending-create</orchestration-status>
- <resource-version>0000075</resource-version>
- </vf-module>
- </vf-modules>
- <relationship-list/>
- <l-interfaces/>
- <lag-interfaces/>
-</generic-vnf>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml
deleted file mode 100644
index d7bbb15b8c..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
- statusCode="200">
- <rest:headers>
- <rest:header name="Transfer-Encoding" value="chunked"/>
- <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
- <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
- <rest:header name="X-AAI-TXID"
- value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>
- <rest:header name="Content-Type" value="application/xml"/>
- <rest:header name="Server" value="Apache-Coyote/1.1"/>
- <rest:header name="Cache-Control" value="private"/>
- </rest:headers>
- <rest:payload contentType="text/xml">
- <network-policy xmlns="http://org.openecomp.aai.inventory/v8">
- <network-policy-id>9a7b327d9-287aa00-82c4b0-105757</network-policy-id>
- <network-policy-fqdn>GN_EVPN_Test</network-policy-fqdn>
- <heat-stack-id>195159195</heat-stack-id>
- <resource-version>14567890</resource-version>
- </network-policy>
- </rest:payload>
-</rest:RESTResponse> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCSITopologyAssignCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCSITopologyAssignCallback.xml
deleted file mode 100644
index f6314e55b3..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCSITopologyAssignCallback.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<output
- xmlns="com:att:sdnctl:generic-resource">
- <svc-request-id>094d311c-40bc-4ff1-9617-37c4226efcc3</svc-request-id>
- <response-code>200</response-code>
- <response-message></response-message>
- <ack-final-indicator>Y</ack-final-indicator>
- <service-response-information>
- <instance-id>8462db9b-3e91-4e90-a2c8-6471313f87bf</instance-id>
- <object-path>restconf/config/GENERIC-RESOURCE-API:services/service/8462db9b-3e91-4e90-a2c8-6471313f87bf/service-data/service-topology/</object-path>
- </service-response-information>
-</output> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyActivateCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyActivateCallback.xml
deleted file mode 100644
index 5fa58e9c03..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyActivateCallback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<output xmlns="com:att:sdnctl:vnf">
- <vnf-information>
- <vnf-id>skask</vnf-id>
- </vnf-information>
- <response-code>200</response-code>
- <svc-request-id>{{REQUEST-ID}}</svc-request-id>
- <ack-final-indicator>Y</ack-final-indicator>
- <service-information>
- <subscriber-name>dontcare</subscriber-name>
- <service-instance-id>0</service-instance-id>
- <service-type>SDN-MOBILITY</service-type>
- </service-information>
-</output> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyAssignCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyAssignCallback.xml
deleted file mode 100644
index 2b732f952d..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyAssignCallback.xml
+++ /dev/null
@@ -1,16 +0,0 @@
- <output xmlns="com:att:sdnctl:vnf">
- <vnf-information>
- <vnf-id>skask</vnf-id>
- </vnf-information>
- <response-code>200</response-code>
- <svc-request-id>{{REQUEST-ID}}</svc-request-id>
- <ack-final-indicator>Y</ack-final-indicator>
- <service-information>
- <subscriber-name>dontcare</subscriber-name>
- <service-instance-id>0</service-instance-id>
- <service-type>SDN-MOBILITY</service-type>
- </service-information>
- <instance-reference>
- <object-path>restconf/SDNCObjectPath</object-path>
- </instance-reference>
- </output> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyChangeAssignCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyChangeAssignCallback.xml
deleted file mode 100644
index 3e138775d4..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyChangeAssignCallback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
- <output xmlns="com:att:sdnctl:vnf">
- <vnf-information>
- <vnf-id>skask</vnf-id>
- </vnf-information>
- <response-code>200</response-code>
- <svc-request-id>{{REQUEST-ID}}</svc-request-id>
- <ack-final-indicator>Y</ack-final-indicator>
- <service-information>
- <subscriber-name>dontcare</subscriber-name>
- <service-instance-id>0</service-instance-id>
- <service-type>SDN-MOBILITY</service-type>
- </service-information>
- </output> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyCreateCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyCreateCallback.xml
deleted file mode 100644
index b579f232b1..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyCreateCallback.xml
+++ /dev/null
@@ -1,16 +0,0 @@
- <output xmlns="org:onap:sdnctl:vnf">
- <vnf-information>
- <vnf-id>skask</vnf-id>
- </vnf-information>
- <response-code>200</response-code>
- <svc-request-id>{{REQUEST-ID}}</svc-request-id>
- <ack-final-indicator>Y</ack-final-indicator>
- <service-information>
- <subscriber-name>dontcare</subscriber-name>
- <service-instance-id>0</service-instance-id>
- <service-type>SDN-MOBILITY</service-type>
- </service-information>
- <instance-reference>
- <object-path>restconf/SDNCObjectPath</object-path>
- </instance-reference>
- </output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallback.xml
deleted file mode 100644
index 3cf0c81c72..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<output xmlns="org:onap:sdnctl:vnf">
- <vnf-information>
- <vnf-id>skask</vnf-id>
- </vnf-information>
- <response-code>200</response-code>
- <svc-request-id>{{REQUEST-ID}}</svc-request-id>
- <ack-final-indicator>Y</ack-final-indicator>
- <service-information>
- <subscriber-name>dontcare</subscriber-name>
- <service-instance-id>0</service-instance-id>
- <service-type>SDN-MOBILITY</service-type>
- </service-information>
-</output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallbackNotFound.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallbackNotFound.xml
deleted file mode 100644
index df5004edf5..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallbackNotFound.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<output xmlns="org:onap:sdnctl:vnf">
- <vnf-information>
- <vnf-id>skask</vnf-id>
- </vnf-information>
- <response-code>404</response-code>
- <svc-request-id>{{REQUEST-ID}}</svc-request-id>
- <ack-final-indicator>Y</ack-final-indicator>
-</output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeleteCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeleteCallback.xml
deleted file mode 100644
index b579f232b1..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeleteCallback.xml
+++ /dev/null
@@ -1,16 +0,0 @@
- <output xmlns="org:onap:sdnctl:vnf">
- <vnf-information>
- <vnf-id>skask</vnf-id>
- </vnf-information>
- <response-code>200</response-code>
- <svc-request-id>{{REQUEST-ID}}</svc-request-id>
- <ack-final-indicator>Y</ack-final-indicator>
- <service-information>
- <subscriber-name>dontcare</subscriber-name>
- <service-instance-id>0</service-instance-id>
- <service-type>SDN-MOBILITY</service-type>
- </service-information>
- <instance-reference>
- <object-path>restconf/SDNCObjectPath</object-path>
- </instance-reference>
- </output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml
deleted file mode 100644
index 10af29a210..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml
+++ /dev/null
@@ -1,315 +0,0 @@
-<output xmlns="com:att:sdnctl:vnf">
-<vnf-list xmlns="com:att:sdnctl:vnf">
- <vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>
- <service-data>
- <vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>
- <sdnc-request-header>
- <svc-request-id>9ddf628a-9eca-430e-8974-22d520a31be1</svc-request-id>
- <svc-action>assign</svc-action>
- <svc-notification-url>https://msojra.infra.aic.net:8443/adapters/rest/SDNCNotify</svc-notification-url>
- </sdnc-request-header>
- <service-information>
- <subscriber-name>notsurewecare</subscriber-name>
- <service-instance-id>bd1b3789-6474-4935-94b2-90b656e035d0</service-instance-id>
- <service-type>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-type>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- </service-information>
- <oper-status>
- <order-status>PendingCreate</order-status>
- </oper-status>
- <vnf-request-information>
- <aic-cloud-region>VNN1CA52LCP</aic-cloud-region>
- <vnf-name>skask</vnf-name>
- <generic-vnf-id>afd0f02a-1ddb-43bb-aded-5113e46e82ae</generic-vnf-id>
- <generic-vnf-type>ZVNN1MOGX01-SVC/ZVNN1MOGX01 - VF AUG 1 1</generic-vnf-type>
- <generic-vnf-name>ZVNN1MOGX01</generic-vnf-name>
- <tenant>33d209df14ac4c08ad60747185d2f3e0</tenant>
- <vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>
- <vnf-type>ZVNN1MOGX01 - VF AUG 1::module-0</vnf-type>
- </vnf-request-information>
- <vnf-topology-information>
- <vnf-assignments>
- <vnf-networks>
- <network-role>mog_exn</network-role>
- <network-id>03dbd833-785c-40c0-bf32-37594b5334bc</network-id>
- <network-name>MNS-25180-P-VNNYCA01_exn_protected_net_1</network-name>
- <contrail-network-fqdn/>
- <subnet-id/>
- <neutron-id>6f82d234-41a4-48e9-a9e8-415667a72929</neutron-id>
- <sriov-vlan-filter-list>
- <sriov-vlan-filter>filter1</sriov-vlan-filter>
- </sriov-vlan-filter-list>
- <sriov-vlan-filter-list>
- <sriov-vlan-filter>filter2</sriov-vlan-filter>
- </sriov-vlan-filter-list>
- </vnf-networks>
- <vnf-networks>
- <network-role>mog_oam</network-role>
- <network-id>3f181cde-9380-4c20-9d3a-e1a4ee74f994</network-id>
- <network-name>MNS-25180-P-VNNYCA01_oam_protected_net_1</network-name>
- <contrail-network-fqdn/>
- <subnet-id/>
- <neutron-id>713b6770-13fa-4949-8dbb-a1288c5e5932</neutron-id>
- </vnf-networks>
- <vnf-networks>
- <network-role>mog_cor_B</network-role>
- <network-id>821a550a-3f50-4725-995b-f212d5caec7c</network-id>
- <network-name>MNS-25180-P-VNNYCA01_cor_direct_net_1</network-name>
- <contrail-network-fqdn/>
- <subnet-id/>
- <neutron-id>18926e56-12b6-4a4d-98b6-37e0c05626ee</neutron-id>
- </vnf-networks>
- <vnf-networks>
- <network-role>mog_cor_A</network-role>
- <network-id>3dabf5c0-cffb-420c-8960-8499c74eb25f</network-id>
- <network-name>MNS-25180-P-VNNYCA01_cor_direct_net_2</network-name>
- <contrail-network-fqdn/>
- <subnet-id/>
- <neutron-id>35530b29-a4de-48ff-a014-111110ccc652</neutron-id>
- </vnf-networks>
- <vnf-networks>
- <network-role>mog_gn</network-role>
- <network-id>3ce97321-6e7f-49af-bd12-f833e377c310</network-id>
- <network-name>MNS-25180-P-VNNYCA01_gn_direct_net_1</network-name>
- <contrail-network-fqdn/>
- <subnet-id/>
- <neutron-id>32bfdd2c-28e1-4895-87a6-373bf12c3129</neutron-id>
- </vnf-networks>
- <vnf-networks>
- <network-role>mog_dmz</network-role>
- <network-id>d43ca910-02a5-47dc-8510-100a68a3c9e0</network-id>
- <network-name>MNS-25180-P-VNNYCA01_dmz_protected_net_1</network-name>
- <contrail-network-fqdn/>
- <subnet-id/>
- <neutron-id>cb9500fb-943f-412e-aea6-458711564a75</neutron-id>
- </vnf-networks>
- <availability-zones>
- <availability-zone>nova</availability-zone>
- </availability-zones>
- <vnf-vms>
- <vm-type>ps</vm-type>
- <vm-names>
- <vm-name>ZVNN1MOGX01MPS001</vm-name>
- </vm-names>
- <vm-names>
- <vm-name>ZVNN1MOGX01MPS002</vm-name>
- </vm-names>
- <vm-names>
- <vm-name>ZVNN1MOGX01MPS003</vm-name>
- </vm-names>
- <vm-names>
- <vm-name>ZVNN1MOGX01MPS004</vm-name>
- </vm-names>
- <vm-count>4</vm-count>
- <vm-networks>
- <network-role>mog_cor_B</network-role>
- <network-ips>
- <ip-address>107.224.36.251</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.224.36.252</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.224.36.253</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.224.36.254</ip-address>
- </network-ips>
- <use-dhcp>N</use-dhcp>
- </vm-networks>
- </vnf-vms>
- <vnf-vms>
- <vm-type>cm</vm-type>
- <vm-names>
- <vm-name>ZVNN1MOGX01MCM001</vm-name>
- </vm-names>
- <vm-names>
- <vm-name>ZVNN1MOGX01OAM002</vm-name>
- </vm-names>
- <vm-count>1</vm-count>
- <vm-networks>
- <network-role>mog_cor_B</network-role>
- <network-ips>
- <ip-address>107.224.36.249</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.224.36.250</ip-address>
- </network-ips>
- <use-dhcp>N</use-dhcp>
- </vm-networks>
- <vm-networks>
- <network-role>mog_oam</network-role>
- <network-ips>
- <ip-address>107.239.167.250</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.239.167.251</ip-address>
- </network-ips>
- <use-dhcp>N</use-dhcp>
- </vm-networks>
- </vnf-vms>
- <vnf-vms>
- <vm-type>oam</vm-type>
- <vm-names>
- <vm-name>ZVNN1MOGX01OAM001</vm-name>
- </vm-names>
- <vm-names>
- <vm-name>ZVNN1MOGX01OAM002</vm-name>
- </vm-names>
- <vm-count>2</vm-count>
- <vm-networks>
- <network-role>mog_oam</network-role>
- <network-ips>
- <ip-address>107.239.167.252</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.239.167.251</ip-address>
- </network-ips>
- <use-dhcp>N</use-dhcp>
- </vm-networks>
- <vm-networks>
- <network-role>mog_cor_B</network-role>
- <network-ips>
- <ip-address>107.224.36.249</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.224.36.250</ip-address>
- </network-ips>
- <use-dhcp>N</use-dhcp>
- </vm-networks>
- </vnf-vms>
- <vnf-vms>
- <vm-type>pd</vm-type>
- <vm-names>
- <vm-name>ZVNN1MOGX01MPD001</vm-name>
- </vm-names>
- <vm-names>
- <vm-name>ZVNN1MOGX01MPD002</vm-name>
- </vm-names>
- <vm-count>2</vm-count>
- <vm-networks>
- <network-role>mog_dmz</network-role>
- <network-ips>
- <ip-address>107.225.25.253</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.225.25.254</ip-address>
- </network-ips>
- <use-dhcp>N</use-dhcp>
- <floating-ip>107.225.254.253</floating-ip>
- </vm-networks>
- <vm-networks>
- <network-role>mog_oam</network-role>
- <network-ips>
- <ip-address>107.239.167.254</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.239.167.253</ip-address>
- </network-ips>
- <use-dhcp>N</use-dhcp>
- <floating-ip>107.239.167.249</floating-ip>
- </vm-networks>
- <vm-networks>
- <network-role>mog_exn</network-role>
- <network-ips>
- <ip-address>107.224.46.253</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.224.46.254</ip-address>
- </network-ips>
- <use-dhcp>N</use-dhcp>
- <floating-ip>107.224.46.252</floating-ip>
- </vm-networks>
- <vm-networks>
- <network-role>mog_cor_B</network-role>
- <network-ips>
- <ip-address>107.224.36.247</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.224.36.248</ip-address>
- </network-ips>
- <use-dhcp>N</use-dhcp>
- <floating-ip>107.224.41.252</floating-ip>
- </vm-networks>
- <vm-networks>
- <network-role>mog_gn</network-role>
- <network-ips>
- <ip-address>107.224.41.253</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.224.41.254</ip-address>
- </network-ips>
- <use-dhcp>N</use-dhcp>
- <floating-ip>107.224.41.252</floating-ip>
- </vm-networks>
- <vm-networks>
- <network-role>mog_cor_A</network-role>
- <network-ips>
- <ip-address>107.224.38.253</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.224.38.254</ip-address>
- </network-ips>
- <use-dhcp>N</use-dhcp>
- </vm-networks>
- </vnf-vms>
- <vnf-vms>
- <vm-type>sm</vm-type>
- <vm-names>
- <vm-name>ZVNN1MOGX01MSM001</vm-name>
- </vm-names>
- <vm-names>
- <vm-name>ZVNN1MOGX01MSM002</vm-name>
- </vm-names>
- <vm-names>
- <vm-name>ZVNN1MOGX01MSM003</vm-name>
- </vm-names>
- <vm-names>
- <vm-name>ZVNN1MOGX01MSM004</vm-name>
- </vm-names>
- <vm-count>4</vm-count>
- <vm-networks>
- <network-role>mog_cor_B</network-role>
- <network-ips>
- <ip-address>107.224.36.243</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.224.36.244</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.224.36.245</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.224.36.246</ip-address>
- </network-ips>
- <use-dhcp>N</use-dhcp>
- </vm-networks>
- </vnf-vms>
- </vnf-assignments>
- <vnf-topology-identifier>
- <vnf-name>ZVNNMOGX01_base</vnf-name>
- <service-type>SDN-MOBILITY</service-type>
- <vnf-type>ZVNN1MOGX01 - VF AUG 1::module-0</vnf-type>
- <generic-vnf-type>ZVNN1MOGX01-SVC/ZVNN1MOGX01 - VF AUG 1 1</generic-vnf-type>
- <generic-vnf-name>ZVNN1MOGX01</generic-vnf-name>
- </vnf-topology-identifier>
- </vnf-topology-information>
- <request-information>
- <request-id>9ddf628a-9eca-430e-8974-22d520a31be1</request-id>
- <notification-url/>
- <source>PORTAL</source>
- <request-action>VNFActivateRequest</request-action>
- </request-information>
- </service-data>
- <service-status>
- <response-code>200</response-code>
- <final-indicator>Y</final-indicator>
- <request-status>synccomplete</request-status>
- <response-timestamp>2016-08-05T16:15:19.398Z</response-timestamp>
- <rpc-name>vnf-topology-operation</rpc-name>
- <vnfsdn-action>VNFActivateRequest</vnfsdn-action>
- <rpc-action>assign</rpc-action>
- </service-status>
-</vnf-list>
-
-</output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml
deleted file mode 100644
index f96a073ef6..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<output xmlns="com:att:sdnctl:vnf">
- <vnf-list xmlns="com:att:sdnctl:vnf">
- <vnf-id>28455973-1ee5-4ad1-8d35-c4732679743a</vnf-id>
- <service-status>
- <response-code>200</response-code>
- <final-indicator>Y</final-indicator>
- <request-status>synccomplete</request-status>
- <response-timestamp>2016-06-08T19:44:59.138Z</response-timestamp>
- <rpc-name>vnf-topology-operation</rpc-name>
- <vnfsdn-action>VNFActivateRequest</vnfsdn-action>
- <rpc-action>assign</rpc-action>
- </service-status>
- <service-data>
- <vnf-id>28455973-1ee5-4ad1-8d35-c4732679743</vnf-id>
- <service-information>
- <subscriber-name>notsurewecare</subscriber-name>
- <service-instance-id>28455973-1ee5-4ad1-8d35-c4732679743a</service-instance-id>
- <service-type>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-type>
- <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
- </service-information>
- <sdnc-request-header>
- <svc-request-id>5e168556-a5c6-4813-bff3-cc03007afbbc</svc-request-id>
- <svc-notification-url>http://mtanjv9moja01-eth1-0.aic.cip.com:8080/adapters/rest/SDNCNotify</svc-notification-url>
- <svc-action>assign</svc-action>
- </sdnc-request-header>
- <vnf-request-information>
- <aic-cloud-region>AAIAIC25</aic-cloud-region>
- <vnf-name>MSOTEST06-vSAMP3::base::module-0</vnf-name>
- <generic-vnf-id>91ad7ab0-9ffd-471d-971c-3eb913a2cc75</generic-vnf-id>
- <generic-vnf-type>Test/vSAMP3 1</generic-vnf-type>
- <generic-vnf-name>MSOTEST06</generic-vnf-name>
- <tenant>4ae1d3446a4c48b2bec44b6cfba06d68</tenant>
- <vnf-id>28455973-1ee5-4ad1-8d35-c4732679743a</vnf-id>
- <vnf-type>vSAMP3::base::module-0</vnf-type>
- </vnf-request-information>
- <oper-status>
- <order-status>PendingCreate</order-status>
- </oper-status>
- <vnf-topology-information>
- <vnf-parameters>
- <vnf-parameter-name>image</vnf-parameter-name>
- <vnf-parameter-value>Ubuntu_Perf</vnf-parameter-value>
- </vnf-parameters>
- <vnf-parameters>
- <vnf-parameter-name>flavor</vnf-parameter-name>
- <vnf-parameter-value>m1.small</vnf-parameter-value>
- </vnf-parameters>
- <vnf-assignments>
- <vnf-networks>
- <network-role>int_imbl</network-role>
- <network-id>680b7453-0ec4-4d96-b355-280d981d418f</network-id>
- <network-name>Nimbus-25193-T-Willows2_int_imbl_net_1</network-name>
- <contrail-network-fqdn>default-domain:Nimbus-25193-T-Willows2:Nimbus-25193-T-Willows2_int_imbl_net_1</contrail-network-fqdn>
- <subnet-id></subnet-id>
- <ipv6-subnet-id>775607fb-e16a-45ef-94a7-82fba0d16eec</ipv6-subnet-id>
- <neutron-id>640d07fb-e16a-45ef-94a7-82fba0d169bf</neutron-id>
- <sriov-vlan-filter-list>
- <sriov-vlan-filter>filter1</sriov-vlan-filter>
- </sriov-vlan-filter-list>
- <sriov-vlan-filter-list>
- <sriov-vlan-filter>filter2</sriov-vlan-filter>
- </sriov-vlan-filter-list>
- </vnf-networks>
- <vnf-networks>
- <network-role>sgi_protected</network-role>
- <network-id>f9039ce9-e3cf-4716-b2d1-ec7912178ea4</network-id>
- <network-name>Nimbus-25193-T-Willows2_sgi_protected_net_1</network-name>
- <contrail-network-fqdn>default-domain:Nimbus-25193-T-Willows2:Nimbus-25193-T-Willows2_sgi_protected_net_1</contrail-network-fqdn>
- <subnet-id>b9999ce9-e3cf-4716-b2d1-ec791217678c</subnet-id>
- <ipv6-subnet-id></ipv6-subnet-id>
- <neutron-id>bf11bba8-b971-4ab5-8281-215b3fedcd3c</neutron-id>
- </vnf-networks>
- <vnf-vms>
- <vm-type>cm</vm-type>
- <vm-names>
- <vm-name>ZVNN1MOGX01MCM001</vm-name>
- </vm-names>
- <vm-names>
- <vm-name>ZVNN1MOGX01OAM002</vm-name>
- </vm-names>
- <vm-count>1</vm-count>
- <vm-networks>
- <network-role>mog_cor_B</network-role>
- <network-ips>
- <ip-address>107.224.36.249</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.224.36.250</ip-address>
- </network-ips>
- <network-ips-v6>
- <ip-address-ipv6>2606:ae00:2e01:800::67</ip-address-ipv6>
- </network-ips-v6>
- <use-dhcp>N</use-dhcp>
- <floating-ip>107.224.41.252</floating-ip>
- <floating-ip-v6>2001:1890:1001:2B32::29:C</floating-ip-v6>
- </vm-networks>
- <vm-networks>
- <network-role>mog_oam</network-role>
- <network-ips>
- <ip-address>107.239.167.250</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.239.167.251</ip-address>
- </network-ips>
- <network-ips-v6>
- <ip-address-ipv6>aa::aa::aa::aa::aa::aa</ip-address-ipv6>
- </network-ips-v6>
- <network-ips-v6>
- <ip-address-ipv6>bb::bb::bb::bb::bb::bb</ip-address-ipv6>
- </network-ips-v6>
- <interface-route-prefixes>
- <interface-route-prefix-cidr>1.2.3.4/26</interface-route-prefix-cidr>
- </interface-route-prefixes>
- <interface-route-prefixes>
- <interface-route-prefix-cidr>2002::/64</interface-route-prefix-cidr>
- </interface-route-prefixes>
- <use-dhcp>N</use-dhcp>
- <floating-ip-v6>1111:1890:1001:2B32::29:D</floating-ip-v6>
- </vm-networks>
- </vnf-vms>
- <availability-zones>
- <availability-zone>nova</availability-zone>
- </availability-zones>
- </vnf-assignments>
- <vnf-topology-identifier>
- <vnf-name>MSOTEST06-vSAMP3::base::module-0</vnf-name>
- <service-type>SDN-MOBILITY</service-type>
- <vnf-type>vSAMP3::base::module-0</vnf-type>
- <generic-vnf-type>Test/vSAMP3 1</generic-vnf-type>
- <generic-vnf-name>MSOTEST06</generic-vnf-name>
- </vnf-topology-identifier>
- </vnf-topology-information>
- <request-information>
- <request-id>5e168556-a5c6-4813-bff3-cc03007afbbc</request-id>
- <notification-url></notification-url>
- <source>SoapUI-bns-vf-base-vSAMP3-9001</source>
- <request-action>VNFActivateRequest</request-action>
- </request-information>
- </service-data>
-</vnf-list>
-</output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml
deleted file mode 100644
index 689c214cba..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<output xmlns="com:att:sdnctl:vnf">
-<vf-module-topology xmlns="com:att:sdnctl:generic-resource">
- <vf-module-topology-identifier>
- <vf-module-id>0725b072-b854-4705-bf8e-c1a1eb08651e</vf-module-id>
- <vf-module-type>vSAMP10aDEV::base::module-0</vf-module-type>
- <vf-module-name>zmtn6nf-code-111_base_0</vf-module-name>
- </vf-module-topology-identifier>
- <ecomp-model-information>
- <model-name>vSAMP10aDEV::base::module-0</model-name>
- <model-customization-uuid>819ef122-ca19-4141-a61e-62922f8fc279</model-customization-uuid>
- <model-version>ff2ae348-214a-11e7-93ae-92361f002673</model-version>
- <model-invariant-uuid>3a97db99-c4bb-498a-a13a-38f65f1ced3d</model-invariant-uuid>
- <model-uuid>ff2ae348-214a-11e7-93ae-92361f002673</model-uuid>
- </ecomp-model-information>
- <tenant>19123c2924c648eb8e42a3c1f14b7682</tenant>
- <aic-cloud-region>mtn6</aic-cloud-region>
- <aic-clli>AUSTTXGR</aic-clli>
- <vf-module-parameters>
- <param>
- <name>image</name>
- <value>Ubuntu_Perf</value>
- </param>
- <param>
- <name>flavor</name>
- <value>m1.small</value>
- </param>
- </vf-module-parameters>
- <vf-module-assignments>
- <vms>
- <vm>
- <vm-type>cm</vm-type>
- <vm-names>
- <vm-name>ZVNN1MOGX01MCM001</vm-name>
- </vm-names>
- <vm-names>
- <vm-name>ZVNN1MOGX01OAM002</vm-name>
- </vm-names>
- <vm-count>1</vm-count>
- <vm-networks>
- <network-role-tag>mog_cor_B</network-role-tag>
- <network-role>hhh</network-role>
- <network-ips>
- <ip-address>107.224.36.249</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.224.36.250</ip-address>
- </network-ips>
- <network-ips-v6>
- <ip-address-ipv6>2606:ae00:2e01:800::67</ip-address-ipv6>
- </network-ips-v6>
- <use-dhcp>N</use-dhcp>
- <floating-ip>107.224.41.252</floating-ip>
- <floating-ip-v6>2001:1890:1001:2B32::29:C</floating-ip-v6>
- </vm-networks>
- <vm-networks>
- <network-role>mog_oam</network-role>
- <network-ips>
- <ip-address>107.239.167.250</ip-address>
- </network-ips>
- <network-ips>
- <ip-address>107.239.167.251</ip-address>
- </network-ips>
- <network-ips-v6>
- <ip-address-ipv6>aa::aa::aa::aa::aa::aa</ip-address-ipv6>
- </network-ips-v6>
- <network-ips-v6>
- <ip-address-ipv6>bb::bb::bb::bb::bb::bb</ip-address-ipv6>
- </network-ips-v6>
- <interface-route-prefixes>
- <interface-route-prefix-cidr>1.2.3.4/26</interface-route-prefix-cidr>
- </interface-route-prefixes>
- <interface-route-prefixes>
- <interface-route-prefix-cidr>2002::/64</interface-route-prefix-cidr>
- </interface-route-prefixes>
- <use-dhcp>N</use-dhcp>
- <floating-ip-v6>1111:1890:1001:2B32::29:D</floating-ip-v6>
- </vm-networks>
- </vm>
- </vms>
- </vf-module-assignments>
-</vf-module-topology>
-</output> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml
deleted file mode 100644
index bc2c7b9e63..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<output xmlns="com:att:sdnctl:vnf">
-<vnf-topology xmlns="com:att:sdnctl:generic-resource">
- <vnf-topology-identifier-structure>
- <nf-type>nf-type-1</nf-type>
- <vnf-name>zmtn6nf-code-111</vnf-name>
- <nf-role>nf-role-1</nf-role>
- <nf-function>nf-function-1</nf-function>
- <nf-code>nf-code-1</nf-code>
- <vnf-id>eac30f85-f61f-4c5f-862e-2c62f9e135de</vnf-id>
- <vnf-type>null</vnf-type>
- </vnf-topology-identifier-structure>
- <ecomp-model-information>
- <model-name>vSAMP10a_macro</model-name>
- <model-customization-uuid>819ef122-ca19-4141-a61e-62922f8fc279</model-customization-uuid>
- <model-version>1.0</model-version>
- <model-invariant-uuid>ef176121-f02c-4dd3-927c-22131d48446b</model-invariant-uuid>
- <model-uuid>ff2ae348-214a-11e7-93ae-92361f002672</model-uuid>
- </ecomp-model-information>
- <vnf-resource-assignments>
- <vnf-networks>
- <network-role>mog_exn</network-role>
- <network-id>03dbd833-785c-40c0-bf32-37594b5334bc</network-id>
- <network-name>MNS-25180-P-VNNYCA01_exn_protected_net_1</network-name>
- <contrail-network-fqdn/>
- <subnet-id/>
- <neutron-id>6f82d234-41a4-48e9-a9e8-415667a72929</neutron-id>
- <sriov-vlan-filter-list>
- <sriov-vlan-filter>filter1</sriov-vlan-filter>
- </sriov-vlan-filter-list>
- <sriov-vlan-filter-list>
- <sriov-vlan-filter>filter2</sriov-vlan-filter>
- </sriov-vlan-filter-list>
- </vnf-networks>
- <vnf-networks>
- <network-role>mog_oam</network-role>
- <network-id>3f181cde-9380-4c20-9d3a-e1a4ee74f994</network-id>
- <network-name>MNS-25180-P-VNNYCA01_oam_protected_net_1</network-name>
- <contrail-network-fqdn/>
- <subnet-id/>
- <neutron-id>713b6770-13fa-4949-8dbb-a1288c5e5932</neutron-id>
- </vnf-networks>
- <vnf-networks>
- <network-role>mog_cor_B</network-role>
- <network-id>821a550a-3f50-4725-995b-f212d5caec7c</network-id>
- <network-name>MNS-25180-P-VNNYCA01_cor_direct_net_1</network-name>
- <contrail-network-fqdn/>
- <subnet-id/>
- <neutron-id>18926e56-12b6-4a4d-98b6-37e0c05626ee</neutron-id>
- </vnf-networks>
- <vnf-networks>
- <network-role>mog_cor_A</network-role>
- <network-id>3dabf5c0-cffb-420c-8960-8499c74eb25f</network-id>
- <network-name>MNS-25180-P-VNNYCA01_cor_direct_net_2</network-name>
- <contrail-network-fqdn/>
- <subnet-id/>
- <neutron-id>35530b29-a4de-48ff-a014-111110ccc652</neutron-id>
- </vnf-networks>
- <vnf-networks>
- <network-role>mog_gn</network-role>
- <network-id>3ce97321-6e7f-49af-bd12-f833e377c310</network-id>
- <network-name>MNS-25180-P-VNNYCA01_gn_direct_net_1</network-name>
- <contrail-network-fqdn/>
- <subnet-id/>
- <neutron-id>32bfdd2c-28e1-4895-87a6-373bf12c3129</neutron-id>
- </vnf-networks>
- <vnf-networks>
- <network-role>mog_dmz</network-role>
- <network-id>d43ca910-02a5-47dc-8510-100a68a3c9e0</network-id>
- <network-name>MNS-25180-P-VNNYCA01_dmz_protected_net_1</network-name>
- <contrail-network-fqdn/>
- <subnet-id/>
- <neutron-id>cb9500fb-943f-412e-aea6-458711564a75</neutron-id>
- </vnf-networks>
- <availability-zones>
- <availability-zone>nova</availability-zone>
- </availability-zones>
- </vnf-resource-assignments>
- <tenant>19123c2924c648eb8e42a3c1f14b7682</tenant>
- <aic-cloud-region>mtn6</aic-cloud-region>
- <aic-clli>AUSTTXGR</aic-clli>
-</vnf-topology>
-</output> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyUnassignCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyUnassignCallback.xml
deleted file mode 100644
index b579f232b1..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyUnassignCallback.xml
+++ /dev/null
@@ -1,16 +0,0 @@
- <output xmlns="org:onap:sdnctl:vnf">
- <vnf-information>
- <vnf-id>skask</vnf-id>
- </vnf-information>
- <response-code>200</response-code>
- <svc-request-id>{{REQUEST-ID}}</svc-request-id>
- <ack-final-indicator>Y</ack-final-indicator>
- <service-information>
- <subscriber-name>dontcare</subscriber-name>
- <service-instance-id>0</service-instance-id>
- <service-type>SDN-MOBILITY</service-type>
- </service-information>
- <instance-reference>
- <object-path>restconf/SDNCObjectPath</object-path>
- </instance-reference>
- </output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/StandardSDNCSynchResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/StandardSDNCSynchResponse.xml
deleted file mode 100644
index 919ff2c36b..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/StandardSDNCSynchResponse.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <SDNCAdapterResponse xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1"/>
- </soap:Body>
-</soap:Envelope> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestCreateCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestCreateCallback.xml
deleted file mode 100644
index 3afcb3f21c..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestCreateCallback.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<createVfModuleResponse>
- <vnfId>skask</vnfId>
- <vfModuleId>supercool</vfModuleId>
- <vfModuleStackId>slowburn</vfModuleStackId>
- <vfModuleCreated>true</vfModuleCreated>
- <vfModuleOutputs>
- <entry>
- <key>key1</key>
- <value>value1</value>
- </entry>
- <entry>
- <key>key2</key>
- <value>value2</value>
- </entry>
- <entry>
-<key>server1_private_ip</key>
-<value>192.168.28.3</value>
-</entry>
-<entry>
-<key>contrail-service-instance-fqdn</key>
-<value>default-domain:MSOTest:MsoNW-RA</value>
-</entry>
-<entry>
-<key>policyKey1_contrail_network_policy_fqdn</key>
-<value>MSOTest:DefaultPolicyFQDN1</value>
-</entry>
-<entry>
-<key>policyKey2_contrail_network_policy_fqdn</key>
-<value>MSOTest:DefaultPolicyFQDN2</value>
-</entry>
-<entry>
-<key>oam_management_v6_address</key>
-<value>2000:abc:bce:1111</value>
-</entry>
-<entry>
-<key>oam_management_v4_address</key>
-<value>127.0.0.1</value>
-</entry>
- </vfModuleOutputs>
- <rollback> <!-- JC's doc has "vfModuleRollback" -->
- <vnfId>skask</vnfId>
- <vfModuleId>supercool</vfModuleId>
- <vfModuleStackId>slowburn</vfModuleStackId>
- <vfModuleCreated>true</vfModuleCreated>
- <tenantId>tenantId</tenantId>
- <cloudSiteId>cloudSiteId</cloudSiteId>
- <msoRequest>
- <requestId>requestId</requestId>
- <serviceInstanceId>serviceInstanceId</serviceInstanceId>
- </msoRequest>
- <messageId>{{MESSAGE-ID}}</messageId> <!-- JC's doc does not have this -->
- </rollback>
- <messageId>{{MESSAGE-ID}}</messageId>
-</createVfModuleResponse>
-
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestUpdateCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestUpdateCallback.xml
deleted file mode 100644
index 2d3ebebccd..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestUpdateCallback.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<updateVfModuleResponse>
- <vnfId>skask</vnfId>
- <vfModuleId>supercool</vfModuleId>
- <vfModuleStackId>slowburn</vfModuleStackId>
- <vfModuleOutputs>
- <entry>
- <key>key1</key>
- <value>value1</value>
- </entry>
- <entry>
- <key>key2</key>
- <value>value2</value>
- </entry>
- </vfModuleOutputs>
- <messageId>{{MESSAGE-ID}}</messageId>
-</updateVfModuleResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestVolumeGroupCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestVolumeGroupCallback.xml
deleted file mode 100644
index af2bd7abfd..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestVolumeGroupCallback.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<updateVolumeGroupResponse>
- <volumeGroupId>78987</volumeGroupId>
- <volumeGroupStackId>slowburn</volumeGroupStackId>
- <vfModuleOutputs>
- <entry>
- <key>key1</key>
- <value>value1</value>
- </entry>
- <entry>
- <key>key2</key>
- <value>value2</value>
- </entry>
- </vfModuleOutputs>
- <messageId>{{MESSAGE-ID}}</messageId>
-</updateVolumeGroupResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml
deleted file mode 100644
index 8db8610501..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vf-module xmlns="http://org.openecomp.aai.inventory/v7">
- <vf-module-id>lukewarm</vf-module-id>
- <vf-module-name>PCRF::module-1</vf-module-name>
- <heat-stack-id>slowburn</heat-stack-id>
- <orchestration-status>pending-create</orchestration-status>
- <is-base-vf-module>true</is-base-vf-module>
- <resource-version>330-90</resource-version>
- <model-invariant-id>introvert</model-invariant-id>
- <model-version-id>2.0</model-version-id>
-</vf-module> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-new-PendingActivation.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-new-PendingActivation.xml
deleted file mode 100644
index 2ccba7d056..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-new-PendingActivation.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vf-module xmlns="http://org.openecomp.aai.inventory/v7">
- <vf-module-id>b37d96db-7d2c-47ce-bf61-a6c7b82fe161</vf-module-id>
- <vf-module-name>PCRF::module-0-2</vf-module-name>
- <model-invariant-id>00000000-0000-0000-0000-000000000000</model-invariant-id>
- <model-version-id>1.0</model-version-id>
- <is-base-vf-module>false</is-base-vf-module>
- <orchestration-status>PendingActivation</orchestration-status>
- <resource-version>330-90</resource-version>
-</vf-module> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml
deleted file mode 100644
index 10e85c0568..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vf-module xmlns="http://org.openecomp.aai.inventory/v7">
- <vf-module-id>b37d96db-7d2c-47ce-bf61-a6c7b82fe161</vf-module-id>
- <vf-module-name>PCRF::module-0-2</vf-module-name>
- <model-invariant-id>00000000-0000-0000-0000-000000000000</model-invariant-id>
- <model-version-id>1.0</model-version-id>
- <is-base-vf-module>false</is-base-vf-module>
- <orchestration-status>pending-create</orchestration-status>
- <resource-version>330-90</resource-version>
-</vf-module> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
deleted file mode 100644
index 4e7d567564..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<vf-module xmlns="http://org.openecomp.aai.inventory/v7">
- <vf-module-id>supercool</vf-module-id>
- <vf-module-name>PCRF::module-2</vf-module-name>
- <heat-stack-id>fastburn</heat-stack-id>
- <orchestration-status>pending-create</orchestration-status>
- <is-base-vf-module>false</is-base-vf-module>
- <resource-version>330-89</resource-version>
- <model-invariant-id>introvert</model-invariant-id>
- <model-version-id>2.0</model-version-id>
- <relationship-list>
- <relationship>
- <related-to>volume-group</related-to>
- <relationship-data>
- <relationship-key>cloud-region.cloud-owner</relationship-key>
- <relationship-value>att-aic</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-region-id</relationship-key>
- <relationship-value>pdk1</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>volume-group.volume-group-id</relationship-key>
- <relationship-value>78987</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
-</vf-module> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VolumeGroup.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VolumeGroup.xml
deleted file mode 100644
index 354ebb7160..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VolumeGroup.xml
+++ /dev/null
@@ -1,25 +0,0 @@
- <volume-group xmlns="http://org.openecomp.aai.inventory/v7">
- <volume-group-id>78987</volume-group-id>
- <volume-group-name>Volume_2</volume-group-name>
- <heat-stack-id>slowburn</heat-stack-id>
- <vnf-type>pcrf-capacity</vnf-type>
- <orchestration-status>Active</orchestration-status>
- <resource-version>0000020</resource-version>
- <relationship-list>
- <relationship>
- <related-to>tenant</related-to>
- <relationship-data>
- <relationship-key>cloud-region.cloud-owner</relationship-key>
- <relationship-value>att-aic</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>cloud-region.cloud-region-id</relationship-key>
- <relationship-value>MDTWNJ21</relationship-value>
- </relationship-data>
- <relationship-data>
- <relationship-key>tenant.tenant-id</relationship-key>
- <relationship-value>fba1bd1e195a404cacb9ce17a9b2b421</relationship-value>
- </relationship-data>
- </relationship>
- </relationship-list>
- </volume-group> \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/deleteNetworkResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/deleteNetworkResponse_Success.xml
deleted file mode 100644
index 902c0837d9..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/deleteNetworkResponse_Success.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ns2:deleteNetworkResponse xmlns:ns2="http://org.openecomp.mso/network">
- <networkDeleted>true</networkDeleted>
-</ns2:deleteNetworkResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/applicationContext_forPnfTesting.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/applicationContext_forPnfTesting.xml
deleted file mode 100644
index 980a0b1186..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/applicationContext_forPnfTesting.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-2.5.xsd" >
-
- <bean id="dataSource" class="org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy">
- <property name="targetDataSource">
- <bean class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
- <property name="driverClass" value="org.h2.Driver" />
- <property name="url"
- value="jdbc:h2:mem:process-engine;DB_CLOSE_DELAY=1000" />
- <property name="username" value="sa" />
- <property name="password" value="" />
- </bean>
- </property>
- </bean>
-
- <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
- <property name="dataSource" ref="dataSource" />
- </bean>
-
- <bean id="processEngineConfiguration" class="org.camunda.bpm.engine.spring.SpringProcessEngineConfiguration">
- <property name="processEngineName" value="engine" />
- <property name="dataSource" ref="dataSource" />
- <property name="transactionManager" ref="transactionManager" />
- <property name="databaseSchemaUpdate" value="true" />
- <property name="jobExecutorActivate" value="false" />
- <!--<property name="deploymentResources" value="classpath*:*.bpmn" />-->
- </bean>
-
- <bean id="processEngine" class="org.camunda.bpm.engine.spring.ProcessEngineFactoryBean">
- <property name="processEngineConfiguration" ref="processEngineConfiguration" />
- </bean>
-
- <bean id="repositoryService" factory-bean="processEngine" factory-method="getRepositoryService" />
- <bean id="runtimeService" factory-bean="processEngine" factory-method="getRuntimeService" />
- <bean id="taskService" factory-bean="processEngine" factory-method="getTaskService" />
- <bean id="historyService" factory-bean="processEngine" factory-method="getHistoryService" />
- <bean id="managementService" factory-bean="processEngine" factory-method="getManagementService" />
-
- <context:annotation-config />
-
- <bean id="processEngineRule" class="org.camunda.bpm.engine.test.ProcessEngineRule">
- <property name="processEngine" ref="processEngine" />
- </bean>
-
- <bean id="aaiConnection" class="org.openecomp.mso.bpmn.infrastructure.pnf.delegate.AaiConnectionTestImpl"/>
-
- <bean id="checkAaiForCorrelationIdDelegate" class="org.openecomp.mso.bpmn.infrastructure.pnf.delegate.CheckAaiForCorrelationIdDelegate">
- <property name="aaiConnection" ref="aaiConnection"/>
- </bean>
-
- <bean id="createAaiEntryWithPnfIdDelegate" class="org.openecomp.mso.bpmn.infrastructure.pnf.delegate.CreateAaiEntryWithPnfIdDelegate">
- <property name="aaiConnection" ref="aaiConnection"/>
- </bean>
-
- <bean id="informDmaapClient" class="org.openecomp.mso.bpmn.infrastructure.pnf.delegate.InformDmaapClient">
- <property name="dmaapClient" ref="dmaapClient"/>
- </bean>
-
- <bean id="dmaapClient" class="org.openecomp.mso.bpmn.infrastructure.pnf.delegate.DmaapClientTestImpl"/>
-
-
- <bean id="pnfCheckInputs" class="org.openecomp.mso.bpmn.infrastructure.pnf.delegate.PnfCheckInputs">
- <property name="defaultTimeout" value="PT1S"/>
- </bean>
-</beans>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/camunda.cfg.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/camunda.cfg.xml
deleted file mode 100644
index e4e8ae5176..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/camunda.cfg.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="processEngineConfiguration" class="org.camunda.bpm.engine.impl.cfg.StandaloneInMemProcessEngineConfiguration">
-
- <property name="jdbcUrl" value="jdbc:h2:mem:camunda;DB_CLOSE_DELAY=1000" />
- <property name="jdbcDriver" value="org.h2.Driver" />
- <property name="jdbcUsername" value="sa" />
- <property name="jdbcPassword" value="" />
-
- <!-- Database configurations -->
- <property name="databaseSchemaUpdate" value="true" />
-
- <!-- job executor configurations -->
- <property name="jobExecutorActivate" value="true" />
-
- <property name="history" value="full" />
-
- <!--<property name="idGenerator" ref="uuidGenerator" />-->
-
- <!-- engine plugins -->
- <property name="processEnginePlugins">
- <list>
- <ref bean="connectProcessEnginePlugin" />
- <ref bean="spinProcessEnginePlugin" />
- <ref bean="loggingPlugin" />
- <ref bean="workflowExceptionPlugin" />
- </list>
- </property>
- </bean>
-
- <bean id="loggingPlugin" class="org.openecomp.mso.bpmn.core.plugins.LoggingAndURNMappingPlugin" />
-
- <!-- Needed until all subflows generate MSOWorkflowException events -->
- <bean id="workflowExceptionPlugin" class="org.openecomp.mso.bpmn.core.plugins.WorkflowExceptionPlugin" />
-
- <!--<bean id="uuidGenerator" class="org.camunda.bpm.engine.impl.persistence.StrongUuidGenerator" />-->
-
- <!-- engine plugin beans -->
- <bean id="connectProcessEnginePlugin" class="org.camunda.connect.plugin.impl.ConnectProcessEnginePlugin" />
- <bean id="spinProcessEnginePlugin" class="org.camunda.spin.plugin.impl.SpinProcessEnginePlugin" />
-
-</beans>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/log4j.properties b/bpmn/MSOInfrastructureBPMN/src/test/resources/log4j.properties
deleted file mode 100644
index 393e0877ec..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# Root logger option
-log4j.rootLogger=INFO, stdout
-
-# Direct log messages to stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/logging.properties b/bpmn/MSOInfrastructureBPMN/src/test/resources/logging.properties
deleted file mode 100644
index 4941c55971..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/logging.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#register SLF4JBridgeHandler as handler for the j.u.l. root logger
-handlers = org.slf4j.bridge.SLF4JBridgeHandler
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.properties b/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.properties
deleted file mode 100644
index f800d00245..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default BPMN properties for unit tests
-
-URNMapping.FileSystemLoading.Enabled=true \ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
deleted file mode 100644
index 6dac08dc56..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
+++ /dev/null
@@ -1,130 +0,0 @@
-# Default URN Mappings for unit tests
-
-mso.rollback=true
-
-canopi.auth=757A94191D685FD2092AC1490730A4FC
-csi.aots.addincidentmanagement.endpoint=http://localhost:28090/AddIncidentManagementTicketRequest
-csi.networkstatus.endpoint=http://localhost:28090/SendManagedNetworkStatusNotification
-mso.csi.pwd=4EA237303511EFBBC37F17A351562131
-mso.csi.usrname=mso
-mso.msoKey=07a7159d3bf51a0e53be7a8f89699be7
-
-mso.healthcheck.log.debug=false
-
-mso.adapters.completemsoprocess.endpoint=http://localhost:28090/CompleteMsoProcess
-mso.workflow.message.endpoint=http://localhost:8080/mso/WorkflowMessage
-mso.adapters.db.endpoint=http://localhost:28090/dbadapters/MsoRequestsDbAdapter
-mso.openecomp.adapters.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
-mso.adapters.openecomp.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
-mso.adapters.db.auth=757A94191D685FD2092AC1490730A4FC
-
-mso.adapters.network.endpoint=http://localhost:28090/networks/NetworkAdapter
-mso.adapters.network.rest.endpoint=http://localhost:28090/networks/NetworkAdapter
-
-mso.adapters.po.auth=757A94191D685FD2092AC1490730A4FC
-mso.adapters.po.password=3141634BF7E070AA289CF2892C986C0B
-mso.po.timeout=PT60S
-
-aai.auth=757A94191D685FD2092AC1490730A4FC
-
-mso.default.adapter.namespace=http://org.openecomp.mso
-mso.adapters.sdnc.endpoint=http://localhost:28090/SDNCAdapter
-mso.adapters.sdnc.rest.endpoint=http://localhost:28090/SDNCAdapter/v1/sdnc
-mso.adapters.sdnc.timeout=PT60S
-mso.sdnc.firewall.yang.model=http://com/openecomp/svc/mis/firewall-lite-gui
-mso.sdnc.firewall.yang.model.version=2015-05-15
-mso.sdnc.password=3141634BF7E070AA289CF2892C986C0B
-mso.sdnc.timeout.firewall.minutes=20
-mso.callbackRetryAttempts=5
-mso.sdnc.timeout=PT10S
-mso.sdnc.timeout.ucpe.async.hours=120
-mso.sdnc.timeout.ucpe.async.minutes=5
-mso.workflow.message.endpoint=http://localhost:28080/mso/WorkflowMesssage
-mso.workflow.sdncadapter.callback=http://localhost:28080/mso/SDNCAdapterCallbackService
-mso.workflow.sdnc.replication.delay=PT0.01S
-mso.workflow.aai.distribution.delay=PT0.01S
-
-mso.catalog.db.endpoint=http://localhost:28090
-
-mso.adapters.tenant.endpoint=http://localhost:28090/tenantAdapterMock
-mso.adapters.vnf-async.endpoint=http://localhost:28090/vnfs/VnfAdapterAsync
-mso.adapters.vnf.endpoint=http://localhost:28090/vnfs/VnfAdapter
-mso.adapters.vnf.rest.endpoint=http://localhost:28090/vnfs/v1/vnfs
-mso.workflow.vnfadapter.create.callback=http://localhost:28080/mso/vnfAdapterNotify
-mso.workflow.vnfadapter.delete.callback=http://localhost:28080/mso/vnfAdapterNotify
-mso.workflow.vnfadapter.query.callback=http://localhost:28080/mso/services/VNFAdapterQuerCallbackV1
-mso.workflow.vnfadapter.rollback.callback=http://localhost:28080/mso/vnfAdapterNotify
-mso.workflow.createvce.delay.seconds=1
-mso.infra.customer.id=testCustIdInfra
-
-aai.endpoint=http://localhost:28090
-
-# AAI version mappings
-
-# Example to override default version for a resource:
-#mso.workflow.default.aai.vce.version=6
-#mso.workflow.default.aai.v6.vce.uri=/aai/v6/network/vces/vce
-mso.workflow.global.default.aai.namespace=http://org.openecomp.aai.inventory/
-mso.workflow.global.default.aai.version=8
-mso.workflow.default.aai.cloud-region.version=9
-mso.workflow.default.aai.generic-vnf.version=9
-
-mso.workflow.default.aai.v9.cloud-region.uri=/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic
-mso.workflow.default.aai.v8.customer.uri=/aai/v8/business/customers/customer
-mso.workflow.default.aai.v8.generic-query.uri=/aai/v8/search/generic-query
-mso.workflow.default.aai.v9.generic-vnf.uri=/aai/v9/network/generic-vnfs/generic-vnf
-mso.workflow.default.aai.v8.l3-network.uri=/aai/v8/network/l3-networks/l3-network
-mso.workflow.default.aai.v8.network-policy.uri=/aai/v8/network/network-policies/network-policy
-mso.workflow.default.aai.v8.nodes-query.uri=/aai/v8/search/nodes-query
-mso.workflow.default.aai.v8.route-table-reference.uri=/aai/v8/network/route-table-references/route-table-reference
-mso.workflow.default.aai.v8.tenant.uri=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant
-mso.workflow.default.aai.v8.vce.uri=/aai/v8/network/vces/vce
-mso.workflow.default.aai.v8.vpn-binding.uri=/aai/v8/network/vpn-bindings/vpn-binding
-mso.workflow.notification.name=GenericNotificationService
-
-log.debug.CompleteMsoProcess=true
-log.debug.CreateNetworkInstanceInfra=true
-log.debug.CreateServiceInstanceInfra=true
-log.debug.DeleteNetworkInstanceInfra=true
-log.debug.FalloutHandler=true
-log.debug.GenericGetService=true
-log.debug.sdncAdapter=true
-log.debug.UpdateNetworkInstanceInfra=true
-log.debug.VnfAdapterRestV1=true
-log.debug.CreateNetworkInstance=true
-log.debug.DoCreateNetworkInstance=true
-log.debug.DoCreateNetworkInstanceRollback=true
-log.debug.DeleteNetworkInstance=true
-log.debug.DoDeleteNetworkInstance=true
-log.debug.DoDeleteNetworkInstanceRollback=true
-log.debug.UpdateNetworkInstance=true
-log.debug.DoUpdateNetworkInstance=true
-log.debug.DoUpdateNetworkInstanceRollback=true
-log.debug.CreateVnfInfra=true
-log.debug.DoCreateVnf=true
-log.debug.CreateGenericALaCarteServiceInstance=true
-log.debug.DecomposeService=true
-log.debug.DoCreateServiceInstance=true
-log.debug.DoDeleteServiceInstance=true
-log.debug.VnfInPlaceUpdate=true
-
-policy.client.auth=Basic bTAzNzQzOnBvbGljeVIwY2sk
-policy.auth=Basic dGVzdHBkcDphbHBoYTEyMw==
-policy.environment=TEST
-policy.endpoint=http://localhost:28090/pdp/api/
-policy.default.disposition=Skip
-
-appc.client.topic.read=APPC-LCM-WRITE
-appc.client.topic.write=APPC-LCM-READ
-appc.client.topic.sdnc.read=SDNC-LCM-WRITE
-appc.client.topic.sdnc.write=SDNC-LCM-READ
-appc.client.topic.read.timeout=100
-appc.client.response.timeout=300
-appc.client.poolMembers=localhost:28090
-appc.client.key=iaEMAfjsVsZnraBP
-appc.client.secret=wcivUjsjXzmGFBfxMmyJu9dz
-#appc.client.service=ueb
-
-sdnc.si.sv.types=PORT-MIRROR,PPROBES
-mso.bpmn.optimisticlockingexception.retrycount=3
-