14 files changed, 118 insertions, 135 deletions
diff --git a/docs/files/csv/release-demo-features.csv b/docs/files/csv/release-demo-features.csv
index e61cde6a6..22bc99eaa 100644
--- a/docs/files/csv/release-demo-features.csv
+++ b/docs/files/csv/release-demo-features.csv
@@ -1,9 +1,5 @@
 Issue-ID;Description
-INT-1960;vFW CNF CDS Change Blueprint to BluePrint
-INT-1960;vFW CNF CDS usecase automation scripts update
-INT-1899;[vFW_CNF_CDS] Improve logging and fix tests typo
-INT-1899;[vFW_CNF_CDS] Add workflow health-check and K8sHealthCheck.kt script
-INT-1899;[vFW_CNF_CDS] Sort generated json files
-INT-1899;[vFW_CNF_CDS] Add Healthcheck automation
-INT-1899;[vFW_CNF_CDS] Provide Helm Tests for CNF
-INT-1899;[vFW_CNF_CDS] Correct Makefile target
+INT-2094;[APACHE] Add Apache CNF use case files
+INT-2069;Make Network Slicing usecase more user friendly
+INT-1960;[vFW CNF CDS] Fix issue with multiple tenants creation for k8s region
+INT-1960;[vFW CNF CDS] vf_module and vnf name generation improvment in CBA
diff --git a/docs/files/csv/release-integration-features.csv b/docs/files/csv/release-integration-features.csv
index f2f385f4d..00575b2da 100644
--- a/docs/files/csv/release-integration-features.csv
+++ b/docs/files/csv/release-integration-features.csv
@@ -1,39 +1,30 @@
 Issue-ID;Description
-INT-2010;Release data-provider
-INT-1979;E2E Network slicing - Istanbul Release Documentation
-INT-1976;Updating release notes for CCVPN - Intent Based Networking and Cloud Leased Line Service.
-DOC-765;Remove indirect deps
-DOC-765;Make funcparserlib + lfdocs-conf work on RTD
-DOC-765;Adds 2 upper-constraints to pin all the dependencies.
-REQ-910;Update docs for OOF-SON use case
-INT-1966;[DOC] Remove direct gating link
-DCAEGEN2-2692;Fix problem with expired certs in FTPES tests
-DCAEGEN2-2692;Update DFC tests to use file based conifg
-TEST-360;[SECURITY] Fix waiver management of check_for_nonssl_ports test
-INT-1735;Update Vagrantfile for tern
-INT-1601;Enable VID
-INT-1601;noheat: deploy ONAP
-INT-1601;noheat: deploy MetalLB, cert-manager and prometheus
-INT-1601;noheat: deploy helm with plugins & chartmuseum
-INT-1601;noheat: install Ansible kubernetes collection
-INT-1601;noheat: use Python 3 as Ansible interpreter
-INT-1601;noheat: clone OOM repository
-INT-1601;noheat: deploy kubernetes
-INT-1601;noheat: deploy Docker
-INT-1601;noheat deployment: use nfs0 as nexus3 bastion
-INT-1601;noheat deployment: setup NFS server and clients
-INT-1601;noheat deployment: add operator0 key to itself
-INT-1601;noheat deployment: loosen security groups constraints
-INT-1601;noheat deployment: Add groups to dynamic inventory
-INT-1601;Update requirements of OpenStack noheat deployment
-INT-1940;[CODESEARCH] Update documentation
-INT-1940;[CODESEARCH] Always run the 'run_codesearch' provisioner
-INT-1940;[CODESEARCH] Rework the nameserver provisioning
-INT-1940;[CODESEARCH] Drop ssh authentication for Gerrit endpoint
-INT-1940;[CODESEARCH] Rework how --git option works
-INT-1942;[CODESEARCH] Add option to define custom polling interval
-INT-1941;[CODESEARCH] Upgrade Vagrant box to utilise newest 20.04 LTS
-INT-1922;Standard defined schema files in VES Collector
-INT-1601;Set up network for in-cluster deployment stage
-INT-1601;Add missing dependencies and artifacts for in-cluster deployment stage
-INT-1601;Prepare operation machine for in-cluster deployment stage
+INT-2097;[STRIMZI-CA] Add strimzi ca to cert checks
+INT-2095;Broken URL to 5gbulkpm test case.
+INT-2094;Upstream Apache use case into demo repository
+INT-2093;Disable healtcheck for DCAE platform components
+TEST-383;Fix HVVES test case in Jakarta release
+INT-2078;smoke tests not more run due to jinja2 upstream lib bug
+INT-2077;Add missing INFO.yaml files in integration/simulators/nf-simulator repository (and related repositories)
+INT-2057;Use the latest Python 3.10.2
+INT-2051;Add cert manager support to netconf simulator
+INT-2049;Release data-provider image
+INT-2043;Update SDK version in data-provider
+TEST-379;Integrate basic_cnf_macro test
+INT-2040;Reset security waivers for jakarta
+INT-2015;Create python baseline image
+INT-2014;Create Java baseline image for Jakarta
+INT-2009;Automate the committers management in INFO.yaml files
+TEST-368;"No execution start time saved for..." error log in tests
+INT-1998;A1 Policy Enforcement PoC documentation improvments
+INT-1980;CNF/CBA - DayOneConfig.kt throw java.io.FileNotFoundException
+INT-1974;Build pythonsdk-tests docker image for every change
+INT-1971;Add gating mechanism on integration test changes
+INT-1956;DT tests results should be available to check to the community
+TEST-356;Create tests resources not in ONAP namespace
+INT-1952;Run gating tests on selected pythonsdk-tests version/change
+TEST-354;PNF macro failing due to: services "pnf-macro-test-simulator-mongo"
+INT-1925;Issues during stability instantiation tests on weekly master
+TEST-297;Include testuite/cds in a xtesting dockers
+TEST-294;Integrate CDS regression tests in End to End CI/CD chain
+INT-1665;Setup CI jobs, functional/unit tests, tests runners to automate Python tools testing
diff --git a/docs/files/csv/release-integration-ref.csv b/docs/files/csv/release-integration-ref.csv
index 4f6f4b4a0..c47a0046a 100644
--- a/docs/files/csv/release-integration-ref.csv
+++ b/docs/files/csv/release-integration-ref.csv
@@ -1,30 +1,33 @@
 Repository;Revision
