22 files changed, 85 insertions, 85 deletions
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