15 files changed, 67 insertions, 117 deletions
diff --git a/docs/files/csv/release-integration-features.csv b/docs/files/csv/release-integration-features.csv
index 00575b2da..ed06a4284 100644
--- a/docs/files/csv/release-integration-features.csv
+++ b/docs/files/csv/release-integration-features.csv
@@ -1,30 +1,5 @@
 Issue-ID;Description
-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
+INT-2070;Automate 5G Slicing use case in CI - Manual configuration step 7 - AAI Configuration
+INT-2164;Update Apache CNF Demo
+INT-2126;Data provider - add relationships into cloud region and tenant
+INT-2135;Add CPS resources into data-provider
diff --git a/docs/files/csv/release-integration-ref.csv b/docs/files/csv/release-integration-ref.csv
index c47a0046a..b9f3535ef 100644
--- a/docs/files/csv/release-integration-ref.csv
+++ b/docs/files/csv/release-integration-ref.csv
@@ -1,33 +1,39 @@
 Repository;Revision
-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
+demo;5dcd47bfc76ab8257fcc3b8927b78295a4376c8b
+integration;cdacb811f7acc2eb0a6e5662d8d225a967160f2c
+integration/csit;08bc9551a07da29c478ca2f6487aafa651ea95dd
+integration/data-provider;3f1416193789e00f6b09029c7e841d98803e5749
+integration/docker/onap-java11;1a5e22c812aa988fbfc27a668c1d2541db971080
+integration/docker/onap-python;e2de6cdd2d5f2e4a8067c40d1af0392b02426d61
+integration/ietf-actn-tools;3a8b2c604c13584fbc807ac21058288c424893b3
+integration/onap-component-simulators;748da401868fbf35744e292ee132be614b489623
+integration/pipelines/chained-ci;0399d9842c2a5670e4ee21d45343d2ac168eee2d
+integration/pipelines/oom-automatic-installation;4934d86bfe15a6132331f802afb4b3a062cbaf8c
+integration/pipelines/xtesting-onap;276fb7948607bd6b3fc09693619f021763b5ec6e
+integration/python-onapsdk;25cafb994c9ba3b874cd973a1e1d440fb0b98bf0
+integration/seccom;0131d962bdfcf97794ac49a2f45f5eb974249288
+integration/simulators/5G-core-nf-simulator;1eaabdb8299e49dc7e81c205edce8ce46e64a511
+integration/simulators/A1-policy-enforcement-simulator;63501fbea1b8a6dc859099c3465b1758e19e0956
+integration/simulators/core-nssmf-simulator;5ce930d4a9e8137b1fbac98a58ebe2cfd3e6a77e
+integration/simulators/nf-simulator;b4e937c4c92ef68fd1ab640ce9e30a531112b371
+integration/simulators/nf-simulator/avcn-manager;13fab3acdc7a22ca7000125112c84a2e942ea307
+integration/simulators/nf-simulator/netconf-server;8d0a5c8e95ef58e391eee31c1562dcb541c4c369
+integration/simulators/nf-simulator/pm-https-server;1f0bcaac6410f2a5497aad7c6ed5e46610a4a8a7
+integration/simulators/nf-simulator/ves-client;94891f32b3e2c4be8240b4df88830f97f2255e0b
+integration/simulators/pnf-simulator;f00c718bc3978d5b7ed55a5cda1c2a1443919af9
+integration/simulators/ran-app;746cc0a4aa1ada72d98ed161322fb2bd1e359637
+integration/simulators/ran-nssmf-simulator;1528d0a38026e3e183de2d4dcf7bbfcfec633eda
+integration/simulators/ran-simulator;41bbe166748510b4c5be7606ff27ee7ee64cb001
+integration/usecases/A1-policy-enforcement;0a885a2b3595988922b8e7af3e76bef4913de8bd
+integration/usecases/A1-policy-enforcement-r-apps;e3f79f43ba8e51fda97a5d67cd5c01b04e54c9e1
+integration/xtesting;c90366fa6ec58cd063addcf50c6948ea859f5fc9
+oparent;371de4b87ccf46f1292d68468fcfd41303ab394c
+testsuite;d7fe3776469399384a340b9a38e2c0de8771e6c1
+testsuite/cds;a5eb7d86926fac92965c35de1cae9114dc471a35
+testsuite/cds-mock-odl;b7f29dc3f03ec40369941af6e525d40c822d1ced
 testsuite/cds-mock-server;7db71adaf139e54f2186cfd19d468f5a1123835d
 testsuite/cds-mock-ssh;a43ce8950dcc36363c406b1cc4043dc7d623c9f4