-demo;129d553d323653461d14f248cb9e8b6f266eb5e3
-integration;81ef97d2e7f8bf1d50f590447725efd05ba9014b
-integration/csit;85321a52e56422c1bb552c10387d27066decee84
-integration/docker/onap-java11;ad17a4087baaefb1adf9ad0dde3029b1da7dfc7d
-integration/docker/onap-python;a0588db586ae626b4fadcfde450039ab69ed4171
-integration/ietf-actn-tools;2770f33536cfb828b7416adff8eafdd0a141a0b4
-integration/seccom;538d7faf46a58fdf8ff857770a9e65aa9c312913
-integration/simulators/5G-core-nf-simulator;ef3045db013ce7826c0c6f2a3597f7a1d1033106
-integration/simulators/nf-simulator;f739bd6b7e48edad36966a00894dc08de0c4de21
-integration/simulators/nf-simulator/avcn-manager;8be57ab7523dc201a54cf4f5b0251159af1fda38
-integration/simulators/nf-simulator/netconf-server;2cf18a71ceccf0ae6508a4ffabd1adef90772211
-integration/simulators/nf-simulator/pm-https-server;3f7d8d756e0951c95b894cdbec785ed4f24052e4
-integration/simulators/nf-simulator/ves-client;7397ac984b69f7605e6ccb0b5ab02a74b73e818b
-integration/simulators/pnf-simulator;20fbea02fedad63770a5a7e3958adb71992a7878
-integration/simulators/ran-nssmf-simulator;85ccf7677389c9bd3f43c31d220347e9ebd4d404
-integration/simulators/ran-simulator;a3165afba7f422e61fecdce5c5c24d8b91d8bd40
-integration/usecases/A1-policy-enforcement;ada51c6695b785865eea3ccea45a13026bd03518
-integration/usecases/A1-policy-enforcement-r-apps;3ac3f212d7127e887625a344c3e4846269a01df0
-integration/xtesting;a93cdb28c8e9e05f8d794556dce52bca11b59028
-oparent;c6044f697e3345c8b907a4f8d5f0cfa3d4069071
-testsuite;b4680596e5c876b12dc416c305de69371d5aedd5
-testsuite/cds;9f83b04496cd16ae280af1e939eff20ff7195fc6
-testsuite/cds-mock-odl;ae2aebead9224fb0bbbe6aaf0b782b27a501dee9
+demo;a112ebd160d3acc20e6766d8550d757a0581797d
+integration;fd5b23e8ff35aff3eacf0d20b6910b0257bcced0
+integration/csit;8f88f01b9fbbdd2af363a747ecf43b9de15a9b6e
+integration/data-provider;a5d76c710471e8c6819a8d5963ee73349a48013c
+integration/docker/onap-java11;1a12b2560c0b168c64e1b38a25d8284904b8ef01
+integration/docker/onap-python;5fb8770183d2bef14d47124b100dc4dec4ee1999
+integration/ietf-actn-tools;2e7a9a57f2610268002badc23748d483b653042e
+integration/seccom;687008f10b08ded20cb222d732523fea270b9c8e
+integration/simulators/5G-core-nf-simulator;7ee6ee299f53e226663645010b9467860a656c07
+integration/simulators/A1-policy-enforcement-simulator;a1408cfc73163ed209049b47098d86e2f94a538a
+integration/simulators/core-nssmf-simulator;c3bbe92494ba80d10628dbe102eddaadaac9d421
+integration/simulators/nf-simulator;745a7b4c9bc5606a342f5fcb250b606836f73627
+integration/simulators/nf-simulator/avcn-manager;0e280f888bcc42909eee1aefe65a5a8b79a7477b
+integration/simulators/nf-simulator/netconf-server;c7bd72db1a290848fdad94c2b3688c790b4e778f
+integration/simulators/nf-simulator/pm-https-server;98b44a558e1993f0ceafbf22b250ba0975042229
+integration/simulators/nf-simulator/ves-client;4ac8f0ad9b5f627697f2d3a67bb47c3315737528
+integration/simulators/pnf-simulator;c942281da3cc77db1aee06ef69398fd57b970f31
+integration/simulators/ran-nssmf-simulator;220120e53977d6df4eda174dca710320a2bcba8f
+integration/simulators/ran-simulator;b395e82cedb969d392fd4a1a2b13cfa8cf64cce7
+integration/usecases/A1-policy-enforcement;f29388582dc68a8f1cfdff4aa65f3839e9e1aaac
+integration/usecases/A1-policy-enforcement-r-apps;3fc8bbb9080cd637318fb920056f5a51014e5c1f
+integration/xtesting;1b5b1a3dc73431c671971a22abd875cd292c1692
+oparent;f95bafef87324b634305e1b98cf17838aa998d26
+testsuite;898230f3ead89797c4e4f774ccef38f7c23c0b7e
+testsuite/cds;b1f769130a6abe8ac67f42fe74b834eb25f33c07
+testsuite/cds-mock-odl;4784fbe07e25a6894d6dfccf76f78e8710f20f11
 testsuite/cds-mock-server;7db71adaf139e54f2186cfd19d468f5a1123835d
 testsuite/cds-mock-ssh;a43ce8950dcc36363c406b1cc4043dc7d623c9f4
