Merge "Replace json_templater usage"

12 files changed, 84 insertions, 84 deletions

diff --git a/tests/sdc-dcae-d/dcaed/assets/artifact_upload.jinja b/tests/sdc-dcae-d/dcaed/assets/artifact_upload.jinja
new file mode 100755
index 00000000..80e6fc63
--- /dev/null
+++ b/tests/sdc-dcae-d/dcaed/assets/artifact_upload.jinja
@@ -0,0 +1,8 @@
+{
+  "artifactLabel":"{{artifactLabel}}",
+  "artifactName": "{{artifactName}}",
+  "artifactType": "{{artifactType}}",
+  "artifactGroupType": "{{artifactGroupType}}",
+  "description": "{{description}}",
+  "payloadData": "{{payloadData}}"
+}
diff --git a/tests/sdc-dcae-d/dcaed/assets/artifact_upload.template b/tests/sdc-dcae-d/dcaed/assets/artifact_upload.template
deleted file mode 100755
index 9be6ca04..00000000
--- a/tests/sdc-dcae-d/dcaed/assets/artifact_upload.template
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "artifactLabel":"${artifactLabel}",
-  "artifactName": "${artifactName}",
-  "artifactType": "${artifactType}",
-  "artifactGroupType": "${artifactGroupType}",
-  "description": "${description}",
-  "payloadData": "${payloadData}"
-}
diff --git a/tests/sdc-dcae-d/dcaed/assets/catalog_service.template b/tests/sdc-dcae-d/dcaed/assets/catalog_service.jinja
index 56085025..3cd326e4 100755
--- a/tests/sdc-dcae-d/dcaed/assets/catalog_service.template
+++ b/tests/sdc-dcae-d/dcaed/assets/catalog_service.jinja
@@ -21,10 +21,10 @@
   "icon": "defaulticon",
   "componentInstancesProperties": {},
   "componentInstancesAttributes": {},
-  "name": "${service_name}",
+  "name": "{{service_name}}",
   "tags": [
     "robot-ete",
-    "${service_name}"
+    "{{service_name}}"
   ],
   "capabilities": {},
   "requirements": {},
diff --git a/tests/sdc-dcae-d/dcaed/assets/component_catalog_resource.template b/tests/sdc-dcae-d/dcaed/assets/component_catalog_resource.jinja
index cb6c402c..a3661b36 100644
--- a/tests/sdc-dcae-d/dcaed/assets/component_catalog_resource.template
+++ b/tests/sdc-dcae-d/dcaed/assets/component_catalog_resource.jinja
@@ -23,15 +23,15 @@
   "icon": "defaulticon",
   "componentInstancesProperties": {},
   "componentInstancesAttributes": {},
-  "name": "${resource_name}",
+  "name": "{{resource_name}}",
   "tags": [
-    "${resource_name}"
+    "{{resource_name}}"
   ],
   "capabilities": {},
   "requirements": {},
   "deploymentArtifacts": {},
   "componentType": "RESOURCE",
-  "vendorName": "${vendor_name}",
+  "vendorName": "{{vendor_name}}",
   "vendorRelease": "1.0",
   "componentInstances": [],
   "properties": [],
diff --git a/tests/sdc-dcae-d/dcaed/assets/create_vfcmt.jinja b/tests/sdc-dcae-d/dcaed/assets/create_vfcmt.jinja
new file mode 100644
index 00000000..d399e25e
--- /dev/null
+++ b/tests/sdc-dcae-d/dcaed/assets/create_vfcmt.jinja
@@ -0,0 +1,4 @@
+{
+"name":"{{vfcmtName}}",
+"description":"{{description}}"
+}
diff --git a/tests/sdc-dcae-d/dcaed/assets/create_vfcmt.template b/tests/sdc-dcae-d/dcaed/assets/create_vfcmt.template
deleted file mode 100644
index 19ce2117..00000000
--- a/tests/sdc-dcae-d/dcaed/assets/create_vfcmt.template
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-"name":"${vfcmtName}",
-"description":"${description}"
-}
diff --git a/tests/sdc-dcae-d/dcaed/assets/dcae_composition.template b/tests/sdc-dcae-d/dcaed/assets/dcae_composition.jinja
index 81be7893..c2557ca2 100644
--- a/tests/sdc-dcae-d/dcaed/assets/dcae_composition.template
+++ b/tests/sdc-dcae-d/dcaed/assets/dcae_composition.jinja
@@ -1,5 +1,5 @@
 {
-    "cid": "${cid}",
+    "cid": "{{cid}}",
     "flowType": "TCA Hi Lo",
     "inputs": [],
     "nodes": [
@@ -13,8 +13,8 @@
                     }
                 }
             ],
