10 files changed, 123 insertions, 105 deletions
diff --git a/docs/files/csv/issues-integration.csv b/docs/files/csv/issues-integration.csv
deleted file mode 100644
index ef939c297..000000000
--- a/docs/files/csv/issues-integration.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-Issue key;Issue id;Summary;Priority;Status;Created
-INT-1883;59237;Reccurent various errors in smoke tests;High;In progress;12/Mar/21
-INT-1880;59163;Xtesting - basic_vm - values from basic_vm-service.yaml not applied;Low;In progress;11/Mar/21
-INT-1873;58953;Race condition between  cmpv2 and Basic DCAE health check;Medium;In progress;24/Feb/21
-INT-1843;57940;Upload 5G-core-nf-simulator code;Medium;In progress;25/Jan/21
-INT-1828;57751;Update Transport simu documentation;Medium;In progress;11/Jan/21
diff --git a/docs/files/csv/issues-testsuite.csv b/docs/files/csv/issues-testsuite.csv
deleted file mode 100644
index 907b87bcf..000000000
--- a/docs/files/csv/issues-testsuite.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-Issue key;Issue id;Summary;Priority;Status;Created
-TEST-306;58636;Resiliency testing;Medium;In progress;17/Feb/21
diff --git a/docs/files/csv/release-demo-features.csv b/docs/files/csv/release-demo-features.csv
index 92a8d9af3..e61cde6a6 100644
--- a/docs/files/csv/release-demo-features.csv
+++ b/docs/files/csv/release-demo-features.csv
@@ -1,8 +1,9 @@
 Issue-ID;Description
-INT-1868;vFW CNF fix for issue with config-deploy operation
-INT-1868;vFW CNF updates after integration tests
-INT-1868;Real vFW CNF config-assign and config-deploy
-INT-1868;Implementation of config-assign and config-deploy actions
-INT-1868;Add cofig-assign and config-deploy to cds workflow
-INT-1658;Check orchestration status during instantiation and deletion vFW_CNF_CDS usecase
-INT-1658;Automation scripts for vFW_CNF_CDS usecase
+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
diff --git a/docs/files/csv/release-integration-features.csv b/docs/files/csv/release-integration-features.csv
index 39714891e..24c256a5b 100644
--- a/docs/files/csv/release-integration-features.csv
+++ b/docs/files/csv/release-integration-features.csv
@@ -1,30 +1,38 @@
 Issue-ID;Description
-INT-1874;E2E_network_slicing-H-release known issues update
-INT-1601;Flatten Ansible role structure
-INT-1906;Add instructions for the simulator wrapper
-INT-1869;Update 5G PNF PnP test documentation about information on how to use NF Simulator
-INT-1869;[INTEGRATION] NF simulator documentation - fix indents and bullet points
-INT-1908;[INT] Fix netconf-pnp-simulator Python dependencies version
-INT-1867;vFW CNF use case changes for CNFO
-INT-1869;[INTEGRATION] Add NF simulator documentation in read the docs
-INT-1888;[DOC] Honolulu documentation
-INT-1900;Update the simulators list and description
-INT-1900;Update the simulators repository list
-INT-1900;Fix repositories links
-INT-1875;Updating release notes for CCVPN - Transport Slicing (REQ-456).
-INT-1874;E2E_network_slicing - Honolulu updates
-INT-1888;[DOCUMENTATION] Add a simulator section in documentation
-INT-1877;Fix Integration-netconf-pnp-simulator-docker-merge-master jenkins build
-INT-1875;Documentation update for CCVPN - Transport Slicing (REQ-456)
-INT-1872;G-release docs_E2E_network_slicing.rst- Reverting the overwrites
-TEST-289;[DOC] Improve automated tests doc section
-DCAEGEN2-2528;Add HTTPS to DFC tests
-INT-1601;Make adding Ubuntu Bionic image to the DevStack idempotent
-INT-1601;Create cluster operator access information
-INT-1601;Inject operator key when launching cluster instances
-INT-1601;Divide host group into cluster and operation instances
-INT-1601;Accept host group as an argument to allow reusing roles
-INT-1834;Fix version test in CI
-ONAPARC-551;Force new location of default Helm chart repository
-ONAPARC-551;Update Vagrant-based minimal ONAP deployment to Guilin
-DCAEGEN2-2527;Add HTTP to DFC tests
+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
diff --git a/docs/files/csv/release-integration-ref.csv b/docs/files/csv/release-integration-ref.csv
index 0b70ad1b8..4f6f4b4a0 100644
--- a/docs/files/csv/release-integration-ref.csv
+++ b/docs/files/csv/release-integration-ref.csv
@@ -1,21 +1,30 @@
 Repository;Revision
-demo;660f9f9e9f4450f12e948b9601fa185af53a9006
-integration;fd30314fcd836a0f0ead81cd6f4c15a678a58228
-integration/csit;e5b006b384d3c514fa64f83c9724f6ce04c2522f
-integration/docker/onap-java11;5f1789c7c781cffebb5bbb4b81766a1f91416e1c
-integration/docker/onap-python;c8f336a7137e0f34d7cb7a55ee4fcb9cf104b7b4
-integration/seccom;383788aac9e8debe55c19677dda06401595a1dd5
-integration/simulators/5G-core-nf-simulator;2f7418ace1ff799e0e77dd69bbfa099fc100c307
-integration/simulators/dc-simulator;cca3a1ede66374b42b3e126a6c3a75c96dd26490
-integration/simulators/ran-simulator;9764b6bb545a8edd4979c481627c38c1892f207e
-integration/terraform;017fc08036e8c5a7aac70970f0db400aeaed192c
-integration/terragrunt;563e0bf506444b97b172998f7304a5ef6297b266
-integration/usecases/BBS;7804110df11239058a0bb5b81705521d2d1457d3
-integration/usecases/mdons;d8daa086b9cfa97e223ecfc3260a3065c135bb43
-integration/xtesting;cedc9a1de18778e18b994ea1495a44dd8a1d33c9
-oparent;5ef7981d5e998180524c8c936c31015e71c5921f
-testsuite;ffe24cbee57c7529ab26fe597d14608ee5617a91
-testsuite/cds;2a26e7f038190ef736a73443ee56169fea6815a9
-testsuite/heatbridge;d0d4a8b7af52078c7f4848b2519f17ca380d6915
-testsuite/python-testing-utils;0b72a331ff8c8fa17995cd399d66c9bc500af747
-testsuite/pythonsdk-tests;ea75b7596605a2bb7e5f51aa39ca6e5a962c59db
+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
+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
diff --git a/docs/files/csv/release-oparent-features.csv b/docs/files/csv/release-oparent-features.csv
index 7593de5f7..f1ba6b3fa 100644
--- a/docs/files/csv/release-oparent-features.csv
+++ b/docs/files/csv/release-oparent-features.csv
@@ -1,4 +1,11 @@
 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
diff --git a/docs/files/csv/release-pythonsdk-features.csv b/docs/files/csv/release-pythonsdk-features.csv
index 934e3f71e..8c119f0bc 100644
--- a/docs/files/csv/release-pythonsdk-features.csv
+++ b/docs/files/csv/release-pythonsdk-features.csv
@@ -1,27 +1,20 @@
 Issue-ID;Description