-testsuite/oom;5809297b562203922c13c843c085049148d78edb
-testsuite/python-testing-utils;17d603cf6655198fa61873e4d715889998a92b69
-testsuite/pythonsdk-tests;81584955687e053d0697a63131b026fa0eda47c7
-testsuite/robot-utils;a67403bdb58cfdfc272801d9c4448a22bd40046d
+testsuite/oom;9e5fee150e86c868c0ef40f2a34494be36bd41fc
+testsuite/python-testing-utils;f9d29ad319d54cdabe63b52c20c9acd9d475347b
+testsuite/pythonsdk-tests;a9dddc1095dad400626871f3f1dc5df96d05e035
+testsuite/robot-utils;7e7fbedd13aa9c33433601c8d276f0d43fcd6c78
diff --git a/docs/files/csv/release-oparent-features.csv b/docs/files/csv/release-oparent-features.csv
index 80462fe00..b4a48add1 100644
--- a/docs/files/csv/release-oparent-features.csv
+++ b/docs/files/csv/release-oparent-features.csv
@@ -1,2 +1,4 @@
 Issue-ID;Description
-CPS-475;Enable @surpressWarnings for Checkstyle
+
+USECASEUI-709;Upgrade dependency versions in oparent
+USECASEUI-709;Update Logback to Version 1.2.10
diff --git a/docs/files/csv/release-pythonsdk-features.csv b/docs/files/csv/release-pythonsdk-features.csv
index 1684b2234..6d96dd7b7 100644
--- a/docs/files/csv/release-pythonsdk-features.csv
+++ b/docs/files/csv/release-pythonsdk-features.csv
@@ -1,14 +1,2 @@
 Issue-ID;Description
-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
+INT-2119;Use 10.0.0 version of SDK in tests
+\ 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 9b1a96f8f..2b05ce227 100644
--- a/docs/files/csv/release-testsuite-features.csv
+++ b/docs/files/csv/release-testsuite-features.csv
@@ -1,19 +1,2 @@
 Issue-ID;Description
-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
+INT-2160;[ROBOT] Fix the DCAEMOD testcase for ServiceMes
diff --git a/docs/files/csv/repo-integration-external.csv b/docs/files/csv/repo-integration-external.csv
index 40843dba5..dc401c0a9 100644
--- a/docs/files/csv/repo-integration-external.csv
+++ b/docs/files/csv/repo-integration-external.csv
@@ -1,4 +1,2 @@
 Repository;Description;Link
-pythononapsdk;Python SDK for ONAP, used to create use cases;`link <https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk/-/tree/develop/src/onapsdk/cds>`__
-xtesting-onap;Repository in charge of the test section of the CD chains;`link <https://gitlab.com/Orange-OpenSource/lfn/onap/xtesting-onap/>`__
 integration-view;Repository integration hosting the itegration portal including the hosting of the web site;`link <https://gitlab.com/Orange-OpenSource/lfn/onap/integration-view>`__
diff --git a/docs/files/csv/repo-integration.csv b/docs/files/csv/repo-integration.csv
index 93469a4c1..b7d8a392a 100644
--- a/docs/files/csv/repo-integration.csv
+++ b/docs/files/csv/repo-integration.csv
@@ -5,6 +5,8 @@ integration/data-provider;Project that provides a tool to automate common ONAP r
 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>`__
+integration/onap-component-simulators;ONAP component simulators used for tests;`link <https://git.onap.org/integration/onap-component-simulators/>`__
+integration/python-onapsdk;ONAP Python SDK repository;`link <https://git.onap.org/integration/python-onapsdk/>`__
 integration/seccom;Repory hosting seccom recommended versions and security test waivers;`link <https://git.onap.org/integration/seccom>`__
 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>`__
diff --git a/docs/files/csv/repo-pipelines.csv b/docs/files/csv/repo-pipelines.csv
new file mode 100644
index 000000000..27e43e82c
--- /dev/null
+++ b/docs/files/csv/repo-pipelines.csv
@@ -0,0 +1,4 @@
+Repository;Description;Link
+integration/pipelines/chained-ci;Main pipelines project which holds configuration;`link <https://git.onap.org/integration/pipelines/chained-ci/>`__
+integration/pipelines/oom-automatic-installation;Definition of pipelines to instantiate ONAP;`link <https://git.onap.org/integration/pipelines/oom-automatic-installation/>`__
+integration/pipelines/xtesting-onap;Definition of pipelines to execute tests;`link <https://git.onap.org/integration/pipelines/xtesting-onap/>`__
+\ No newline at end of file
diff --git a/docs/files/csv/repo-simulators.csv b/docs/files/csv/repo-simulators.csv
index b0044ba03..91f75eb66 100644
--- a/docs/files/csv/repo-simulators.csv
+++ b/docs/files/csv/repo-simulators.csv
@@ -1,6 +1,6 @@
 Repository;Description;Link
