Merge "Merge simulator from ECOMP's repository"

45 files changed, 0 insertions, 0 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
index 36d5ab90c..41da82a47 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
index 09e088798..2080bc27a 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
index 1f848554c..2476da0bc 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
index 390393f5a..bcbe0781c 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
index ab254690f..749a4f2ec 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
index 39f9c8aae..30ec25a4a 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
new file mode 100644
index 000000000..157fffa02
--- /dev/null
+++ 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
index b3e7bf94f..3cdde15ab 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
new file mode 100644
index 000000000..bf44d05f2
--- /dev/null
+++ 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
index c22037d4f..86b75d1a1 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
new file mode 100644
index 000000000..b687c11a6
--- /dev/null
+++ 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
index cc5539fa4..ff2b9b27a 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
index 343419ef7..566cae7d0 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_instantiationTypeMacroWithCR.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithCR.zip
index be93cdb96..a189f206b 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithCR.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithCR.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
index bd967ebfb..d595a2f6b 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
index 55dee5d59..dd681456b 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
index ff031c7f2..6cc6454f2 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
new file mode 100644
index 000000000..c75b4d57a
--- /dev/null
+++ 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
index 1c30bf8d7..916d03ca7 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
index 5a85d9cda..fbe40fa0f 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
index 627117e51..5c229e0ff 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/ggghhh.zip b/vid-ext-services-simulator/src/main/resources/download_files/ggghhh.zip
index daeb9bf24..f06b53c44 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
index db666bc00..6e686efa8 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
index ffbb3f9b7..3192fbf5c 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
index 31c7a2e92..898da77f4 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-AdiodVmxVpeBvService488-csar-annotations.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-AdiodVmxVpeBvService488-csar-annotations.zip
deleted file mode 100644
index f2337b475..000000000
--- a/vid-ext-services-simulator/src/main/resources/download_files/service-AdiodVmxVpeBvService488-csar-annotations.zip
+++ /dev/null
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
new file mode 100644
index 000000000..891a90c16
--- /dev/null
+++ 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
index c8a31864f..e0ac08335 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
index ebaf24c7e..34f20f04f 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-MsoExampleService-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-MsoExampleService-csar.zip
index 5bd59b1c2..83131de5e 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/service-MsoExampleService-csar.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-MsoExampleService-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
new file mode 100644
index 000000000..d0ffdb225
--- /dev/null
+++ 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-SrIovProvider1-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-SrIovProvider1-csar.zip
new file mode 100644
index 000000000..62bda3134
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-SrIovProvider1-csar.zip
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-VdbeSrv-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-VdbeSrv-csar.zip
deleted file mode 100644
index 60c664488..000000000
--- a/vid-ext-services-simulator/src/main/resources/download_files/service-VdbeSrv-csar.zip
+++ /dev/null
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-VdbeSrv-csar_ecomp_false6.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-VdbeSrv-csar_ecomp_false6.zip
deleted file mode 100644
index 140d2e615..000000000
--- a/vid-ext-services-simulator/src/main/resources/download_files/service-VdbeSrv-csar_ecomp_false6.zip
+++ /dev/null
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
new file mode 100644
index 000000000..ee11a0409
--- /dev/null
+++ 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-VmmeRvpmsFeAic3011217Svc-csar.csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-VmmeRvpmsFeAic3011217Svc-csar.csar.zip
deleted file mode 100644
index 415ccc5d7..000000000
--- a/vid-ext-services-simulator/src/main/resources/download_files/service-VmmeRvpmsFeAic3011217Svc-csar.csar.zip
+++ /dev/null
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
new file mode 100644
index 000000000..3df7e777c
--- /dev/null
+++ 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
new file mode 100644
index 000000000..bab0603b7
--- /dev/null
+++ 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
index 2932b9835..78e46733b 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
new file mode 100644
index 000000000..768d502e8
--- /dev/null
+++ 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
new file mode 100644
index 000000000..4b9f54509
--- /dev/null
+++ 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-vl-with-5g-network-provider-alacarte.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-vl-with-5g-network-provider-alacarte.zip
new file mode 100644
index 000000000..6b2adaa28
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-vl-with-5g-network-provider-alacarte.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
new file mode 100644
index 000000000..ea178fa9c
--- /dev/null
+++ 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
index ddb4bf656..54f7bf589 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
index 6bdf3fd31..6cccded1b 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