-testsuite/oom;f3b6c657d38373ce2aaac9a2041285b75525bfc2
-testsuite/python-testing-utils;1911416dec8d483ccaa320b5ed0a6fbbafe1f9c2
-testsuite/pythonsdk-tests;1a77bcd6eb5ab695a232004b88e5e59d9d9ff6a3
-testsuite/robot-utils;8b80d8c8bebad201185639807ec50110fb857638
+testsuite/oom;5809297b562203922c13c843c085049148d78edb
+testsuite/python-testing-utils;17d603cf6655198fa61873e4d715889998a92b69
+testsuite/pythonsdk-tests;81584955687e053d0697a63131b026fa0eda47c7
+testsuite/robot-utils;a67403bdb58cfdfc272801d9c4448a22bd40046d
diff --git a/docs/files/csv/release-oparent-features.csv b/docs/files/csv/release-oparent-features.csv
index f1ba6b3fa..80462fe00 100644
--- a/docs/files/csv/release-oparent-features.csv
+++ b/docs/files/csv/release-oparent-features.csv
@@ -1,12 +1,2 @@
 Issue-ID;Description
-
-INT-1948;Set default branch in oparent gitreview file
-INT-1948;Bump oparent to 3.2.2
-INT-1948;Release oparent 3.2.1 Istanbul
-INT-1938;Upgrade depenencies for Istanbul
-POLICY-3209; Step version of spring to 5.3.8
-POLICY-3206;Update Checkstyle to version 8.43
-INT-1711;Bump oparent 3.2.1-SNAPSHOT
-INT-1711;Release 3.2.0 oparent
-INT-1766;Upgrade latest dependencies
-INT-1756;Bump master to 3.2.0-SNAPSHOT
+CPS-475;Enable @surpressWarnings for Checkstyle
diff --git a/docs/files/csv/release-pythonsdk-features.csv b/docs/files/csv/release-pythonsdk-features.csv
index 8c119f0bc..1684b2234 100644
--- a/docs/files/csv/release-pythonsdk-features.csv
+++ b/docs/files/csv/release-pythonsdk-features.csv
@@ -1,20 +1,14 @@
 Issue-ID;Description
