From 9d8ae6d68ea8427052ec45326e22f3a2ea7ed081 Mon Sep 17 00:00:00 2001 From: Alexander Dehn Date: Thu, 28 Apr 2022 16:14:09 +0000 Subject: Refactore SDNC/R robot test suite for K-Release add improvements SDNC ready state detection Issue-ID: SDNC-1682 Signed-off-by: Alexander Dehn Change-Id: I6b9829b5187f9c27ff9c2fab6b9a7381ce563b25 Former-commit-id: 83da3b4380d992d5891ed8e35b305358db9af4ff --- csit/plans/sdnr/setup.sh | 9 +++++++++ csit/plans/sdnr/testdata/nts-networkfunctions.csv | 13 ++++++------- csit/plans/sdnr/testplan.txt | 7 +++---- 3 files changed, 18 insertions(+), 11 deletions(-) (limited to 'csit/plans') diff --git a/csit/plans/sdnr/setup.sh b/csit/plans/sdnr/setup.sh index 5fa5f7ba..8f0d2963 100755 --- a/csit/plans/sdnr/setup.sh +++ b/csit/plans/sdnr/setup.sh @@ -36,6 +36,15 @@ onap_dependent_components_launch nts_networkfunctions_launch ${WORKSPACE}/plans/sdnr/testdata/nts-networkfunctions.csv sdnr_launch +## environment for SDNC/R specific robot test runs +## Ready state will be checked every SDNC_READY_RETRY_PERIOD seconds +# SDNC_READY_RETRY_PERIOD=15 +## SDNC ready state will be checked max SDNC_READY_TIMEOUT seconds +# SDNC_READY_TIMEOUT=450 + +# if jenkins should be ok without running robots TCS's +# SDNC_RELEASE_WITHOUT_ROBOT=true + #Pass any variables required by Robot test suites in ROBOT_VARIABLES ROBOT_VARIABLES="--variablefile=${WORKSPACE}/plans/sdnr/testdata/localhost.py" ROBOT_IMAGE="hightec/sdnc-test-lib:v0.10.0" diff --git a/csit/plans/sdnr/testdata/nts-networkfunctions.csv b/csit/plans/sdnr/testdata/nts-networkfunctions.csv index c2ccb2d6..0b0970d0 100644 --- a/csit/plans/sdnr/testdata/nts-networkfunctions.csv +++ b/csit/plans/sdnr/testdata/nts-networkfunctions.csv @@ -1,7 +1,6 @@ -NAME,NTS_NF_DOCKER_REPOSITORY,NTS_NF_IMAGE_NAME,NTS_NF_IMAGE_TAG,NTSFUNC-IP,NTS_HOST_NETCONF_SSH_BASE_PORT,NTS_HOST_NETCONF_TLS_BASE_PORT,NTS_NF_SSH_CONNECTIONS,NTS_NF_TLS_CONNECTIONS -ONF-CORE-1-2,docker.io/hightec/,nts-ng-onf-core-1-2,1.3.4,172.40.0.30,30000,30500,1,1 -ONF-CORE-1-4,docker.io/hightec/,nts-ng-onf-core-1-4,1.3.4,172.40.0.31,31000,31500,1,1 -OPENROADM-6-1-0,docker.io/hightec/,nts-ng-openroadm-6.1.0,1.3.4,172.40.0.36,36000,36500,1,1 -O-RAN-FH,docker.io/hightec/,nts-ng-o-ran-fh,1.3.4,172.40.0.40,40000,40500,1,1 -X-RAN,docker.io/hightec/,nts-ng-x-ran,1.3.4,172.40.0.42,42000,42500,1,1 - +NAME,NTS_NF_DOCKER_REPOSITORY,NTS_NF_IMAGE_NAME,NTS_NF_IMAGE_TAG,NTSFUNC-IP,NTSFUNC-IPv6,NTS_HOST_NETCONF_SSH_BASE_PORT,NTS_HOST_NETCONF_TLS_BASE_PORT,NTS_NF_SSH_CONNECTIONS,NTS_NF_TLS_CONNECTIONS,PORT,NETCONF_HOST,USER,PASSWORD,NTS_FUNCTION_TYPE +ONF-CORE-1-2,docker.io/hightec/,nts-ng-onf-core-1-2,1.3.4,172.40.0.30,2001:db8:1:50:172:50:0:30,30000,30500,1,1,830,172.40.0.1,netconf,netconf!,nts-onf-pac:NTS_FUNCTION_TYPE_ONF_CORE_MODEL_1_2 +ONF-CORE-1-4,docker.io/hightec/,nts-ng-onf-core-1-4,1.3.4,172.40.0.31,2001:db8:1:50:172:50:0:31,31000,31500,1,1,830,172.40.0.1,netconf,netconf!,nts-onf-pac:NTS_FUNCTION_TYPE_ONF_CORE_MODEL_1_4 +OPENROADM-6-1-0,docker.io/hightec/,nts-ng-openroadm-6.1.0,1.3.4,172.40.0.36,2001:db8:1:50:172:50:0:36,36000,36500,1,1,830,172.40.0.1,netconf,netconf!,nts-openroadm-pac:NTS_FUNCTION_TYPE_OPENROADM_6_1_0 +O-RAN-FH,docker.io/hightec/,nts-ng-o-ran-fh,1.3.4,172.40.0.40,2001:db8:1:50:172:50:0:40,40000,40500,1,1,830,172.40.0.1,netconf,netconf!,nts-o-ran-fh-pac:NTS_FUNCTION_TYPE_O_RAN_FH +X-RAN,docker.io/hightec/,nts-ng-x-ran,1.3.4,172.40.0.42,2001:db8:1:50:172:50:0:42,42000,42500,1,1,830,172.40.0.1,netconf,netconf!,nts-x-ran-pac:NTS_FUNCTION_TYPE_X_RAN diff --git a/csit/plans/sdnr/testplan.txt b/csit/plans/sdnr/testplan.txt index 08ec3550..dcbd829a 100644 --- a/csit/plans/sdnr/testplan.txt +++ b/csit/plans/sdnr/testplan.txt @@ -1,9 +1,8 @@ # Test suites are relative paths under [integration/csit.git]/tests/. # Place the suites in run order. -## To skip sdnr robot test suite uncomment this test case -#sdnr/debug/10_dummy.robot -## To skip sdnr robot test suite comment this test case +## To skip sdnr robot test suite +## set in .setup.sh SDNC_RELEASE_WITHOUT_ROBOT=true sdnr/healthcheck -#sdnr/functional +sdnr/functional -- cgit 1.2.3-korg