Merge "Added CSIT for Macroflow with HELM"

2 files changed, 353 insertions, 0 deletions

diff --git a/tests/so/sanity-check/data/MacroflowWithHelm.json b/tests/so/sanity-check/data/MacroflowWithHelm.json
new file mode 100644
index 00000000..bea4ad95
--- /dev/null
+++ b/tests/so/sanity-check/data/MacroflowWithHelm.json
@@ -0,0 +1,183 @@
+{
+            "requestDetails": {
+               "modelInfo": {
+                  "modelInvariantId": "12f78123-0fe3-4691-8621-152b1aeb740b",
+                  "modelType": "service",
+                  "modelName": "vfw_k8s_demo_CNF_e2e_native_2",
+                  "modelVersion": "1.0",
+                  "modelVersionId": "623d4032-89ec-4f14-a655-31943fb002fa",
+                  "modelUuid": "623d4032-89ec-4f14-a655-31943fb002fa",
+                  "modelInvariantUuid": "12f78123-0fe3-4691-8621-152b1aeb740b"
+               },
+               "requestInfo": {
+                  "productFamilyId": "1234",
+                  "source": "VID",
+                  "instanceName": "INSTANCE_vfw_k8s_demo_CNF_e2e_native_2",
+                  "suppressRollback": false,
+                  "requestorId": "demo"
+               },
+               "subscriberInfo": {
+                  "globalSubscriberId": "DemoCustomer"
+               },
+               "cloudConfiguration": {
+                  "tenantId": "693c7729b2364a26a3ca602e6f66187d",
+                  "cloudOwner": "CloudOwner",
+                  "lcpCloudRegionId": "EtsiCloudRegion"
+               },
+               "requestParameters": {
+                  "subscriptionServiceType": "vCPE",
+                  "userParams": [
+                     {
+                        "Homing_Solution": "none"
+                     },
+                     {
+                        "service": {
+                           "instanceParams": [],
+                           "instanceName": "INSTANCE_vfw_k8s_demo_CNF_e2e_native_2",
+                           "resources": {
+                              "vnfs": [
+                                 {
+                                    "modelInfo": {
+                                       "modelName": "VF_vfw_k8s_demo_CNF_e2e_native_2",
+                                       "modelVersionId": "9b6c36da-e4bb-4d58-b22e-5f0198a1813e",
+                                       "modelInvariantUuid": "d65aeed1-1980-44dd-bdeb-ee78ea5ab842",
+                                       "modelVersion": "1.0",
+                                       "modelCustomizationId": "28aeaced-a71c-48ce-a3ae-58ab9eb4dd9f",
+                                       "modelInstanceName": "VF_vfw_k8s_demo_CNF_e2e_native_2"
+                                    },
+                                    "cloudConfiguration": {
+                                       "tenantId": "693c7729b2364a26a3ca602e6f66187d",
+                                       "cloudOwner": "CloudOwner",
+                                       "lcpCloudRegionId": "EtsiCloudRegion"
+                                    },
+                                    "platform": {
+                                       "platformName": "test"
+                                    },
+                                    "lineOfBusiness": {
+                                       "lineOfBusinessName": "LOB-Demonstration"
+                                    },
+                                    "productFamilyId": "1234",
+                                    "instanceName": "VF_vfw_k8s_demo_CNF_e2e_native_2",
+                                    "instanceParams": [
+                                       {
+                                          "sdnc_model_name": "vFW_CNF_CDS",
+                                          "sdnc_model_version": "7.1.0",
+                                          "sdnc_artifact_name": "vnf"
+                                       }
+                                    ],
+                                    "vfModules": [
+                                       {
+                                          "modelInfo": {
+                                             "modelName": "VfVfwK8sDemoCnfE2eNative2..helm_vpkg..module-2",
+                                             "modelVersionId": "b3e97d36-8e10-411f-a682-8551844e04ea",
+                                             "modelInvariantUuid": "f753b92d-2a70-488d-b53a-300435d6a455",
+                                             "modelVersion": "1",
+                                             "modelCustomizationId": "30ce403e-99cc-43c2-8782-15499895d157"
+                                          },
+                                          "instanceName": "vf_vfw_k8s_demo_cnf_e2e_native_20..VfVfwK8sDemoCnfE2eNative2..helm_vpkg..module-2",
+                                          "instanceParams": [
+                                             {
+                                                "k8s-rb-profile-name": "vfw-cnf-cds-base-profile",
+                                                "k8s-rb-profile-namespace": "vfirewall",
+                                                "sdnc_model_name": "vFW_CNF_CDS",
+                                                "sdnc_model_version": "7.1.0",
+                                                "vf_module_label": "helm_vpkg"
+                                             }
+                                          ]
+                                       },
+                                       {
+                                          "modelInfo": {
+                                             "modelName": "VfVfwK8sDemoCnfE2eNative2..helm_base_template..module-4",
+                                             "modelVersionId": "bb944b26-d331-4e01-9e1a-47355b162bc8",
+                                             "modelInvariantUuid": "12ac8bc6-330a-4071-a34b-65aab99539ec",
+                                             "modelVersion": "1",
+                                             "modelCustomizationId": "95db0408-b8df-44fb-8199-37394c1085d8"
+                                          },
+                                          "instanceName": "vf_vfw_k8s_demo_cnf_e2e_native_20..VfVfwK8sDemoCnfE2eNative2..helm_base_template..module-4",
+                                          "instanceParams": [
+                                             {
+                                                "k8s-rb-profile-name": "vfw-cnf-cds-base-profile",
+                                                "k8s-rb-profile-namespace": "vfirewall",
+                                                "sdnc_model_name": "vFW_CNF_CDS",
+                                                "sdnc_model_version": "7.1.0",
+                                                "vf_module_label": "helm_base_template"
+                                             }
+                                          ]
+                                       },
+                                       {
+                                          "modelInfo": {
+                                             "modelName": "VfVfwK8sDemoCnfE2eNative2..helm_vfw..module-3",
+                                             "modelVersionId": "79cfcc33-1456-438b-b362-a2a8587a80f8",
+                                             "modelInvariantUuid": "e46c710f-ad4b-49a5-bbae-4e0f16fc4a98",
+                                             "modelVersion": "1",
+                                             "modelCustomizationId": "b87081da-c8e0-4c20-aefa-2da23c998502"
+                                          },
+                                          "instanceName": "vf_vfw_k8s_demo_cnf_e2e_native_20..VfVfwK8sDemoCnfE2eNative2..helm_vfw..module-3",
+                                          "instanceParams": [
+                                             {
+                                                "k8s-rb-profile-name": "vfw-cnf-cds-base-profile",
+                                                "k8s-rb-profile-namespace": "vfirewall",
+                                                "sdnc_model_name": "vFW_CNF_CDS",
+                                                "sdnc_model_version": "7.1.0",
+                                                "vf_module_label": "helm_vfw"
+                                             }
+                                          ]
+                                       },
+                                       {
+                                          "modelInfo": {
+                                             "modelName": "VfVfwK8sDemoCnfE2eNative2..helm_vsn..module-1",
+                                             "modelVersionId": "efa8355e-d011-4f90-b17a-3542d2cf8321",
+                                             "modelInvariantUuid": "502a434b-f718-4332-a8d2-2e689f8ceb22",
+                                             "modelVersion": "1",
+                                             "modelCustomizationId": "0dc8a6d0-fe90-4f77-bf2a-4dcd4b82f548"
+                                          },
+                                          "instanceName": "vf_vfw_k8s_demo_cnf_e2e_native_20..VfVfwK8sDemoCnfE2eNative2..helm_vsn..module-1",
+                                          "instanceParams": [
+                                             {
+                                                "k8s-rb-profile-name": "vfw-cnf-cds-base-profile",
+                                                "k8s-rb-profile-namespace": "vfirewall",
+                                                "sdnc_model_name": "vFW_CNF_CDS",
+                                                "sdnc_model_version": "7.1.0",
+                                                "vf_module_label": "helm_vsn"
+                                             }
+                                          ]
+                                       },
+                                       {
+                                          "modelInfo": {
+                                             "modelName": "VfVfwK8sDemoCnfE2eNative2..base_template_dummy_ignore..module-0",
+                                             "modelVersionId": "67b3b9a9-23cf-4212-a482-3fb5d9521247",
+                                             "modelInvariantUuid": "f7b40081-9ddc-4885-a409-5f57685c4a46",
+                                             "modelVersion": "1",
+                                             "modelCustomizationId": "c25ecd21-31a6-4a9d-8bc1-945570f7d2aa"
+                                          },
+                                          "instanceName": "vf_vfw_k8s_demo_cnf_e2e_native_20..VfVfwK8sDemoCnfE2eNative2..base_template_dummy_ignore..module-0",
+                                          "instanceParams": [
+                                             {}
+                                          ]
+                                       }
+                                    ]
+                                 }
+                              ]
+                           },
+                           "modelInfo": {
+                              "modelVersion": "1.0",
+                              "modelVersionId": "623d4032-89ec-4f14-a655-31943fb002fa",
+                              "modelInvariantId": "12f78123-0fe3-4691-8621-152b1aeb740b",
+                              "modelName": "vfw_k8s_demo_CNF_e2e_native_2",
+                              "modelType": "service"
+                           }
+                        }
+                     }
+                  ],
+                  "aLaCarte": false,
+                  "usePreload": false
+               },
+               "project": {
+                  "projectName": "etsiCsitProject"
+               },
+               "owningEntity": {
+                  "owningEntityId": "f2e1071e-3d47-4a65-94d4-e473ec03326a",
+                  "owningEntityName": "OE-Demonstration"
+               }
+            }
+         }
diff --git a/tests/so/sanity-check/data/serviceBasicVfCnfWithHelm.json b/tests/so/sanity-check/data/serviceBasicVfCnfWithHelm.json
new file mode 100644
index 00000000..c1775f94
--- /dev/null
+++ b/tests/so/sanity-check/data/serviceBasicVfCnfWithHelm.json
@@ -0,0 +1,170 @@
+{
+  "distributionID": "538da916-d1fc-4616-81d3-a4ccc07b5ee3",
+  "serviceName": "vfw_k8s_demo_CNF_e2e_native_2",
+  "serviceVersion": "1.0",
+  "serviceUUID": "623d4032-89ec-4f14-a655-31943fb002fa",
+  "serviceDescription": "service",
+  "serviceInvariantUUID": "12f78123-0fe3-4691-8621-152b1aeb740b",
+  "resources": [
+    {
+      "resourceInstanceName": "VF_vfw_k8s_demo_CNF_e2e_native_2",
+      "resourceName": "VF_vfw_k8s_demo_CNF_e2e_native_2",
+      "resourceVersion": "1.0",
+      "resoucreType": "VF",
+      "resourceUUID": "9b6c36da-e4bb-4d58-b22e-5f0198a1813e",
+      "resourceInvariantUUID": "d65aeed1-1980-44dd-bdeb-ee78ea5ab842",
+      "resourceCustomizationUUID": "28aeaced-a71c-48ce-a3ae-58ab9eb4dd9f",
+      "category": "Generic",
+      "subcategory": "Abstract",
+      "artifacts": [{
+          "artifactName": "vf_vfw_k8s_demo_cnf_e2e_native_20_modules.json",
+          "artifactType": "VF_MODULES_METADATA",
+          "artifactURL": "/unzipped_sdc_csar/vf_vfw_k8s_demo_cnf_e2e_native_20_modules.json",
+          "artifactChecksum": "MTA2MjAxNDAyMmY0NmMwYTlmMDMyN2FjZDUxODkzNWI\u003d",
+          "artifactDescription": "Auto-generated VF Modules information artifact",
+          "artifactTimeout": 120,
+          "artifactUUID": "86224a10-c17e-42c9-9809-f3c31ba1b781",
+          "artifactVersion": "1"
+        }, 
+        {
+          "artifactName": "helm_base_template.env",
+          "artifactType": "HEAT_ENV",
+          "artifactURL": "/unzipped_sdc_csar/helm_base_template.env",
+          "artifactChecksum": "MTA2MjAxNDAyMmY0NmMwYTlmMDMyN2FjZDUxODkzNWI\u003d",
+          "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
+          "artifactTimeout": 0,
+          "artifactVersion": "2",
+          "artifactUUID": "368f90d2-2b5e-4987-a35a-248b77d7aa0a",
+          "relatedArtifactsInfo": []
+        },
+        {
+          "artifactName": "helm_vfw.env",
+          "artifactType": "HEAT_ENV",
+          "artifactURL": "/unzipped_sdc_csar/helm_vfw.env",
+          "artifactChecksum": "MTA2MjAxNDAyMmY0NmMwYTlmMDMyN2FjZDUxODkzNWI\u003d",
+          "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
+          "artifactTimeout": 0,
+          "artifactVersion": "2",
+          "artifactUUID": "47cdc1c7-07b6-4121-b49c-521658ac7f9a",
+          "relatedArtifactsInfo": []
+        },
+        {
+          "artifactName": "helm_vpkg.env",
+          "artifactType": "HEAT_ENV",
+          "artifactURL": "/unzipped_sdc_csar/helm_vpkg.env",
+          "artifactChecksum": "MTA2MjAxNDAyMmY0NmMwYTlmMDMyN2FjZDUxODkzNWI\u003d",
+          "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
+          "artifactTimeout": 0,
+          "artifactVersion": "2",
+          "artifactUUID": "da36f872-ce07-4f1f-95e5-5d9f836b2fb4",
+          "relatedArtifactsInfo": []
+        },
+        {
+          "artifactName": "base_template_dummy_ignore.yaml",
+          "artifactType": "HEAT",
+          "artifactURL": "/unzipped_sdc_csar/base_template_dummy_ignore.yaml",
+          "artifactChecksum": "ZjI3NTdkZWViNTEzY2NhZjg4MmQ3OTcxZjcyMmNmNDY\u003d",
+          "artifactDescription": "created from csar",
+          "artifactTimeout": 30,
+          "artifactVersion": "1",
+          "artifactUUID": "54f0f7f4-600d-473a-869f-bd86a3a57d52",
+          "generatedArtifact": {
+            "artifactName": "base_template_dummy_ignore.env",
+            "artifactType": "HEAT_ENV",
+            "artifactURL": "/unzipped_sdc_csar/base_template_dummy_ignore.env",
+            "artifactChecksum": "MTFhYjczYTdlMDU5MmE4N2FlMzhkM2RmMjIxZmY4ZmM\u003d",
+            "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
+            "artifactTimeout": 0,
+            "artifactVersion": "2",
+            "artifactUUID": "098499f4-aad8-4398-b02b-ae9f18cc2770",
+            "generatedFromUUID": "54f0f7f4-600d-473a-869f-bd86a3a57d52"
+          },
+          "relatedArtifactsInfo": []
+        },
+        {
+          "artifactName": "helm_vsn.env",
+          "artifactType": "HEAT_ENV",
+          "artifactURL": "/unzipped_sdc_csar/helm_vsn.env",
+          "artifactChecksum": "MTA2MjAxNDAyMmY0NmMwYTlmMDMyN2FjZDUxODkzNWI\u003d",
+          "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
+          "artifactTimeout": 0,
+          "artifactVersion": "2",
+          "artifactUUID": "756c8891-9120-42b2-948f-4831c248b5a3",
+          "relatedArtifactsInfo": []
+        },
+        {
+          "artifactName": "helm_base_template.tgz",
+          "artifactType": "HELM",
+          "artifactURL": "/unzipped_sdc_csar/helm_base_template.tgz",
+          "artifactChecksum": "YmVkODgxMzUzMzJlZmYzNzg0ZDViMjNlYmJiMmVlZmY\u003d",
+          "artifactDescription": "created from csar",
+          "artifactTimeout": 30,
+          "artifactVersion": "1",
+          "artifactUUID": "4affda27-3aac-4d12-bc09-d7539cafc122",
+          "relatedArtifactsInfo": []
+        },
+        {
+          "artifactName": "base_template_dummy_ignore.env",
+          "artifactType": "HEAT_ENV",
+          "artifactURL": "/unzipped_sdc_csar/base_template_dummy_ignore.env",
+          "artifactChecksum": "MTFhYjczYTdlMDU5MmE4N2FlMzhkM2RmMjIxZmY4ZmM\u003d",
+          "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
+          "artifactTimeout": 0,
+          "artifactVersion": "2",
+          "artifactUUID": "098499f4-aad8-4398-b02b-ae9f18cc2770",
+          "relatedArtifactsInfo": []
+        },
+        {
+          "artifactName": "helm_vsn.tgz",
+          "artifactType": "HELM",
+          "artifactURL": "/unzipped_sdc_csar/helm_vsn.tgz",
+          "artifactChecksum": "NmJmODE3NzY5YWRjNDYxZjI4ZGYyZjU1ZDY3ZDJkMWE\u003d",
+          "artifactDescription": "created from csar",
+          "artifactTimeout": 30,
+          "artifactVersion": "1",
+          "artifactUUID": "c9e8dce1-43f0-4100-973c-0eb576b3270c",
+          "relatedArtifactsInfo": []
+        },
+        {
+          "artifactName": "helm_vfw.tgz",
+          "artifactType": "HELM",
+          "artifactURL": "/unzipped_sdc_csar/helm_vfw.tgz",
+          "artifactChecksum": "MGNhNjAxYjNkOTUyYzBiOTJjNzIzMWVjN2FkZTg3ZWU\u003d",
+          "artifactDescription": "created from csar",
+          "artifactTimeout": 30,
+          "artifactVersion": "1",
+          "artifactUUID": "6d46bee9-d724-4332-b6e8-3133af774b6b",
+          "relatedArtifactsInfo": []
+        },
+        {
+          "artifactName": "helm_vpkg.tgz",
+          "artifactType": "HELM",
+          "artifactURL": "/unzipped_sdc_csar/helm_vpkg.tgz",
+          "artifactChecksum": "NjQ0MDA1OTI5Nzk1NjJmZGJjYjZlZTk0MzY1NjhmZjk\u003d",
+          "artifactDescription": "created from csar",
+          "artifactTimeout": 30,
+          "artifactVersion": "1",
+          "artifactUUID": "dfc44bf0-ffec-4b70-9226-da4ca7801f79",
+          "relatedArtifactsInfo": []
+        }
+
+]
+    }
+   
+   
+  ],
+  "serviceArtifacts": [
+    {
+      "artifactName": "service-VfwK8sDemoCnfE2eNative2-csar.csar",
+      "artifactType": "TOSCA_CSAR",
+      "artifactURL": "/unzipped_sdc_csar/service-VfwK8sDemoCnfE2eNative2-csar.csar",
+      "artifactChecksum": "ZTRhOGI0M2UxN2ZhYjQ0ODI5ZDZhZTExZTFkMGU3N2Y\u003d",
+      "artifactDescription": "TOSCA definition package of the asset",
+      "artifactTimeout": 0,
+      "artifactUUID": "623d4032-89ec-4f14-a655-31943fb002fa",
+      "artifactVersion": "1"
+    }
+  ],
+  "workloadContext": "Production"
+}
+