From afd22dac87adc52066e35a9ac5b475fc17f2ca69 Mon Sep 17 00:00:00 2001
From: rope252 <gareth.roper@est.tech>
Date: Fri, 12 Feb 2021 12:39:12 +0000
Subject: [PATCH] Add initial configurations + basic test for ETSI NFVO NS LCM
 CSIT Tests

Change-Id: Icbcac6c89a0635306c0502e558159618c5df8e58
Issue-ID: INT-1839
Signed-off-by: rope252 <gareth.roper@est.tech>
---
 .../aai-simulator-populate-data/customer.json      |  32 ++++++++++++++
 .../so-etsi-nfvo-ns-lcm/onapheat/override.yaml     |  47 +++++++++++++++++++++
 .../so/integration-etsi-testing/docker-compose.yml |  28 ++++++++++++
 .../9bb8c882-44a1-4b67-a12c-5a998e18d6ba.csar      | Bin 147743 -> 147255 bytes
 .../controller/CatalogControllerTest.java          |   2 +-
 plans/so/integration-etsi-testing/testplan.txt     |   1 +
 .../so/etsi/data/createNetworkServiceRequest.json  |   1 +
 .../data/networkServicePackageOnboardRequest.json  |   1 +
 tests/so/etsi/etsi_nfvo_ns_lcm_tests.robot         |  27 ++++++++++++
 tests/so/etsi/etsi_package_onboarding_tests.robot  |  11 +++++
 10 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 plans/so/integration-etsi-testing/config/override-files/so-etsi-nfvo-ns-lcm/onapheat/override.yaml
 create mode 100644 tests/so/etsi/data/createNetworkServiceRequest.json
 create mode 100644 tests/so/etsi/data/networkServicePackageOnboardRequest.json
 create mode 100644 tests/so/etsi/etsi_nfvo_ns_lcm_tests.robot

diff --git a/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/customer.json b/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/customer.json
index 6c53c056..931e31eb 100644
--- a/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/customer.json
+++ b/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/customer.json
@@ -67,6 +67,38 @@
                         }
                     ]
                 }
+            },
+	    {
+                "service-type": "NetworkService",
+                "relationship-list": {
+                    "relationship": [
+                        {
+                            "related-to": "tenant",
+                            "relationship-label": "org.onap.relationships.inventory.Uses",
+                            "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/xyzcloud/tenants/tenant/693c7729b2364a26a3ca602e6f66187d",
+                            "relationship-data": [
+                                {
+                                    "relationship-key": "cloud-region.cloud-owner",
+                                    "relationship-value": "CloudOwner"
+                                },
+                                {
+                                    "relationship-key": "cloud-region.cloud-region-id",
+                                    "relationship-value": "xyzcloud"
+                                },
+                                {
+                                    "relationship-key": "tenant.tenant-id",
+                                    "relationship-value": "693c7729b2364a26a3ca602e6f66187d"
+                                }
+                            ],
+                            "related-to-property": [
+                                {
+                                    "property-key": "tenant.tenant-name",
+                                    "property-value": "admin"
+                                }
+                            ]
+                        }
+                    ]
+                }
             }
         ]
     }
