Merge "Adjust DCAE-DS CSIT for Jenkins and to master"

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