-TEST-364;[TEST] Do not use VID API in tests
-INT-1978;[BASIC_CLAMP] Adapt tca clamp plugin
-TEST-361;Update HEAT-file for ubuntu20 used for basic_vm_macro test
-TEST-357;[TEST] Get cleanup reports from substeps also if parent step has no cleanup report
-MULTICLOUD-1377;Change rb-definition-version identifier
-TEST-352;[TEST] Use the newest ONAP SDK version
-TEST-349;[TEST] Basic macro stability scenario
-TEST-347;[TEST] Check if cds blueprintsprocessor service type is 'NodePort'
-TEST-341;[TEST] Wait for instantiated simulator longer
-TEST-341;[TEST] Create "pnf-macro-test-simulator" resources
-TEST-341;[TEST] Use nf-simulator/vesclient
-TEST-315;[OPTIM] Tune SDC delay before certification
-INT-1894;[TEST] Patch ip values in pnf-simulator event
-TEST-333;[TEST] Do not try to recreate already created SDC resources
-TEST-338;[CLAMP] Fix Policy exception in basic_clamp
-TEST-337;[TEST] Catch ConnectionError exception during pnf simulator startup
-TEST-336;[TEST] Catch k8s connection exceptions
-TEST-334;[CLAMP] Update clamp to allow re-play of the test
-TEST-332;[EXCEPTIONS] Distinguish onaptests and onapsdk exception
-\ No newline at end of file
+SDC-3949;Log exception stack trace on test failure
+TEST-384;[TEST] Change of the k8sregion name
+TEST-382;[TEST] Change of the namespace for basic_cnf_macro
+INT-2078;Use Python ONAP SDK 9.4.0
+TEST-354;[TEST] PNF macro nad CDS resource resoulution tests are failing on retry
+INT-2078;[PYTHON] Improve requirement versioning
+TEST-380;[TEST] Add cds resource resolution missing cleanup method call
+TEST-376;[TEST] Basic CNF macro
+TEST-356;[TEST] Do not create simulators in "onap" namespace
+TEST-369;[TEST] Fix cds-resource-resolution test
+TEST-368;[TEST] Do not show "No execution start time..." error log message for skipped substeps
+TEST-358;[TEST] Added support for multi-vnf macro instantiation
+INT-1994;[INTEGRATION] Use the newest onapsdk (9.0.0)
+\ No newline at end of file
diff --git a/docs/files/csv/release-testsuite-features.csv b/docs/files/csv/release-testsuite-features.csv
index ee2d03418..9b1a96f8f 100644
--- a/docs/files/csv/release-testsuite-features.csv
+++ b/docs/files/csv/release-testsuite-features.csv
@@ -1,10 +1,19 @@
 Issue-ID;Description