diff --git a/plans/so/integration-etsi-testing/config/override-files/so-etsi-nfvo-ns-lcm/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/so-etsi-nfvo-ns-lcm/onapheat/override.yaml
new file mode 100644
index 00000000..bb35d1f9
--- /dev/null
+++ b/plans/so/integration-etsi-testing/config/override-files/so-etsi-nfvo-ns-lcm/onapheat/override.yaml
@@ -0,0 +1,47 @@
+aai:
+  auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
+  version: v15
+  endpoint: https://aai-simulator:9993
+spring:
+  datasource:
+    hikari:
+      camunda:
+        jdbcUrl: jdbc:mariadb://mariadb:3306/camundabpmn
+        username: so_user
+        password: so_User123
+        driver-class-name: org.mariadb.jdbc.Driver
+        pool-name: bpmn-pool
+        registerMbeans: true
+      nfvo:
+        jdbcUrl: jdbc:mariadb://mariadb:3306/nfvo
+        username: so_admin
+        password: so_Admin123
+        driver-class-name: org.mariadb.jdbc.Driver
+        pool-name: nfvo-pool
+        registerMbeans: true
+  security:
+    usercredentials:
+    - username: so-etsi-nfvo-ns-lcm
+      password: $2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke
+      role: ETSI-NFVO-Client
+server:
+  port: 9095
+  tomcat:
+    max-threads: 50
+mso:
+  key: 07a7159d3bf51a0e53be7a8f89699be7
+so:
+  adapters:
+    sol003-adapter:
+      url: http://so-vnfm-adapter:9092/so/vnfm-adapter/v1
+      auth: Basic dm5mbTpwYXNzd29yZDEk
+etsi-catalog-manager:
+  base:
+    endpoint: http://modeling-etsicatalog:8806/api
+camunda:
+  bpm:
+    history-level: full
+    job-execution:
+      max-pool-size: 30
+      core-pool-size: 3
+      deployment-aware: true
diff --git a/plans/so/integration-etsi-testing/docker-compose.yml b/plans/so/integration-etsi-testing/docker-compose.yml
index cc753118..1d51221c 100644
--- a/plans/so/integration-etsi-testing/docker-compose.yml
+++ b/plans/so/integration-etsi-testing/docker-compose.yml
@@ -376,3 +376,31 @@ services:
         max-size: "30m"
         max-file: "5"
     entrypoint: /bin/sh -c '/service/wait-for.sh -t 300 -h mariadb -p 3306 && /service/modeling/etsicatalog/docker/docker-entrypoint.sh'
+###############################################################################
+  so-etsi-nfvo-ns-lcm:
+    image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-etsi-nfvo-ns-lcm:${TAG}
+    ports:
+      - "9095:9095"
+    volumes:
+      - ${CONFIG_DIR_PATH}/override-files/so-etsi-nfvo-ns-lcm/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
+      - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+    environment:
+      - APP=so-etsi-nfvo-ns-lcm
+      - JVM_ARGS=-Xms64m -Xmx512m
+      - DB_HOST=mariadb
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
+    hostname:
+      etsi.nfvo.ns.lcm
+    depends_on:
+      - mariadb
+      - aai-simulator
+      - sdc-simulator
+      - modeling-etsicatalog
+      - so-vnfm-adapter
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" mariadb:3306 -- "/app/start-app.sh"'
diff --git a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/main/resources/csar/SERVICES/9bb8c882-44a1-4b67-a12c-5a998e18d6ba.csar b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/main/resources/csar/SERVICES/9bb8c882-44a1-4b67-a12c-5a998e18d6ba.csar
index 6504cb1a05d7b52c84a1f38aa0241a7fda8fa8c2..1610b7fc8ae1090c37c4a3d12aec1c0c46e01e56 100644
GIT binary patch
delta 4202
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

