diff options
Diffstat (limited to 'src/onapsdk/so/templates/instantiate_service_macro.json.j2')
| -rw-r--r-- | src/onapsdk/so/templates/instantiate_service_macro.json.j2 | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/onapsdk/so/templates/instantiate_service_macro.json.j2 b/src/onapsdk/so/templates/instantiate_service_macro.json.j2 index a252672..1435205 100644 --- a/src/onapsdk/so/templates/instantiate_service_macro.json.j2 +++ b/src/onapsdk/so/templates/instantiate_service_macro.json.j2 @@ -2,11 +2,11 @@ "requestDetails": { "requestInfo": { "suppressRollback": false, - {% if aai_service %} + {%- if aai_service %} "productFamilyId":"{{ aai_service.service_id }}", {% else %} "productFamilyId": "1234", - {% endif %} + {%- endif %} "requestorId": "demo", "instanceName": "{{ service_instance_name }}", "source": "VID" @@ -18,13 +18,13 @@ "modelName": "{{ sdc_service.name }}", "modelVersion": "1.0" }, - {% if sdc_service.components and sdc_service.has_vnfs %} + {%- if sdc_service.components and sdc_service.has_vnfs %} "cloudConfiguration": { "tenantId": "{{ tenant.tenant_id }}", "cloudOwner": "{{ cloud_region.cloud_owner }}", "lcpCloudRegionId": "{{ cloud_region.cloud_region_id }}" }, - {% endif %} + {%- endif %} "subscriberInfo": { "globalSubscriberId": "{{ customer.global_customer_id }}" }, @@ -36,30 +36,30 @@ { "Homing_Solution": "none" }, - {% if enable_multicloud %} + {%- if enable_multicloud %} { "name":"orchestrator", "value":"multicloud" }, - {% endif %} + {%- endif %} { "service": { - {% if not sdc_service.components %} + {%- if not sdc_service.components %} "instanceParams": [], {% else %} "instanceParams": [ - {% if so_service %} + {%- if so_service %} { {% for key, value in so_service.parameters.items() %} - "{{ key }}": "{{ value }}"{% if not loop.last %}, - {% endif %} + "{{ key }}": "{{ value }}"{%- if not loop.last %}, + {%- endif %} {% endfor %} } - {% endif %} + {%- endif %} ], - {% endif %} + {%- endif %} "instanceName": "{{ service_instance_name }}", - {% if not sdc_service.components %} + {%- if not sdc_service.components %} "resources": {}, "modelInfo": { "modelVersion": "1.0", @@ -72,7 +72,7 @@ {% else %} "resources": { {% block pnfs %} - {% if sdc_service.pnfs %} + {%- if sdc_service.pnfs %} "pnfs":[ {% for pnf in sdc_service.pnfs %} { @@ -94,14 +94,14 @@ "productFamilyId":"{{ aai_service.service_id }}", "instanceParams":[], "instanceName":"{{ service_instance_name }}" - }{% if not loop.last %},{% endif %} + }{%- if not loop.last %},{%- endif %} {% endfor %} ] - {% if sdc_service.vnfs %},{% endif %} - {% endif %} + {%- if sdc_service.vnfs %},{%- endif %} + {%- endif %} {% endblock %} {% block vnfs %} - {% if sdc_service.vnfs %} + {%- if sdc_service.vnfs %} "vnfs": [ {% for vnf in sdc_service.vnfs %} { @@ -129,11 +129,11 @@ "instanceParams": [ { {% for vnf_parameter in vnf_parameters %} - {% if vnf_parameter.name == vnf.model_name %} + {%- if vnf_parameter.name == vnf.model_name %} {% for parameter in vnf_parameter.vnf_parameters %} - "{{ parameter.name }}": "{{ parameter.value }}"{% if not loop.last %},{% endif %} + "{{ parameter.name }}": "{{ parameter.value }}"{%- if not loop.last %},{%- endif %} {% endfor %} - {% endif %} + {%- endif %} {% endfor %} } ], @@ -151,27 +151,27 @@ "instanceParams": [ { {% for vnf_parameter in vnf_parameters %} - {% if vnf_parameter.name == vnf.model_name %} + {%- if vnf_parameter.name == vnf.model_name %} {% set mylist = vf_module.name.split('..') %} {% set item = mylist|length-2 %} {% for vf_module_parameter in vnf_parameter.vfmodule_parameters %} - {% if vf_module_parameter.name == mylist[item] %} + {%- if vf_module_parameter.name == mylist[item] %} {% for parameter in vf_module_parameter.vfmodule_parameters %} - "{{ parameter.name }}": "{{ parameter.value }}"{% if not loop.last %},{% endif %} + "{{ parameter.name }}": "{{ parameter.value }}"{%- if not loop.last %},{%- endif %} {% endfor %} - {% endif %} + {%- endif %} {% endfor %} - {% endif %} + {%- endif %} {% endfor %} } ] - }{% if not loop.last %},{% endif %} + }{%- if not loop.last %},{%- endif %} {% endfor %} ] - }{% if not loop.last %},{% endif %} + }{%- if not loop.last %},{%- endif %} {% endfor %} ] - {% endif %} + {%- endif %} {% endblock %} }, "modelInfo": { @@ -182,7 +182,7 @@ "modelType": "service" } } - {% endif %} + {%- endif %} } ], |