-TEST-364;[TEST] Do not use VID API in pnf-registrate test
-TEST-365;[HEALTHCHECK] Remove VID from healthcheck
-DCAEGEN2-2718;Use configMap instead of Consul to configure hv-ves
-TEST-353;Cmpv2 robot testcase fails when using proxy
-MULTICLOUD-1362;[MULTICLOUD] Exclude  multicloud healthcheck tests
-OPTFRA-969;[OOF] Remove CMSO related test cases
-TEST-346;CMPv2 test case fails with error No keyword with name
-TEST-345;Refactor ves client and mongo db host name usage in CMPv2 test
-TEST-339;[POLICY] Increase Timeout for Enhanced Policy Healthcheck Test
+INT-1895;[ROBOT] Change performance measurements topic for 5gbulkpm
+INT-1895;[ROBOT] Add timout flag for helm unintsll operation
+INT-1895;[ROBOT] Change pm mapper readiness check to HTTP
+INT-2012;[Healthcheck] Remove clamp Healthcheck
+NT-1895;[ROBOT] Adopt DCAEMOD test cases to helm based deployment
+INT-2093;[DCAE] Deprecate DCAE basic healthcheck
+INT-1895;[ROBOT] Fix failing CMPv2 and 5gbulkpm test cases in CI
+TEST-383;[INTEGRATION] Fix failing HVVES test case in Jakarta release
+OOM-2921;[INT] Remove Portal robot test from full and medium test suite
+INT-1895;[ROBOT] ADD CMPv2 test cases that use helm based components
+POLICY-3887;Add policy cleanup if policy is existing before policy health check execution
+INT-1895;[ROBOT] FIX BULKPM test cases for Jakarta release
+SO-3829;[HEALTCHECK] remove mariadbgalera connectivity tests from core
+SO-3829;[SO] MariaDB Galera connectivity with SO Issue-ID:SO-3829
+INT-1895;[ROBOT] ADD HTTPS based BULKPM test cases that use helm based components
+POLICY-3815;[POLICY] Change API and PAP usernames
+INT-1895;[ROBOT] ADD BULKPM test cases that use helm based component services
+INT-2006;[TIMEOUT] Extend healthcheck timeout value
diff --git a/docs/files/csv/repo-integration.csv b/docs/files/csv/repo-integration.csv
index c9487da6f..93469a4c1 100644
--- a/docs/files/csv/repo-integration.csv
+++ b/docs/files/csv/repo-integration.csv
@@ -1,6 +1,7 @@
 Repository;Description;Link
 integration;Historical main repository including documentation, simulators (e.g. mass PNF simulator), non robot tests (e.g. security tests, vCPE Tosca,..), ...;`link <https://git.onap.org/integration>`__
 integration/csit;Repository hosting some tooling to start component functional tests in Jenkins (To be deprecated in Guilin as such tests must be reinsourced by the projects);`link <https://git.onap.org/integration/csit>`__
+integration/data-provider;Project that provides a tool to automate common ONAP resource creation;`link <https://git.onap.org/integration/data-provider>`__
 integration/docker/onap-java11;Java11 baseline image conformed to SECCOM recommendations;`link <https://git.onap.org/integration/docker/onap-java11>`__
 integration/docker/onap-python;Python baseline image conformed to SECCOM recommendations;`link <https://git.onap.org/integration/docker/onap-python>`__
 integration/ietf-actn-tools;IETF ACTN tools introduced in Honolulu);`link <https://git.onap.org/integration/ietf-actn-tools>`__
@@ -8,4 +9,3 @@ integration/seccom;Repory hosting seccom recommended versions and security test
 integration/usecases/A1-policy-enforcement;A1 policy enforcement introduced in Honolulu;`link <https://git.onap.org/integration/usecases/A1-policy-enforcement>`__
 integration/usecases/A1-policy-enforcement-r-apps;A1 policy enforcement (analyticis part) introduced in Honolulu;`link <https://git.onap.org/integration/usecases/A1-policy-enforcement-r-apps>`__
 integration/xtesting;Repository in charge to build th xtesting dockers used in CI/CD chains;`link <https://git.onap.org/integration/xtesting>`__