delta 4900
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
Y9v(9jTHr?^NCf=!gG(Zf19l1eA9Xw4@&Et;

diff --git a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
index e3d040da..e5a6e7f7 100644
--- a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
+++ b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
@@ -102,7 +102,7 @@ public class CatalogControllerTest {
 
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertTrue(response.hasBody());
-        assertEquals(147743, response.getBody().length);
+        assertEquals(147255, response.getBody().length);
 
     }
 
diff --git a/plans/so/integration-etsi-testing/testplan.txt b/plans/so/integration-etsi-testing/testplan.txt
index 249010a9..963abb93 100644
--- a/plans/so/integration-etsi-testing/testplan.txt
+++ b/plans/so/integration-etsi-testing/testplan.txt
@@ -5,3 +5,4 @@ so/etsi/etsi_package_onboarding_tests.robot
 so/etsi/etsi_vnf_lcm_tests.robot
 so/etsi/etsi_vnf_package_management_tests.robot
 so/etsi/etsi_vnf_notification_tests.robot
+so/etsi/etsi_nfvo_ns_lcm_tests.robot
diff --git a/tests/so/etsi/data/createNetworkServiceRequest.json b/tests/so/etsi/data/createNetworkServiceRequest.json
new file mode 100644
index 00000000..6980068e
--- /dev/null
+++ b/tests/so/etsi/data/createNetworkServiceRequest.json
@@ -0,0 +1 @@
+{"nsdId": "9bb8c882-44a1-4b67-a12c-5a998e18d6ba", "nsName": "demo", "nsDescription": "demo"}
diff --git a/tests/so/etsi/data/networkServicePackageOnboardRequest.json b/tests/so/etsi/data/networkServicePackageOnboardRequest.json
new file mode 100644
index 00000000..f6ffeb2e
--- /dev/null
+++ b/tests/so/etsi/data/networkServicePackageOnboardRequest.json
@@ -0,0 +1 @@
+{"csarId": "9bb8c882-44a1-4b67-a12c-5a998e18d6ba"}
diff --git a/tests/so/etsi/etsi_nfvo_ns_lcm_tests.robot b/tests/so/etsi/etsi_nfvo_ns_lcm_tests.robot
new file mode 100644
index 00000000..e931b3ca
--- /dev/null
+++ b/tests/so/etsi/etsi_nfvo_ns_lcm_tests.robot
@@ -0,0 +1,27 @@
+*** Settings ***
+Library     Collections
+Library     RequestsLibrary
+Library     OperatingSystem
+Library     json
+Library     ArchiveLibrary
+
+*** Variables ***
+${NFVO_NS_LCM_BASE_URL}=    /so/so-etsi-nfvo-ns-lcm/v1/api/nslcm/v1
+${BASIC_AUTH}=    Basic c28tZXRzaS1uZnZvLW5zLWxjbTpwYXNzd29yZDEk
+
+*** Test Cases ***
+
+Invoke Create Network Service
+    Create Session   etsi_nfvo_ns_lcm_session  http://${REPO_IP}:9095
+    ${data}=    Get Binary File     ${CURDIR}${/}data${/}createNetworkServiceRequest.json
+    &{headers}=  Create Dictionary    Authorization=${BASIC_AUTH}    Content-Type=application/json    Accept=application/json    HTTP_GLOBALCUSTOMERID=DemoCustomer
+    ${create_network_service_request}=    POST On Session    etsi_nfvo_ns_lcm_session    ${NFVO_NS_LCM_BASE_URL}/ns_instances    data=${data}    headers=${headers}
+    log to console      ${create_network_service_request.content}
+    ${create_network_service_json_response}=    Evaluate     json.loads(r"""${create_network_service_request.content}""", strict=False)    json
+    ${request_Id}=          Set Variable         ${create_network_service_json_response}[id]
+    SET GLOBAL VARIABLE       ${request_Id}
+
+    Run Keyword If  '${create_network_service_request.status_code}' == '201'  log to console  \nexecuted with expected result
+    log to console      \nCreate Network Service Response Status Code: ${create_network_service_request.status_code}
+    Should Be Equal As Strings    '${create_network_service_request.status_code}'    '201'
+
diff --git a/tests/so/etsi/etsi_package_onboarding_tests.robot b/tests/so/etsi/etsi_package_onboarding_tests.robot
index 96c9896d..2b2054d2 100644
--- a/tests/so/etsi/etsi_package_onboarding_tests.robot
+++ b/tests/so/etsi/etsi_package_onboarding_tests.robot
@@ -46,6 +46,17 @@ OnBoard VNF Package In Etsi Catalog
     Run Keyword If  '${actual_job_status}' == 'finished'  log to console   \nexecuted with expected result
     Should Be Equal As Strings    '${actual_job_status}'    'finished'
 
+Onboard Network Service Package In Etsi Catalog
+    Create Session   etsi_catalog_session  http://${REPO_IP}:8806
+    ${data}=    Get Binary File     ${CURDIR}${/}data${/}networkServicePackageOnboardRequest.json
+    &{headers}=  Create Dictionary    Content-Type=application/json    Accept=application/json
+    ${resp}=    POST On Session    etsi_catalog_session    /api/catalog/v1/nspackages    data=${data}    headers=${headers}
+    log to console      ${resp.content}
+
+    Run Keyword If  '${resp.status_code}' == '202'  log to console  \nexecuted with expected result
+    Should Be Equal As Strings    '${resp.status_code}'    '202'
+
+
 Distribute Service Template
     Create Session   sdc_controller_session  http://${REPO_IP}:8085
     ${data}=    Get Binary File     ${CURDIR}${/}data${/}distributeServiceTemplate.json
-- 
2.16.6