-INT-1894;[VMMACRO] Do not use multicloud when running basic_vm_macro
-INT-1819;[CLAMP] raise exception in case of Policy or DCAE errors
-INT-1842;Remove masspnfsimulator as a git submodule.
-TEST-316;Basic VM macro
-INT-1822;[CLAMP] Integrate basic_clamp
-TEST-315;[SDC] Add a timer before certifying
-INT-1822;Nodeport cleanup in basic_cds test
-INT-1819;Wait 15 minutes for orchestration requests
-INT-1822;Timeout on orchestration requests
-INT-1829;[PNF] Extend timer before sending request to simulator
-TEST-305;[SDC] Certify only when needed
-TEST-303;Remove pvc from pnf simulator helm chart
-TEST-302;Remove cert authent in basic_clamp
-TEST-299;[SDC] Add manifest to basic packages
-INT-1822;Add missing logger for Pnf Scenario
-TEST-288;Wrapper for simulators
-TEST-288;[TEST] Collect steps cleanup reports
-TEST-292;[INT] Catch all onaptests and onapsdk exceptions for scenarios
-TEST-280;Consider settings custom exceptions for reporting
-TEST-278;Python SDK 7.4.0 compatibility
-TEST-277;[TESTS] cleanup tests and remove reference to ubuntu16
-TEST-245;PNF simulator CNF instantiation and registation steps
-TEST-245;Add basic_pnf entry point
-INT-1796;[TESTCASE] fix basic_onboard scenario
-TEST-245;[PythonSDK-tests] Add basic_onboard testcase
-TEST-279;Fix steps time measurement
+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
diff --git a/docs/files/csv/release-testsuite-features.csv b/docs/files/csv/release-testsuite-features.csv
index ec47327f4..ee2d03418 100644
--- a/docs/files/csv/release-testsuite-features.csv
+++ b/docs/files/csv/release-testsuite-features.csv
@@ -1,13 +1,10 @@
 Issue-ID;Description
-INT-1907;Close all browsers at healthcheck suite teardown
-TEST-329;[HEALTCHECK] Exclude appc healthcheck test from CI
-INT-1815;[ROBOT] Add new E2E test for 5G BulkPM usecase from HTTP server to ONAP gating
-HOLMES-416;Re-introduced Holmes Health Check Tasks
-DCAEGEN2-2660;Add DCAE Microservice Health Check
-INT-1855 DCAEGEN2-2548;[ROBOT] Add DCAEMOD usecase test to xtestnig image
-POLICY-3118;invalid controllerName in policies robot tests
-INT-1855;Update DCAE MOD smoke/verification test using simple app
-POLICY-2526;Updates to check for 202 response during Policy-PAP Deployment
-INT-1855;Add DCAE MOD smoke/verification test using simple app
-INT-1804;Fix CMPv2 test cases after pnf-simulator changes
-INT-1801;Extend 5g bulk pm test suite in order to have possibility to test custom PM FILES
+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
diff --git a/docs/files/csv/repo-archived.csv b/docs/files/csv/repo-archived.csv
new file mode 100644
index 000000000..4eedae852
--- /dev/null
+++ b/docs/files/csv/repo-archived.csv
@@ -0,0 +1,10 @@
+Repository;Description;Link
+integration/benchmark;Benchmark project;`link <https://git.onap.org/integration/benchmark>`__
+integration/devtool;Devtool project;`link <https://git.onap.org/integration/devtool>`__
+integration/simulators/dc-simulator;Data Center simulator;`link <https://git.onap.org/integration/simulators/dc-simulator>`__
+integration/simulators/masspnf-simulator;Mass PNF Simulator;`link <https://git.onap.org/integration/simulators/masspnf-simulator>`__
+integration/terraform;Terraform based alternative infrastructure installation;`link <https://git.onap.org/integration/terraform>`__
+integration/terragrunt;Compagnon repository of terraform;`link <https://git.onap.org/integration/terragrunt>`__
+integration/usecases/bbs;BBS use case introduced in Dublin and extracted from global repository in frankfurt;`link <https://git.onap.org/integration/usecases/bbs>`__
+integration/usecases/mdons;MDONS use case introduced in Frankfurt;`link <https://git.onap.org/integration/usecases/mdons>`__
+testsuite/heatbridge;python utils to manage the heatbridge function to enrich cloud information to AAI (deprecated);`link <https://git.onap.org/testsuite/heatbridge>`__
+\ No newline at end of file
diff --git a/docs/files/csv/tests-healthcheck.csv b/docs/files/csv/tests-healthcheck.csv
index 8071c4345..6571255a9 100644
--- a/docs/files/csv/tests-healthcheck.csv
+++ b/docs/files/csv/tests-healthcheck.csv
@@ -5,6 +5,7 @@ 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/>`__
+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/>`__