-integration/data-provider;Project that provides a tool to automate common ONAP resource creation;`link <https://git.onap.org/integration/data-provider>`__
diff --git a/docs/files/csv/s3p-instantiation.csv b/docs/files/csv/s3p-instantiation.csv
index 6b3febd3d..53f2a5b69 100644
--- a/docs/files/csv/s3p-instantiation.csv
+++ b/docs/files/csv/s3p-instantiation.csv
@@ -1,6 +1,6 @@
-Parameters;Istanbul;Honolulu
-Number of tests;1310;1410
-Global success rate;97%;96%
-Min duration;193s;81s
-Max duration;2128s;2000s
-mean duration;564s;530s
-\ No newline at end of file
+Parameters;Jakarta;Istanbul;Honolulu
+Number of tests;TBD;1310;1410
+Global success rate;TBD;97%;96%
+Min duration;TBD;193s;81s
+Max duration;TBD;2128s;2000s
+mean duration;TBD;564s;530s
+\ No newline at end of file
diff --git a/docs/files/csv/s3p-sdc.csv b/docs/files/csv/s3p-sdc.csv
index f89fef24a..cd9bb9e6c 100644
--- a/docs/files/csv/s3p-sdc.csv
+++ b/docs/files/csv/s3p-sdc.csv
@@ -1,6 +1,6 @@
-Parameters;Istanbul;Honolulu
-Number of tests;1085;715
-Global success rate;92%;93%
-Min duration;111s;80s
-Max duration;799s;1128s
-mean duration;366s;565s
-\ No newline at end of file
+Parameters;Jakarta;Istanbul;Honolulu
+Number of tests;1000;1085;715
+Global success rate;92%;92%;93%
+Min duration;119;111s;80s
+Max duration;844;799s;1128s
+mean duration;394s;366s;565s
+\ No newline at end of file
diff --git a/docs/files/csv/tests-healthcheck.csv b/docs/files/csv/tests-healthcheck.csv
index 6571255a9..df5411cbb 100644
--- a/docs/files/csv/tests-healthcheck.csv
+++ b/docs/files/csv/tests-healthcheck.csv
@@ -5,7 +5,6 @@ healthdist;Check the onboarding and distribution of the vFW;`robot tests <https:
 postinstall;Check dmaap and AA&I Design model DB tests;`robot tests <https://git.onap.org/testsuite/tree/robot/testsuites/post-install-tests.robot>`__;`robotframework <https://robotframework.org/>`__
 ves-collector (new);Suite for checking handling events by VES Collector;`code <https://git.onap.org/testsuite/tree/robot/testsuites/ves.robot>`__;`robotframework <https://robotframework.org/>`__
 hv-ves;HV-VES 'Sunny Scenario' Robot Framework test - message is sent to the collector and Kafka topic is checked if the message has been published. Content is decoded and checked.;`code <https://git.onap.org/testsuite/tree/robot/testsuites/hvves-ci.robot>`__;`robotframework <https://robotframework.org/>`__
-basic_cds;CDS blueprint enrichment, open a nodeport on CDS then enrich CDS CBA;`code <https://git.onap.org/testsuite/pythonsdk-tests/tree/src/onaptests/scenario/cds_blueprint_enrichment.py>`__;`onap_pythonsdk <https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk>`__, `pythonsdk-tests <https://git.onap.org/testsuite/pythonsdk-tests/tree/>`__
 basic_onboard;onboard a model, subset of most of the other basic_* tests, created to perform stability testing;`code <https://git.onap.org/testsuite/pythonsdk-tests/tree/src/onaptests/scenario/basic_onboard.py>`__;`onap_pythonsdk <https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk>`__, `pythonsdk-tests <https://git.onap.org/testsuite/pythonsdk-tests/tree/>`__
 dcaemod;Check new DCAEmod;`robot tests <https://git.onap.org/testsuite/tree/robot/testsuites/dcaemod.robot>`__;`robotframework <https://robotframework.org/>`__