-            "description": "/sdc/v1/catalog/resources/${vf_id}/toscaModel/",
-            "id": "${vf_id}",
+            "description": "/sdc/v1/catalog/resources/{{vf_id}}/toscaModel/",
+            "id": "{{vf_id}}",
             "name": "tca-docker",
             "ndata": {
                 "label": "tca-docker",
@@ -160,39 +160,39 @@
                     {
                         "name": "feature",
                         "type": {
-                            "id": "${vf_id}/tosca.capabilities.Node",
+                            "id": "{{vf_id}}/tosca.capabilities.Node",
                             "name": "tosca.capabilities.Node"
                         }
                     }
                 ],
                 "hierarchy": [
                     {
-                        "id": "${vf_id}/tosca.dcae.nodes.dockerApp",
+                        "id": "{{vf_id}}/tosca.dcae.nodes.dockerApp",
                         "name": "tosca.dcae.nodes.dockerApp"
                     },
                     {
-                        "id": "${vf_id}/tosca.dcae.nodes.Root",
+                        "id": "{{vf_id}}/tosca.dcae.nodes.Root",
                         "name": "tosca.dcae.nodes.Root"
                     },
                     {
                         "description": "The TOSCA Node Type all other TOSCA base Node Types derive from",
-                        "id": "${vf_id}/tosca.nodes.Root",
+                        "id": "{{vf_id}}/tosca.nodes.Root",
                         "name": "tosca.nodes.Root"
                     }
                 ],
-                "id": "${vf_id}/tosca.dcae.nodes.dockerApp.tca-docker",
-                "itemId": "${vf_id}/tosca.dcae.nodes.dockerApp.tca-docker",
+                "id": "{{vf_id}}/tosca.dcae.nodes.dockerApp.tca-docker",
+                "itemId": "{{vf_id}}/tosca.dcae.nodes.dockerApp.tca-docker",
                 "name": "tosca.dcae.nodes.dockerApp.tca-docker",
                 "requirements": [
                     {
                         "capability": {
-                            "id": "${vf_id}/dcae.capabilities.dmmap.topic",
+                            "id": "{{vf_id}}/dcae.capabilities.dmmap.topic",
                             "name": "dcae.capabilities.dmmap.topic"
                         },
-                        "id": "${vf_id}/stream_subscribe_0",
+                        "id": "{{vf_id}}/stream_subscribe_0",
                         "name": "stream_subscribe_0",
                         "node": {
-                            "id": "${vf_id}/dcae.capabilities.dmmap.topic",
+                            "id": "{{vf_id}}/dcae.capabilities.dmmap.topic",
                             "name": "dcae.capabilities.dmmap.topic"
                         },
                         "relationship": {
@@ -201,13 +201,13 @@
                     },
                     {
                         "capability": {
-                            "id": "${vf_id}/dcae.capabilities.dmmap.topic",
+                            "id": "{{vf_id}}/dcae.capabilities.dmmap.topic",
                             "name": "dcae.capabilities.dmmap.topic"
                         },
-                        "id": "${vf_id}/stream_publish_0",
+                        "id": "{{vf_id}}/stream_publish_0",
                         "name": "stream_publish_0",
                         "node": {
-                            "id": "${vf_id}/dcae.capabilities.dmmap.topic",
+                            "id": "{{vf_id}}/dcae.capabilities.dmmap.topic",
                             "name": "dcae.capabilities.dmmap.topic"
                         },
                         "relationship": {
@@ -216,13 +216,13 @@
                     },
                     {
                         "capability": {
-                            "id": "${vf_id}/dcae.capabilities.dockerHost",
+                            "id": "{{vf_id}}/dcae.capabilities.dockerHost",
                             "name": "dcae.capabilities.dockerHost"
                         },
-                        "id": "${vf_id}/host",
+                        "id": "{{vf_id}}/host",
                         "name": "host",
                         "node": {
-                            "id": "${vf_id}/dcae.capabilities.dockerHost",
+                            "id": "{{vf_id}}/dcae.capabilities.dockerHost",
                             "name": "dcae.capabilities.dockerHost"
                         },
                         "relationship": {
@@ -231,25 +231,25 @@
                     },
                     {
                         "capability": {
-                            "id": "${vf_id}/dcae.capabilities.composition.host",
+                            "id": "{{vf_id}}/dcae.capabilities.composition.host",
                             "name": "dcae.capabilities.composition.host"
                         },
-                        "id": "${vf_id}/composition",
+                        "id": "{{vf_id}}/composition",
                         "name": "composition",
                         "node": {
-                            "id": "${vf_id}/dcae.capabilities.composition.host",
+                            "id": "{{vf_id}}/dcae.capabilities.composition.host",
                             "name": "dcae.capabilities.composition.host"
                         }
                     },
                     {
                         "capability": {
-                            "id": "${vf_id}/tosca.capabilities.Node",
+                            "id": "{{vf_id}}/tosca.capabilities.Node",
                             "name": "tosca.capabilities.Node"
                         },
-                        "id": "${vf_id}/dependency",
+                        "id": "{{vf_id}}/dependency",
                         "name": "dependency",
                         "node": {
-                            "id": "${vf_id}/tosca.capabilities.Node",
+                            "id": "{{vf_id}}/tosca.capabilities.Node",
                             "name": "tosca.capabilities.Node"
                         },
                         "occurrences": [
@@ -354,8 +354,8 @@
                     }
                 }
             ],
-            "description": "/sdc/v1/catalog/resources/${vf_id}/toscaModel/",
-            "id": "${vf_id}",
+            "description": "/sdc/v1/catalog/resources/{{vf_id}}/toscaModel/",
+            "id": "{{vf_id}}",
             "name": "topic0",
             "ndata": {
                 "label": "topic0",
@@ -473,54 +473,54 @@
                     {
                         "name": "topic",
                         "type": {
-                            "id": "${vf_id}/dcae.capabilities.dmmap.topic",
+                            "id": "{{vf_id}}/dcae.capabilities.dmmap.topic",
                             "name": "dcae.capabilities.dmmap.topic"
                         }
                     },
                     {
                         "name": "feature",
                         "type": {
-                            "id": "${vf_id}/tosca.capabilities.Node",
+                            "id": "{{vf_id}}/tosca.capabilities.Node",
                             "name": "tosca.capabilities.Node"
                         }
                     }
                 ],
                 "hierarchy": [
                     {
-                        "id": "${vf_id}/tosca.dcae.nodes.Root",
+                        "id": "{{vf_id}}/tosca.dcae.nodes.Root",
                         "name": "tosca.dcae.nodes.Root"
                     },
                     {
                         "description": "The TOSCA Node Type all other TOSCA base Node Types derive from",
-                        "id": "${vf_id}/tosca.nodes.Root",
+                        "id": "{{vf_id}}/tosca.nodes.Root",
                         "name": "tosca.nodes.Root"
                     }
                 ],
-                "id": "${vf_id}/tosca.dcae.nodes.dmaap.topic",
-                "itemId": "${vf_id}/tosca.dcae.nodes.dmaap.topic",
+                "id": "{{vf_id}}/tosca.dcae.nodes.dmaap.topic",
+                "itemId": "{{vf_id}}/tosca.dcae.nodes.dmaap.topic",
                 "name": "tosca.dcae.nodes.dmaap.topic",
                 "requirements": [
                     {
                         "capability": {
-                            "id": "${vf_id}/dcae.capabilities.composition.host",
+                            "id": "{{vf_id}}/dcae.capabilities.composition.host",
                             "name": "dcae.capabilities.composition.host"
                         },
-                        "id": "${vf_id}/composition",
+                        "id": "{{vf_id}}/composition",
                         "name": "composition",
                         "node": {
-                            "id": "${vf_id}/dcae.capabilities.composition.host",
+                            "id": "{{vf_id}}/dcae.capabilities.composition.host",
                             "name": "dcae.capabilities.composition.host"
                         }
                     },
                     {
                         "capability": {
-                            "id": "${vf_id}/tosca.capabilities.Node",
+                            "id": "{{vf_id}}/tosca.capabilities.Node",
                             "name": "tosca.capabilities.Node"
                         },
-                        "id": "${vf_id}/dependency",
+                        "id": "{{vf_id}}/dependency",
                         "name": "dependency",
                         "node": {
-                            "id": "${vf_id}/tosca.capabilities.Node",
+                            "id": "{{vf_id}}/tosca.capabilities.Node",
                             "name": "tosca.capabilities.Node"
                         },
                         "occurrences": [
@@ -625,8 +625,8 @@
                     }
                 }
             ],
-            "description": "/sdc/v1/catalog/resources/${vf_id}/toscaModel/",
-            "id": "${vf_id}",
+            "description": "/sdc/v1/catalog/resources/{{vf_id}}/toscaModel/",
+            "id": "{{vf_id}}",
             "name": "topic1",
             "ndata": {
                 "label": "topic1",
@@ -744,54 +744,54 @@
                     {
                         "name": "topic",
                         "type": {
-                            "id": "${vf_id}/dcae.capabilities.dmmap.topic",
+                            "id": "{{vf_id}}/dcae.capabilities.dmmap.topic",
                             "name": "dcae.capabilities.dmmap.topic"
                         }
                     },
                     {
                         "name": "feature",
                         "type": {
-                            "id": "${vf_id}/tosca.capabilities.Node",
+                            "id": "{{vf_id}}/tosca.capabilities.Node",
                             "name": "tosca.capabilities.Node"
                         }
                     }
                 ],
                 "hierarchy": [
                     {
-                        "id": "${vf_id}/tosca.dcae.nodes.Root",
+                        "id": "{{vf_id}}/tosca.dcae.nodes.Root",
                         "name": "tosca.dcae.nodes.Root"
                     },
                     {
                         "description": "The TOSCA Node Type all other TOSCA base Node Types derive from",
-                        "id": "${vf_id}/tosca.nodes.Root",
+                        "id": "{{vf_id}}/tosca.nodes.Root",
                         "name": "tosca.nodes.Root"
                     }
                 ],
-                "id": "${vf_id}/tosca.dcae.nodes.dmaap.topic",
-                "itemId": "${vf_id}/tosca.dcae.nodes.dmaap.topic",
+                "id": "{{vf_id}}/tosca.dcae.nodes.dmaap.topic",
+                "itemId": "{{vf_id}}/tosca.dcae.nodes.dmaap.topic",
                 "name": "tosca.dcae.nodes.dmaap.topic",
                 "requirements": [
                     {
                         "capability": {
-                            "id": "${vf_id}/dcae.capabilities.composition.host",
+                            "id": "{{vf_id}}/dcae.capabilities.composition.host",
                             "name": "dcae.capabilities.composition.host"
                         },
-                        "id": "${vf_id}/composition",
+                        "id": "{{vf_id}}/composition",
                         "name": "composition",
                         "node": {
-                            "id": "${vf_id}/dcae.capabilities.composition.host",
+                            "id": "{{vf_id}}/dcae.capabilities.composition.host",
                             "name": "dcae.capabilities.composition.host"
                         }
                     },
                     {
                         "capability": {
-                            "id": "${vf_id}/tosca.capabilities.Node",
+                            "id": "{{vf_id}}/tosca.capabilities.Node",
                             "name": "tosca.capabilities.Node"
                         },
-                        "id": "${vf_id}/dependency",
+                        "id": "{{vf_id}}/dependency",
                         "name": "dependency",
                         "node": {
-                            "id": "${vf_id}/tosca.capabilities.Node",
+                            "id": "{{vf_id}}/tosca.capabilities.Node",
                             "name": "tosca.capabilities.Node"
                         },
                         "occurrences": [
diff --git a/tests/sdc-dcae-d/dcaed/assets/dcae_monitoring_configuration.template b/tests/sdc-dcae-d/dcaed/assets/dcae_monitoring_configuration.jinja
index f42e4685..27a5d020 100755..100644
--- a/tests/sdc-dcae-d/dcaed/assets/dcae_monitoring_configuration.template
+++ b/tests/sdc-dcae-d/dcaed/assets/dcae_monitoring_configuration.jinja
@@ -1,9 +1,9 @@
 {
-  "name": "${name}",
+  "name": "{{name}}",
   "description": "Created by robot",
-  "templateUuid": "${template_uuid}",
-  "vfiName": "${vfi_name}",
-  "serviceUuid": "${service_uuid}",
+  "templateUuid": "{{template_uuid}}",
+  "vfiName": "{{vfi_name}}",
+  "serviceUuid": "{{service_uuid}}",
   "contextType": "SERVICE",
   "flowType": "TCA Hi Lo",
   "cloneVFCMT": true,
diff --git a/tests/sdc-dcae-d/dcaed/assets/resource_instance.jinja b/tests/sdc-dcae-d/dcaed/assets/resource_instance.jinja
new file mode 100644
index 00000000..18b71685
--- /dev/null
+++ b/tests/sdc-dcae-d/dcaed/assets/resource_instance.jinja
@@ -0,0 +1,10 @@
+{
+  "uniqueId": "{{catalog_resource_id}}{{milli_timestamp}}",
+  "posX": {{posX}},
+  "posY": {{posY}},
+  "name": "{{catalog_resource_name}}",
+  "componentVersion": "1.0",
+  "originType": "{{originType}}",
+  "icon": "defaulticon",
+  "componentUid": "{{catalog_resource_id}}"
+}
diff --git a/tests/sdc-dcae-d/dcaed/assets/resource_instance.template b/tests/sdc-dcae-d/dcaed/assets/resource_instance.template
deleted file mode 100644
index 18cf34c7..00000000
--- a/tests/sdc-dcae-d/dcaed/assets/resource_instance.template
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "uniqueId": "${catalog_resource_id}${milli_timestamp}",
-  "posX": ${posX},
-  "posY": ${posY},
-  "name": "${catalog_resource_name}",
-  "componentVersion": "1.0",
-  "originType": "${originType}",
-  "icon": "defaulticon",
-  "componentUid": "${catalog_resource_id}"
-}
diff --git a/tests/sdc-dcae-d/dcaed/assets/user_remarks.jinja b/tests/sdc-dcae-d/dcaed/assets/user_remarks.jinja
new file mode 100644
index 00000000..ea01a249
--- /dev/null
+++ b/tests/sdc-dcae-d/dcaed/assets/user_remarks.jinja
@@ -0,0 +1 @@
+{"userRemarks":"{{user_remarks}}"}
\ No newline at end of file
diff --git a/tests/sdc-dcae-d/dcaed/assets/user_remarks.template b/tests/sdc-dcae-d/dcaed/assets/user_remarks.template
deleted file mode 100644
index 465115e6..00000000
--- a/tests/sdc-dcae-d/dcaed/assets/user_remarks.template
+++ /dev/null
@@ -1 +0,0 @@
-{"userRemarks":"${user_remarks}"}
\ No newline at end of file