diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2019-07-08 18:35:07 +0300 |
|---|---|---|
| committer | Ittay Stern <ittay.stern@att.com> | 2019-07-09 13:05:29 +0300 |
| commit | 97d9f66df456ef4573047a90baa3cc3ee4bfb0b7 (patch) | |
| tree | b20f6304508e469fb5b48a70f17f02e713e66725 /vid-ext-services-simulator/src/main/resources | |
| parent | f4dff328c0386c8901b5841943b11f0c13b3169f (diff) | |
Merge from ecomp 718fd196 - Ext. Services Simulator
Issue-ID: VID-378
Change-Id: Ib4430bf23d109e6fdfe38c55e55b7d3b96fff3af
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-ext-services-simulator/src/main/resources')
64 files changed, 85 insertions, 773 deletions
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/1707vidnf.zip b/vid-ext-services-simulator/src/main/resources/download_files/1707vidnf.zip Binary files differindex 1201f9571..e415d7332 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/1707vidnf.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/1707vidnf.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/2f80c596-instantiationTypeMacro.zip b/vid-ext-services-simulator/src/main/resources/download_files/2f80c596-instantiationTypeMacro.zip Binary files differindex 2080bc27a..68280898d 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/2f80c596-instantiationTypeMacro.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/2f80c596-instantiationTypeMacro.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/2f80c596.zip b/vid-ext-services-simulator/src/main/resources/download_files/2f80c596.zip Binary files differindex 2476da0bc..6d695fbce 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/2f80c596.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/2f80c596.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596-vnfEcompNamingFalse.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596-vnfEcompNamingFalse.zip Binary files differindex bcbe0781c..e4e8d1368 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596-vnfEcompNamingFalse.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596-vnfEcompNamingFalse.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596.zip Binary files differindex 749a4f2ec..f4dfda067 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails.zip Binary files differindex 30ec25a4a..d43b370a4 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingFalse-partialModelDetails-vnfEcompNamingFalse.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingFalse-partialModelDetails-vnfEcompNamingFalse.zip Binary files differindex 157fffa02..8a85d7efc 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingFalse-partialModelDetails-vnfEcompNamingFalse.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingFalse-partialModelDetails-vnfEcompNamingFalse.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingTrue-partialModelDetails.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingTrue-partialModelDetails.zip Binary files differindex 3cdde15ab..73247809d 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingTrue-partialModelDetails.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingTrue-partialModelDetails.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_VnfGrouping.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_VnfGrouping.zip Binary files differindex bf44d05f2..178fc9ef4 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_VnfGrouping.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_VnfGrouping.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_invariantUUIDMacro.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_invariantUUIDMacro.zip Binary files differindex 8da4914e1..f5435b6e5 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_invariantUUIDMacro.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_invariantUUIDMacro.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID.zip Binary files differindex f28cb1fb7..6f045d05d 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeBoth_invariantUUIDAlacarte.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeBoth_invariantUUIDAlacarte.zip Binary files differindex aff42568d..bc06df439 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeBoth_invariantUUIDAlacarte.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeBoth_invariantUUIDAlacarte.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeEmpty_invariantUUIDAlacarte.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeEmpty_invariantUUIDAlacarte.zip Binary files differindex e43b5787f..4a374eca0 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeEmpty_invariantUUIDAlacarte.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeEmpty_invariantUUIDAlacarte.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithNetwork.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithNetwork.zip Binary files differindex 40d1ea5f1..4efed62dd 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithNetwork.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithNetwork.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithPnf.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithPnf.zip Binary files differindex dd681456b..df743dec8 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithPnf.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithPnf.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte.zip Binary files differindex 8d468f357..9fa546aab 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip Binary files differindex bdcce4940..1f073b472 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_invariantUUIDMacro.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_invariantUUIDMacro.zip Binary files differindex 70c5c8b6b..c76b42601 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_invariantUUIDMacro.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_invariantUUIDMacro.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar2f80c596-modified-ecompNaming-false.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar2f80c596-modified-ecompNaming-false.zip Binary files differindex fbe40fa0f..beb299639 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar2f80c596-modified-ecompNaming-false.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar2f80c596-modified-ecompNaming-false.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar317927061915233480.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar317927061915233480.zip Binary files differindex 754b39844..fbc54d295 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/csar317927061915233480.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar317927061915233480.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csarTransportWithPnfs.zip b/vid-ext-services-simulator/src/main/resources/download_files/csarTransportWithPnfs.zip Binary files differnew file mode 100644 index 000000000..33225f9d6 --- /dev/null +++ b/vid-ext-services-simulator/src/main/resources/download_files/csarTransportWithPnfs.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar_collection_resource.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar_collection_resource.zip Binary files differnew file mode 100644 index 000000000..7166eb040 --- /dev/null +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar_collection_resource.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar_collection_resource_for_resume.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar_collection_resource_for_resume.zip Binary files differnew file mode 100644 index 000000000..b1f2fbd99 --- /dev/null +++ b/vid-ext-services-simulator/src/main/resources/download_files/csar_collection_resource_for_resume.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/ggghhh.zip b/vid-ext-services-simulator/src/main/resources/download_files/ggghhh.zip Binary files differindex 6a5dde184..3769f7d52 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/ggghhh.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/ggghhh.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/min_max_initial_vfModule_csar_v4.0.zip b/vid-ext-services-simulator/src/main/resources/download_files/min_max_initial_vfModule_csar_v4.0.zip Binary files differindex 6e686efa8..af2004d43 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/min_max_initial_vfModule_csar_v4.0.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/min_max_initial_vfModule_csar_v4.0.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/pm1111.zip b/vid-ext-services-simulator/src/main/resources/download_files/pm1111.zip Binary files differindex 3192fbf5c..b8c919d34 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/pm1111.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/pm1111.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/pm1111_equip_model_rename.zip b/vid-ext-services-simulator/src/main/resources/download_files/pm1111_equip_model_rename.zip Binary files differindex 898da77f4..60a231fe6 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/pm1111_equip_model_rename.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/pm1111_equip_model_rename.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar-2.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar-2.zip Binary files differindex eb96906ba..730f784f1 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar-2.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar-2.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar.zip Binary files differindex fb664ac1a..5cbbb3bed 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-csar.zip Binary files differindex 7836364c4..83080ee8d 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-csar.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-csar.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-Infravpn-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-Infravpn-csar.zip Binary files differnew file mode 100644 index 000000000..403aacc8f --- /dev/null +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-Infravpn-csar.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-PASQUALEVmxVpeBvService488-csar-annotations.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-PASQUALEVmxVpeBvService488-csar-annotations.zip Binary files differindex d0ffdb225..a1f1f5d83 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/service-PASQUALEVmxVpeBvService488-csar-annotations.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-PASQUALEVmxVpeBvService488-csar-annotations.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip Binary files differindex e265965d8..9853ac801 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-fabric-SriovService-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-fabric-SriovService-csar.zip Binary files differindex 3df7e777c..1908f7ec0 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/service-fabric-SriovService-csar.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-fabric-SriovService-csar.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-fabric-configuration.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-fabric-configuration.zip Binary files differindex bab0603b7..15ed9a71e 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/service-fabric-configuration.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-fabric-configuration.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-network-vl.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-network-vl.zip Binary files differindex 78e46733b..ae268a656 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/service-network-vl.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-network-vl.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-vDOROTHEASrv-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-vDOROTHEASrv-csar.zip Binary files differindex 768d502e8..2967a50ec 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/service-vDOROTHEASrv-csar.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-vDOROTHEASrv-csar.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-vDOROTHEASrv-csar_ecomp_false6.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-vDOROTHEASrv-csar_ecomp_false6.zip Binary files differindex 4b9f54509..dfd929875 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/service-vDOROTHEASrv-csar_ecomp_false6.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-vDOROTHEASrv-csar_ecomp_false6.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-vnf-grouping-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-vnf-grouping-csar.zip Binary files differindex ea178fa9c..8d3d03e3d 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/service-vnf-grouping-csar.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-vnf-grouping-csar.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/serviceCreationTest.zip b/vid-ext-services-simulator/src/main/resources/download_files/serviceCreationTest.zip Binary files differindex 54f7bf589..797f54ad3 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/serviceCreationTest.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/serviceCreationTest.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/vid-test-444-demo-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/vid-test-444-demo-csar.zip Binary files differindex 6cccded1b..03736a4b7 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/vid-test-444-demo-csar.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/vid-test-444-demo-csar.zip diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_filter_service_instance_by_id_test_fabric_conf.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_filter_service_instance_by_id_test_fabric_conf.json index 429a2ad2b..d2dc0f2cf 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_filter_service_instance_by_id_test_fabric_conf.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_filter_service_instance_by_id_test_fabric_conf.json @@ -13,7 +13,7 @@ "result-data": [ { "resource-type": "service-instance", - "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d891234/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/c187e9fe-40c3-4862-b73e-84ff056205f61234" + "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d891234/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/c187e9fe-40c3-4862-b73e-84ff056205f61234" } ] } diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_filter_service_instance_by_name_test_fabric_conf.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_filter_service_instance_by_name_test_fabric_conf.json index 70d8b599d..e3fae782b 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_filter_service_instance_by_name_test_fabric_conf.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_filter_service_instance_by_name_test_fabric_conf.json @@ -13,7 +13,7 @@ "result-data": [ { "resource-type": "service-instance", - "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d891234/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/c187e9fe-40c3-4862-b73e-84ff056205f61234" + "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d891234/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/c187e9fe-40c3-4862-b73e-84ff056205f61234" } ] } diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/aai_filter_service_instance_by_id_test_sssdad.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/aai_filter_service_instance_by_id_test_sssdad.json index e5cabc754..e0fef6c89 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/aai_filter_service_instance_by_id_test_sssdad.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/aai_filter_service_instance_by_id_test_sssdad.json @@ -13,7 +13,7 @@ "result-data": [ { "resource-type": "service-instance", - "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/c187e9fe-40c3-4862-b73e-84ff056205f6" + "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/c187e9fe-40c3-4862-b73e-84ff056205f6" } ] } diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/aai_filter_service_instance_by_name_test_sssdad.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/aai_filter_service_instance_by_name_test_sssdad.json index aff1359d6..f0f995521 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/aai_filter_service_instance_by_name_test_sssdad.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/aai_filter_service_instance_by_name_test_sssdad.json @@ -13,7 +13,7 @@ "result-data": [ { "resource-type": "service-instance", - "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/c187e9fe-40c3-4862-b73e-84ff056205f6" + "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/c187e9fe-40c3-4862-b73e-84ff056205f6" } ] } diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_filter_service_instance_by_id.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_filter_service_instance_by_id.json index 0d15e8ab4..ea84c593e 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_filter_service_instance_by_id.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_filter_service_instance_by_id.json @@ -13,7 +13,7 @@ "result-data": [ { "resource-type": "service-instance", - "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/3f93c7cb-2fd0-4557-9514-e189b7b04f9d" + "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/3f93c7cb-2fd0-4557-9514-e189b7b04f9d" } ] } diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_filter_service_instance_by_name.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_filter_service_instance_by_name.json index 03de297eb..6daec4cf7 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_filter_service_instance_by_name.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_filter_service_instance_by_name.json @@ -13,7 +13,7 @@ "result-data": [ { "resource-type": "service-instance", - "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/3f93c7cb-2fd0-4557-9514-e189b7b04f9d" + "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/3f93c7cb-2fd0-4557-9514-e189b7b04f9d" } ] } diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_named_query_for_view_edit.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_named_query_for_view_edit.json index 2f2479a90..9f12498ad 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_named_query_for_view_edit.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_named_query_for_view_edit.json @@ -97,7 +97,7 @@ } }, { - "model-name":"VidPcrf051517..pcrf_nimbus_pcm..module-4", + "model-name":"VidPcrf051517..pcrf_kennedy_pcm..module-4", "vf-module":{ "vf-module-id":"f91515e5-cf8d-4abf-aacc-5bc5c5a47f09", "vf-module-name":"gg", @@ -114,7 +114,7 @@ } }, { - "model-name":"VidPcrf051517..pcrf_nimbus_pcm..module-4", + "model-name":"VidPcrf051517..pcrf_kennedy_pcm..module-4", "vf-module":{ "vf-module-id":"a231a99c-7e75-4d6d-a0fb-5c7d26f30f77", "vf-module-name":"my_vfModule", @@ -187,7 +187,7 @@ } }, { - "model-name":"VidPcrf051517..pcrf_nimbus_pcm..module-4", + "model-name":"VidPcrf051517..pcrf_kennedy_pcm..module-4", "vf-module":{ "vf-module-id":"a9b70ac0-5917-4203-a308-0e6920e6d09b", "vf-module-name":"vf_module2", diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/aai_get_subscribers.json b/vid-ext-services-simulator/src/main/resources/preset_registration/aai_get_subscribers.json deleted file mode 100644 index 3bf1ded9c..000000000 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/aai_get_subscribers.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/aai/v../business/customers", - "queryParams": { - "subscriber-type": "INFRA", - "depth": 0 - } - } , - "simulatorResponse": { - "responseCode": 200, - "body": { - "customer":[ - { - "global-customer-id":"CAR_2020_ER", - "subscriber-name":"CAR_2020_ER", - "subscriber-type":"INFRA", - "resource-version":"1494001902987" - }, - { - "global-customer-id":"21014aa2-526b-11e6-beb8-9e71128cae77", - "subscriber-name":"JULIO ERICKSON", - "subscriber-type":"INFRA", - "resource-version":"1494001776295" - }, - { - "global-customer-id":"DHV1707-TestSubscriber-2", - "subscriber-name":"DALE BRIDGES", - "subscriber-type":"INFRA", - "resource-version":"1498751754450" - }, - { - "global-customer-id":"DHV1707-TestSubscriber-1", - "subscriber-name":"LLOYD BRIDGES", - "subscriber-type":"INFRA", - "resource-version":"1498595633607" - }, - { - "global-customer-id":"jimmy-example", - "subscriber-name":"JimmyExampleCust-20161102", - "subscriber-type":"INFRA", - "resource-version":"1494001970063" - }, - { - "global-customer-id":"jimmy-example2", - "subscriber-name":"JimmyExampleCust-20161103", - "subscriber-type":"INFRA", - "resource-version":"1494001970225" - }, - { - "global-customer-id":"ERICA5779-TestSub-PWT-102", - "subscriber-name":"ERICA5779-TestSub-PWT-102", - "subscriber-type":"INFRA", - "resource-version":"1508852495058" - }, - { - "global-customer-id":"ERICA5779-TestSub-PWT-101", - "subscriber-name":"ERICA5779-TestSub-PWT-101", - "subscriber-type":"INFRA", - "resource-version":"1508179953733" - }, - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"Emanuel", - "subscriber-type":"INFRA", - "resource-version":"1494001894192" - }, - { - "global-customer-id":"ERICA5779-Subscriber-4", - "subscriber-name":"ERICA5779-Subscriber-5", - "subscriber-type":"INFRA", - "resource-version":"1509134064531" - }, - { - "global-customer-id":"ERICA5779-TestSub-PWT-103", - "subscriber-name":"ERICA5779-TestSub-PWT-103", - "subscriber-type":"INFRA", - "resource-version":"1509045503736" - }, - { - "global-customer-id":"ERICA5779-Subscriber-2", - "subscriber-name":"ERICA5779-Subscriber-2", - "subscriber-type":"INFRA", - "resource-version":"1509122065439" - }, - { - "global-customer-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name":"SILVIA ROBBINS", - "subscriber-type":"INFRA", - "resource-version":"1494001938080" - }, - { - "global-customer-id":"ERICA5779-Subscriber-3", - "subscriber-name":"ERICA5779-Subscriber-3", - "subscriber-type":"INFRA", - "resource-version":"1509122759407" - }, - { - "global-customer-id":"31739f3e-526b-11e6-beb8-9e71128cae77", - "subscriber-name":"CRAIG/ROBERTS", - "subscriber-type":"INFRA", - "resource-version":"1494001772223" - } - ] - } - - } -}
\ No newline at end of file diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_services_by_customer.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_services_by_customer.json index a7801268b..cb2dc7cf5 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_services_by_customer.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_services_by_customer.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/aai/v../business/customers/customer/CAR_2020_ER", + "path": "/aai/v../business/customers/customer/MSO_1610_ST", "queryParams": { "depth": [ "2" @@ -11,8 +11,8 @@ "simulatorResponse": { "responseCode": 200, "body": { - "global-customer-id": "CAR_2020_ER", - "subscriber-name": "CAR_2020_ER", + "global-customer-id": "MSO_1610_ST", + "subscriber-name": "MSO_1610_ST", "subscriber-type": "INFRA", "resource-version": "1549008901724", "service-subscriptions": { diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_sub_details.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_sub_details.json index 07e11c666..0a447272e 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_sub_details.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_sub_details.json @@ -22,7 +22,7 @@ "service-instance":[ { "service-instance-id":"414db2d4-18d0-415e-aac2-f255b586cfb5", - "service-instance-name":"vFlowLogic-vflf_080117", + "service-instance-name":"vRichardson-vflf_080117", "persona-model-id":null, "persona-model-version":null, "resource-version":"1502391806301", @@ -32,7 +32,7 @@ }, { "service-instance-id":"769be44e-981a-4da8-af3b-ca5fa76b7fb1", - "service-instance-name":"vFlowLogic-vflp_080117", + "service-instance-name":"vRichardson-vflp_080117", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501712783617", @@ -1718,13 +1718,13 @@ "is-permitted":false }, { - "service-type":"vMME", + "service-type":"vFLORENCE", "resource-version":"1497729820723", "service-instances":{ "service-instance":[ { "service-instance-id":"26731151-6854-4936-8ddc-1eb2b28cef26", - "service-instance-name":"vMME_2017-33_Svc", + "service-instance-name":"vFLORENCE_2017-33_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152917", @@ -1734,7 +1734,7 @@ }, { "service-instance-id":"b75fb352-0719-465b-ba48-3aa7d781b394", - "service-instance-name":"vMME1610Svc", + "service-instance-name":"vFLORENCE1610Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148345", @@ -1744,7 +1744,7 @@ }, { "service-instance-id":"1d291ab5-0440-4263-8648-1846a09d6135", - "service-instance-name":"vMME_1610_Svc", + "service-instance-name":"vFLORENCE_1610_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148352", @@ -1764,7 +1764,7 @@ }, { "service-instance-id":"14ce9494-9a75-49bf-a898-3503697c29f1", - "service-instance-name":"vMME+Svc+Jul+14", + "service-instance-name":"vFLORENCE+Svc+Jul+14", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135820", @@ -1774,7 +1774,7 @@ }, { "service-instance-id":"72960ff3-a1e9-493d-93f4-ac026b22326b", - "service-instance-name":"vMME_CI_110216_Svc", + "service-instance-name":"vFLORENCE_CI_110216_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255136021", @@ -1784,7 +1784,7 @@ }, { "service-instance-id":"c9bf0fc4-b621-40d1-8b89-7f8235171ffb", - "service-instance-name":"vMME1.8_LAB_8152017_Svc", + "service-instance-name":"vFLORENCE1.8_LAB_8152017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1504727411210", @@ -1794,7 +1794,7 @@ }, { "service-instance-id":"aee4df10-4289-4ae1-acdc-7f8cffa61603", - "service-instance-name":"xx_2017_417_vMME_0622_Svc", + "service-instance-name":"xx_2017_417_vFLORENCE_0622_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1498675414340", diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_vlb_service_instances.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_vlb_service_instances.json index 91a596b4e..5e998e3a8 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_vlb_service_instances.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_vlb_service_instances.json @@ -5,7 +5,7 @@ "queryParams": { "format": ["simple"] }, - "body": {"start": ["business/customers/customer/CAR_2020_ER/service-subscriptions/service-subscription/vLB/service-instances"], "query": "query/vnf-topology-fromServiceInstance"} + "body": {"start": ["business/customers/customer/MSO_1610_ST/service-subscriptions/service-subscription/vLB/service-instances"], "query": "query/vnf-topology-fromServiceInstance"} }, "simulatorResponse": { "responseCode": 200, diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_sdc_catalog_services_83d587e1.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_sdc_catalog_services_83d587e1.json deleted file mode 100644 index ca94ed1fb..000000000 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_sdc_catalog_services_83d587e1.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "simulatorRequest": { - "method": "GET", - "path": "/sdc/v1/catalog/services/83d587e1-742d-4cb0-b087-3963b012dfe3/toscaModel" - }, - "simulatorResponse": { - "responseCode": 200, - "file": "csar15782222_instantiationTypeMacroWithPnf.zip" - } - }, - { - "simulatorRequest": { - "method": "GET", - "path": "/sdc/v1/catalog/services/83d587e1-742d-4cb0-b087-3963b012dfe3/metadata" - }, - "simulatorResponse": { - "responseCode": 200, - "responseHeaders": { - "Content-Type": "application/json" - }, - "body": { - "uuid": "83d587e1-742d-4cb0-b087-3963b012dfe3", - "invariantUUID": "any-id", - "name": "test-pnf", - "version": "1.0", - "toscaModelURL": "./csar15782222_instantiationTypeMacroWithPnf.zip", - "category": "Emanuel", - "lifecycleState": "CERTIFIED", - "lastUpdaterUserId": "rg276b", - "lastUpdaterFullName": null, - "distributionStatus": "DISTRIBUTED", - "artifacts": null, - "resources": null - } - } - } -]
\ No newline at end of file diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_vnf_data_by_globalid_and_service_type.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_vnf_data_by_globalid_and_service_type.json index 2094edde3..e557c7d9f 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_vnf_data_by_globalid_and_service_type.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_vnf_data_by_globalid_and_service_type.json @@ -7,7 +7,7 @@ "simple" ] }, - "body": "{\"start\": [\"business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances\"],\"query\": \"query/vnf-topology-fromServiceInstance\"}" + "body": "{\"start\": [\"business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances\"],\"query\": \"query/vnf-topology-fromServiceInstance\"}" }, "simulatorResponse": { "responseCode": 200, @@ -16,7 +16,7 @@ { "id": "3400916992", "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1", "properties": { "service-instance-id": "66b13cb4-b575-449f-aa45-ffbfe005c7b1", "service-instance-name": "CHARLOTTE_preload_1710_0914", @@ -29,7 +29,7 @@ { "id": "10207440", "node-type": "service-subscription", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3481829392", @@ -41,7 +41,7 @@ { "id": "3771572432", "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95", "properties": { "service-instance-id": "f195837b-ef28-42c3-8dea-47ad37eaed95", "service-instance-name": "CHARLOTTE_preload_1710_0914_0920", @@ -54,7 +54,7 @@ { "id": "10207440", "node-type": "service-subscription", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3484520464", @@ -66,7 +66,7 @@ { "id": "3775807704", "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700", "properties": { "service-instance-id": "9ad4ac55-a5e0-4b49-95c0-b2d846abf700", "service-instance-name": "CHARLOTTE_preload_1710_0914_100417", @@ -79,7 +79,7 @@ { "id": "10207440", "node-type": "service-subscription", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3783459064", @@ -91,7 +91,7 @@ { "id": "4178862184", "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2", "properties": { "service-instance-id": "599c7247-b083-447c-b6b1-0cdd5170dfd2", "service-instance-name": "CHARLOTTE_preload_1710_0914_1010", @@ -104,7 +104,7 @@ { "id": "10207440", "node-type": "service-subscription", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3892133896", @@ -116,7 +116,7 @@ { "id": "3008335920", "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08", "properties": { "service-instance-id": "97315a05-e6f3-4c47-ae7e-d850c327aa08", "service-instance-name": "CHARLOTTE_preload_1710_0914_0927", @@ -129,7 +129,7 @@ { "id": "10207440", "node-type": "service-subscription", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3418898432", @@ -179,7 +179,7 @@ { "id": "3400916992", "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1" }, { "id": "3477385312", @@ -254,7 +254,7 @@ { "id": "3771572432", "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95" } ] }, @@ -284,7 +284,7 @@ { "id": "3775807704", "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700" } ] }, @@ -314,7 +314,7 @@ { "id": "4178862184", "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2" } ] }, @@ -349,7 +349,7 @@ { "id": "3008335920", "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" }, { "id": "3477385312", @@ -389,7 +389,7 @@ { "id": "3008335920", "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" }, { "id": "3477385312", @@ -429,7 +429,7 @@ { "id": "3008335920", "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" }, { "id": "3477385312", @@ -504,7 +504,7 @@ { "id": "3008335920", "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" }, { "id": "3477385312", @@ -579,7 +579,7 @@ { "id": "3008335920", "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" }, { "id": "3477385312", diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_change_managements.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_change_managements.json index 2c6af279c..3017b012d 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_change_managements.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_change_managements.json @@ -1733,6 +1733,25 @@ "requestorId": "az2016" } } + }, + { + "request": { + "requestId": "2d6502bf-c488-4903-817e-2ed2c644dcf4", + "requestScope": "vnf", + "requestStatus": { + "percentProgress": 100.0, + "requestState": "COMPLETE", + "statusMessage": "Completedd successfuly", + "finishTime": "Thu, 09 Nov 2017 10:58:14 GMT" + }, + "requestType": "updateInstance", + "startTime": "Thu, 09 Nov 2017 10:58:14 GMT", + "instanceReferences": { + "serviceInstanceId": "54ba3628-9ee5-4b32-8a2a-3abf001bed4e", + "vnfInstanceId": "b8d99523-1e83-4fd1-b42f-849361ef7024", + "requestorId": "az2016" + } + } } ] } diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/environment/get_operational_environments_aai.json b/vid-ext-services-simulator/src/main/resources/preset_registration/environment/get_operational_environments_aai.json index 3c9c78bf1..a793f7cf7 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/environment/get_operational_environments_aai.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/environment/get_operational_environments_aai.json @@ -14,7 +14,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "operational-environment-name": "operational_environment_ea", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -43,7 +43,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "operational-environment-name": "operational_environment_eb", "operational-environment-type": "VNF", - "operational-environment-status": "Deactivate", + "operational-environment-status": "INACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -72,7 +72,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "operational_environment_ec", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912", @@ -101,7 +101,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "operational_environment_ed", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912", @@ -145,7 +145,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "operational_environment_ec", "operational-environment-type": "ONAP", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912" @@ -154,7 +154,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "operational_environment_ed", "operational-environment-type": "ONAP", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912" diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/general/ecompportal_getSessionSlotCheckInterval.json b/vid-ext-services-simulator/src/main/resources/preset_registration/general/ecompportal_getSessionSlotCheckInterval.json index 075991654..d4d19a418 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/general/ecompportal_getSessionSlotCheckInterval.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/general/ecompportal_getSessionSlotCheckInterval.json @@ -2,7 +2,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/ONAPPORTAL/auxapi/v[0-9]+/getSessionSlotCheckInterval" + "path": "/(ONAPPORTAL|ecompportal_att)/auxapi/v[0-9]+/getSessionSlotCheckInterval" }, "simulatorResponse": { "responseCode": 200, @@ -12,7 +12,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/ONAPPORTAL/auxapi//extendSessionTimeOuts" + "path": "/(ONAPPORTAL|ecompportal_att)/auxapi//extendSessionTimeOuts" }, "simulatorResponse": { "responseCode": 200, @@ -22,7 +22,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/ONAPPORTAL/auxapi/v[0-9]+/getSessionSlotCheckInterval" + "path": "/(ONAPPORTAL|ecompportal_att)/auxapi/v[0-9]+/getSessionSlotCheckInterval" }, "simulatorResponse": { "responseCode": 200, @@ -32,7 +32,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/ONAPPORTAL/auxapi/extendSessionTimeOuts" + "path": "/(ONAPPORTAL|ecompportal_att)/auxapi/extendSessionTimeOuts" }, "simulatorResponse": { "responseCode": 200, @@ -42,7 +42,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/ONAPPORTAL/auxapi/context/get_user" + "path": "/(ONAPPORTAL|ecompportal_att)/auxapi/context/get_user" }, "simulatorResponse": { "responseCode": 200, diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_pnf_instances_by_region.json b/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_pnf_instances_by_region.json index d2ce59cfc..68befb6ae 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_pnf_instances_by_region.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_pnf_instances_by_region.json @@ -9,8 +9,8 @@ ] }, "body": { - "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911", - "query": "query/pnf-fromModel-byRegion?cloudRegionId=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP" + "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911", + "query": "query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP" } }, "simulatorResponse": { @@ -58,7 +58,7 @@ ] }, "body": { - "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911", + "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911", "query": "query/pnf-fromModel-byRegion?cloudRegionId=hvf6&equipVendor=Cisco&equipModel=Nexus%203048-TP" } }, diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_tenants.json b/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_tenants.json index fdd9da5e4..1558ceb4c 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_tenants.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_tenants.json @@ -12,7 +12,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -20,7 +20,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_vnf_instances_by_region.json b/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_vnf_instances_by_region.json index 7a033392b..86d589f46 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_vnf_instances_by_region.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_vnf_instances_by_region.json @@ -9,8 +9,8 @@ ] }, "body": { - "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=2a2ea15f-07c6-4b89-bfca-e8aba39a34d6&model-invariant-id=a7eac2b3-8444-40ee-92e3-b3359b32445c", - "query": "query/queryvnfFromModelbyRegion?cloudRegionId=JANET25" + "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances?model-version-id=2a2ea15f-07c6-4b89-bfca-e8aba39a34d6&model-invariant-id=a7eac2b3-8444-40ee-92e3-b3359b32445c", + "query": "query/queryvnfFromModelbyRegion?cloudRegionId=AAIAIC25" } }, "simulatorResponse": { @@ -111,7 +111,7 @@ ] }, "body": { - "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=2a2ea15f-07c6-4b89-bfca-e8aba39a34d6&model-invariant-id=a7eac2b3-8444-40ee-92e3-b3359b32445c", + "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances?model-version-id=2a2ea15f-07c6-4b89-bfca-e8aba39a34d6&model-invariant-id=a7eac2b3-8444-40ee-92e3-b3359b32445c", "query": "query/queryvnfFromModelbyRegion?cloudRegionId=hvf6" } }, diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_full_subscribers.json b/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_full_subscribers.json deleted file mode 100644 index 3bf1ded9c..000000000 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_full_subscribers.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/aai/v../business/customers", - "queryParams": { - "subscriber-type": "INFRA", - "depth": 0 - } - } , - "simulatorResponse": { - "responseCode": 200, - "body": { - "customer":[ - { - "global-customer-id":"CAR_2020_ER", - "subscriber-name":"CAR_2020_ER", - "subscriber-type":"INFRA", - "resource-version":"1494001902987" - }, - { - "global-customer-id":"21014aa2-526b-11e6-beb8-9e71128cae77", - "subscriber-name":"JULIO ERICKSON", - "subscriber-type":"INFRA", - "resource-version":"1494001776295" - }, - { - "global-customer-id":"DHV1707-TestSubscriber-2", - "subscriber-name":"DALE BRIDGES", - "subscriber-type":"INFRA", - "resource-version":"1498751754450" - }, - { - "global-customer-id":"DHV1707-TestSubscriber-1", - "subscriber-name":"LLOYD BRIDGES", - "subscriber-type":"INFRA", - "resource-version":"1498595633607" - }, - { - "global-customer-id":"jimmy-example", - "subscriber-name":"JimmyExampleCust-20161102", - "subscriber-type":"INFRA", - "resource-version":"1494001970063" - }, - { - "global-customer-id":"jimmy-example2", - "subscriber-name":"JimmyExampleCust-20161103", - "subscriber-type":"INFRA", - "resource-version":"1494001970225" - }, - { - "global-customer-id":"ERICA5779-TestSub-PWT-102", - "subscriber-name":"ERICA5779-TestSub-PWT-102", - "subscriber-type":"INFRA", - "resource-version":"1508852495058" - }, - { - "global-customer-id":"ERICA5779-TestSub-PWT-101", - "subscriber-name":"ERICA5779-TestSub-PWT-101", - "subscriber-type":"INFRA", - "resource-version":"1508179953733" - }, - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"Emanuel", - "subscriber-type":"INFRA", - "resource-version":"1494001894192" - }, - { - "global-customer-id":"ERICA5779-Subscriber-4", - "subscriber-name":"ERICA5779-Subscriber-5", - "subscriber-type":"INFRA", - "resource-version":"1509134064531" - }, - { - "global-customer-id":"ERICA5779-TestSub-PWT-103", - "subscriber-name":"ERICA5779-TestSub-PWT-103", - "subscriber-type":"INFRA", - "resource-version":"1509045503736" - }, - { - "global-customer-id":"ERICA5779-Subscriber-2", - "subscriber-name":"ERICA5779-Subscriber-2", - "subscriber-type":"INFRA", - "resource-version":"1509122065439" - }, - { - "global-customer-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name":"SILVIA ROBBINS", - "subscriber-type":"INFRA", - "resource-version":"1494001938080" - }, - { - "global-customer-id":"ERICA5779-Subscriber-3", - "subscriber-name":"ERICA5779-Subscriber-3", - "subscriber-type":"INFRA", - "resource-version":"1509122759407" - }, - { - "global-customer-id":"31739f3e-526b-11e6-beb8-9e71128cae77", - "subscriber-name":"CRAIG/ROBERTS", - "subscriber-type":"INFRA", - "resource-version":"1494001772223" - } - ] - } - - } -}
\ No newline at end of file diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_Emanuel.json b/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_Emanuel.json index 71e525dd0..448c6f232 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_Emanuel.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_Emanuel.json @@ -8367,7 +8367,7 @@ }, { "service-instance-id": "8b5e21c0-6466-4ac5-919f-6469b2a65fe5", - "service-instance-name": "VIK_test_vDOROTHEA", + "service-instance-name": "VIK_test_VDOROTHEA", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -27086,7 +27086,7 @@ }, { "service-instance-id": "f416d2f3-92c1-43e3-8d36-2adb10e180bc", - "service-instance-name": "oren-PASQUALE", + "service-instance-name": "oren-pasquale", "service-type": "", "service-role": "", "environment-context": "null", diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json b/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json index 1da40f57a..b06909bbb 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json @@ -7319,7 +7319,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -7327,7 +7327,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/service-design-and-creation.json b/vid-ext-services-simulator/src/main/resources/preset_registration/service-design-and-creation.json deleted file mode 100644 index 04b1f995a..000000000 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/service-design-and-creation.json +++ /dev/null @@ -1,453 +0,0 @@ -{ - "simulatorRequest": { - "method": "PUT", - "path": "/aai/v../query", - "body": "{\"start\" : \"service-design-and-creation\/models\/\", \"query\" : \"query\/serviceModels-byDistributionStatus?distributionStatus=DISTRIBUTION_COMPLETE_OK\"}", - "queryParams": { - "format": [ - "resource" - ] - } - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "results": [ - { - "model": { - "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", - "model-type": "resource", - "resource-version": "1500138206526", - "model-vers": { - "model-ver": [ - { - "model-version-id": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", - "model-name": "action-data", - "model-version": "1.0", - "model-description": "lustre settler sideways volcanic eight cellular", - "resource-version": "1500137463984", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/l2-bridge-for-wan-connector-model-id-ps-02/model-vers/model-ver/l2-bridge-for-wan-connector-resource-id-ps-02/model-elements/model-element/e874da22-729d-47bd-8c08-d596fd9c213d/model-elements/model-element/ccbb65b8-2faf-4f5f-80d9-804bb50f1455", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "l2-bridge-for-wan-connector-model-id-ps-02" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "l2-bridge-for-wan-connector-resource-id-ps-02" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "e874da22-729d-47bd-8c08-d596fd9c213d" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "ccbb65b8-2faf-4f5f-80d9-804bb50f1455" - } - ] - } - ] - } - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "9551346c-7d8b-4daf-9926-b93e96e2344a", - "model-type": "resource", - "resource-version": "1500138206526", - "model-vers": { - "model-ver": [ - { - "model-version-id": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", - "model-name": "action-data", - "model-version": "1.0", - "model-description": "decontamination arm circus ammonia hump edge", - "resource-version": "1500137463984" - }, - { - "model-version-id": "2590c596-27e5-4ca9-b5bb-e03a7fd4c0fc", - "model-name": "action-data", - "model-version": "3.0", - "model-description": "decontamination arm circus ammonia hump edge", - "resource-version": "1500137463984" - }, - { - "model-version-id": "6790c596-27e5-4ca9-b5bb-e03a7fd4c0ee", - "model-name": "action-data", - "model-version": "2.0", - "model-description": "decontamination arm circus ammonia hump edge", - "resource-version": "1500137463984" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "00beb8f9-6d39-452f-816d-c709b9cbb87d", - "model-type": "resource", - "resource-version": "4076846985447", - "model-vers": { - "model-ver": [ - { - "model-version-id": "0903e1c0-8e03-4936-b5c2-260653b96413", - "model-name": "action-data", - "model-version": "1.0", - "model-description": "honor immunity exile prong below misshapen", - "resource-version": "4076846985447" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "ea78c9e3-514d-4a0a-9162-13837fa54c35", - "model-type": "resource", - "resource-version": "1500137034452", - "model-vers": { - "model-ver": [ - { - "model-version-id": "666a06ee-4b57-46df-bacf-908da8f10c3f", - "model-name": "multicast-configuration", - "model-version": "1.0", - "model-description": "python bullwhip appointment computation ambidextrous heaving", - "resource-version": "1500136282691" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "78ca26d0-246d-11e7-93ae-92361f002671", - "model-type": "resource", - "resource-version": "1492627634298", - "model-vers": { - "model-ver": [ - { - "model-version-id": "20c4431c-246d-11e7-93ae-92361f002671", - "model-name": "vSAMP10aDEV::base::module-0", - "model-version": "2", - "model-description": "MSO aLaCarte VF vSAMP10aDEV Base", - "resource-version": "1492627634300" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "5b607929-6088-4614-97ef-cac817508e0e", - "model-type": "resource", - "resource-version": "1492814035001", - "model-vers": { - "model-ver": [ - { - "model-version-id": "797a6c41-0f80-4d35-a288-3920c4e06baa", - "model-name": "CONTRAIL30_L2NODHCP", - "model-version": "1.0", - "model-description": "contrail 3.0.x L2 network for AIC 3.x sites (and No DHCP).", - "resource-version": "1492814035003", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f/model-vers/model-ver/aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e/model-elements/model-element/2f622421-1c67-4142-be6e-cecad5242af6/model-elements/model-element/2add7556-a23b-46b8-b6b4-ad300b47ceab", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "2f622421-1c67-4142-be6e-cecad5242af6" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "2add7556-a23b-46b8-b6b4-ad300b47ceab" - } - ] - } - ] - } - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "0143d57b-a517-4de9-a0a1-eb76db51f402", - "model-type": "resource", - "resource-version": "1497897268768", - "model-vers": { - "model-ver": [ - { - "model-version-id": "f1bde010-cc5f-4765-941f-75f15b24f9fc", - "model-name": "BkVmxAv061917..base_vPE_AV..module-0", - "model-version": "2", - "resource-version": "1497897268769", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/267ef491-3c1a-4c32-8e69-0e557bfb61e7/model-vers/model-ver/18655c7f-c846-4934-9e25-34378dfd33d6/model-elements/model-element/578492b2-36a4-47da-83dc-91b58c699ad1/model-elements/model-element/6b1fc7a5-fc01-4a9d-a87f-0ad0d8caa13f", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "267ef491-3c1a-4c32-8e69-0e557bfb61e7" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "18655c7f-c846-4934-9e25-34378dfd33d6" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "578492b2-36a4-47da-83dc-91b58c699ad1" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "6b1fc7a5-fc01-4a9d-a87f-0ad0d8caa13f" - } - ] - } - ] - } - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "ipe-resource-id-ps-02", - "model-type": "resource", - "resource-version": "1493389430122", - "model-vers": { - "model-ver": [ - { - "model-version-id": "ipe-resource-id-ps-02", - "model-name": "abc", - "model-version": "v1.0", - "resource-version": "1493389520357", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/l2-bridge-for-wan-connector-model-id-ps-02/model-vers/model-ver/l2-bridge-for-wan-connector-resource-id-ps-02/model-elements/model-element/e874da22-729d-47bd-8c08-d596fd9c213d/model-elements/model-element/ccbb65b8-2faf-4f5f-80d9-804bb50f1455", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "l2-bridge-for-wan-connector-model-id-ps-02" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "l2-bridge-for-wan-connector-resource-id-ps-02" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "e874da22-729d-47bd-8c08-d596fd9c213d" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "ccbb65b8-2faf-4f5f-80d9-804bb50f1455" - } - ] - } - ] - } - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "lmoser410-connector-model-id", - "model-type": "widget", - "resource-version": "1493389512180", - "model-vers": { - "model-ver": [ - { - "model-version-id": "lmoser410-connector-model-version-id", - "model-name": "connector", - "model-version": "v1.0", - "resource-version": "1493389444766" - } - ] - }, - "relationship-list": { - "relationship": [ - { - "related-to": "named-query-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/named-queries/named-query/lmoser410-named-query-uuid/named-query-elements/named-query-element/48278a7d-2b1e-454f-89e6-5c0ba145f486", - "relationship-data": [ - { - "relationship-key": "named-query.named-query-uuid", - "relationship-value": "lmoser410-named-query-uuid" - }, - { - "relationship-key": "named-query-element.named-query-element-uuid", - "relationship-value": "48278a7d-2b1e-454f-89e6-5c0ba145f486" - } - ] - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "3a97db99-c4bb-498a-a13a-38f65f1ced3d", - "model-type": "resource", - "resource-version": "1492630209768", - "model-vers": { - "model-ver": [ - { - "model-version-id": "ff2ae348-214a-11e7-93ae-92361f002673", - "model-name": "vSAMP10aDEV::base::module-0", - "model-version": "1.0", - "model-description": "MACRO_vSAMP_module", - "resource-version": "1492630209769" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "3a97db99-c4bb-498a-a13a-38f65f1ced3d", - "model-type": "resource", - "resource-version": "1492630209768", - "model-vers": { - "model-ver": [ - { - "model-version-id": "ff2ae348-214a-11e7-93ae-92361f002673", - "model-name": "vSAMP10aDEV::base::module-0", - "model-version": "9.0", - "model-description": "MACRO_vSAMP_module", - "resource-version": "1492630209769" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "3a97db99-c4bb-498a-a13a-38f65f1ced3d", - "model-type": "resource", - "resource-version": "1492630209768", - "model-vers": { - "model-ver": [ - { - "model-version-id": "ff2ae348-214a-11e7-93ae-92361f002673", - "model-name": "vSAMP10aDEV::base::module-0", - "model-version": "10.0", - "model-description": "MACRO_vSAMP_module", - "resource-version": "1492630209769" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "3c504d40-b847-424c-9d25-4fb7e0a3e994", - "model-type": "widget", - "resource-version": "1493389430124", - "model-vers": { - "model-ver": [ - { - "model-version-id": "204c641a-3494-48c8-979a-86856f5fd32a", - "model-name": "named-query-element", - "model-version": "1.0", - "resource-version": "1493389423212" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "93e56950-cb19-44e6-ace4-8b50f2d02e45", - "model-type": "resource", - "resource-version": "1497898974232", - "model-vers": { - "model-ver": [ - { - "model-version-id": "acba1f72-c6e0-477f-9426-ad190151e100", - "model-name": "RG_6-19_Test", - "model-version": "1.0", - "model-description": "RG_6-19_Test", - "resource-version": "1497898974233", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/a07220ba-954e-422f-86b5-e8b95fe6b116/model-vers/model-ver/bf6dbd68-2c7d-4ba2-ade1-dfd4476aa505/model-elements/model-element/6e10fe2e-6d04-4198-9124-dd051a5ae65f/model-elements/model-element/cb3c22e1-9dc6-467f-9636-0a7aef10d5d0", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "a07220ba-954e-422f-86b5-e8b95fe6b116" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "bf6dbd68-2c7d-4ba2-ade1-dfd4476aa505" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "6e10fe2e-6d04-4198-9124-dd051a5ae65f" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "cb3c22e1-9dc6-467f-9636-0a7aef10d5d0" - } - ] - } - ] - } - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "any-id", - "model-type": "resource", - "resource-version": "10001", - "model-vers": { - "model-ver": [ - { - "model-version-id": "83d587e1-742d-4cb0-b087-3963b012dfe3", - "model-name": "pnf-test", - "model-version": "1.0", - "model-description": "Should ask about CorrelationId", - "resource-version": "200021" - } - ] - } - } - } - ] - } - } -}
\ No newline at end of file |