-integration/simulators/A1-policy-enforcement-simulator;A1 Policy Enforcement Simulator;`link <https://git.onap.org/integration/simulators/A1-policy-enforcement-simulator>`__
 integration/simulators/5G-core-nf-simulator;5G core nf simulator;`link <https://git.onap.org/integration/simulators/5G-core-nf-simulator>`__
+integration/simulators/A1-policy-enforcement-simulator;A1 Policy Enforcement Simulator;`link <https://git.onap.org/integration/simulators/A1-policy-enforcement-simulator>`__
 integration/simulators/core-nssmf-simulator;Core NSSMF Simulator;`link <https://git.onap.org/integration/simulators/core-nssmf-simulator>`__
 integration/simulators/nf-simulator;NF simulator;`link <https://git.onap.org/integration/simulators/nf-simulator>`__
 integration/simulators/nf-simulator/avcn-manager;NF simulator avcn manager;`link <https://git.onap.org/integration/simulators/nf-simulator/avcn-manager>`__
@@ -8,5 +8,6 @@ integration/simulators/nf-simulator/netconf-server;NF simulator netconf server;`
 integration/simulators/nf-simulator/pm-https-server;NF simulator pm https server;`link <https://git.onap.org/integration/simulators/nf-simulator/pm-https-server>`__
 integration/simulators/nf-simulator/ves-client;NF simulator ves client;`link <https://git.onap.org/integration/simulators/nf-simulator/ves-client>`__
 integration/simulators/pnf-simulator;PNF Simulator;`link <https://git.onap.org/integration/simulators/pnf-simulator>`__
-integration/simulators/ran-simulator;RAN simulator;`link <https://git.onap.org/integration/simulators/ran-simulator>`__
+integration/simulators/ran-app;RAN App;`link <https://git.onap.org/integration/simulators/ran-app/>`__
 integration/simulators/ran-nssmf-simulator;RAN NSSMF simulator;`link <https://git.onap.org/integration/simulators/ran-nssmf-simulator>`__
+integration/simulators/ran-simulator;RAN simulator;`link <https://git.onap.org/integration/simulators/ran-simulator>`__
diff --git a/docs/files/csv/tests-healthcheck.csv b/docs/files/csv/tests-healthcheck.csv
index df5411cbb..1b8b940ff 100644
--- a/docs/files/csv/tests-healthcheck.csv
+++ b/docs/files/csv/tests-healthcheck.csv
@@ -8,3 +8,5 @@ hv-ves;HV-VES 'Sunny Scenario' Robot Framework test - message is sent to the col
 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-temporal-healthcheck**;Call endpoints of CPS Temporal component;`robot tests <https://github.com/onap/cps-cps-temporal/blob/master/csit/tests/actuator/actuator.robot>`__;`robotframework <https://robotframework.org/>`__
+**cps-dmi-plugin-healthcheck**;Call endpoints of CPS DMI plugin component;`robot tests <https://github.com/onap/cps-ncmp-dmi-plugin/blob/master/csit/tests/actuator/actuator.robot>`__;`robotframework <https://robotframework.org/>`__
+\ No newline at end of file
diff --git a/docs/files/csv/tests-infrastructure-healthcheck.csv b/docs/files/csv/tests-infrastructure-healthcheck.csv
index 0bdabf3cb..a350f6bc8 100644
--- a/docs/files/csv/tests-infrastructure-healthcheck.csv
+++ b/docs/files/csv/tests-infrastructure-healthcheck.csv
@@ -1,4 +1,4 @@
 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
+onap-k8s-teardown;Check common resources of the ONAP Kubernetes namespace after all tests execution;`python module <https://gitlab.com/Orange-OpenSource/lfn/tools/kubernetes-status>`__;kubernetes python library
diff --git a/docs/files/csv/tests-security.csv b/docs/files/csv/tests-security.csv
index 0ded0a206..9d949a9e0 100644
--- a/docs/files/csv/tests-security.csv
+++ b/docs/files/csv/tests-security.csv
@@ -1,10 +1,5 @@
 Tests;Description;Code;Comments
 root_pods;check that pods are nor using root user or started as root; `bash script <https://git.onap.org/integration/xtesting/tree/security/scripts/check_security_root.sh>`__; kubectl
 unlimitted_pods;check that limits are set for pods;`bash script <https://git.onap.org/integration/xtesting/tree/security/scripts/check_unlimitted_pods.sh>`__;	kubectl
