replace aai, closeloop, sdc with jinja
Issue-ID: TEST-158
Change-Id: I95a783f26e28512cb4fc98e50931d62001c489c6
Signed-off-by: DR695H <dr695h@att.com>
diff --git a/robot/assets/templates/aai/add-connectivity.template b/robot/assets/templates/aai/add-connectivity.jinja
similarity index 90%
rename from robot/assets/templates/aai/add-connectivity.template
rename to robot/assets/templates/aai/add-connectivity.jinja
index a693b20..5721ccf 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 0000000..e09dbcc
--- /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 e8550aa..0000000
--- 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
similarity index 93%
rename from robot/assets/templates/aai/add-vpn-binding.template
rename to robot/assets/templates/aai/add-vpn-binding.jinja
index 8c6743f..f901e80 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.jinja b/robot/assets/templates/aai/add_availability_zone_body.jinja
new file mode 100644
index 0000000..1d16dd6
--- /dev/null
+++ b/robot/assets/templates/aai/add_availability_zone_body.jinja
@@ -0,0 +1,5 @@
+{
+"availability-zone-name":"{{availability_zone_name}}",
+"hypervisor-type": "KVM",
+"operational-status": "Active"
+}
diff --git a/robot/assets/templates/aai/add_availability_zone_body.template b/robot/assets/templates/aai/add_availability_zone_body.template
deleted file mode 100644
index e955ab3..0000000
--- a/robot/assets/templates/aai/add_availability_zone_body.template
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-"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
similarity index 80%
rename from robot/assets/templates/aai/add_complex_body.template
rename to robot/assets/templates/aai/add_complex_body.jinja
index 3e0ac87..6ae3c0d 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
similarity index 77%
rename from robot/assets/templates/aai/add_customer.template
rename to robot/assets/templates/aai/add_customer.jinja
index d0ae174..062f93b 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
similarity index 63%
rename from robot/assets/templates/aai/add_demo_customer.template
rename to robot/assets/templates/aai/add_demo_customer.jinja
index a91e383..2c4f6c9 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 0000000..76eab16
--- /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 ca32fd5..0000000
--- 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 0000000..71430b9
--- /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 a7dbbbf..0000000
--- 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 0000000..fa32b4a
--- /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 88ababd..0000000
--- 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 0000000..87dfaa5
--- /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 01f99c0..0000000
--- 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
similarity index 84%
rename from robot/assets/templates/aai/named_query.template
rename to robot/assets/templates/aai/named_query.jinja
index de3f21f..f4501d0 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
similarity index 91%
rename from robot/assets/templates/aai/service_subscription.template
rename to robot/assets/templates/aai/service_subscription.jinja
index 8570358..f8ec466 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 0000000..bf03459
--- /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 27f9c96..0000000
--- 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}"
-}