From dc396847579288b9049135833fad6080b96179b0 Mon Sep 17 00:00:00 2001 From: kaihlavi Date: Wed, 26 Jun 2019 15:09:37 +0300 Subject: [PATCH] Adjust DCAE-DS CSIT for Jenkins and to master - directory structures of DCAE-DS CSIT plans, scripts and tests have been changed to be more compatible with jjb templates to enable working Jenkins jobs - robot tests adjusted to latest changes in robotframework-onap library Change-Id: Id05602a88557267cc7ae77f066877680ae431a7f Issue-ID: SDC-2365 Signed-off-by: kaihlavi --- plans/{sdc => sdc-dcae-d}/dcaed/setup.sh | 2 +- plans/{sdc => sdc-dcae-d}/dcaed/teardown.sh | 2 +- plans/{sdc => sdc-dcae-d}/dcaed/testplan.txt | 2 +- scripts/{sdc => sdc-dcae-d}/cleanup_sdc_dcaed.sh | 0 scripts/{sdc => sdc-dcae-d}/setup_sdc_dcaed.sh | 0 tests/{sdc => sdc-dcae-d}/dcaed/__init__.robot | 0 tests/{sdc => sdc-dcae-d}/dcaed/asdc_interface.robot | 0 tests/{sdc => sdc-dcae-d}/dcaed/assets/artifact_upload.template | 0 tests/{sdc => sdc-dcae-d}/dcaed/assets/catalog_service.template | 0 .../dcaed/assets/component_catalog_resource.template | 0 tests/{sdc => sdc-dcae-d}/dcaed/assets/create_vfcmt.template | 0 tests/{sdc => sdc-dcae-d}/dcaed/assets/dcae_composition.template | 0 .../dcaed/assets/dcae_monitoring_configuration.template | 0 tests/{sdc => sdc-dcae-d}/dcaed/assets/resource_instance.template | 0 tests/{sdc => sdc-dcae-d}/dcaed/assets/schema.yaml | 0 tests/{sdc => sdc-dcae-d}/dcaed/assets/template.yaml | 0 tests/{sdc => sdc-dcae-d}/dcaed/assets/translate.yaml | 0 tests/{sdc => sdc-dcae-d}/dcaed/assets/user_remarks.template | 0 tests/{sdc => sdc-dcae-d}/dcaed/common.robot | 2 +- tests/{sdc => sdc-dcae-d}/dcaed/dcaed_interface.robot | 3 +-- tests/{sdc => sdc-dcae-d}/dcaed/json_templater.robot | 2 +- .../dcaed/monitoring_configuration_service_test.robot | 0 22 files changed, 6 insertions(+), 7 deletions(-) rename plans/{sdc => sdc-dcae-d}/dcaed/setup.sh (91%) rename plans/{sdc => sdc-dcae-d}/dcaed/teardown.sh (91%) rename plans/{sdc => sdc-dcae-d}/dcaed/testplan.txt (85%) rename scripts/{sdc => sdc-dcae-d}/cleanup_sdc_dcaed.sh (100%) rename scripts/{sdc => sdc-dcae-d}/setup_sdc_dcaed.sh (100%) rename tests/{sdc => sdc-dcae-d}/dcaed/__init__.robot (100%) rename tests/{sdc => sdc-dcae-d}/dcaed/asdc_interface.robot (100%) rename tests/{sdc => sdc-dcae-d}/dcaed/assets/artifact_upload.template (100%) rename tests/{sdc => sdc-dcae-d}/dcaed/assets/catalog_service.template (100%) rename tests/{sdc => sdc-dcae-d}/dcaed/assets/component_catalog_resource.template (100%) rename tests/{sdc => sdc-dcae-d}/dcaed/assets/create_vfcmt.template (100%) rename tests/{sdc => sdc-dcae-d}/dcaed/assets/dcae_composition.template (100%) rename tests/{sdc => sdc-dcae-d}/dcaed/assets/dcae_monitoring_configuration.template (100%) rename tests/{sdc => sdc-dcae-d}/dcaed/assets/resource_instance.template (100%) rename tests/{sdc => sdc-dcae-d}/dcaed/assets/schema.yaml (100%) rename tests/{sdc => sdc-dcae-d}/dcaed/assets/template.yaml (100%) rename tests/{sdc => sdc-dcae-d}/dcaed/assets/translate.yaml (100%) rename tests/{sdc => sdc-dcae-d}/dcaed/assets/user_remarks.template (100%) rename tests/{sdc => sdc-dcae-d}/dcaed/common.robot (75%) rename tests/{sdc => sdc-dcae-d}/dcaed/dcaed_interface.robot (97%) rename tests/{sdc => sdc-dcae-d}/dcaed/json_templater.robot (94%) rename tests/{sdc => sdc-dcae-d}/dcaed/monitoring_configuration_service_test.robot (100%) diff --git a/plans/sdc/dcaed/setup.sh b/plans/sdc-dcae-d/dcaed/setup.sh similarity index 91% rename from plans/sdc/dcaed/setup.sh rename to plans/sdc-dcae-d/dcaed/setup.sh index 074b8c05..5a94a939 100644 --- a/plans/sdc/dcaed/setup.sh +++ b/plans/sdc-dcae-d/dcaed/setup.sh @@ -15,4 +15,4 @@ # limitations under the License. # -source ${WORKSPACE}/scripts/sdc/setup_sdc_dcaed.sh +source ${WORKSPACE}/scripts/sdc-dcae-d/setup_sdc_dcaed.sh diff --git a/plans/sdc/dcaed/teardown.sh b/plans/sdc-dcae-d/dcaed/teardown.sh similarity index 91% rename from plans/sdc/dcaed/teardown.sh rename to plans/sdc-dcae-d/dcaed/teardown.sh index 911273c2..2467d1e9 100644 --- a/plans/sdc/dcaed/teardown.sh +++ b/plans/sdc-dcae-d/dcaed/teardown.sh @@ -15,4 +15,4 @@ # limitations under the License. # -source ${WORKSPACE}/scripts/sdc/cleanup_sdc_dcaed.sh +source ${WORKSPACE}/scripts/sdc-dcae-d/cleanup_sdc_dcaed.sh diff --git a/plans/sdc/dcaed/testplan.txt b/plans/sdc-dcae-d/dcaed/testplan.txt similarity index 85% rename from plans/sdc/dcaed/testplan.txt rename to plans/sdc-dcae-d/dcaed/testplan.txt index a1313f18..63a4cda4 100644 --- a/plans/sdc/dcaed/testplan.txt +++ b/plans/sdc-dcae-d/dcaed/testplan.txt @@ -1,3 +1,3 @@ # Test suites are relative paths under [integration/csit.git]/tests/. # Place the suites in run order. -sdc/dcaed +sdc-dcae-d/dcaed diff --git a/scripts/sdc/cleanup_sdc_dcaed.sh b/scripts/sdc-dcae-d/cleanup_sdc_dcaed.sh similarity index 100% rename from scripts/sdc/cleanup_sdc_dcaed.sh rename to scripts/sdc-dcae-d/cleanup_sdc_dcaed.sh diff --git a/scripts/sdc/setup_sdc_dcaed.sh b/scripts/sdc-dcae-d/setup_sdc_dcaed.sh similarity index 100% rename from scripts/sdc/setup_sdc_dcaed.sh rename to scripts/sdc-dcae-d/setup_sdc_dcaed.sh diff --git a/tests/sdc/dcaed/__init__.robot b/tests/sdc-dcae-d/dcaed/__init__.robot similarity index 100% rename from tests/sdc/dcaed/__init__.robot rename to tests/sdc-dcae-d/dcaed/__init__.robot diff --git a/tests/sdc/dcaed/asdc_interface.robot b/tests/sdc-dcae-d/dcaed/asdc_interface.robot similarity index 100% rename from tests/sdc/dcaed/asdc_interface.robot rename to tests/sdc-dcae-d/dcaed/asdc_interface.robot diff --git a/tests/sdc/dcaed/assets/artifact_upload.template b/tests/sdc-dcae-d/dcaed/assets/artifact_upload.template similarity index 100% rename from tests/sdc/dcaed/assets/artifact_upload.template rename to tests/sdc-dcae-d/dcaed/assets/artifact_upload.template diff --git a/tests/sdc/dcaed/assets/catalog_service.template b/tests/sdc-dcae-d/dcaed/assets/catalog_service.template similarity index 100% rename from tests/sdc/dcaed/assets/catalog_service.template rename to tests/sdc-dcae-d/dcaed/assets/catalog_service.template diff --git a/tests/sdc/dcaed/assets/component_catalog_resource.template b/tests/sdc-dcae-d/dcaed/assets/component_catalog_resource.template similarity index 100% rename from tests/sdc/dcaed/assets/component_catalog_resource.template rename to tests/sdc-dcae-d/dcaed/assets/component_catalog_resource.template diff --git a/tests/sdc/dcaed/assets/create_vfcmt.template b/tests/sdc-dcae-d/dcaed/assets/create_vfcmt.template similarity index 100% rename from tests/sdc/dcaed/assets/create_vfcmt.template rename to tests/sdc-dcae-d/dcaed/assets/create_vfcmt.template diff --git a/tests/sdc/dcaed/assets/dcae_composition.template b/tests/sdc-dcae-d/dcaed/assets/dcae_composition.template similarity index 100% rename from tests/sdc/dcaed/assets/dcae_composition.template rename to tests/sdc-dcae-d/dcaed/assets/dcae_composition.template diff --git a/tests/sdc/dcaed/assets/dcae_monitoring_configuration.template b/tests/sdc-dcae-d/dcaed/assets/dcae_monitoring_configuration.template similarity index 100% rename from tests/sdc/dcaed/assets/dcae_monitoring_configuration.template rename to tests/sdc-dcae-d/dcaed/assets/dcae_monitoring_configuration.template diff --git a/tests/sdc/dcaed/assets/resource_instance.template b/tests/sdc-dcae-d/dcaed/assets/resource_instance.template similarity index 100% rename from tests/sdc/dcaed/assets/resource_instance.template rename to tests/sdc-dcae-d/dcaed/assets/resource_instance.template diff --git a/tests/sdc/dcaed/assets/schema.yaml b/tests/sdc-dcae-d/dcaed/assets/schema.yaml similarity index 100% rename from tests/sdc/dcaed/assets/schema.yaml rename to tests/sdc-dcae-d/dcaed/assets/schema.yaml diff --git a/tests/sdc/dcaed/assets/template.yaml b/tests/sdc-dcae-d/dcaed/assets/template.yaml similarity index 100% rename from tests/sdc/dcaed/assets/template.yaml rename to tests/sdc-dcae-d/dcaed/assets/template.yaml diff --git a/tests/sdc/dcaed/assets/translate.yaml b/tests/sdc-dcae-d/dcaed/assets/translate.yaml similarity index 100% rename from tests/sdc/dcaed/assets/translate.yaml rename to tests/sdc-dcae-d/dcaed/assets/translate.yaml diff --git a/tests/sdc/dcaed/assets/user_remarks.template b/tests/sdc-dcae-d/dcaed/assets/user_remarks.template similarity index 100% rename from tests/sdc/dcaed/assets/user_remarks.template rename to tests/sdc-dcae-d/dcaed/assets/user_remarks.template diff --git a/tests/sdc/dcaed/common.robot b/tests/sdc-dcae-d/dcaed/common.robot similarity index 75% rename from tests/sdc/dcaed/common.robot rename to tests/sdc-dcae-d/dcaed/common.robot index 3cb73ff4..d1e8c74b 100644 --- a/tests/sdc/dcaed/common.robot +++ b/tests/sdc-dcae-d/dcaed/common.robot @@ -7,5 +7,5 @@ ${ASDC_OPS_USER_ID} op0001 ${GLOBAL_APPLICATION_ID} robot -${ASSETS_DIR} %{WORKSPACE}/tests/sdc/dcaed/assets/ +${ASSETS_DIR} %{WORKSPACE}/tests/sdc-dcae-d/dcaed/assets/ diff --git a/tests/sdc/dcaed/dcaed_interface.robot b/tests/sdc-dcae-d/dcaed/dcaed_interface.robot similarity index 97% rename from tests/sdc/dcaed/dcaed_interface.robot rename to tests/sdc-dcae-d/dcaed/dcaed_interface.robot index 76401a86..e3aa4b91 100644 --- a/tests/sdc/dcaed/dcaed_interface.robot +++ b/tests/sdc-dcae-d/dcaed/dcaed_interface.robot @@ -1,6 +1,5 @@ *** Settings *** Library json -Library eteutils/HTTPUtils.py Library ONAPLibrary.Utilities Resource json_templater.robot @@ -70,7 +69,7 @@ Add Monitoring Configuration To DCAE-DS Submit Monitoring Configuration To DCAE-DS [Arguments] ${mc_uuid} ${cs_uuid} ${vfi_name} - ${url_vfi_name} HTTPUtils.url_encode_string ${vfi_name} + ${url_vfi_name} url_encode_string ${vfi_name} ${resp}= Run DCAE-DS Post Request ${DCAE_PATH}${DCAE_CREATE_BLUEPRINT_PATH}/${mc_uuid}/${cs_uuid}/${url_vfi_name} ${None} ${ASDC_DESIGNER_USER_ID} Should Be Equal As Strings ${resp.status_code} 200 diff --git a/tests/sdc/dcaed/json_templater.robot b/tests/sdc-dcae-d/dcaed/json_templater.robot similarity index 94% rename from tests/sdc/dcaed/json_templater.robot rename to tests/sdc-dcae-d/dcaed/json_templater.robot index 884c8f97..33e8baa4 100644 --- a/tests/sdc/dcaed/json_templater.robot +++ b/tests/sdc-dcae-d/dcaed/json_templater.robot @@ -1,7 +1,7 @@ *** Settings *** Documentation This resource is filling out json string templates and returning the json back Library RequestsLibrary -Library eteutils/StringTemplater.py +Library ONAPLibrary.TemplatingKeywords Library OperatingSystem *** Keywords *** diff --git a/tests/sdc/dcaed/monitoring_configuration_service_test.robot b/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot similarity index 100% rename from tests/sdc/dcaed/monitoring_configuration_service_test.robot rename to tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot -- 2.16.6