9 files changed, 398 insertions, 3 deletions

diff --git a/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/V1.1__Initial_Recipe_Setup.sql b/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/V1.1__Initial_Recipe_Setup.sql
index c1bb9ec272..6dfc863e0b 100644
--- a/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/V1.1__Initial_Recipe_Setup.sql
+++ b/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/V1.1__Initial_Recipe_Setup.sql
@@ -108,4 +108,5 @@ INSERT INTO `vnf_recipe` (`id`, `VF_MODULE_ID`, `ACTION`, `SERVICE_TYPE`, `VERSI
 INSERT INTO `vnf_recipe` (`id`, `VF_MODULE_ID`, `ACTION`, `SERVICE_TYPE`, `VERSION_STR`, `VNF_TYPE`, `DESCRIPTION`, `ORCHESTRATION_URI`, `VNF_PARAM_XSD`, `RECIPE_TIMEOUT`, `CREATION_TIMESTAMP`) VALUES (13,NULL,'inPlaceSoftwareUpdate',NULL,'1','VID_DEFAULT','VID_DEFAULT recipe to update VNF software if no custom BPMN flow is found','/mso/async/services/VnfInPlaceUpdate',NULL,180,'2018-05-23 11:00:00');
 INSERT INTO `vnf_recipe` (`id`, `VF_MODULE_ID`, `ACTION`, `SERVICE_TYPE`, `VERSION_STR`, `VNF_TYPE`, `DESCRIPTION`, `ORCHESTRATION_URI`, `VNF_PARAM_XSD`, `RECIPE_TIMEOUT`, `CREATION_TIMESTAMP`) VALUES (14,NULL,'applyUpdatedConfig',NULL,'1','VID_DEFAULT','VID_DEFAULT recipe to apply updated VNF config if no custom BPMN flow is found','/mso/async/services/VnfConfigUpdate',NULL,180,'2018-05-23 11:00:00');
 INSERT INTO `vnf_recipe` (`id`, `VF_MODULE_ID`, `ACTION`, `SERVICE_TYPE`, `VERSION_STR`, `VNF_TYPE`, `DESCRIPTION`, `ORCHESTRATION_URI`, `VNF_PARAM_XSD`, `RECIPE_TIMEOUT`, `CREATION_TIMESTAMP`) VALUES (10030,NULL,'upgradeCnf',NULL,'1','GR-API-DEFAULT','Gr api recipe to do CNF-Upgrade','/mso/async/services/WorkflowActionBB',NULL,180,'2022-01-23 10:00:00');
+INSERT INTO `vnf_recipe` (`id`, `VF_MODULE_ID`, `ACTION`, `SERVICE_TYPE`, `VERSION_STR`, `VNF_TYPE`, `DESCRIPTION`, `ORCHESTRATION_URI`, `VNF_PARAM_XSD`, `RECIPE_TIMEOUT`, `CREATION_TIMESTAMP`) VALUES (10032,NULL,'healthCheck',NULL,'1','GR-API-DEFAULT','Gr api recipe to do CNF health check','/mso/async/services/WorkflowActionBB',NULL,180,'2022-01-05 18:52:03');
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
diff --git a/docs/architecture/architecture.rst b/docs/architecture/architecture.rst
index d59429a366..7cfb276cf7 100644
--- a/docs/architecture/architecture.rst
+++ b/docs/architecture/architecture.rst
@@ -9,7 +9,7 @@ SO - Architecture
 SO Functional View
 ------------------
 
-.. image:: ../images/SO_Architecture_1.png
+.. image:: ../images/SO_Architecture_2.png
 
 SO Deployment View
 --------------------
@@ -110,9 +110,22 @@ SO Sub-Components
    * Create, Instantiate, Terminate and Delete VNF, including Granting, Subscription and Lifecycle Notifications
    * Tracking capability which VNFM instance has handled with which VNF instance
    * BPMN Building Block workflows and Java-based recipes for VNF LCM
+   * Conformance of SOL001 VNFD and SOL004 VNF package specifications
+   * Interfacing with the ETSI Catalog Manager (a.k.a. etsicatalog) for retrieving ETSI VNF descriptors and artifacts
    * VNFM Simulator for validating SO VNFM Adapter NBI and SBI for integration testing
-   * The SO ETSI CSIT Tests and running them, https://wiki.onap.org/display/DW/SO+ETSI+CSIT
-   * Testing the SO ETSI Alignment manually (Instantiate VNF using SVNFM), https://wiki.onap.org/pages/viewpage.action?pageId=68524128
+
+.. image:: ../images/SO-SOL003-Adapter-Architecture-1.png
+
+**SO ETSI NFVO**
+
+  Support ETSI NFVO functions which manages Network Service LCM
+   * Create, Instantiate, Terminate and Delete NS
+   * Decomposing an NS request into associated VNF request(s) and managing VNF LCM (Create, Instantiate, Terminate, Delete VNF) through SO VNFMN Adapter
+   * Leveraging SOL005 for its NBI and SOl003 for its SBI
+   * Conformance of SOL001 NSD and SOL007 NS package specifications
+   * Interfacing with the ETSI Catalog Manager (a.k.a. etsicatalog) for retrieving ETSI NS descriptors and artifacts
+
+.. image:: ../images/SO-NFVO-Architecture-1.png
 
 Third Party and Open Source
 ---------------------------
diff --git a/docs/developer_info/CSIT_Macroflow_developer_info.rst b/docs/developer_info/CSIT_Macroflow_developer_info.rst
new file mode 100644
index 0000000000..d8c52a4a71
--- /dev/null
+++ b/docs/developer_info/CSIT_Macroflow_developer_info.rst
@@ -0,0 +1,153 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright 2022 Huawei Technologies Co., Ltd.
+
+SO CSIT (Macroflow)
+========================
+
+Ensure you have a healthy ONAP Deployment running. The following components will be required/used as part of this guide:
+
+- SO
+- SDC
+- AAI
+- DMAAP
+- SDNC
+- MultiCloud
+
+What is Macroflow?
+-----------------
+
+The SO building blocks are a set of database-driven, configurable and generic process steps to be leveraged through several actions defined as 'Macro' flows. For each of the macro flows, there are a set of actions to be performed which are implemented as building blocks - which then implement generic logic to handle the orchestration of services and various type of resources orchestrated by ONAP, as well as their corresponding actions.
+
+**Macroflow** method allows the user to build and send only one request to instantiate all objects : Service, VNFs, VFModules and Networks.
+
+How to run CSIT Macroflow?
+--------------------------
+
+The follow steps are to be installed and run on an Ubuntu 18.04 (desktop) installation.
+Later versions of Ubuntu and Java may work for the tests.
+
+**Prerequisite:**
+Install Java 11, Maven, docker, docker-compose
+
+Following steps need to be followed to run the CSIT Macroflow:
+
+First pull the CSIT repo from Gerrit, either with or without the hooks
+
+… code-block::
+
+    git clone "https://gerrit.onap.org/r/integration/csit"
+or
+
+.. code-block::
+
+    git clone "https://gerrit.onap.org/r/integration/csit" && (cd "csit" && mkdir -p .git/hooks && curl -Lo `git rev-parse --git-dir`/hooks/commit-msg https://gerrit.onap.org/r/tools/hooks/commit-msg; chmod +x `git rev-parse --git-dir`/hooks/commit-msg)
+    
+Once this is downloaded a few more installations are required.
+
+Install pip (if required)
+
+.. code-block::
+
+    sudo apt install python-pip
+
+Install Robot Framework through pip
+
+.. code-block::
+
+    pip install robotframework
+
+Run Script
+
+Once all of this is done, then the tests should be run by calling the run-csit.sh script and giving it the location of our test folder (csit/plans/so/macroflow).
+
+From the csit projects root folder run the following command:
+
+.. code-block::
+    
+    ./run-csit.sh plans/so/macroflow
+    
+This should successfully run the CSIT Macroflow
+
+The run-csit.sh will automatically set up a Robot environment for you, and execute the test plan defined in the plans/so/macroflow directory.
+
+If you look at the contents of the plans/so/macroflow you will see the following:
+
+**setup.sh:** the shell script that starts all the necessary docker containers required by this test plan, as well as passing the necessary environment variables to Robot.
+**testplan.txt:** the text file listing, in order, the test suites that should be executed by Robot for this particular test plan. This allows you to refactor test suites to be reused by multiple test plans as necessary.
+**teardown.sh:** the shell script that kills all the docker containers that were started by this test plan.
+**docker-compose.yml:** This lists all the requrired docker.
+
+How to run tests against specific SO versions
+--------------------------------------------
+It is possible to run the CSIT Macroflow suite against local docker images although it is not the default. Through this method specific versions of SO can be tested.
+
+There are two changes required to make this work.
+
+1. The env file, located at [containing folder]/csit/plans/so/macroflow/config/env, first needs to be changed. The DOCKER_ENVIROMENT needs to be changed from "remote" to "local". Also the TAG value might need to be changed. This Tag relates to the version of images being used. Make sure the cnf-adapter image version also need to be changed here.
+
+2. Secondly all of the required docker images must be present on system.
+
+This should be enough to run the CSIT Macroflow test suite locally.
+
+CSIT Macroflow Tests High Level Scenarios
+---------------------------------------------------
+
+**Step 1:**
+
+Perform Configuration / Setup Steps prior to running tests
+
+**Step 2:**
+
+Onoboard the Macroflow Csar Package to complete the distribution from sdc-controller. This will be done by RoboFramework itlself. ASDC saves both heat and helm info into mso catalogdb.
+
+**Step 3:**
+
+Once the distribution done, next Instantiation will be executed for Macrolfow. RoboFramework is used to trigger the Instantiation flow. In this case, API handler receives the call and fetches required information from mso catalogdb.
+
+**Step 4:**
+
+Bpmn-Infra is called and fetches required information from mso catalogdb and executes all the selected building blocks which will call cnf-adapter or openstack adapter on the basis of usecase whether it is Macroflow Heat or Macroflow Helm.
+
+**Step 5:**
+
+Bpmn-Infra also fetches and updates Action infromation to the AAI-Simulator and SDNC-Simulator
+
+**Step 6:**
+
+Cnf-Adapter will then call to Multicloud (Multicloud-Simulator) and complete the Execution of Macroflow.
+
+Follow the diagram in the image below to understand the step
+
+.. image:: ../images/Architecture_flow.png
+
+What are the tests doing?
+-------------------------
+There are three tests currently being run "Distribute Service Template", "Invoke Service Instantiation".
+
+**Distribute Service Template**
+
+As the name would suggest the aim for the "Distribute Service Template" test is to distribute a service template within the SDC controller pod. Once a http session of the SDC controller is created a post request can be made to it. This post requests sends binary data from "serviceBasicVfCnfnotification.json" for Macroflow heat and "serviceBasicVfCnfWithHelm.json" for Macroflow helm. These json files contain the information of resources and artifacts required to distribute a service. These json file gather information from the Csar package which resides in the plans/so/macroflow/config/distribution-test-zip directory. Once this post request is sent, the response status code is checked to see if it is 200. If the code is not equal to 200 then the test is thought to be a failure.
+
+**Invoke Service Instantiation**
+
+The aim of the "Invoke Service Instantiation" test is to invoke the service distributed to the sdc controller in the previous test. A http session of the api handler pod is created. This session is sent a post request containing "macroflow.json" for Macroflow heat and "MacroflowWithHelm.json" for Macroflow helm. Once these request are made the response is checked if it a valid code is returned.  A for loop is used to continually make calls to check the orchestration request for both the request, to check the status of service instantiation. Only once this orchestration returns either a fail or success, will we break out of the for loop. Once outside the for loop a final statement is used to check if service has been successfully instantiated.
+
+Troubleshooting
+---------------
+There are a number of simple issues relating from Python and its libraries
+
+A correct installation of the robot framework to run our tests requiring python and the following pip libraries.
+
+- robotframework
+- robotframework-extendedselenium2library
+- robotframework-httplibrary
+- robotframework-onap
+- robotframework-requests
+- robotframework-selenium2library
+
+To make sure each of the previous libraries is installed run the following command
+
+.. code-block::
+
+    pip -list
diff --git a/docs/developer_info/ETSI_CSIT_NFVO_VNFM.rst b/docs/developer_info/ETSI_CSIT_NFVO_VNFM.rst
new file mode 100644
index 0000000000..3bc8393d56
--- /dev/null
+++ b/docs/developer_info/ETSI_CSIT_NFVO_VNFM.rst
@@ -0,0 +1,227 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright 2022 Ericsson Software Technologies
+
+SO ETSI CSIT (NFVO and VNFM)
+============================
+This guide will go through the CSIT of the ETSI NFVO and VNFM.
+
+Ensure you have a healthy ONAP Deployment running. The following components will be required/used as part of this guide:
+
+- SO
+- SDC
+- AAI
+- DMAAP
+- Modeling
+
+What is ETSI?
+-------------
+The European Telecommunications Standards Institute (ETSI) produces globally-applicable standards
+for Information and Communications Technologies. ETSI  set out standards covering the functionalities
+of the interfaces specified on the reference points, which use the acronym NFV-SOL
+(standing for “NFV Solutions”). As of ONAPs Dublin release the  SO SVNFM adapter supports
+SOL003 standards for Create, Instantiate, Terminate and Delete operations with Granting, Subscription
+and Notification. As of ONAP Honolulu release, the SO ETSI NFVO sub-component supports
+SOL005 (NBI) and SOL003 (SBI) standards for Create, Instantiate, Terminate and Delete NS and VNF
+(through the SOL003 Adapter) operations.
+
+How to Run CSIT Tests
+---------------------
+The follow steps are to install and run on an Ubuntu 18.04 (desktop) installation.
+Later versions of Ubuntu and Java may work for the tests.
+
+First pull the CSIT repo from Gerrit, either with or without the hooks
+
+.. code-block::
+
+    git clone "https://gerrit.onap.org/r/integration/csit"
+
+or
+
+.. code-block::
+
+    git clone "https://gerrit.onap.org/r/integration/csit" && (cd "csit" && mkdir -p .git/hooks && curl -Lo `git rev-parse --git-dir`/hooks/commit-msg https://gerrit.onap.org/r/tools/hooks/commit-msg; chmod +x `git rev-parse --git-dir`/hooks/commit-msg)
+
+Once this is downloaded a few more installations are required.
+
+Install pip (if required)
+
+.. code-block::
+
+    sudo apt install python-pip
+
+Install Robot Framework through pip
+
+.. code-block::
+
+    pip install robotframework
+
+Run Script
+
+Once all of this is done, then the tests should be run by calling the run-csit.sh script and giving it the location of our test folder (csit/plans/so/integration-etsi-testing).
+From the csit projects root folder run the following command:
+
+.. code-block::
+
+    ./run-csit.sh plans/so/integration-etsi-testing
+
+This should successfully run the ETSI CSIT suite
+
+How to run tests againt specific SO versions
+--------------------------------------------
+It is possible to run the ETSI CSIT suite against local docker images although it is not the default.
+Through this method specific versions of SO can be tested.
+There are two changes required to make this work.
+The env file, located at [containing folder]/csit/plans/so/integration-etsi-testing/config/env,
+first needs to be changed. The DOCKER_ENVIROMENT needs to be changed from "remote" to "local".
+Also the TAG value might need to be changed. This Tag relates to the version of images being used.
+
+Secondly all of the required docker images must be present on system.
+
+This should be enough to run the ETSI CSIT test suite locally.
+
+ETSI NFVO Automated CSIT Tests High Level Scenarios
+---------------------------------------------------
+**Step 1:**
+
+Perform Configuration / Setup Steps prior to running tests
+
+**Step 2:**
+
+Onboard SOL004 Package and SOL007 directly into ETSI Catalog using ROBOT framework
+
+**Step 3:**
+
+ETSI Catalog Gets Package from SDC Simulator (New: ETSI Catalog and Modeling ETSI Catalog DB will need to be set up and spun up for CSIT. May be some impact on SDC Simulator here)
+
+**Step 4:**
+
+ETSI Catalog Stores Package in its Modeling ETSI Catalog DB
+
+**Step 5:**
+
+ROBOT framework used to trigger NS LCM requests, e.g., INSTANTIATE NS
+
+**Step 6:**
+
+ETSI NFVO NS LCM gets required data from ETSI Catalog, e.g., Get and Parse NSD
+
+**Step 7:**
+
+If e.g., a CREATE NS task, ETSI NFVO NS LCM checks to see if already exists in ETSI NFVO DB
+
+**Step 8:**
+
+Create Generic VNF and connect to Service Instance in A&AI Simulator (May be some impact on A&AI Simulator here)
+
+**Step 9:**
+
+Instantiate VNF through SOL003 Adapter
+
+**Step 10:**
+
+SOL003 Adapter processes requests through A&AI and (May be some impact on A&AI Simulator here)
+
+**Step 11:**
+
+SOL003 Adapter processes requests through ETSI-Catalog
+
+**Step 12:**
+
+SOL003 Adapter sends notification to SOL003 NBI, etc.
+
+What are the tests doing?
+-------------------------
+There are three tests currently being run "Distribute Service Template", "Invoke Service Instantiation",
+"Invoke NS Instantiation", "Delete NS Instance", "Invoke VNF Instantiation", "Delete VNF Instance" and
+"Delete Service Instance".
+
+Distribute Service Template
+
+As the name would suggest the aim for the "Distribute Service Template" test is to distribute a service
+template within the SDC controller pod. Once a http session of the SDC controller is created a post request
+can be made to it. This post requests sends binary data from "distributeServiceTemplate.json".
+This json file contains resources and artifacts required to distribute a service. Once this post request
+is sent, the response status code is checked to see if it is 200. If the code is not equal to 200 then
+the test is thought to be a failure.
+
+Invoke Service Instantiation
+
+The aim of the "Invoke Service Instantiation" test is to invoke the service distributed to the sdc controller
+in the previous test. A http session of the api handler pod is created. This session is sent a post request
+containing "serviceInstantiationRequest.json". Once this request is made the response is checked if it
+a valid code is returned.  A for loop is used to continually make calls to check the orchestration request,
+to check the status of service instantiation. Only once this orchestration returns either a fail or success,
+will we break out of the for loop.Once outside the for loop a final statement is used to check if service
+has been successfully instantiated.
+
+Invoke NS Instance
+
+The aim of "Invoke NS Instantiation" test is to now instantiate the NS that relates to service in the
+previous test. This test requires the ID of the service instance created in the previous test. If this is
+not provided then the test will fail from the get go. Once again a http session of the api handler pod is
+created. Similarly a post request using the json data within "nsInstantiationRequest.json".
+Once this request is made if it returns a success code then the test moves on to a for loop. Within this
+for a loop an orchestration request is made each time, when this request signals that either the instantiation
+request has failed or fully succeeded then the loop is escaped. The test will either be a pass or fail depending
+on this final orchestration request.
+
+Delete NS Instance
+
+This test will delete the NS Instance created in the previous test. Both the ID of the NS instance created
+in the previous test and the service instance created in the test before that. If either of these values is
+not provided then the test will fail. This test once again makes use of a session of the api handler pod.
+A post request is made using the data from  "nsDeleteRequest.json". Once this request is made if it returns
+a success code then the test moves on to a for loop. Within this for a loop an orchestration request is made
+each time, when this request signals that either the instantiation request has failed or fully succeeded
+then the loop is escaped. The test will either be a pass or fail depending on this final orchestration request.
+
+Invoke VNF Instance
+
+The aim of "Invoke VNF Instantiation" test is to now instantiate the VNF that relates to service in
+the previous test. This test requires the ID of the service instance created in the previous test.
+If this is not provided then the test will fail from the get go. Once again a http session of the
+api handler pod is created. Similarly a post request using the json data within "vnfInstantiationRequest.json".
+Once this request is made if it returns a success code then the test moves on to a for loop. Within this
+for a loop an orchestration request is made each time, when this request signals that either the instantiation
+request has failed or fully succeeded then the loop is escaped. The test will either be a pass or fail
+depending on this final orchestration request.
+
+Delete VNF Instance
+
+This test will delete the VNF Instance created in the previous test. Both the ID of the vnf instance created
+in the previous test and the service instance created in the test before that. If either of these values is
+not provided then the test will fail. This test once again makes use of a session of the api handler pod.
+A post request is made using the data from  "vnfDeleteRequest.json". Once this request is made if it returns
+a success code then the test moves on to a for loop. Within this for a loop an orchestration request is made
+each time, when this request signals that either the instantiation request has failed or fully succeeded then
+the loop is escaped. The test will either be a pass or fail depending on this final orchestration request.
+
+Delete Service Instance
+
+This test will delete the service instance created in earlier test. To delete the service the ID of previously
+ created Service Instance is required, if this is not supplied then the test will fail before starting.
+ A post request is then made to the API handler containing data from "serviceDeleteRquest.json".
+ Once this request is made if it returns a success code then the test moves on to a for loop.
+ Within this for a loop an orchestration request is made each time, when this request signals that either
+ the instantiation request has failed or fully succeeded then the loop is escaped. The test will either be
+ a pass or fail depending on this final orchestration request.
+
+Troubleshooting
+---------------
+There are a number of simple issues relating from Python and its libraries
+
+A correct installation of the robot framework to run our tests requiring python and the following pip libraries.
+
+- robotframework
+- robotframework-extendedselenium2library
+- robotframework-httplibrary
+- robotframework-onap
+- robotframework-requests
+- robotframework-selenium2library
+
+To make sure each of the previous libraries is installed run the following command
+
+.. code-block::
+
+    pip -list
\ No newline at end of file
diff --git a/docs/developer_info/developer_information.rst b/docs/developer_info/developer_information.rst
index e174133d6f..11b515248a 100644
--- a/docs/developer_info/developer_information.rst
+++ b/docs/developer_info/developer_information.rst
@@ -15,6 +15,7 @@ SO Developer Information
    Camunda_Cockpit_Community_Edition.rst
    Camunda_Cockpit_Enterprise_Edition.rst
    Camunda_Modeler.rst
+   CSIT_Macroflow_developer_info.rst
    BPMN_Project_Structure.rst
    BPMN_Main_Process_Flows.rst
    BPMN_Subprocess_Process_Flows.rst
diff --git a/docs/images/Architecture_flow.png b/docs/images/Architecture_flow.png
new file mode 100644
index 0000000000..112192560d
--- /dev/null
+++ b/docs/images/Architecture_flow.png
diff --git a/docs/images/SO-NFVO-Architecture-1.png b/docs/images/SO-NFVO-Architecture-1.png
new file mode 100644
index 0000000000..dd04a7b2e4
--- /dev/null
+++ b/docs/images/SO-NFVO-Architecture-1.png
diff --git a/docs/images/SO-SOL003-Adapter-Architecture-1.png b/docs/images/SO-SOL003-Adapter-Architecture-1.png
new file mode 100644
index 0000000000..932d5d1bcd
--- /dev/null
+++ b/docs/images/SO-SOL003-Adapter-Architecture-1.png
diff --git a/docs/images/SO_Architecture_2.png b/docs/images/SO_Architecture_2.png
new file mode 100644
index 0000000000..45ffd953e6
--- /dev/null
+++ b/docs/images/SO_Architecture_2.png