From: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Date: Tue, 16 Feb 2021 17:15:50 +0000 (+0000)
Subject: Merge "Add initial configurations + basic test for ETSI NFVO NS LCM CSIT Tests"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a680781ff2266be181cad97275514ab5bb6716e4;hp=-c;p=integration%2Fcsit.git

Merge "Add initial configurations + basic test for ETSI NFVO NS LCM CSIT Tests"
---

a680781ff2266be181cad97275514ab5bb6716e4
diff --combined plans/so/integration-etsi-testing/docker-compose.yml
index 772fb6f0,1d51221c..6aea906b
--- a/plans/so/integration-etsi-testing/docker-compose.yml
+++ b/plans/so/integration-etsi-testing/docker-compose.yml
@@@ -220,7 -220,7 +220,7 @@@ services
        - request-db-adapter
  ################################################################################
    so-vnfm-adapter:
 -    image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vnfm-adapter:${TAG}
 +    image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vnfm-adapter:${SOL_003_ADAPTER_IMAGE_VERSION}
      ports:
        - "9092:9092"
      volumes:
@@@ -376,3 -376,31 +376,31 @@@
          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 --combined tests/so/etsi/etsi_package_onboarding_tests.robot
index e4694e01,2b2054d2..c48101c8
--- a/tests/so/etsi/etsi_package_onboarding_tests.robot
+++ b/tests/so/etsi/etsi_package_onboarding_tests.robot
@@@ -3,11 -3,6 +3,11 @@@ Library     Collection
  Library     RequestsLibrary
  Library     OperatingSystem
  Library     json
 +Documentation    Test cases for onboarding and distributing a VNF package
 +...              Note: onboarded VNF package is used in later VNF tests including:
 +...                -etsi_vnf_lcm_tests.robot
 +...                -etsi_vnf_package_management_tests.robot
 +...                -etsi_vnf_notification_tests.robot
  
  *** Variables ***
  ${SLEEP_INTERVAL_SEC}=   5
@@@ -51,6 -46,17 +51,17 @@@ OnBoard VNF Package In Etsi Catalo
      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