diff options
author | 2019-06-26 14:01:13 +0000 | |
---|---|---|
committer | 2019-06-26 14:01:13 +0000 | |
commit | d74cd46cf68d7b60a8b07edf6c05bc06dd861bd6 (patch) | |
tree | 6d3ab911797cc62beb866db96738f56fd10d6092 | |
parent | d28f36b347191243ee3c49d516809462823fc2df (diff) | |
parent | dc396847579288b9049135833fad6080b96179b0 (diff) |
Merge "Adjust DCAE-DS CSIT for Jenkins and to master"
-rw-r--r-- | plans/sdc-dcae-d/dcaed/setup.sh (renamed from plans/sdc/dcaed/setup.sh) | 2 | ||||
-rw-r--r-- | plans/sdc-dcae-d/dcaed/teardown.sh (renamed from plans/sdc/dcaed/teardown.sh) | 2 | ||||
-rw-r--r-- | plans/sdc-dcae-d/dcaed/testplan.txt (renamed from plans/sdc/dcaed/testplan.txt) | 2 | ||||
-rw-r--r-- | scripts/sdc-dcae-d/cleanup_sdc_dcaed.sh (renamed from scripts/sdc/cleanup_sdc_dcaed.sh) | 0 | ||||
-rw-r--r-- | scripts/sdc-dcae-d/setup_sdc_dcaed.sh (renamed from scripts/sdc/setup_sdc_dcaed.sh) | 0 | ||||
-rw-r--r-- | tests/sdc-dcae-d/dcaed/__init__.robot (renamed from tests/sdc/dcaed/__init__.robot) | 0 | ||||
-rw-r--r-- | tests/sdc-dcae-d/dcaed/asdc_interface.robot (renamed from tests/sdc/dcaed/asdc_interface.robot) | 0 | ||||
-rwxr-xr-x | tests/sdc-dcae-d/dcaed/assets/artifact_upload.template (renamed from tests/sdc/dcaed/assets/artifact_upload.template) | 0 | ||||
-rwxr-xr-x | tests/sdc-dcae-d/dcaed/assets/catalog_service.template (renamed from tests/sdc/dcaed/assets/catalog_service.template) | 0 | ||||
-rw-r--r-- | tests/sdc-dcae-d/dcaed/assets/component_catalog_resource.template (renamed from tests/sdc/dcaed/assets/component_catalog_resource.template) | 0 | ||||
-rw-r--r-- | tests/sdc-dcae-d/dcaed/assets/create_vfcmt.template (renamed from tests/sdc/dcaed/assets/create_vfcmt.template) | 0 | ||||
-rw-r--r-- | tests/sdc-dcae-d/dcaed/assets/dcae_composition.template (renamed from tests/sdc/dcaed/assets/dcae_composition.template) | 0 | ||||
-rwxr-xr-x | tests/sdc-dcae-d/dcaed/assets/dcae_monitoring_configuration.template (renamed from tests/sdc/dcaed/assets/dcae_monitoring_configuration.template) | 0 | ||||
-rw-r--r-- | tests/sdc-dcae-d/dcaed/assets/resource_instance.template (renamed from tests/sdc/dcaed/assets/resource_instance.template) | 0 | ||||
-rwxr-xr-x | tests/sdc-dcae-d/dcaed/assets/schema.yaml (renamed from tests/sdc/dcaed/assets/schema.yaml) | 0 | ||||
-rwxr-xr-x | tests/sdc-dcae-d/dcaed/assets/template.yaml (renamed from tests/sdc/dcaed/assets/template.yaml) | 0 | ||||
-rwxr-xr-x | tests/sdc-dcae-d/dcaed/assets/translate.yaml (renamed from tests/sdc/dcaed/assets/translate.yaml) | 0 | ||||
-rw-r--r-- | tests/sdc-dcae-d/dcaed/assets/user_remarks.template (renamed from tests/sdc/dcaed/assets/user_remarks.template) | 0 | ||||
-rw-r--r-- | tests/sdc-dcae-d/dcaed/common.robot (renamed from tests/sdc/dcaed/common.robot) | 2 | ||||
-rw-r--r-- | tests/sdc-dcae-d/dcaed/dcaed_interface.robot (renamed from tests/sdc/dcaed/dcaed_interface.robot) | 3 | ||||
-rw-r--r-- | tests/sdc-dcae-d/dcaed/json_templater.robot (renamed from tests/sdc/dcaed/json_templater.robot) | 2 | ||||
-rw-r--r-- | tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot (renamed from tests/sdc/dcaed/monitoring_configuration_service_test.robot) | 0 |
22 files changed, 6 insertions, 7 deletions
diff --git a/plans/sdc/dcaed/setup.sh b/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 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 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 index 35cbc7be..35cbc7be 100644 --- a/scripts/sdc/cleanup_sdc_dcaed.sh +++ b/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 index e0d0cc28..e0d0cc28 100644 --- a/scripts/sdc/setup_sdc_dcaed.sh +++ b/scripts/sdc-dcae-d/setup_sdc_dcaed.sh diff --git a/tests/sdc/dcaed/__init__.robot b/tests/sdc-dcae-d/dcaed/__init__.robot index fc9392d3..fc9392d3 100644 --- a/tests/sdc/dcaed/__init__.robot +++ b/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 index 88053e88..88053e88 100644 --- a/tests/sdc/dcaed/asdc_interface.robot +++ b/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 index 9be6ca04..9be6ca04 100755 --- a/tests/sdc/dcaed/assets/artifact_upload.template +++ b/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 index 56085025..56085025 100755 --- a/tests/sdc/dcaed/assets/catalog_service.template +++ b/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 index cb6c402c..cb6c402c 100644 --- a/tests/sdc/dcaed/assets/component_catalog_resource.template +++ b/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 index 19ce2117..19ce2117 100644 --- a/tests/sdc/dcaed/assets/create_vfcmt.template +++ b/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 index 81be7893..81be7893 100644 --- a/tests/sdc/dcaed/assets/dcae_composition.template +++ b/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 index f42e4685..f42e4685 100755 --- a/tests/sdc/dcaed/assets/dcae_monitoring_configuration.template +++ b/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 index 18cf34c7..18cf34c7 100644 --- a/tests/sdc/dcaed/assets/resource_instance.template +++ b/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 index 7024a35c..7024a35c 100755 --- a/tests/sdc/dcaed/assets/schema.yaml +++ b/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 index 5a03da76..5a03da76 100755 --- a/tests/sdc/dcaed/assets/template.yaml +++ b/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 index 5515dc2c..5515dc2c 100755 --- a/tests/sdc/dcaed/assets/translate.yaml +++ b/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 index 465115e6..465115e6 100644 --- a/tests/sdc/dcaed/assets/user_remarks.template +++ b/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 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 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 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 index 9a4bbc60..9a4bbc60 100644 --- a/tests/sdc/dcaed/monitoring_configuration_service_test.robot +++ b/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot |