replace aai, closeloop, sdc with jinja

Issue-ID: TEST-158
Change-Id: I95a783f26e28512cb4fc98e50931d62001c489c6
Signed-off-by: DR695H <dr695h@att.com>

64 files changed, 253 insertions, 259 deletions

diff --git a/robot/assets/templates/aai/add-connectivity.template b/robot/assets/templates/aai/add-connectivity.jinja
index a693b208..5721ccff 100644
--- a/robot/assets/templates/aai/add-connectivity.template
+++ b/robot/assets/templates/aai/add-connectivity.jinja
@@ -1,5 +1,5 @@
 {
-      "connectivity-id": "${connectivity_id}",
+      "connectivity-id": "{{connectivity_id}}",
       "bandwidth-profile-name": "",
       "vpn-type": "",
       "cir": "",
diff --git a/robot/assets/templates/aai/add-relationship.jinja b/robot/assets/templates/aai/add-relationship.jinja
new file mode 100644
index 00000000..e09dbcc9
--- /dev/null
+++ b/robot/assets/templates/aai/add-relationship.jinja
@@ -0,0 +1,4 @@
+{
+    "related-to": "{{related_class_name}}",
+    "related-link": "{{related_object_url}}"
+}
diff --git a/robot/assets/templates/aai/add-relationship.template b/robot/assets/templates/aai/add-relationship.template
deleted file mode 100644
index e8550aaf..00000000
--- a/robot/assets/templates/aai/add-relationship.template
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "related-to": "${related_class_name}",
-    "related-link": "${related_object_url}"
-}
diff --git a/robot/assets/templates/aai/add-vpn-binding.template b/robot/assets/templates/aai/add-vpn-binding.jinja
index 8c6743fe..f901e806 100644
--- a/robot/assets/templates/aai/add-vpn-binding.template
+++ b/robot/assets/templates/aai/add-vpn-binding.jinja
@@ -1,5 +1,5 @@
 {
-  "vpn-id": "${vpn_id}",
+  "vpn-id": "{{vpn_id}}",
   "vpn-name": "",
   "vpn-platform": "",
   "vpn-type": "",
diff --git a/robot/assets/templates/aai/add_availability_zone_body.template b/robot/assets/templates/aai/add_availability_zone_body.jinja
index e955ab32..1d16dd6e 100644
--- a/robot/assets/templates/aai/add_availability_zone_body.template
+++ b/robot/assets/templates/aai/add_availability_zone_body.jinja
@@ -1,5 +1,5 @@
 {
-"availability-zone-name":"${availability_zone_name}",
+"availability-zone-name":"{{availability_zone_name}}",
 "hypervisor-type": "KVM",
 "operational-status": "Active"
 }
diff --git a/robot/assets/templates/aai/add_complex_body.template b/robot/assets/templates/aai/add_complex_body.jinja
index 3e0ac871..6ae3c0d0 100644
--- a/robot/assets/templates/aai/add_complex_body.template
+++ b/robot/assets/templates/aai/add_complex_body.jinja
@@ -1,6 +1,6 @@
         {
-            "complex-name": "${complex_name}",
-            "physical-location-id": "${physical_location_id}",
+            "complex-name": "{{complex_name}}",
+            "physical-location-id": "{{physical_location_id}}",
             "data-center-code": "example-data-center-code-val-5556",
             "identity-url": "example-identity-url-val-56898",
             "physical-location-type": "example-physical-location-type-val-7608",
@@ -19,21 +19,21 @@
                 "relationship": [
                     {
                         "related-to": "cloud-region",
-                        "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/${region}",
+                        "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/{{region}}",
                         "relationship-data": [
                             {
                                 "relationship-key": "cloud-region.cloud-owner",
-                                "relationship-value": "${cloud_owner}"
+                                "relationship-value": "{{cloud_owner}}"
                             },
                             {
                                 "relationship-key": "cloud-region.cloud-region-id",
-                                "relationship-value": "${region}"
+                                "relationship-value": "{{region}}"
                             }
                         ],
                         "related-to-property": [
                             {
                                 "property-key": "cloud-region.owner-defined-type",
-                                "property-value": "${owner_defined_type}"
+                                "property-value": "{{owner_defined_type}}"
                             }
                         ]
                     }
diff --git a/robot/assets/templates/aai/add_customer.template b/robot/assets/templates/aai/add_customer.jinja
index d0ae174a..062f93bb 100644
--- a/robot/assets/templates/aai/add_customer.template
+++ b/robot/assets/templates/aai/add_customer.jinja
@@ -1,22 +1,22 @@
 {
-         "global-customer-id": "${global_customer_id}",
-         "subscriber-name": "${subscriber_name}",
-         "subscriber-type": "${subscriber_type}",
+         "global-customer-id": "{{global_customer_id}}",
+         "subscriber-name": "{{subscriber_name}}",
+         "subscriber-type": "{{subscriber_type}}",
          "service-subscriptions": {
                  "service-subscription": [{
-                         "service-type": "${service1}",
+                         "service-type": "{{service1}}",
                          "relationship-list": {
                                  "relationship": [{
                                          "related-to": "tenant",
                                          "relationship-data": [{
                                                  "relationship-key": "cloud-region.cloud-owner",
-                                                 "relationship-value": "${cloud_owner1}"
+                                                 "relationship-value": "{{cloud_owner1}}"
                                          }, {
                                                  "relationship-key": "cloud-region.cloud-region-id",
-                                                 "relationship-value": "${cloud_region_id1}"
+                                                 "relationship-value": "{{cloud_region_id1}}"
                                          }, {
                                                  "relationship-key": "tenant.tenant-id",
-                                                 "relationship-value": "${tenant_id1}"
+                                                 "relationship-value": "{{tenant_id1}}"
                                          }]
                                  }]
                          }
diff --git a/robot/assets/templates/aai/add_demo_customer.template b/robot/assets/templates/aai/add_demo_customer.jinja
index a91e3836..2c4f6c92 100644
--- a/robot/assets/templates/aai/add_demo_customer.template
+++ b/robot/assets/templates/aai/add_demo_customer.jinja
@@ -1,117 +1,117 @@
 {
-	"global-customer-id" : "${global_customer_id}",
-	"subscriber-name" : "${subscriber_name}",
-	"subscriber-type" : "${subscriber_type}",
+	"global-customer-id" : "{{global_customer_id}}",
+	"subscriber-name" : "{{subscriber_name}}",
+	"subscriber-type" : "{{subscriber_type}}",
 	"service-subscriptions" : {
 		"service-subscription" : [{
-				"service-type" : "${service1}",
+				"service-type" : "{{service1}}",
 				"relationship-list" : {
 					"relationship" : [{
 							"related-to" : "tenant",
 							"relationship-data" : [{
 									"relationship-key" : "cloud-region.cloud-owner",
-									"relationship-value" : "${cloud_owner}"
+									"relationship-value" : "{{cloud_owner}}"
 								}, {
 									"relationship-key" : "cloud-region.cloud-region-id",
-									"relationship-value" : "${cloud_region_id}"
+									"relationship-value" : "{{cloud_region_id}}"
 								}, {
 									"relationship-key" : "tenant.tenant-id",
-									"relationship-value" : "${tenant_id}"
+									"relationship-value" : "{{tenant_id}}"
 								}
 							]
 						}
 					]
 				}
 			}, {
-				"service-type" : "${service2}",
+				"service-type" : "{{service2}}",
 				"relationship-list" : {
 					"relationship" : [{
 							"related-to" : "tenant",
 							"relationship-data" : [{
 									"relationship-key" : "cloud-region.cloud-owner",
-									"relationship-value" : "${cloud_owner}"
+									"relationship-value" : "{{cloud_owner}}"
 								}, {
 									"relationship-key" : "cloud-region.cloud-region-id",
-									"relationship-value" : "${cloud_region_id}"
+									"relationship-value" : "{{cloud_region_id}}"
 								}, {
 									"relationship-key" : "tenant.tenant-id",
-									"relationship-value" : "${tenant_id}"
+									"relationship-value" : "{{tenant_id}}"
 								}
 							]
 						}
 					]
 				}
 			}, {
-				"service-type" : "${service3}",
+				"service-type" : "{{service3}}",
 				"relationship-list" : {
 					"relationship" : [{
 							"related-to" : "tenant",
 							"relationship-data" : [{
 									"relationship-key" : "cloud-region.cloud-owner",
-									"relationship-value" : "${cloud_owner}"
+									"relationship-value" : "{{cloud_owner}}"
 								}, {
 									"relationship-key" : "cloud-region.cloud-region-id",
-									"relationship-value" : "${cloud_region_id}"
+									"relationship-value" : "{{cloud_region_id}}"
 								}, {
 									"relationship-key" : "tenant.tenant-id",
-									"relationship-value" : "${tenant_id}"
+									"relationship-value" : "{{tenant_id}}"
 								}
 							]
 						}
 					]
 				}
 			}, {
-				"service-type" : "${service4}",
+				"service-type" : "{{service4}}",
 				"relationship-list" : {
 					"relationship" : [{
 							"related-to" : "tenant",
 							"relationship-data" : [{
 									"relationship-key" : "cloud-region.cloud-owner",
-									"relationship-value" : "${cloud_owner}"
+									"relationship-value" : "{{cloud_owner}}"
 								}, {
 									"relationship-key" : "cloud-region.cloud-region-id",
-									"relationship-value" : "${cloud_region_id}"
+									"relationship-value" : "{{cloud_region_id}}"
 								}, {
 									"relationship-key" : "tenant.tenant-id",
-									"relationship-value" : "${tenant_id}"
+									"relationship-value" : "{{tenant_id}}"
 								}
 							]
 						}
 					]
 				}
 			}, {
-				"service-type" : "${service5}",
+				"service-type" : "{{service5}}",
 				"relationship-list" : {
 					"relationship" : [{
 							"related-to" : "tenant",
 							"relationship-data" : [{
 									"relationship-key" : "cloud-region.cloud-owner",
-									"relationship-value" : "${cloud_owner}"
+									"relationship-value" : "{{cloud_owner}}"
 								}, {
 									"relationship-key" : "cloud-region.cloud-region-id",
-									"relationship-value" : "${cloud_region_id}"
+									"relationship-value" : "{{cloud_region_id}}"
 								}, {
 									"relationship-key" : "tenant.tenant-id",
-									"relationship-value" : "${tenant_id}"
+									"relationship-value" : "{{tenant_id}}"
 								}
 							]
 						}
 					]
 				}
 			}, {
-				"service-type" : "${service6}",
+				"service-type" : "{{service6}}",
 				"relationship-list" : {
 					"relationship" : [{
 							"related-to" : "tenant",
 							"relationship-data" : [{
 									"relationship-key" : "cloud-region.cloud-owner",
-									"relationship-value" : "${cloud_owner}"
+									"relationship-value" : "{{cloud_owner}}"
 								}, {
 									"relationship-key" : "cloud-region.cloud-region-id",
-									"relationship-value" : "${cloud_region_id}"
+									"relationship-value" : "{{cloud_region_id}}"
 								}, {
 									"relationship-key" : "tenant.tenant-id",
-									"relationship-value" : "${tenant_id}"
+									"relationship-value" : "{{tenant_id}}"
 								}
 							]
 						}
diff --git a/robot/assets/templates/aai/add_service_body.jinja b/robot/assets/templates/aai/add_service_body.jinja
new file mode 100644
index 00000000..76eab165
--- /dev/null
+++ b/robot/assets/templates/aai/add_service_body.jinja
@@ -0,0 +1,6 @@
+{
+   "service-id": "{{UUID}}",
+   "service-description": "{{service_type}}"
+}
+
+
diff --git a/robot/assets/templates/aai/add_service_body.template b/robot/assets/templates/aai/add_service_body.template
deleted file mode 100644
index ca32fd51..00000000
--- a/robot/assets/templates/aai/add_service_body.template
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-   "service-id": "${UUID}",
-   "service-description": "${service_type}"
-}
-
-
diff --git a/robot/assets/templates/aai/add_tenant_body.jinja b/robot/assets/templates/aai/add_tenant_body.jinja
new file mode 100644
index 00000000..71430b97
--- /dev/null
+++ b/robot/assets/templates/aai/add_tenant_body.jinja
@@ -0,0 +1,18 @@
+{
+        "cloud-owner": "{{cloud_owner}}",
+        "cloud-region-id": "{{cloud_region_id}}",
+        "cloud-type": "{{cloud_type}}",
+        "owner-defined-type": "{{owner_defined_type}}",
+        "cloud-region-version": "{{cloud_region_version}}",
+        "cloud-zone": "{{cloud_zone}}",
+        {{resource_version}}
+        "tenants": {
+                "tenant": [{
+                        "tenant-id": "{{tenant_id}}",
+                        "tenant-name": "{{tenant_name}}"
+
+                }]
+        }
+}
+
+
diff --git a/robot/assets/templates/aai/add_tenant_body.template b/robot/assets/templates/aai/add_tenant_body.template
deleted file mode 100644
index a7dbbbf7..00000000
--- a/robot/assets/templates/aai/add_tenant_body.template
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-        "cloud-owner": "${cloud_owner}",
-        "cloud-region-id": "${cloud_region_id}",
-        "cloud-type": "${cloud_type}",
-        "owner-defined-type": "${owner_defined_type}",
-        "cloud-region-version": "${cloud_region_version}",
-        "cloud-zone": "${cloud_zone}",
-        ${resource_version}
-        "tenants": {
-                "tenant": [{
-                        "tenant-id": "${tenant_id}",
-                        "tenant-name": "${tenant_name}"
-
-                }]
-        }
-}
-
-
diff --git a/robot/assets/templates/aai/add_vnfc_body.jinja b/robot/assets/templates/aai/add_vnfc_body.jinja
new file mode 100644
index 00000000..fa32b4a8
--- /dev/null
+++ b/robot/assets/templates/aai/add_vnfc_body.jinja
@@ -0,0 +1,7 @@
+{
+"vnfc-name": "{{vnfc_name}}",
+"nfc-naming-code": "{{vnfc_nc}}",
+"nfc-function": "{{vnfc_func}}",
+"in-maint": "false",
+"is-closed-loop-disabled": "false"
+}
\ No newline at end of file
diff --git a/robot/assets/templates/aai/add_vnfc_body.template b/robot/assets/templates/aai/add_vnfc_body.template
deleted file mode 100644
index 88ababd3..00000000
--- a/robot/assets/templates/aai/add_vnfc_body.template
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-"vnfc-name": "${vnfc_name}",
-"nfc-naming-code": "${vnfc_nc}",
-"nfc-function": "${vnfc_func}",
-"in-maint": "false",
-"is-closed-loop-disabled": "false"
-}
\ No newline at end of file
diff --git a/robot/assets/templates/aai/add_zone_body.jinja b/robot/assets/templates/aai/add_zone_body.jinja
new file mode 100644
index 00000000..87dfaa5c
--- /dev/null
+++ b/robot/assets/templates/aai/add_zone_body.jinja
@@ -0,0 +1,7 @@
+{
+"zone-id":"{{zone_id}}",
+"zone-name":"{{zone_name}}",
+"design-type":"{{design_type}}",
+"zone-context":"{{zone_context}}",
+"status":"deployed"
+}
\ No newline at end of file
diff --git a/robot/assets/templates/aai/add_zone_body.template b/robot/assets/templates/aai/add_zone_body.template
deleted file mode 100644
index 01f99c0a..00000000
--- a/robot/assets/templates/aai/add_zone_body.template
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-"zone-id":"${zone_id}",
-"zone-name":"${zone_name}",
-"design-type":"${design_type}",
-"zone-context":"${zone_context}",
-"status":"deployed"
-}
\ No newline at end of file
diff --git a/robot/assets/templates/aai/named_query.template b/robot/assets/templates/aai/named_query.jinja
index de3f21f6..f4501d0f 100644
--- a/robot/assets/templates/aai/named_query.template
+++ b/robot/assets/templates/aai/named_query.jinja
@@ -9,7 +9,7 @@
             { 
                 "vserver": 
                 { 
-                    "vserver-name": "${vserver_name}" 
+                    "vserver-name": "{{vserver_name}}" 
                 }
             } 
         ] 
diff --git a/robot/assets/templates/aai/service_subscription.template b/robot/assets/templates/aai/service_subscription.jinja
index 85703581..f8ec466d 100644
--- a/robot/assets/templates/aai/service_subscription.template
+++ b/robot/assets/templates/aai/service_subscription.jinja
@@ -1,7 +1,7 @@
 {
    "service-subscription":[
       {
-         "service-type":"{$service_type}",
+         "service-type":"{{service_type}}",
          "resource-version":"1473866861",
          "service-instances":{
             "service-instance":[
diff --git a/robot/assets/templates/aai/vlb_closed_loop_hack.jinja b/robot/assets/templates/aai/vlb_closed_loop_hack.jinja
new file mode 100644
index 00000000..bf034592
--- /dev/null
+++ b/robot/assets/templates/aai/vlb_closed_loop_hack.jinja
@@ -0,0 +1,7 @@
+{
+	"is-base-vf-module": false,
+	"persona-model-id": "{{persona_model_id}}",
+	"persona-model-version": "1.0",
+	"vf-module-id": "{{vf_module_id}}",
+	"vf-module-name": "{{vf_module_id}}"								 
+}
diff --git a/robot/assets/templates/aai/vlb_closed_loop_hack.template b/robot/assets/templates/aai/vlb_closed_loop_hack.template
deleted file mode 100644
index 27f9c963..00000000
--- a/robot/assets/templates/aai/vlb_closed_loop_hack.template
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"is-base-vf-module": false,
-	"persona-model-id": "${persona_model_id}",
-	"persona-model-version": "1.0",
-	"vf-module-id": "${vf_module_id}",
-	"vf-module-name": "${vf_module_id}"								 
-}
diff --git a/robot/assets/templates/asdc/action.jinja b/robot/assets/templates/asdc/action.jinja
new file mode 100644
index 00000000..3ef9f60b
--- /dev/null
+++ b/robot/assets/templates/asdc/action.jinja
@@ -0,0 +1,3 @@
+{
+  "action": "{{action}}"
+}
\ No newline at end of file
diff --git a/robot/assets/templates/asdc/action.template b/robot/assets/templates/asdc/action.template
deleted file mode 100644
index 4d417c9f..00000000
--- a/robot/assets/templates/asdc/action.template
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "action": "${action}"
-}
\ No newline at end of file
diff --git a/robot/assets/templates/asdc/artifact_upload.jinja b/robot/assets/templates/asdc/artifact_upload.jinja
new file mode 100644
index 00000000..80e6fc63
--- /dev/null
+++ b/robot/assets/templates/asdc/artifact_upload.jinja
@@ -0,0 +1,8 @@
+{
+  "artifactLabel":"{{artifactLabel}}",
+  "artifactName": "{{artifactName}}",
+  "artifactType": "{{artifactType}}",
+  "artifactGroupType": "{{artifactGroupType}}",
+  "description": "{{description}}",
+  "payloadData": "{{payloadData}}"
+}
diff --git a/robot/assets/templates/asdc/artifact_upload.template b/robot/assets/templates/asdc/artifact_upload.template
deleted file mode 100644
index 9be6ca04..00000000
--- a/robot/assets/templates/asdc/artifact_upload.template
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "artifactLabel":"${artifactLabel}",
-  "artifactName": "${artifactName}",
-  "artifactType": "${artifactType}",
-  "artifactGroupType": "${artifactGroupType}",
-  "description": "${description}",
-  "payloadData": "${payloadData}"
-}
diff --git a/robot/assets/templates/asdc/catalog_allotted_inputs.template b/robot/assets/templates/asdc/catalog_allotted_inputs.jinja
index 11074801..b53a2e7a 100644
--- a/robot/assets/templates/asdc/catalog_allotted_inputs.template
+++ b/robot/assets/templates/asdc/catalog_allotted_inputs.jinja
@@ -1,6 +1,6 @@
 [
   {
-    "defaultValue": "${nf_type}",
+    "defaultValue": "{{nf_type}}",
     "description": null,
     "name": "nf_type",
     "parentUniqueId": null,
@@ -10,7 +10,7 @@
       "property": {}
     },
     "type": "string",
-    "uniqueId": "${nf_type_uid}",
+    "uniqueId": "{{nf_type_uid}}",
     "value": null,
     "definition": false,
     "getInputValues": null,
@@ -22,7 +22,7 @@
     "inputPath": null
   },
   {
-    "defaultValue": "${nf_role}",
+    "defaultValue": "{{nf_role}}",
     "description": null,
     "name": "nf_role",
     "parentUniqueId": null,
@@ -32,7 +32,7 @@
       "property": {}
     },
     "type": "string",
-    "uniqueId": "${nf_role_uid}",
+    "uniqueId": "{{nf_role_uid}}",
     "value": null,
     "definition": false,
     "getInputValues": null,
diff --git a/robot/assets/templates/asdc/catalog_allotted_properties.template b/robot/assets/templates/asdc/catalog_allotted_properties.jinja
index 023abcfe..ba183a1e 100644
--- a/robot/assets/templates/asdc/catalog_allotted_properties.template
+++ b/robot/assets/templates/asdc/catalog_allotted_properties.jinja
@@ -9,8 +9,8 @@
 		"password": false,
 		"required": true,
 		"type": "string",
-		"value": ${providing_service_invariant_uuid},
-                "uniqueId": "${uniqueId}.providing_service_invariant_uuid"
+		"value": {{providing_service_invariant_uuid}},
+                "uniqueId": "{{uniqueId}}.providing_service_invariant_uuid"
 	},
         {
 		"definition": false,
@@ -23,8 +23,8 @@
 		"password": false,
 		"required": true,
 		"type": "string",
-		"value": ${providing_service_uuid},
-                "uniqueId": "${uniqueId}.providing_service_uuid"
+		"value": {{providing_service_uuid}},
+                "uniqueId": "{{uniqueId}}.providing_service_uuid"
 	},
         {
 		"definition": false,
@@ -37,7 +37,7 @@
 		"password": false,
 		"required": true,
 		"type": "string",
-		"value": ${providing_service_name},
-                "uniqueId": "${uniqueId}.providing_service_name"
+		"value": {{providing_service_name}},
+                "uniqueId": "{{uniqueId}}.providing_service_name"
 	}
 ]
diff --git a/robot/assets/templates/asdc/catalog_net_input_properties.template b/robot/assets/templates/asdc/catalog_net_input_properties.jinja
index 852bb5d7..772e4ffa 100644
--- a/robot/assets/templates/asdc/catalog_net_input_properties.template
+++ b/robot/assets/templates/asdc/catalog_net_input_properties.jinja
@@ -1,10 +1,10 @@
 [
 {
-        "uniqueId": "${uniqueId}",
+        "uniqueId": "{{uniqueId}}",
         "type": "string",
         "required": false,
         "definition": false,
-        "description": "${description}",
+        "description": "{{description}}",
         "schema": {
           "property": {
             "required": false,
@@ -18,11 +18,11 @@
           "empty": false
         },
         "password": false,
-        "name": "${name}",
-        "value": "${value}",
+        "name": "{{name}}",
+        "value": "{{value}}",
         "hidden": false,
         "immutable": false,
-        "parentUniqueId": "${parentUniqueId}",
+        "parentUniqueId": "{{parentUniqueId}}",
         "schemaProperty": {
           "required": false,
           "definition": true,
@@ -33,7 +33,7 @@
           "empty": false
         },
         "getInputProperty": false,
-        "ownerId": "${ownerId}",
+        "ownerId": "{{ownerId}}",
         "empty": false
       }
 ]
diff --git a/robot/assets/templates/asdc/catalog_resource.template b/robot/assets/templates/asdc/catalog_resource.jinja
index fcc17ce2..6839beda 100644
--- a/robot/assets/templates/asdc/catalog_resource.template
+++ b/robot/assets/templates/asdc/catalog_resource.jinja
@@ -23,21 +23,21 @@
   "icon": "defaulticon",
   "componentInstancesProperties": {},
   "componentInstancesAttributes": {},
-  "name": "${software_product_name}",
+  "name": "{{software_product_name}}",
   "tags": [
-    "${software_product_name}"
+    "{{software_product_name}}"
   ],
   "capabilities": {},
   "requirements": {},
   "deploymentArtifacts": {},
   "componentType": "RESOURCE",
-  "vendorName": "${vendor_name}",
+  "vendorName": "{{vendor_name}}",
   "vendorRelease": "1.0",
   "componentInstances": [],
   "properties": [],
   "attributes": [],
   "groups": [],
   "resourceType": "VF",
-  "csarUUID": "${software_product_id}",
+  "csarUUID": "{{software_product_id}}",
   "csarVersion": "1.0"
 }
\ No newline at end of file
diff --git a/robot/assets/templates/asdc/catalog_resource_alloted_resource.template b/robot/assets/templates/asdc/catalog_resource_alloted_resource.jinja
index e3a11ec3..9890edfe 100644
--- a/robot/assets/templates/asdc/catalog_resource_alloted_resource.template
+++ b/robot/assets/templates/asdc/catalog_resource_alloted_resource.jinja
@@ -9,9 +9,9 @@
       "uniqueId": "resourceNewCategory.allotted resource",
       "subcategories": [
         {
-          "name": "${subcategory}",
-          "normalizedName": "${subcategory}",
-          "uniqueId": "resourceNewCategory.allotted resource.${subcategory}",
+          "name": "{{subcategory}}",
+          "normalizedName": "{{subcategory}}",
+          "uniqueId": "resourceNewCategory.allotted resource.{{subcategory}}",
           "icons": [
             "allotted_resource"
           ]
@@ -19,19 +19,19 @@
       ]
     }
   ],
-  "description": "Alloted Resource ${subcategory}",
+  "description": "Alloted Resource {{subcategory}}",
   "icon": "defaulticon",
   "componentInstancesProperties": {},
   "componentInstancesAttributes": {},
-  "name": "${software_product_name}",
+  "name": "{{software_product_name}}",
   "tags": [
-    "${software_product_name}"
+    "{{software_product_name}}"
   ],
   "capabilities": {},
   "requirements": {},
   "deploymentArtifacts": {},
   "componentType": "RESOURCE",
-  "vendorName": "${vendor_name}",
+  "vendorName": "{{vendor_name}}",
   "vendorRelease": "1.0",
   "componentInstances": [],
   "properties": [],
diff --git a/robot/assets/templates/asdc/catalog_service.template b/robot/assets/templates/asdc/catalog_service.jinja
index e35768f4..8fa31f4c 100644
--- a/robot/assets/templates/asdc/catalog_service.template
+++ b/robot/assets/templates/asdc/catalog_service.jinja
@@ -21,10 +21,10 @@
   "icon": "network_l_1-3",
   "componentInstancesProperties": {},
   "componentInstancesAttributes": {},
-  "name": "${service_name}",
+  "name": "{{service_name}}",
   "tags": [
     "robot-ete",
-    "${service_name}"
+    "{{service_name}}"
   ],
   "capabilities": {},
   "requirements": {},
diff --git a/robot/assets/templates/asdc/catalog_vnf_inputs.template b/robot/assets/templates/asdc/catalog_vnf_inputs.jinja
index fb5d4940..25b0ccae 100644
--- a/robot/assets/templates/asdc/catalog_vnf_inputs.template
+++ b/robot/assets/templates/asdc/catalog_vnf_inputs.jinja
@@ -1,6 +1,6 @@
 [
   {
-    "defaultValue": "${nf_function}",
+    "defaultValue": "{{nf_function}}",
     "description": null,
     "name": "nf_function",
     "parentUniqueId": "cs0008",
@@ -10,7 +10,7 @@
       "property": {}
     },
     "type": "string",
-    "uniqueId": "${nf_function_uid}",
+    "uniqueId": "{{nf_function_uid}}",
     "value": null,
     "definition": false,
     "getInputValues": null,
@@ -22,7 +22,7 @@
     "inputPath": null
   },
   {
-    "defaultValue": "${nf_type}",
+    "defaultValue": "{{nf_type}}",
     "description": null,
     "name": "nf_type",
     "parentUniqueId": null,
@@ -32,7 +32,7 @@
       "property": {}
     },
     "type": "string",
-    "uniqueId": "${nf_type_uid}",
+    "uniqueId": "{{nf_type_uid}}",
     "value": null,
     "definition": false,
     "getInputValues": null,
@@ -44,7 +44,7 @@
     "inputPath": null
   },
   {
-    "defaultValue": "${nf_naming_code}",
+    "defaultValue": "{{nf_naming_code}}",
     "description": null,
     "name": "nf_naming_code",
     "parentUniqueId": null,
@@ -54,7 +54,7 @@
       "property": {}
     },
     "type": "string",
-    "uniqueId": "${nf_naming_code_uid}",
+    "uniqueId": "{{nf_naming_code_uid}}",
     "value": null,
     "definition": false,
     "getInputValues": null,
@@ -66,7 +66,7 @@
     "inputPath": null
   },
   {
-    "defaultValue": "${nf_role}",
+    "defaultValue": "{{nf_role}}",
     "description": null,
     "name": "nf_role",
     "parentUniqueId": null,
@@ -76,7 +76,7 @@
       "property": {}
     },
     "type": "string",
-    "uniqueId": "${nf_role_uid}",
+    "uniqueId": "{{nf_role_uid}}",
     "value": null,
     "definition": false,
     "getInputValues": null,
@@ -88,7 +88,7 @@
     "inputPath": null
   },
   {
-    "defaultValue": "${cloud_env}",
+    "defaultValue": "{{cloud_env}}",
     "description": "Cloud environment (e.g., openstack, rackspace)",
     "name": "cloud_env",
     "parentUniqueId": null,
@@ -98,7 +98,7 @@
       "property": {}
     },
     "type": "string",
-    "uniqueId": "${cloud_env_uid}",
+    "uniqueId": "{{cloud_env_uid}}",
     "value": null,
     "definition": false,
     "getInputValues": null,
diff --git a/robot/assets/templates/asdc/catalog_vnf_properties.template b/robot/assets/templates/asdc/catalog_vnf_properties.jinja
index 63e85527..d725e0a2 100644
--- a/robot/assets/templates/asdc/catalog_vnf_properties.template
+++ b/robot/assets/templates/asdc/catalog_vnf_properties.jinja
@@ -1,29 +1,29 @@
 [
   {
     "name": "nfc_function",
-    "parentUniqueId": "${parent_id}",
+    "parentUniqueId": "{{parent_id}}",
     "password": false,
     "required": false,
     "schema": {
       "property": {}
     },
     "type": "string",
-    "uniqueId": "${parent_id}.nfc_function",
-    "value": "${nfc_function}",
+    "uniqueId": "{{parent_id}}.nfc_function",
+    "value": "{{nfc_function}}",
     "definition": false
   },
   {
     "description": "vfc naming",
     "name": "nfc_naming",
-    "parentUniqueId": "${parent_id}",
+    "parentUniqueId": "{{parent_id}}",
     "password": false,
     "required": false,
     "schema": {
       "property": {}
     },
     "type": "org.openecomp.datatypes.Naming",
-    "uniqueId": "${parent_id}.nfc_naming",
-    "value": "{\"ecomp_generated_naming\":true,\"naming_policy\":\"${nfc_naming_policy}\"}",
+    "uniqueId": "{{parent_id}}.nfc_naming",
+    "value": "{\"ecomp_generated_naming\":true,\"naming_policy\":\"{{nfc_naming_policy}}\"}",
     "definition": false
   }
 ]
diff --git a/robot/assets/templates/asdc/entitlement_pool.template b/robot/assets/templates/asdc/entitlement_pool.jinja
index b7e6825c..d9d39469 100644
--- a/robot/assets/templates/asdc/entitlement_pool.template
+++ b/robot/assets/templates/asdc/entitlement_pool.jinja
@@ -1,5 +1,5 @@
 {
-	"name": "${entitlement_pool_name}",
+	"name": "{{entitlement_pool_name}}",
 	"description": "vendor entitlement pool",
 	"thresholdValue": "100",
 	"thresholdUnits": "Percentage",
@@ -7,7 +7,7 @@
 		"choice": "",
 		"other": ""
 	},
-	"startDate": "${license_start_date}",
-	"expiryDate": "${license_end_date}",
+	"startDate": "{{license_start_date}}",
+	"expiryDate": "{{license_end_date}}",
 	"manufacturerReferenceNumber": "111111"
 }
diff --git a/robot/assets/templates/asdc/feature_group.template b/robot/assets/templates/asdc/feature_group.jinja
index 9b54663a..5bc03f55 100644
--- a/robot/assets/templates/asdc/feature_group.template
+++ b/robot/assets/templates/asdc/feature_group.jinja
@@ -1,11 +1,11 @@
 {
-  "name": "${feature_group_name}",
+  "name": "{{feature_group_name}}",
   "description": "vendor feature group",
   "partNumber": "123abc456",
   "addedLicenseKeyGroupsIds": [
-    "${key_group_id}"
+    "{{key_group_id}}"
   ],
   "addedEntitlementPoolsIds": [
-    "${entitlement_pool_id}"
+    "{{entitlement_pool_id}}"
   ]
 }
diff --git a/robot/assets/templates/asdc/key_group.template b/robot/assets/templates/asdc/key_group.jinja
index 2d194dc8..91e4027b 100644
--- a/robot/assets/templates/asdc/key_group.template
+++ b/robot/assets/templates/asdc/key_group.jinja
@@ -1,10 +1,10 @@
 {
-	"name": "${key_group_name}",
+	"name": "{{key_group_name}}",
 	"description": "vendor license key group",
 	"type": "Universal",
 	"thresholdValue": "100",
 	"thresholdUnits": "Percentage",
-	"startDate": "${license_start_date}",
-	"expiryDate": "${license_end_date}",
+	"startDate": "{{license_start_date}}",
+	"expiryDate": "{{license_end_date}}",
 	"manufacturerReferenceNumber": "11111"
 }
diff --git a/robot/assets/templates/asdc/license_agreement.template b/robot/assets/templates/asdc/license_agreement.jinja
index 6324d140..66776f47 100644
--- a/robot/assets/templates/asdc/license_agreement.template
+++ b/robot/assets/templates/asdc/license_agreement.jinja
@@ -1,5 +1,5 @@
 {
-  "name": "${license_agreement_name}",
+  "name": "{{license_agreement_name}}",
   "description": "vendor license agreement",
   "requirementsAndConstrains": "abcdef",
   "licenseTerm": {
@@ -7,6 +7,6 @@
     "other": ""
   },
   "addedFeatureGroupsIds": [
-    "${feature_group_id}"
+    "{{feature_group_id}}"
   ]
 }
\ No newline at end of file
diff --git a/robot/assets/templates/asdc/license_model.template b/robot/assets/templates/asdc/license_model.jinja
index 45fc83fc..27fe266e 100644
--- a/robot/assets/templates/asdc/license_model.template
+++ b/robot/assets/templates/asdc/license_model.jinja
@@ -1,5 +1,5 @@
 {
-  "vendorName": "${vendor_name}",
+  "vendorName": "{{vendor_name}}",
   "description": "vendor license model",
   "iconRef": "icon"
 }
\ No newline at end of file
diff --git a/robot/assets/templates/asdc/resource_instance.jinja b/robot/assets/templates/asdc/resource_instance.jinja
new file mode 100644
index 00000000..18b71685
--- /dev/null
+++ b/robot/assets/templates/asdc/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/robot/assets/templates/asdc/resource_instance.template b/robot/assets/templates/asdc/resource_instance.template
deleted file mode 100644
index 18cf34c7..00000000
--- a/robot/assets/templates/asdc/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/robot/assets/templates/asdc/software_product.template b/robot/assets/templates/asdc/software_product.jinja
index 61b26f90..2aa5676e 100644
--- a/robot/assets/templates/asdc/software_product.template
+++ b/robot/assets/templates/asdc/software_product.jinja
@@ -1,17 +1,17 @@
 {
-  "name": "${software_product_name}",
+  "name": "{{software_product_name}}",
   "description": "vendor software product",
   "category": "resourceNewCategory.generic",
   "subCategory": "resourceNewCategory.generic.abstract",
   "onboardingMethod" : "NetworkPackage",
-  "licensingVersion":  "${version_id}",
-  "vendorName": "${vendor_name}",
-  "vendorId": "${vendor_id}",
+  "licensingVersion":  "{{version_id}}",
+  "vendorName": "{{vendor_name}}",
+  "vendorId": "{{vendor_id}}",
   "icon": "icon",
   "licensingData": {
-    "licenseAgreement": "${license_agreement_id}",
+    "licenseAgreement": "{{license_agreement_id}}",
     "featureGroups": [
-      "${feature_group_id}"
+      "{{feature_group_id}}"
     ]
   }
 }
diff --git a/robot/assets/templates/asdc/user_remarks.jinja b/robot/assets/templates/asdc/user_remarks.jinja
new file mode 100644
index 00000000..ea01a249
--- /dev/null
+++ b/robot/assets/templates/asdc/user_remarks.jinja
@@ -0,0 +1 @@
+{"userRemarks":"{{user_remarks}}"}
\ No newline at end of file
diff --git a/robot/assets/templates/asdc/user_remarks.template b/robot/assets/templates/asdc/user_remarks.template
deleted file mode 100644
index 465115e6..00000000
--- a/robot/assets/templates/asdc/user_remarks.template
+++ /dev/null
@@ -1 +0,0 @@
-{"userRemarks":"${user_remarks}"}
\ No newline at end of file
diff --git a/robot/assets/templates/cinder_add_volume.template b/robot/assets/templates/cinder_add_volume.template
deleted file mode 100644
index 544f41e3..00000000
--- a/robot/assets/templates/cinder_add_volume.template
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "volume": {
-        "display_name": "${name}",
-        "display_description": "${description}",
-        "size": ${size},
-        "volume_type": "${type}",
-        "availability_zone": "${availability_zone}"
-    }
-}
\ No newline at end of file
diff --git a/robot/assets/templates/keystone_get_v2_auth.template b/robot/assets/templates/keystone_get_v2_auth.template
deleted file mode 100644
index 97182b02..00000000
--- a/robot/assets/templates/keystone_get_v2_auth.template
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "auth": {
-    "tenantId" : "${tenantId}",
-    "passwordCredentials": {
-      "username": "${username}",
-      "password": "${password}"
-    }
-  }
-}
-
diff --git a/robot/assets/templates/neutron_add_subnet.template b/robot/assets/templates/neutron_add_subnet.template
deleted file mode 100644
index 5a4264f8..00000000
--- a/robot/assets/templates/neutron_add_subnet.template
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "subnet": {
-        "network_id": "${network_id}",
-        "ip_version": 4,
-        "name":"${subnet_name}",
-        "cidr": "${cidr}"
-    }
-}
\ No newline at end of file
diff --git a/robot/assets/templates/nova_add_keypair.template b/robot/assets/templates/nova_add_keypair.template
deleted file mode 100644
index 52e2b068..00000000
--- a/robot/assets/templates/nova_add_keypair.template
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "keypair": {
-        "name": "${name}",
-        "public_key": "${publickey}"
-    }
-}
\ No newline at end of file
diff --git a/robot/assets/templates/nova_add_server.template b/robot/assets/templates/nova_add_server.template
deleted file mode 100644
index d40774a2..00000000
--- a/robot/assets/templates/nova_add_server.template
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "server": {
-        "name": "${name}",
-        "imageRef": "${imageRef}",
-        "flavorRef": "${flavorRef}",
-        "config_drive": true,
-        "OS-DCF:diskConfig": "MANUAL",
-        "metadata": {
-            "${name}": "Server for attaching VVG"
-        },
-        "networks": [
-            {
-                "uuid": "${public_net_id}"
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/robot/assets/templates/openstack/cinder_add_volume.jinja b/robot/assets/templates/openstack/cinder_add_volume.jinja
new file mode 100644
index 00000000..b3a6c7bc
--- /dev/null
+++ b/robot/assets/templates/openstack/cinder_add_volume.jinja
@@ -0,0 +1,9 @@
+{
+    "volume": {
+        "display_name": "{{name}}",
+        "display_description": "{{description}}",
+        "size": {{size}},
+        "volume_type": "{{type}}",
+        "availability_zone": "{{availability_zone}}"
+    }
+}
\ No newline at end of file
diff --git a/robot/assets/templates/heat_add_stack.template b/robot/assets/templates/openstack/heat_add_stack.jinja
index c3af3172..2ee4bddf 100644
--- a/robot/assets/templates/heat_add_stack.template
+++ b/robot/assets/templates/openstack/heat_add_stack.jinja
@@ -1,12 +1,12 @@
 {
     "files": {},
     "disable_rollback": true,
-    "stack_name": "${stack_name}",
+    "stack_name": "{{stack_name}}",
     "parameters": 
-        ${parameters}
+        {{parameters}}
     ,
     "template":  
-        ${template}
+        {{template}}
     ,
     "timeout_mins": 60
 }
\ No newline at end of file
diff --git a/robot/assets/templates/openstack/keystone_get_v2_auth.jinja b/robot/assets/templates/openstack/keystone_get_v2_auth.jinja
new file mode 100644
index 00000000..efe6f0d9
--- /dev/null
+++ b/robot/assets/templates/openstack/keystone_get_v2_auth.jinja
@@ -0,0 +1,10 @@
+{
+  "auth": {
+    "tenantId" : "{{tenantId}}",
+    "passwordCredentials": {
+      "username": "{{username}}",
+      "password": "{{password}}"
+    }
+  }
+}
+
diff --git a/robot/assets/templates/keystone_get_v3_auth.template b/robot/assets/templates/openstack/keystone_get_v3_auth.jinja
index 49623367..8a3287d5 100644
--- a/robot/assets/templates/keystone_get_v3_auth.template
+++ b/robot/assets/templates/openstack/keystone_get_v3_auth.jinja
@@ -6,19 +6,19 @@
             ],
             "password": {
                 "user": {
-                    "name": "${username}",
+                    "name": "{{username}",
                     "domain": {
-                        "id": "${domain_id}"
+                        "id": "{{domain_id}}"
                     },
-                    "password": "${password}"
+                    "password": "{{password}}"
                 }
             }
         
     },
     "scope": {
       "project": {
-        "name": "${project_name}",
-        "domain": { "id": "${domain_id}" }
+        "name": "{{project_name}}",
+        "domain": { "id": "{{domain_id}}" }
       }
     }
   }
diff --git a/robot/assets/templates/neutron_add_network.template b/robot/assets/templates/openstack/neutron_add_network.jinja
index 36382d47..91834185 100644
--- a/robot/assets/templates/neutron_add_network.template
+++ b/robot/assets/templates/openstack/neutron_add_network.jinja
@@ -1,7 +1,7 @@
 {
  "network":
   {
-    "name": "${name}",
+    "name": "{{name}}",
     "admin_state_up": false
   }
 }
\ No newline at end of file
diff --git a/robot/assets/templates/openstack/neutron_add_subnet.jinja b/robot/assets/templates/openstack/neutron_add_subnet.jinja
new file mode 100644
index 00000000..e0c2f830
--- /dev/null
+++ b/robot/assets/templates/openstack/neutron_add_subnet.jinja
@@ -0,0 +1,8 @@
+{
+    "subnet": {
+        "network_id": "{{network_id}}",
+        "ip_version": 4,
+        "name":"{{subnet_name}}",
+        "cidr": "{{cidr}}"
+    }
+}
\ No newline at end of file
diff --git a/robot/assets/templates/openstack/nova_add_keypair.jinja b/robot/assets/templates/openstack/nova_add_keypair.jinja
new file mode 100644
index 00000000..77912ddb
--- /dev/null
+++ b/robot/assets/templates/openstack/nova_add_keypair.jinja
@@ -0,0 +1,6 @@
+{
+    "keypair": {
+        "name": "{{name}}",
+        "public_key": "{{publickey}}"
+    }
+}
\ No newline at end of file
diff --git a/robot/assets/templates/openstack/nova_add_server.jinja b/robot/assets/templates/openstack/nova_add_server.jinja
new file mode 100644
index 00000000..e02cbec3
--- /dev/null
+++ b/robot/assets/templates/openstack/nova_add_server.jinja
@@ -0,0 +1,17 @@
+{
+    "server": {
+        "name": "{{name}}",
+        "imageRef": "{{imageRef}}",
+        "flavorRef": "{{flavorRef}}",
+        "config_drive": true,
+        "OS-DCF:diskConfig": "MANUAL",
+        "metadata": {
+            "{{name}}": "Server for attaching VVG"
+        },
+        "networks": [
+            {
+                "uuid": "{{public_net_id}}"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/robot/assets/templates/policy/closedloop_configpolicy.template b/robot/assets/templates/policy/closedloop_configpolicy.jinja
index 3f3575b4..3f3575b4 100644
--- a/robot/assets/templates/policy/closedloop_configpolicy.template
+++ b/robot/assets/templates/policy/closedloop_configpolicy.jinja
diff --git a/robot/assets/templates/policy/closedloop_createpolicy.template b/robot/assets/templates/policy/closedloop_createpolicy.jinja
index 7c693e84..bbb1f1ad 100644
--- a/robot/assets/templates/policy/closedloop_createpolicy.template
+++ b/robot/assets/templates/policy/closedloop_createpolicy.jinja
@@ -1,6 +1,6 @@
 {
 	"policyConfigType": "BRMS_PARAM",
-	"policyName": "${policy_name}",
+	"policyName": "{{policy_name}}",
 	"policyDescription": "Create BRMS Param policy",
 	"attributes": {
 		"RULE": {
diff --git a/robot/assets/templates/policy/closedloop_deletepolicy.template b/robot/assets/templates/policy/closedloop_deletepolicy.jinja
index 55510102..73c5badf 100644
--- a/robot/assets/templates/policy/closedloop_deletepolicy.template
+++ b/robot/assets/templates/policy/closedloop_deletepolicy.jinja
@@ -1,5 +1,5 @@
 {
     "pdpGroup": "default",
     "policyComponent": "PDP",
-    "policyName": "${policy_name}"
+    "policyName": "{{policy_name}}"
 }
diff --git a/robot/assets/templates/policy/closedloop_getconfigpolicy.template b/robot/assets/templates/policy/closedloop_getconfigpolicy.jinja
index 34145e5b..f1142b57 100644
--- a/robot/assets/templates/policy/closedloop_getconfigpolicy.template
+++ b/robot/assets/templates/policy/closedloop_getconfigpolicy.jinja
@@ -3,6 +3,6 @@
     },
     "configName" : ".*",
     "ecompName" : "DCAE",
-    "policyName" : "${config_policy_name}",
+    "policyName" : "{{config_policy_name}}",
     "unique" : true
 }
\ No newline at end of file
diff --git a/robot/assets/templates/policy/closedloop_opspolicy.template b/robot/assets/templates/policy/closedloop_opspolicy.jinja
index 722c9dca..0a2cc08a 100644
--- a/robot/assets/templates/policy/closedloop_opspolicy.template
+++ b/robot/assets/templates/policy/closedloop_opspolicy.jinja
@@ -1,7 +1,7 @@
 
 { 
 	"policyConfigType": "BRMS_PARAM", 
-	"policyName": "${policy_name}", 
+	"policyName": "{{policy_name}}", 
 	"policyDescription": "Create BRMS Param policy for vFW", 
 	"attributes": { 
 		"RULE": { 
diff --git a/robot/assets/templates/policy/closedloop_pushpolicy.jinja b/robot/assets/templates/policy/closedloop_pushpolicy.jinja
new file mode 100644
index 00000000..7be4c9a9
--- /dev/null
+++ b/robot/assets/templates/policy/closedloop_pushpolicy.jinja
@@ -0,0 +1,5 @@
+{
+    "policyName" : "{{policy_name}}",
+    "policyType" : "{{policy_type}}",
+    "pdpGroup" : "default"
+}
\ No newline at end of file
diff --git a/robot/assets/templates/policy/closedloop_pushpolicy.template b/robot/assets/templates/policy/closedloop_pushpolicy.template
deleted file mode 100644
index ce1d4859..00000000
--- a/robot/assets/templates/policy/closedloop_pushpolicy.template
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "policyName" : "${policy_name}",
-    "policyType" : "${policy_type}",
-    "pdpGroup" : "default"
-}
\ No newline at end of file
diff --git a/robot/assets/templates/sdnc/preload.template b/robot/assets/templates/sdnc/preload.jinja
index 327d806c..d1c6425d 100644
--- a/robot/assets/templates/sdnc/preload.template
+++ b/robot/assets/templates/sdnc/preload.jinja
@@ -19,14 +19,14 @@
 				"vnf-vms": []
 			},
 			"vnf-parameters":
-				${vnf_parameters}
+				{{vnf_parameters}}
 			,
 			"vnf-topology-identifier": {
-				"generic-vnf-name": "${generic_vnf_name}",
-				"generic-vnf-type": "${generic_vnf_type}",
-				"vnf-name": "${vf_module_name}",
-				"vnf-type": "${vf_module_type}",
-				"service-type": "${service_type}"
+				"generic-vnf-name": "{{generic_vnf_name}}",
+				"generic-vnf-type": "{{generic_vnf_type}}",
+				"vnf-name": "{{vf_module_name}}",
+				"vnf-type": "{{vf_module_type}}",
+				"service-type": "{{service_type}}"
 			}
 		}
 	}
diff --git a/robot/assets/templates/template_example.template b/robot/assets/templates/template_example.template
deleted file mode 100644
index 42583f14..00000000
--- a/robot/assets/templates/template_example.template
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requestReferences": {
-    "instanceId": "${instanceId}",
-    "requestId": "${requestId}"
-  }
-}
\ No newline at end of file