-**cps-healthcheck**;Call liveness and readiness probes of the CPS module;`robot tests <https://github.com/onap/cps/blob/master/csit/tests/actuator/actuator.robot>`__;`robotframework <https://robotframework.org/>`__
+cps-healthcheck;Call liveness and readiness probes of the CPS module;`robot tests <https://github.com/onap/cps/blob/master/csit/tests/actuator/actuator.robot>`__;`robotframework <https://robotframework.org/>`__
diff --git a/docs/files/csv/tests-infrastructure-healthcheck.csv b/docs/files/csv/tests-infrastructure-healthcheck.csv
index a61e02991..0bdabf3cb 100644
--- a/docs/files/csv/tests-infrastructure-healthcheck.csv
+++ b/docs/files/csv/tests-infrastructure-healthcheck.csv
@@ -2,4 +2,3 @@ Tests;Description;Code;Comments
 onap-helm;Verify Helm chart status, the test has been updated to take into account Helm3;`python module <https://gitlab.com/Orange-OpenSource/lfn/tools/helm-onap-status>`__;
 onap-k8s;Check common resources of the ONAP Kubernetes namespace ;`python module <https://gitlab.com/Orange-OpenSource/lfn/tools/kubernetes-status>`__;kubernetes python library
 nodeport_check_certs;This test list the nodeports and tries to get SSL information to evaluate the validity of the certificates (expiration and issuer) used on the nodeports;`python module <https://git.onap.org/integration/tree/test/security/check_certificates>`__;pyopenssl, kubernetes python libraries
-**internal_check_certs**;This test list the internal ports and tries to get SSL information to evaluate the validity of the certificates (expiration and issuer) used ;`python module <https://git.onap.org/integration/tree/test/security/check_certificates>`__;pyopenssl, kubernetes python libraries
diff --git a/docs/files/csv/tests-security.csv b/docs/files/csv/tests-security.csv
index 4e88b0ada..0ded0a206 100644
--- a/docs/files/csv/tests-security.csv
+++ b/docs/files/csv/tests-security.csv
@@ -7,4 +7,4 @@ http_public_endpoints;check that there is no public http endpoints exposed in ON
 jdpw_ports;check that there are no internal java ports;`bash script <https://git.onap.org/integration/plain/test/security/check_for_jdwp.sh>`__;kubectl, procfs
 kube_hunter;security suite to search k8s vulnerabilities (upstream src aquasecurity);`kube-Hunter <https://github.com/aquasecurity/kube-hunter>`__; `kube-Hunter <https://github.com/aquasecurity/kube-hunter>`__
 versions;check that Java and Python are available only in versions recommended by SECCOM. This test is long and run only in Weekly CI chains;`python module <https://git.onap.org/integration/tree/test/security/check_versions>`__;cerberus, kubernetes python lib,
-**tern**;Check the component licenses within the ONAP dockers;`bash script <https://gitlab.com/Orange-OpenSource/lfn/onap/xtesting-onap/-/blob/master/scripts/run_tern.sh>`__;kubectl
+tern;Check the component licenses within the ONAP dockers;`bash script <https://gitlab.com/Orange-OpenSource/lfn/onap/xtesting-onap/-/blob/master/scripts/run_tern.sh>`__;kubectl
diff --git a/docs/files/csv/tests-smoke.csv b/docs/files/csv/tests-smoke.csv
index b990624c1..db2c173de 100644
--- a/docs/files/csv/tests-smoke.csv
+++ b/docs/files/csv/tests-smoke.csv
@@ -2,8 +2,10 @@ Tests;Description;Code;Comments
 basic_vm;Onboard, distribute and instantiate an Openstack VM using à la carte BPMN, replaced the former basic_vm test;`code <https://git.onap.org/testsuite/pythonsdk-tests/tree/src/onaptests/scenario/basic_vm.py>`__;`onap_pythonsdk <https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk>`__, `pythonsdk-tests <https://git.onap.org/testsuite/pythonsdk-tests/tree/>`__
 basic_network;Onboard, distribute and instantiate a Neutron network;`code <https://git.onap.org/testsuite/pythonsdk-tests/tree/src/onaptests/scenario/basic_network.py>`__;`onap_pythonsdk <https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk>`__, `pythonsdk-tests <https://git.onap.org/testsuite/pythonsdk-tests/tree/>`__
 basic_cnf;Onboard (new), distribute and instantiate a Kubernetes pods;`code <https://git.onap.org/testsuite/pythonsdk-tests/tree/src/onaptests/scenario/basic_cnf.py>`__;`onap_pythonsdk <https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk>`__, `pythonsdk-tests <https://git.onap.org/testsuite/pythonsdk-tests/tree/>`__
