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 <l.kaihlavirt@partner.samsung.com>
diff --git a/tests/sdc-dcae-d/dcaed/json_templater.robot b/tests/sdc-dcae-d/dcaed/json_templater.robot
new file mode 100644
index 0000000..33e8baa
--- /dev/null
+++ b/tests/sdc-dcae-d/dcaed/json_templater.robot
@@ -0,0 +1,20 @@
+*** Settings ***
+Documentation     This resource is filling out json string templates and returning the json back
+Library           RequestsLibrary
+Library           ONAPLibrary.TemplatingKeywords
+Library           OperatingSystem
+
+*** Keywords ***
+Fill JSON Template
+    [Documentation]    Runs substitution on template to return a filled in json
+    [Arguments]    ${json}    ${arguments}
+    ${returned_string}=    Template String    ${json}    ${arguments}
+    ${returned_json}=  To Json    ${returned_string}
+    [Return]    ${returned_json}
+
+Fill JSON Template File
+    [Documentation]    Runs substitution on template to return a filled in json
+    [Arguments]    ${json_file}    ${arguments}
+    ${json}=    OperatingSystem.Get File    ${json_file}
+    ${returned_json}=  Fill JSON Template    ${json}    ${arguments}
+    [Return]    ${returned_json}