-cis_kubernetes;perform the k8s cis test suite (upstream src aquasecurity);`bash script <https://git.onap.org/integration/xtesting/tree/security/scripts/check_cis_kubernetes.sh>`__;`kube-bench <https://github.com/aquasecurity/kube-bench>`__
 nonssl_endpoints;check that all public HTTP endpoints exposed in ONAP cluster use SSL tunnels;`Go	script <https://git.onap.org/integration/plain/test/security/sslendpoints/main.go>`__;kubetl, nmap
-http_public_endpoints;check that there is no public http endpoints exposed in ONAP cluster;`bash script <https://git.onap.org/integration/plain/test/security/check_for_nonssl_endpoints.sh>`__;kubectl,nmap
-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
+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
diff --git a/docs/files/csv/tests-smoke.csv b/docs/files/csv/tests-smoke.csv
index db2c173de..16ea7593e 100644
--- a/docs/files/csv/tests-smoke.csv
+++ b/docs/files/csv/tests-smoke.csv
@@ -6,6 +6,6 @@ basic_cnf;Onboard (new), distribute and instantiate a Kubernetes pods;`code <htt
 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_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/>`__
+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-functional-requirements.csv b/docs/files/csv/usecases-functional-requirements.csv
index 947187d79..6bb6494d7 100644
--- a/docs/files/csv/usecases-functional-requirements.csv
+++ b/docs/files/csv/usecases-functional-requirements.csv
@@ -1,9 +1,3 @@
 Issue key;Summary;Contact;Comment
-REQ-463;ONAP to support Multi Tenancy (part 2);Olivier Phénix ;
-REQ-457;Extend ORAN A1 Adapter and add A1 Policy Management;John Keeney;
-REQ-458;ONAP CNF orchestration - Enhancements;Lukasz Rajewski;Changes of this feature are described in :ref:`vFW CNF use case <docs_vFW_CNF_CDS>`
-REQ-446;NF Software Upgrade enhancement;Zu Qiang;
-REQ-433;ONAP/3GPP & O-RAN Alignment-Standards Defined Notifications over VES (Honolulu);Damian Nowak;Description how to configure :ref:`Standards Defined Notifications in VES <docs_StndDefined_Events_Collection_Mechanism>`
-REQ-432;IPv4/IPv6 dual stack support in ONAP (Honolulu);Damian Nowak;
-REQ-431;CMPv2 Enhancements for R7;Pawel Baniewski;cmpv2 automated test integrated in CI/CD, see :ref:`automated test page <release_automated_usecases>`
-REQ-400;ETSI-Alignment for Guilin and Honolulu;Byung-Woo Jun;
+REQ-1215;E2E Network Slicing use case enhancements for Kohn release;Kevin Tang;
+REQ-1212;5G SON use case enhancements for Kohn release;N.K. Shankaranarayanan;
diff --git a/docs/files/csv/usecases-non-functional-requirements.csv b/docs/files/csv/usecases-non-functional-requirements.csv
index 871efa8bd..3b489ac43 100644
--- a/docs/files/csv/usecases-non-functional-requirements.csv
+++ b/docs/files/csv/usecases-non-functional-requirements.csv
@@ -1,5 +1,5 @@
 Issue key;Summary;Contact;Comment
-REQ-453;Smart Operator Intent Translation in UUI based on IBN - R8 5G Slicing Support;Dong Wang;
-REQ-430;PNF Plug & Play in R8;Damian Nowak;
-REQ-428;5G Service Modeling in R8 - Modeling Work;Benjamin Cheung;
-REQ-427;Configuration Persistence Service in R8;Toine Siebelink;
+REQ-1267;General intent model and general intent interface requirements in R11;Keguang He;
+REQ-1214;Maintenance and Enhancement of Intent-driven Closed-loop Autonomous Networks in R11;Dong Wang;
+REQ-1268;CCVPN Kohn Enhancements for Intent-based Cloud Leased Line and Transport Slicing;Henry Yu;
+REQ-1342;Retirement of unmaintained repos;Amy Zwarico;
+\ No newline at end of file