-**5gbulkpm**;5G Bulk PM Usecase functionality. The test has been significantly enhanced in Honolulu;`code <https://git.onap.org/testsuite/tree/robot/testsuites/usecases/5gbulkpm.robot>`__;`robotframework <https://robotframework.org/>`__
+5gbulkpm;5G Bulk PM Usecase functionality. The test has been significantly enhanced in Honolulu;`code <https://git.onap.org/testsuite/tree/robot/testsuites/usecases/5gbulkpm.robot>`__;`robotframework <https://robotframework.org/>`__
 pnf-registrate;Executes the PNF registration test cases including setup and teardown;`code <https://git.onap.org/testsuite/tree/robot/testsuites/pnf-registration.robot>`__;`robotframework <https://robotframework.org/>`__
 cmpv2;CMPv2 Usecase functionality;`code <https://git.onap.org/testsuite/tree/robot/testsuites/cmpv2.robot>`__;`robotframework <https://robotframework.org/>`__
-**basic_clamp**;distribute a model, enrich it with a tca blueprint, call Clamp to create a loop then instantiate it in Policy and DCAE;`code <https://git.onap.org/testsuite/pythonsdk-tests/tree/src/onaptests/scenario/basic_clamp.py>`__;`onap_pythonsdk <https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk>`__, `pythonsdk-tests <https://git.onap.org/testsuite/pythonsdk-tests/tree/>`__
-**basic_vm_macro**;Instantiate a VM using macro bpmn;`code <https://git.onap.org/testsuite/pythonsdk-tests/tree/src/onaptests/scenario/basic_vm_macro.py>`__;`onap_pythonsdk <https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk>`__, `pythonsdk-tests <https://git.onap.org/testsuite/pythonsdk-tests/tree/>`__
+basic_vm_macro;Instantiate a VM using macro bpmn;`code <https://git.onap.org/testsuite/pythonsdk-tests/tree/src/onaptests/scenario/basic_vm_macro.py>`__;`onap_pythonsdk <https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk>`__, `pythonsdk-tests <https://git.onap.org/testsuite/pythonsdk-tests/tree/>`__
+**pnf_macro**;Run PNF simulator, onboard, distribute and instantiate service including PNF;`code <https://git.onap.org/testsuite/pythonsdk-tests/tree/src/onaptests/scenario/pnf_macro.py>`__;`onap_pythonsdk <https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk>`__, `pythonsdk-tests <https://git.onap.org/testsuite/pythonsdk-tests/tree/>`__
+**cds_resource_resolution**;Upload blueprint file into CDS, execute test workflow and check results;`code <https://git.onap.org/testsuite/pythonsdk-tests/tree/src/onaptests/scenario/cds_resource_resolution.py>`__;`onap_pythonsdk <https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk>`__, `pythonsdk-tests <https://git.onap.org/testsuite/pythonsdk-tests/tree/>`__
+**basic_cnf_macro**;Onboard (new), distribute and instantiate a Kubernetes pods using SO's macro flow;`code <https://git.onap.org/testsuite/pythonsdk-tests/tree/src/onaptests/scenario/basic_cnf_macro.py>`__;`onap_pythonsdk <https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk>`__, `pythonsdk-tests <https://git.onap.org/testsuite/pythonsdk-tests/tree/>`__
diff --git a/docs/files/csv/usecases.csv b/docs/files/csv/usecases.csv
index ad91ffd54..e5d78cf69 100644
--- a/docs/files/csv/usecases.csv
+++ b/docs/files/csv/usecases.csv
@@ -1,4 +1,4 @@
 Ref;Summary;Link;Contacts
-REQ-440;E2E Network Slicing;:ref:`official doc <docs_E2E_network_slicing>`;Lin Meng
-REQ-429;5G OOF SON;:ref:`official doc <docs_5G_oof_son>`;Swaminathan Seetharaman
-REQ-459;CCVPN-Transport Slicing;:ref:`official doc <docs_ccvpn>`;Henry Yu
+REQ-1085;E2E Network Slicing;:ref:`official doc <docs_E2E_network_slicing>`;Lin Meng
+REQ-1042;5G OOF SON;:ref:`official doc <docs_5G_oof_son>`;Swaminathan Seetharaman
+REQ-1076;CCVPN-Transport Slicing;:ref:`official doc <docs_ccvpn>`;Henry Yu