From 3bb6cf4b938d3e725860606d3ddaa8eecd872151 Mon Sep 17 00:00:00 2001 From: DR695H Date: Thu, 20 Jun 2019 15:04:04 -0400 Subject: replace aai, closeloop, sdc with jinja Issue-ID: TEST-158 Change-Id: I95a783f26e28512cb4fc98e50931d62001c489c6 Signed-off-by: DR695H --- robot/assets/templates/aai/add-connectivity.jinja | 21 ++++ .../assets/templates/aai/add-connectivity.template | 21 ---- robot/assets/templates/aai/add-relationship.jinja | 4 + .../assets/templates/aai/add-relationship.template | 4 - robot/assets/templates/aai/add-vpn-binding.jinja | 18 +++ .../assets/templates/aai/add-vpn-binding.template | 18 --- .../templates/aai/add_availability_zone_body.jinja | 5 + .../aai/add_availability_zone_body.template | 5 - robot/assets/templates/aai/add_complex_body.jinja | 42 +++++++ .../assets/templates/aai/add_complex_body.template | 42 ------- robot/assets/templates/aai/add_customer.jinja | 25 +++++ robot/assets/templates/aai/add_customer.template | 25 ----- robot/assets/templates/aai/add_demo_customer.jinja | 123 +++++++++++++++++++++ .../templates/aai/add_demo_customer.template | 123 --------------------- robot/assets/templates/aai/add_service_body.jinja | 6 + .../assets/templates/aai/add_service_body.template | 6 - robot/assets/templates/aai/add_tenant_body.jinja | 18 +++ .../assets/templates/aai/add_tenant_body.template | 18 --- robot/assets/templates/aai/add_vnfc_body.jinja | 7 ++ robot/assets/templates/aai/add_vnfc_body.template | 7 -- robot/assets/templates/aai/add_zone_body.jinja | 7 ++ robot/assets/templates/aai/add_zone_body.template | 7 -- robot/assets/templates/aai/named_query.jinja | 17 +++ robot/assets/templates/aai/named_query.template | 17 --- .../templates/aai/service_subscription.jinja | 19 ++++ .../templates/aai/service_subscription.template | 19 ---- .../templates/aai/vlb_closed_loop_hack.jinja | 7 ++ .../templates/aai/vlb_closed_loop_hack.template | 7 -- 28 files changed, 319 insertions(+), 319 deletions(-) create mode 100644 robot/assets/templates/aai/add-connectivity.jinja delete mode 100644 robot/assets/templates/aai/add-connectivity.template create mode 100644 robot/assets/templates/aai/add-relationship.jinja delete mode 100644 robot/assets/templates/aai/add-relationship.template create mode 100644 robot/assets/templates/aai/add-vpn-binding.jinja delete mode 100644 robot/assets/templates/aai/add-vpn-binding.template create mode 100644 robot/assets/templates/aai/add_availability_zone_body.jinja delete mode 100644 robot/assets/templates/aai/add_availability_zone_body.template create mode 100644 robot/assets/templates/aai/add_complex_body.jinja delete mode 100644 robot/assets/templates/aai/add_complex_body.template create mode 100644 robot/assets/templates/aai/add_customer.jinja delete mode 100644 robot/assets/templates/aai/add_customer.template create mode 100644 robot/assets/templates/aai/add_demo_customer.jinja delete mode 100644 robot/assets/templates/aai/add_demo_customer.template create mode 100644 robot/assets/templates/aai/add_service_body.jinja delete mode 100644 robot/assets/templates/aai/add_service_body.template create mode 100644 robot/assets/templates/aai/add_tenant_body.jinja delete mode 100644 robot/assets/templates/aai/add_tenant_body.template create mode 100644 robot/assets/templates/aai/add_vnfc_body.jinja delete mode 100644 robot/assets/templates/aai/add_vnfc_body.template create mode 100644 robot/assets/templates/aai/add_zone_body.jinja delete mode 100644 robot/assets/templates/aai/add_zone_body.template create mode 100644 robot/assets/templates/aai/named_query.jinja delete mode 100644 robot/assets/templates/aai/named_query.template create mode 100644 robot/assets/templates/aai/service_subscription.jinja delete mode 100644 robot/assets/templates/aai/service_subscription.template create mode 100644 robot/assets/templates/aai/vlb_closed_loop_hack.jinja delete mode 100644 robot/assets/templates/aai/vlb_closed_loop_hack.template (limited to 'robot/assets/templates/aai') diff --git a/robot/assets/templates/aai/add-connectivity.jinja b/robot/assets/templates/aai/add-connectivity.jinja new file mode 100644 index 00000000..5721ccff --- /dev/null +++ b/robot/assets/templates/aai/add-connectivity.jinja @@ -0,0 +1,21 @@ +{ + "connectivity-id": "{{connectivity_id}}", + "bandwidth-profile-name": "", + "vpn-type": "", + "cir": "", + "eir": "", + "cbs": "", + "ebs": "", + "color-aware": "", + "coupling-flag": "", + "etht-svc-name": "", + "access-provider-id": "", + "access-client-id": "", + "access-topology-id": "", + "access-node-id": "", + "access-ltp-id": "", + "connectivity-selflink": "", + "cvlan": "", + "operational-status": "", + "resource-version": "" +} diff --git a/robot/assets/templates/aai/add-connectivity.template b/robot/assets/templates/aai/add-connectivity.template deleted file mode 100644 index a693b208..00000000 --- a/robot/assets/templates/aai/add-connectivity.template +++ /dev/null @@ -1,21 +0,0 @@ -{ - "connectivity-id": "${connectivity_id}", - "bandwidth-profile-name": "", - "vpn-type": "", - "cir": "", - "eir": "", - "cbs": "", - "ebs": "", - "color-aware": "", - "coupling-flag": "", - "etht-svc-name": "", - "access-provider-id": "", - "access-client-id": "", - "access-topology-id": "", - "access-node-id": "", - "access-ltp-id": "", - "connectivity-selflink": "", - "cvlan": "", - "operational-status": "", - "resource-version": "" -} 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.jinja b/robot/assets/templates/aai/add-vpn-binding.jinja new file mode 100644 index 00000000..f901e806 --- /dev/null +++ b/robot/assets/templates/aai/add-vpn-binding.jinja @@ -0,0 +1,18 @@ +{ + "vpn-id": "{{vpn_id}}", + "vpn-name": "", + "vpn-platform": "", + "vpn-type": "", + "vpn-region": "", + "customer-vpn-id": "", + "route-distinguisher": "", + "access-provider-id": "", + "access-client-id": "", + "access-topology-id": "", + "src-access-node-id": "", + "src-access-ltp-id": "", + "dst-access-node-id": "", + "dst-access-ltp-id": "", + "operational-status": "", + "resource-version": "" +} \ No newline at end of file diff --git a/robot/assets/templates/aai/add-vpn-binding.template b/robot/assets/templates/aai/add-vpn-binding.template deleted file mode 100644 index 8c6743fe..00000000 --- a/robot/assets/templates/aai/add-vpn-binding.template +++ /dev/null @@ -1,18 +0,0 @@ -{ - "vpn-id": "${vpn_id}", - "vpn-name": "", - "vpn-platform": "", - "vpn-type": "", - "vpn-region": "", - "customer-vpn-id": "", - "route-distinguisher": "", - "access-provider-id": "", - "access-client-id": "", - "access-topology-id": "", - "src-access-node-id": "", - "src-access-ltp-id": "", - "dst-access-node-id": "", - "dst-access-ltp-id": "", - "operational-status": "", - "resource-version": "" -} \ No newline at end of file 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 00000000..1d16dd6e --- /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 e955ab32..00000000 --- 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.jinja b/robot/assets/templates/aai/add_complex_body.jinja new file mode 100644 index 00000000..6ae3c0d0 --- /dev/null +++ b/robot/assets/templates/aai/add_complex_body.jinja @@ -0,0 +1,42 @@ + { + "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", + "street1": "example-street1-val-34205", + "street2": "example-street2-val-99210", + "city": "example-city-val-27150", + "state": "example-state-val-59487", + "postal-code": "68871", + "country": "example-country-val-94173", + "region": "example-region-val-13893", + "latitude": "example-latitude-val-89101", + "longitude": "32.89948", + "elevation": "97.045443", + "lata": "example-lata-val-46073", + "relationship-list": { + "relationship": [ + { + "related-to": "cloud-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-key": "cloud-region.cloud-region-id", + "relationship-value": "{{region}}" + } + ], + "related-to-property": [ + { + "property-key": "cloud-region.owner-defined-type", + "property-value": "{{owner_defined_type}}" + } + ] + } + ] + } + } diff --git a/robot/assets/templates/aai/add_complex_body.template b/robot/assets/templates/aai/add_complex_body.template deleted file mode 100644 index 3e0ac871..00000000 --- a/robot/assets/templates/aai/add_complex_body.template +++ /dev/null @@ -1,42 +0,0 @@ - { - "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", - "street1": "example-street1-val-34205", - "street2": "example-street2-val-99210", - "city": "example-city-val-27150", - "state": "example-state-val-59487", - "postal-code": "68871", - "country": "example-country-val-94173", - "region": "example-region-val-13893", - "latitude": "example-latitude-val-89101", - "longitude": "32.89948", - "elevation": "97.045443", - "lata": "example-lata-val-46073", - "relationship-list": { - "relationship": [ - { - "related-to": "cloud-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-key": "cloud-region.cloud-region-id", - "relationship-value": "${region}" - } - ], - "related-to-property": [ - { - "property-key": "cloud-region.owner-defined-type", - "property-value": "${owner_defined_type}" - } - ] - } - ] - } - } diff --git a/robot/assets/templates/aai/add_customer.jinja b/robot/assets/templates/aai/add_customer.jinja new file mode 100644 index 00000000..062f93bb --- /dev/null +++ b/robot/assets/templates/aai/add_customer.jinja @@ -0,0 +1,25 @@ +{ + "global-customer-id": "{{global_customer_id}}", + "subscriber-name": "{{subscriber_name}}", + "subscriber-type": "{{subscriber_type}}", + "service-subscriptions": { + "service-subscription": [{ + "service-type": "{{service1}}", + "relationship-list": { + "relationship": [{ + "related-to": "tenant", + "relationship-data": [{ + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "{{cloud_owner1}}" + }, { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "{{cloud_region_id1}}" + }, { + "relationship-key": "tenant.tenant-id", + "relationship-value": "{{tenant_id1}}" + }] + }] + } + }] + } + } \ No newline at end of file diff --git a/robot/assets/templates/aai/add_customer.template b/robot/assets/templates/aai/add_customer.template deleted file mode 100644 index d0ae174a..00000000 --- a/robot/assets/templates/aai/add_customer.template +++ /dev/null @@ -1,25 +0,0 @@ -{ - "global-customer-id": "${global_customer_id}", - "subscriber-name": "${subscriber_name}", - "subscriber-type": "${subscriber_type}", - "service-subscriptions": { - "service-subscription": [{ - "service-type": "${service1}", - "relationship-list": { - "relationship": [{ - "related-to": "tenant", - "relationship-data": [{ - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "${cloud_owner1}" - }, { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "${cloud_region_id1}" - }, { - "relationship-key": "tenant.tenant-id", - "relationship-value": "${tenant_id1}" - }] - }] - } - }] - } - } \ No newline at end of file diff --git a/robot/assets/templates/aai/add_demo_customer.jinja b/robot/assets/templates/aai/add_demo_customer.jinja new file mode 100644 index 00000000..2c4f6c92 --- /dev/null +++ b/robot/assets/templates/aai/add_demo_customer.jinja @@ -0,0 +1,123 @@ +{ + "global-customer-id" : "{{global_customer_id}}", + "subscriber-name" : "{{subscriber_name}}", + "subscriber-type" : "{{subscriber_type}}", + "service-subscriptions" : { + "service-subscription" : [{ + "service-type" : "{{service1}}", + "relationship-list" : { + "relationship" : [{ + "related-to" : "tenant", + "relationship-data" : [{ + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "{{cloud_owner}}" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "{{cloud_region_id}}" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "{{tenant_id}}" + } + ] + } + ] + } + }, { + "service-type" : "{{service2}}", + "relationship-list" : { + "relationship" : [{ + "related-to" : "tenant", + "relationship-data" : [{ + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "{{cloud_owner}}" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "{{cloud_region_id}}" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "{{tenant_id}}" + } + ] + } + ] + } + }, { + "service-type" : "{{service3}}", + "relationship-list" : { + "relationship" : [{ + "related-to" : "tenant", + "relationship-data" : [{ + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "{{cloud_owner}}" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "{{cloud_region_id}}" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "{{tenant_id}}" + } + ] + } + ] + } + }, { + "service-type" : "{{service4}}", + "relationship-list" : { + "relationship" : [{ + "related-to" : "tenant", + "relationship-data" : [{ + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "{{cloud_owner}}" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "{{cloud_region_id}}" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "{{tenant_id}}" + } + ] + } + ] + } + }, { + "service-type" : "{{service5}}", + "relationship-list" : { + "relationship" : [{ + "related-to" : "tenant", + "relationship-data" : [{ + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "{{cloud_owner}}" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "{{cloud_region_id}}" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "{{tenant_id}}" + } + ] + } + ] + } + }, { + "service-type" : "{{service6}}", + "relationship-list" : { + "relationship" : [{ + "related-to" : "tenant", + "relationship-data" : [{ + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "{{cloud_owner}}" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "{{cloud_region_id}}" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "{{tenant_id}}" + } + ] + } + ] + } + } + ] + } +} diff --git a/robot/assets/templates/aai/add_demo_customer.template b/robot/assets/templates/aai/add_demo_customer.template deleted file mode 100644 index a91e3836..00000000 --- a/robot/assets/templates/aai/add_demo_customer.template +++ /dev/null @@ -1,123 +0,0 @@ -{ - "global-customer-id" : "${global_customer_id}", - "subscriber-name" : "${subscriber_name}", - "subscriber-type" : "${subscriber_type}", - "service-subscriptions" : { - "service-subscription" : [{ - "service-type" : "${service1}", - "relationship-list" : { - "relationship" : [{ - "related-to" : "tenant", - "relationship-data" : [{ - "relationship-key" : "cloud-region.cloud-owner", - "relationship-value" : "${cloud_owner}" - }, { - "relationship-key" : "cloud-region.cloud-region-id", - "relationship-value" : "${cloud_region_id}" - }, { - "relationship-key" : "tenant.tenant-id", - "relationship-value" : "${tenant_id}" - } - ] - } - ] - } - }, { - "service-type" : "${service2}", - "relationship-list" : { - "relationship" : [{ - "related-to" : "tenant", - "relationship-data" : [{ - "relationship-key" : "cloud-region.cloud-owner", - "relationship-value" : "${cloud_owner}" - }, { - "relationship-key" : "cloud-region.cloud-region-id", - "relationship-value" : "${cloud_region_id}" - }, { - "relationship-key" : "tenant.tenant-id", - "relationship-value" : "${tenant_id}" - } - ] - } - ] - } - }, { - "service-type" : "${service3}", - "relationship-list" : { - "relationship" : [{ - "related-to" : "tenant", - "relationship-data" : [{ - "relationship-key" : "cloud-region.cloud-owner", - "relationship-value" : "${cloud_owner}" - }, { - "relationship-key" : "cloud-region.cloud-region-id", - "relationship-value" : "${cloud_region_id}" - }, { - "relationship-key" : "tenant.tenant-id", - "relationship-value" : "${tenant_id}" - } - ] - } - ] - } - }, { - "service-type" : "${service4}", - "relationship-list" : { - "relationship" : [{ - "related-to" : "tenant", - "relationship-data" : [{ - "relationship-key" : "cloud-region.cloud-owner", - "relationship-value" : "${cloud_owner}" - }, { - "relationship-key" : "cloud-region.cloud-region-id", - "relationship-value" : "${cloud_region_id}" - }, { - "relationship-key" : "tenant.tenant-id", - "relationship-value" : "${tenant_id}" - } - ] - } - ] - } - }, { - "service-type" : "${service5}", - "relationship-list" : { - "relationship" : [{ - "related-to" : "tenant", - "relationship-data" : [{ - "relationship-key" : "cloud-region.cloud-owner", - "relationship-value" : "${cloud_owner}" - }, { - "relationship-key" : "cloud-region.cloud-region-id", - "relationship-value" : "${cloud_region_id}" - }, { - "relationship-key" : "tenant.tenant-id", - "relationship-value" : "${tenant_id}" - } - ] - } - ] - } - }, { - "service-type" : "${service6}", - "relationship-list" : { - "relationship" : [{ - "related-to" : "tenant", - "relationship-data" : [{ - "relationship-key" : "cloud-region.cloud-owner", - "relationship-value" : "${cloud_owner}" - }, { - "relationship-key" : "cloud-region.cloud-region-id", - "relationship-value" : "${cloud_region_id}" - }, { - "relationship-key" : "tenant.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.jinja b/robot/assets/templates/aai/named_query.jinja new file mode 100644 index 00000000..f4501d0f --- /dev/null +++ b/robot/assets/templates/aai/named_query.jinja @@ -0,0 +1,17 @@ +{ + "query-parameters": { + "named-query": { + "named-query-uuid": "f199cb88-5e69-4b1f-93e0-6f257877d066" + } + }, + "instance-filters": { + "instance-filter": [ + { + "vserver": + { + "vserver-name": "{{vserver_name}}" + } + } + ] + } +} \ No newline at end of file diff --git a/robot/assets/templates/aai/named_query.template b/robot/assets/templates/aai/named_query.template deleted file mode 100644 index de3f21f6..00000000 --- a/robot/assets/templates/aai/named_query.template +++ /dev/null @@ -1,17 +0,0 @@ -{ - "query-parameters": { - "named-query": { - "named-query-uuid": "f199cb88-5e69-4b1f-93e0-6f257877d066" - } - }, - "instance-filters": { - "instance-filter": [ - { - "vserver": - { - "vserver-name": "${vserver_name}" - } - } - ] - } -} \ No newline at end of file diff --git a/robot/assets/templates/aai/service_subscription.jinja b/robot/assets/templates/aai/service_subscription.jinja new file mode 100644 index 00000000..f8ec466d --- /dev/null +++ b/robot/assets/templates/aai/service_subscription.jinja @@ -0,0 +1,19 @@ +{ + "service-subscription":[ + { + "service-type":"{{service_type}}", + "resource-version":"1473866861", + "service-instances":{ + "service-instance":[ + { + "service-instance-id":"d3f9a631-e280-4a87-846d-9ccd7a265980", + "service-instance-name":"VIV+IST+ezNew+Oct6", + "persona-model-id":"e6f1d393-6432-4820-ab86-7a10ba4b31ac", + "persona-model-version":"1.0", + "resource-version":"1475807447" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/robot/assets/templates/aai/service_subscription.template b/robot/assets/templates/aai/service_subscription.template deleted file mode 100644 index 85703581..00000000 --- a/robot/assets/templates/aai/service_subscription.template +++ /dev/null @@ -1,19 +0,0 @@ -{ - "service-subscription":[ - { - "service-type":"{$service_type}", - "resource-version":"1473866861", - "service-instances":{ - "service-instance":[ - { - "service-instance-id":"d3f9a631-e280-4a87-846d-9ccd7a265980", - "service-instance-name":"VIV+IST+ezNew+Oct6", - "persona-model-id":"e6f1d393-6432-4820-ab86-7a10ba4b31ac", - "persona-model-version":"1.0", - "resource-version":"1475807447" - } - ] - } - } - ] -} \ No newline at end of file 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}" -} -- cgit 1.2.3-korg