diff options
Diffstat (limited to 'src/onapsdk/aai/templates')
11 files changed, 148 insertions, 148 deletions
diff --git a/src/onapsdk/aai/templates/aai_add_relationship.json.j2 b/src/onapsdk/aai/templates/aai_add_relationship.json.j2 index 5d7acb8..72b5fd9 100644 --- a/src/onapsdk/aai/templates/aai_add_relationship.json.j2 +++ b/src/onapsdk/aai/templates/aai_add_relationship.json.j2 @@ -1,11 +1,11 @@ { "related-to": "{{ relationship.related_to }}", "related-link": "{{ relationship.related_link }}", - {% if relationship.relationship_label %} + {%- if relationship.relationship_label %} "relationship-label": "{{ relationship.relationship_label }}", - {% endif %} - {% if relationship.related_to_property %} + {%- endif %} + {%- if relationship.related_to_property %} "related-to-property": {{ relationship.related_to_property | tojson }}, - {% endif %} + {%- endif %} "relationship-data": {{ relationship.relationship_data | tojson }} }
\ No newline at end of file diff --git a/src/onapsdk/aai/templates/aai_bulk.json.j2 b/src/onapsdk/aai/templates/aai_bulk.json.j2 index 40a97bd..7dcbcb7 100644 --- a/src/onapsdk/aai/templates/aai_bulk.json.j2 +++ b/src/onapsdk/aai/templates/aai_bulk.json.j2 @@ -5,7 +5,7 @@ "action": "{{ operation.action }}", "uri": "{{ operation.uri }}", "body": {{ operation.body }} - }{% if not loop.last %},{% endif %} + }{%- if not loop.last %},{%- endif %} {% endfor %} ] }
\ No newline at end of file diff --git a/src/onapsdk/aai/templates/aai_delete_relationship.json.j2 b/src/onapsdk/aai/templates/aai_delete_relationship.json.j2 index 5d7acb8..72b5fd9 100644 --- a/src/onapsdk/aai/templates/aai_delete_relationship.json.j2 +++ b/src/onapsdk/aai/templates/aai_delete_relationship.json.j2 @@ -1,11 +1,11 @@ { "related-to": "{{ relationship.related_to }}", "related-link": "{{ relationship.related_link }}", - {% if relationship.relationship_label %} + {%- if relationship.relationship_label %} "relationship-label": "{{ relationship.relationship_label }}", - {% endif %} - {% if relationship.related_to_property %} + {%- endif %} + {%- if relationship.related_to_property %} "related-to-property": {{ relationship.related_to_property | tojson }}, - {% endif %} + {%- endif %} "relationship-data": {{ relationship.relationship_data | tojson }} }
\ No newline at end of file diff --git a/src/onapsdk/aai/templates/aai_put_pnf.json.j2 b/src/onapsdk/aai/templates/aai_put_pnf.json.j2 index 65513c7..4d22058 100644 --- a/src/onapsdk/aai/templates/aai_put_pnf.json.j2 +++ b/src/onapsdk/aai/templates/aai_put_pnf.json.j2 @@ -1,54 +1,54 @@ { -{% if pnf_object.admin_status %}"admin_status": "{{ pnf_object.admin_status }}",{% else %}{%endif %} -{% if pnf_object.equip_model %}"equip_model": "{{ pnf_object.equip_model }}",{% else %}{%endif %} -{% if pnf_object.equip_type %}"equip_type": "{{ pnf_object.equip_type }}",{% else %}{%endif %} -{% if pnf_object.equip_vendor %}"equip_vendor": "{{ pnf_object.equip_vendor }}",{% else %}{%endif %} -{% if pnf_object.frame_id %}"frame_id": "{{ pnf_object.frame_id }}",{% else %}{%endif %} -{% if pnf_object.in_maint != None %}"in_maint": {{ convert_bool_for_json(pnf_object.in_maint) }},{% else %}{%endif %} -{% if pnf_object.inv_status %}"inv_status": "{{ pnf_object.inv_status }}",{% else %}{%endif %} -{% if pnf_object.ipaddress_v4_aim %}"ipaddress_v4_aim": "{{ pnf_object.ipaddress_v4_aim }}",{% else %}{%endif %} -{% if pnf_object.ipaddress_v4_loopback_0 %}"ipaddress_v4_loopback_0": "{{ pnf_object.ipaddress_v4_loopback_0 }}",{% else %}{%endif %} -{% if pnf_object.ipaddress_v4_oam %}"ipaddress_v4_oam": "{{ pnf_object.ipaddress_v4_oam }}",{% else %}{%endif %} -{% if pnf_object.ipaddress_v6_aim %}"ipaddress_v6_aim": "{{ pnf_object.ipaddress_v6_aim }}",{% else %}{%endif %} -{% if pnf_object.ipaddress_v6_loopback_0 %}"ipaddress_v6_loopback_0": "{{ pnf_object.ipaddress_v6_loopback_0 }}",{% else %}{%endif %} -{% if pnf_object.ipaddress_v6_oam %}"ipaddress_v6_oam": "{{ pnf_object.ipaddress_v6_oam }}",{% else %}{%endif %} -{% if pnf_object.management_option %}"management_option": "{{ pnf_object.management_option }}",{% else %}{%endif %} -{% if pnf_object.model_customization_id %}"model_customization_id": "{{ pnf_object.model_customization_id }}",{% else %}{%endif %} -{% if pnf_object.model_invariant_id %}"model_invariant_id": "{{ pnf_object.model_invariant_id }}",{% else %}{%endif %} -{% if pnf_object.model_version_id %}"model_version_id": "{{ pnf_object.model_version_id }}",{% else %}{%endif %} -{% if pnf_object.nf_role %}"nf_role": "{{ pnf_object.nf_role }}",{% else %}{%endif %} -{% if pnf_object.operational_status %}"operational_status": "{{ pnf_object.operational_status }}",{% else %}{%endif %} -{% if pnf_object.orchestration_status %}"orchestration_status": "{{ pnf_object.orchestration_status }}",{% else %}{%endif %} -{% if pnf_object.pnf_id %}"pnf_id": "{{ pnf_object.pnf_id }}",{% else %}{%endif %} -{% if pnf_object.pnf_ipv4_address %}"pnf_ipv4_address": "{{ pnf_object.pnf_ipv4_address }}",{% else %}{%endif %} -{% if pnf_object.pnf_ipv6_address %}"pnf_ipv6_address": "{{ pnf_object.pnf_ipv6_address }}",{% else %}{%endif %} -{% if pnf_object.pnf_name %}"pnf_name": "{{ pnf_object.pnf_name }}",{% else %}{%endif %} -{% if pnf_object.prov_status %}"prov_status": "{{ pnf_object.prov_status }}",{% else %}{%endif %} -{% if pnf_object.selflink %}"selflink": "{{ pnf_object.selflink }}",{% else %}{%endif %} -{% if pnf_object.serial_number %}"serial_number": "{{ pnf_object.serial_number }}",{% else %}{%endif %} -{% if pnf_object.sw_version %}"sw_version": "{{ pnf_object.sw_version }}",{% else %}{%endif %} -{% if pnf_object.service_instance %}"service_instance": { -{% if pnf_object.service_instance.service_subscription %}"service_subscription": "{{ pnf_object.service_instance.service_subscription }}",{% else %}{%endif %} -{% if pnf_object.service_instance.instance_id %}"instance_id": "{{ pnf_object.service_instance.instance_id }}",{% else %}{%endif %} -{% if pnf_object.service_instance.instance_name %}"instance_name": "{{ pnf_object.service_instance.instance_name }}",{% else %}{%endif %} -{% if pnf_object.service_instance.service_type %}"service_type": "{{ pnf_object.service_instance.service_type }}",{% else %}{%endif %} -{% if pnf_object.service_instance.service_role %}"service_role": "{{ pnf_object.service_instance.service_role }}",{% else %}{%endif %} -{% if pnf_object.service_instance.environment_context %}"environment_context": "{{ pnf_object.service_instance.environment_context }}",{% else %}{%endif %} -{% if pnf_object.service_instance.workload_context %}"workload_context": "{{ pnf_object.service_instance.workload_context }}",{% else %}{%endif %} -{% if pnf_object.service_instance.created_at %}"created_at": "{{ pnf_object.service_instance.created_at }}",{% else %}{%endif %} -{% if pnf_object.service_instance.updated_at %}"updated_at": "{{ pnf_object.service_instance.updated_at }}",{% else %}{%endif %} -{% if pnf_object.service_instance.resource_version %}"resource_version": "{{ pnf_object.service_instance.resource_version }}",{% else %}{%endif %} -{% if pnf_object.service_instance.description %}"description": "{{ pnf_object.service_instance.description }}",{% else %}{%endif %} -{% if pnf_object.service_instance.model_invariant_id %}"model_invariant_id": "{{ pnf_object.service_instance.model_invariant_id }}",{% else %}{%endif %} -{% if pnf_object.service_instance.model_version_id %}"model_version_id": "{{ pnf_object.service_instance.model_version_id }}",{% else %}{%endif %} -{% if pnf_object.service_instance.persona_model_version %}"persona_model_version": "{{ pnf_object.service_instance.persona_model_version }}",{% else %}{%endif %} -{% if pnf_object.service_instance.widget_model_id %}"widget_model_id": "{{ pnf_object.service_instance.widget_model_id }}",{% else %}{%endif %} -{% if pnf_object.service_instance.widget_model_version %}"widget_model_version": "{{ pnf_object.service_instance.widget_model_version }}",{% else %}{%endif %} -{% if pnf_object.service_instance.bandwith_total %}"bandwith_total": "{{ pnf_object.service_instance.bandwith_total }}",{% else %}{%endif %} -{% if pnf_object.service_instance.vhn_portal_url %}"vhn_portal_url": "{{ pnf_object.service_instance.vhn_portal_url }}",{% else %}{%endif %} -{% if pnf_object.service_instance.service_instance_location_id %}"service_instance_location_id": "{{ pnf_object.service_instance.service_instance_location_id }}",{% else %}{%endif %} -{% if pnf_object.service_instance.selflink %}"selflink": "{{ pnf_object.service_instance.selflink }}",{% else %}{%endif %} -{% if pnf_object.service_instance.orchestration_status %}"orchestration_status": "{{ pnf_object.service_instance.orchestration_status }}",{% else %}{%endif %} -{% if pnf_object.service_instance.input_parameters %}"input_parameters": "{{ pnf_object.service_instance.input_parameters }}",{% else %}{%endif %} +{%- if pnf_object.admin_status %}"admin_status": "{{ pnf_object.admin_status }}",{% else %}{%endif %} +{%- if pnf_object.equip_model %}"equip_model": "{{ pnf_object.equip_model }}",{% else %}{%endif %} +{%- if pnf_object.equip_type %}"equip_type": "{{ pnf_object.equip_type }}",{% else %}{%endif %} +{%- if pnf_object.equip_vendor %}"equip_vendor": "{{ pnf_object.equip_vendor }}",{% else %}{%endif %} +{%- if pnf_object.frame_id %}"frame_id": "{{ pnf_object.frame_id }}",{% else %}{%endif %} +{%- if pnf_object.in_maint != None %}"in_maint": {{ convert_bool_for_json(pnf_object.in_maint) }},{% else %}{%endif %} +{%- if pnf_object.inv_status %}"inv_status": "{{ pnf_object.inv_status }}",{% else %}{%endif %} +{%- if pnf_object.ipaddress_v4_aim %}"ipaddress_v4_aim": "{{ pnf_object.ipaddress_v4_aim }}",{% else %}{%endif %} +{%- if pnf_object.ipaddress_v4_loopback_0 %}"ipaddress_v4_loopback_0": "{{ pnf_object.ipaddress_v4_loopback_0 }}",{% else %}{%endif %} +{%- if pnf_object.ipaddress_v4_oam %}"ipaddress_v4_oam": "{{ pnf_object.ipaddress_v4_oam }}",{% else %}{%endif %} +{%- if pnf_object.ipaddress_v6_aim %}"ipaddress_v6_aim": "{{ pnf_object.ipaddress_v6_aim }}",{% else %}{%endif %} +{%- if pnf_object.ipaddress_v6_loopback_0 %}"ipaddress_v6_loopback_0": "{{ pnf_object.ipaddress_v6_loopback_0 }}",{% else %}{%endif %} +{%- if pnf_object.ipaddress_v6_oam %}"ipaddress_v6_oam": "{{ pnf_object.ipaddress_v6_oam }}",{% else %}{%endif %} +{%- if pnf_object.management_option %}"management_option": "{{ pnf_object.management_option }}",{% else %}{%endif %} +{%- if pnf_object.model_customization_id %}"model_customization_id": "{{ pnf_object.model_customization_id }}",{% else %}{%endif %} +{%- if pnf_object.model_invariant_id %}"model_invariant_id": "{{ pnf_object.model_invariant_id }}",{% else %}{%endif %} +{%- if pnf_object.model_version_id %}"model_version_id": "{{ pnf_object.model_version_id }}",{% else %}{%endif %} +{%- if pnf_object.nf_role %}"nf_role": "{{ pnf_object.nf_role }}",{% else %}{%endif %} +{%- if pnf_object.operational_status %}"operational_status": "{{ pnf_object.operational_status }}",{% else %}{%endif %} +{%- if pnf_object.orchestration_status %}"orchestration_status": "{{ pnf_object.orchestration_status }}",{% else %}{%endif %} +{%- if pnf_object.pnf_id %}"pnf_id": "{{ pnf_object.pnf_id }}",{% else %}{%endif %} +{%- if pnf_object.pnf_ipv4_address %}"pnf_ipv4_address": "{{ pnf_object.pnf_ipv4_address }}",{% else %}{%endif %} +{%- if pnf_object.pnf_ipv6_address %}"pnf_ipv6_address": "{{ pnf_object.pnf_ipv6_address }}",{% else %}{%endif %} +{%- if pnf_object.pnf_name %}"pnf_name": "{{ pnf_object.pnf_name }}",{% else %}{%endif %} +{%- if pnf_object.prov_status %}"prov_status": "{{ pnf_object.prov_status }}",{% else %}{%endif %} +{%- if pnf_object.selflink %}"selflink": "{{ pnf_object.selflink }}",{% else %}{%endif %} +{%- if pnf_object.serial_number %}"serial_number": "{{ pnf_object.serial_number }}",{% else %}{%endif %} +{%- if pnf_object.sw_version %}"sw_version": "{{ pnf_object.sw_version }}",{% else %}{%endif %} +{%- if pnf_object.service_instance %}"service_instance": { +{%- if pnf_object.service_instance.service_subscription %}"service_subscription": "{{ pnf_object.service_instance.service_subscription }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.instance_id %}"instance_id": "{{ pnf_object.service_instance.instance_id }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.instance_name %}"instance_name": "{{ pnf_object.service_instance.instance_name }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.service_type %}"service_type": "{{ pnf_object.service_instance.service_type }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.service_role %}"service_role": "{{ pnf_object.service_instance.service_role }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.environment_context %}"environment_context": "{{ pnf_object.service_instance.environment_context }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.workload_context %}"workload_context": "{{ pnf_object.service_instance.workload_context }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.created_at %}"created_at": "{{ pnf_object.service_instance.created_at }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.updated_at %}"updated_at": "{{ pnf_object.service_instance.updated_at }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.resource_version %}"resource_version": "{{ pnf_object.service_instance.resource_version }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.description %}"description": "{{ pnf_object.service_instance.description }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.model_invariant_id %}"model_invariant_id": "{{ pnf_object.service_instance.model_invariant_id }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.model_version_id %}"model_version_id": "{{ pnf_object.service_instance.model_version_id }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.persona_model_version %}"persona_model_version": "{{ pnf_object.service_instance.persona_model_version }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.widget_model_id %}"widget_model_id": "{{ pnf_object.service_instance.widget_model_id }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.widget_model_version %}"widget_model_version": "{{ pnf_object.service_instance.widget_model_version }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.bandwith_total %}"bandwith_total": "{{ pnf_object.service_instance.bandwith_total }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.vhn_portal_url %}"vhn_portal_url": "{{ pnf_object.service_instance.vhn_portal_url }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.service_instance_location_id %}"service_instance_location_id": "{{ pnf_object.service_instance.service_instance_location_id }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.selflink %}"selflink": "{{ pnf_object.service_instance.selflink }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.orchestration_status %}"orchestration_status": "{{ pnf_object.service_instance.orchestration_status }}",{% else %}{%endif %} +{%- if pnf_object.service_instance.input_parameters %}"input_parameters": "{{ pnf_object.service_instance.input_parameters }}",{% else %}{%endif %} }{% else %}{%endif %} } diff --git a/src/onapsdk/aai/templates/aai_service_instance_create.json.j2 b/src/onapsdk/aai/templates/aai_service_instance_create.json.j2 index 91f0046..0694b8b 100644 --- a/src/onapsdk/aai/templates/aai_service_instance_create.json.j2 +++ b/src/onapsdk/aai/templates/aai_service_instance_create.json.j2 @@ -1,22 +1,22 @@ { "service-instance-id": "{{ service_instance.instance_id }}" - {% if service_instance.instance_name %}, "service-instance-name": "{{ service_instance.instance_name }}"{% endif %} - {% if service_instance.service_type %}, "service-type": "{{ service_instance.service_type }}"{% endif %} - {% if service_instance.service_role %}, "service-role": "{{ service_instance.service_role }}"{% endif %} - {% if service_instance.environment_context %}, "environment-context": "{{ service_instance.environment_context }}"{% endif %} - {% if service_instance.workload_context %}, "workload-context": "{{ service_instance.workload_context }}"{% endif %} - {% if service_instance.created_at %}, "created-at": "{{ service_instance.created_at }}"{% endif %} - {% if service_instance.updated_at %}, "updated-at": "{{ service_instance.updated_at }}"{% endif %} - {% if service_instance.description %}, "description": "{{ service_instance.description }}"{% endif %} - {% if service_instance.model_invariant_id %}, "model-invariant-id": "{{ service_instance.model_invariant_id }}"{% endif %} - {% if service_instance.model_version_id %}, "model-version-id": "{{ service_instance.model_version_id }}"{% endif %} - {% if service_instance.persona_model_version %}, "persona-model-version": "{{ service_instance.persona_model_version }}"{% endif %} - {% if service_instance.widget_model_id %}, "widget-model-id": "{{ service_instance.widget_model_id }}"{% endif %} - {% if service_instance.widget_model_version %}, "widget-model-version": "{{ service_instance.widget_model_version }}"{% endif %} - {% if service_instance.bandwith_total %}, "bandwidth-total": "{{ service_instance.bandwith_total }}"{% endif %} - {% if service_instance.vhn_portal_url %}, "vhn-portal-url": "{{ service_instance.vhn_portal_url }}"{% endif %} - {% if service_instance.service_instance_location_id %}, "service-instance-location-id": "{{ service_instance.service_instance_location_id }}"{% endif %} - {% if service_instance.selflink %}, "selflink": "{{ service_instance.selflink }}"{% endif %} - {% if service_instance.orchestration_status %}, "orchestration-status": "{{ service_instance.orchestration_status }}"{% endif %} - {% if service_instance.input_parameters %}, "input-parameters": "{{ service_instance.input_parameters }}"{% endif %} + {%- if service_instance.instance_name %}, "service-instance-name": "{{ service_instance.instance_name }}"{%- endif %} + {%- if service_instance.service_type %}, "service-type": "{{ service_instance.service_type }}"{%- endif %} + {%- if service_instance.service_role %}, "service-role": "{{ service_instance.service_role }}"{%- endif %} + {%- if service_instance.environment_context %}, "environment-context": "{{ service_instance.environment_context }}"{%- endif %} + {%- if service_instance.workload_context %}, "workload-context": "{{ service_instance.workload_context }}"{%- endif %} + {%- if service_instance.created_at %}, "created-at": "{{ service_instance.created_at }}"{%- endif %} + {%- if service_instance.updated_at %}, "updated-at": "{{ service_instance.updated_at }}"{%- endif %} + {%- if service_instance.description %}, "description": "{{ service_instance.description }}"{%- endif %} + {%- if service_instance.model_invariant_id %}, "model-invariant-id": "{{ service_instance.model_invariant_id }}"{%- endif %} + {%- if service_instance.model_version_id %}, "model-version-id": "{{ service_instance.model_version_id }}"{%- endif %} + {%- if service_instance.persona_model_version %}, "persona-model-version": "{{ service_instance.persona_model_version }}"{%- endif %} + {%- if service_instance.widget_model_id %}, "widget-model-id": "{{ service_instance.widget_model_id }}"{%- endif %} + {%- if service_instance.widget_model_version %}, "widget-model-version": "{{ service_instance.widget_model_version }}"{%- endif %} + {%- if service_instance.bandwith_total %}, "bandwidth-total": "{{ service_instance.bandwith_total }}"{%- endif %} + {%- if service_instance.vhn_portal_url %}, "vhn-portal-url": "{{ service_instance.vhn_portal_url }}"{%- endif %} + {%- if service_instance.service_instance_location_id %}, "service-instance-location-id": "{{ service_instance.service_instance_location_id }}"{%- endif %} + {%- if service_instance.selflink %}, "selflink": "{{ service_instance.selflink }}"{%- endif %} + {%- if service_instance.orchestration_status %}, "orchestration-status": "{{ service_instance.orchestration_status }}"{%- endif %} + {%- if service_instance.input_parameters %}, "input-parameters": "{{ service_instance.input_parameters }}"{%- endif %} }
\ No newline at end of file diff --git a/src/onapsdk/aai/templates/aai_sp_partner_create.json.j2 b/src/onapsdk/aai/templates/aai_sp_partner_create.json.j2 index 40ba1d7..fe03415 100644 --- a/src/onapsdk/aai/templates/aai_sp_partner_create.json.j2 +++ b/src/onapsdk/aai/templates/aai_sp_partner_create.json.j2 @@ -1,21 +1,21 @@ { "sp-partner-id": "{{ sp_partner_id }}" - {% if url %} + {%- if url %} , "url": "{{ url }}" - {% endif %} - {% if callsource %} + {%- endif %} + {%- if callsource %} , "callsource": "{{ callsource }}" - {% endif %} - {% if operational_status %} + {%- endif %} + {%- if operational_status %} , "operational-status": "{{ operational_status }}" - {% endif %} - {% if model_customization_id %} + {%- endif %} + {%- if model_customization_id %} , "model-customization-id": "{{ model_customization_id }}" - {% endif %} - {% if model_invariant_id %} + {%- endif %} + {%- if model_invariant_id %} , "model-invariant-id": "{{ model_invariant_id }}" - {% endif %} - {% if model_version_id %} + {%- endif %} + {%- if model_version_id %} , "model-version-id": "{{ model_version_id }}" - {% endif %} + {%- endif %} }
\ No newline at end of file diff --git a/src/onapsdk/aai/templates/cloud_region_add_availability_zone.json.j2 b/src/onapsdk/aai/templates/cloud_region_add_availability_zone.json.j2 index be6ebc5..5862ec0 100644 --- a/src/onapsdk/aai/templates/cloud_region_add_availability_zone.json.j2 +++ b/src/onapsdk/aai/templates/cloud_region_add_availability_zone.json.j2 @@ -1,7 +1,7 @@ { "availability-zone-name": "{{ availability_zone_name }}", "hypervisor-type": "{{ availability_zone_hypervisor_type }}" - {% if availability_zone_operational_status %} + {%- if availability_zone_operational_status %} , "operational-status": "{{ availability_zone_operational_status }}" - {% endif %} + {%- endif %} }
\ No newline at end of file diff --git a/src/onapsdk/aai/templates/cloud_region_add_esr_system_info.json.j2 b/src/onapsdk/aai/templates/cloud_region_add_esr_system_info.json.j2 index ab03de3..5af207d 100644 --- a/src/onapsdk/aai/templates/cloud_region_add_esr_system_info.json.j2 +++ b/src/onapsdk/aai/templates/cloud_region_add_esr_system_info.json.j2 @@ -3,52 +3,52 @@ "user-name": "{{ user_name }}", "password": "{{ password }}", "system-type": "{{ system_type }}" - {% if system_name %} + {%- if system_name %} , "system-name": "{{ system_name }}" - {% endif %} - {% if esr_type %} + {%- endif %} + {%- if esr_type %} , "type": "{{ esr_type }}" - {% endif %} - {% if vendor %} + {%- endif %} + {%- if vendor %} , "vendor": "{{ vendor }}" - {% endif %} - {% if version %} + {%- endif %} + {%- if version %} , "version": "{{ version }}" - {% endif %} - {% if service_url %} + {%- endif %} + {%- if service_url %} , "service-url": "{{ service_url }}" - {% endif %} - {% if protocol %} + {%- endif %} + {%- if protocol %} , "protocol": "{{ protocol }}" - {% endif %} - {% if ssl_cacert %} + {%- endif %} + {%- if ssl_cacert %} , "ssl-cacert": "{{ ssl_cacert }}" - {% endif %} - {% if ssl_insecure is not none %} + {%- endif %} + {%- if ssl_insecure is not none %} , "ssl-insecure": {{ ssl_insecure | tojson }} - {% endif %} - {% if ip_address %} + {%- endif %} + {%- if ip_address %} , "ip-address": "{{ ip_address }}" - {% endif %} - {% if port %} + {%- endif %} + {%- if port %} , "port": "{{ port }}" - {% endif %} - {% if cloud_domain %} + {%- endif %} + {%- if cloud_domain %} , "cloud-domain": "{{ cloud_domain }}" - {% endif %} - {% if default_tenant %} + {%- endif %} + {%- if default_tenant %} , "default-tenant": "{{ default_tenant }}" - {% endif %} - {% if passive is not none %} + {%- endif %} + {%- if passive is not none %} , "passive": {{ passive | tojson }} - {% endif %} - {% if remote_path %} + {%- endif %} + {%- if remote_path %} , "remote-path": "{{ remote_path }}" - {% endif %} - {% if system_status %} + {%- endif %} + {%- if system_status %} , "system-status": "{{ system_status }}" - {% endif %} - {% if openstack_region_id %} + {%- endif %} + {%- if openstack_region_id %} , "openstack-region-id": "{{ openstack_region_id }}" - {% endif %} + {%- endif %} }
\ No newline at end of file diff --git a/src/onapsdk/aai/templates/customer_create_update.json.j2 b/src/onapsdk/aai/templates/customer_create_update.json.j2 index 0eea2ed..2ac30b4 100644 --- a/src/onapsdk/aai/templates/customer_create_update.json.j2 +++ b/src/onapsdk/aai/templates/customer_create_update.json.j2 @@ -1,15 +1,15 @@ { "global-customer-id": "{{ global_customer_id }}", "subscriber-name": "{{ subscriber_name }}", - "subscriber-type": "{{ subscriber_type }}"{% if service_subscriptions %}, + "subscriber-type": "{{ subscriber_type }}"{%- if service_subscriptions %}, "service-subscriptions": { "service-subscription": [ {% for service_subscription in service_subscriptions %} { "service-type": "{{ service_subscription }}" - }{% if not loop.last %},{% endif %} + }{%- if not loop.last %},{%- endif %} {% endfor %} ] } - {% endif %} + {%- endif %} }
\ No newline at end of file diff --git a/src/onapsdk/aai/templates/geo_region_create.json.j2 b/src/onapsdk/aai/templates/geo_region_create.json.j2 index d84b427..00f4c46 100644 --- a/src/onapsdk/aai/templates/geo_region_create.json.j2 +++ b/src/onapsdk/aai/templates/geo_region_create.json.j2 @@ -1,10 +1,10 @@ { - {% if geo_region_name is not none %}"geo-region-name": "{{ geo_region_name }}",{% endif %} - {% if geo_region_type is not none %}"geo-region-type": "{{ geo_region_type }}",{% endif %} - {% if geo_region_role is not none %}"geo-region-role": "{{ geo_region_role }}",{% endif %} - {% if geo_region_function is not none %}"geo-region-function": "{{ geo_region_function }}",{% endif %} - {% if data_owner is not none %}"data-owner": "{{ data_owner }}",{% endif %} - {% if data_source is not none %}"data-source": "{{ data_source }}",{% endif %} - {% if data_source_version is not none %}"data-source-version": "{{ data_source_version }}",{% endif %} + {%- if geo_region_name is not none %}"geo-region-name": "{{ geo_region_name }}",{%- endif %} + {%- if geo_region_type is not none %}"geo-region-type": "{{ geo_region_type }}",{%- endif %} + {%- if geo_region_role is not none %}"geo-region-role": "{{ geo_region_role }}",{%- endif %} + {%- if geo_region_function is not none %}"geo-region-function": "{{ geo_region_function }}",{%- endif %} + {%- if data_owner is not none %}"data-owner": "{{ data_owner }}",{%- endif %} + {%- if data_source is not none %}"data-source": "{{ data_source }}",{%- endif %} + {%- if data_source_version is not none %}"data-source-version": "{{ data_source_version }}",{%- endif %} "geo-region-id": "{{ geo_region_id }}" }
\ No newline at end of file diff --git a/src/onapsdk/aai/templates/site_resource_create.json.j2 b/src/onapsdk/aai/templates/site_resource_create.json.j2 index caaf291..d215758 100644 --- a/src/onapsdk/aai/templates/site_resource_create.json.j2 +++ b/src/onapsdk/aai/templates/site_resource_create.json.j2 @@ -1,16 +1,16 @@ { - {% if site_resource_name is not none %}"site-resource-name": "{{ site_resource_name }}",{% endif %} - {% if description is not none %}"description": "{{ description }}",{% endif %} - {% if site_resource_type is not none %}"type": "{{ site_resource_type }}",{% endif %} - {% if role is not none %}"role": "{{ role }}",{% endif %} - {% if generated_site_id is not none %}"generated-site-id": "{{ generated_site_id }}",{% endif %} - {% if selflink is not none %}"selflink": "{{ selflink }}",{% endif %} - {% if operational_status is not none %}"operational-status": "{{ operational_status }}",{% endif %} - {% if model_customization_id is not none %}"model-customization-id": "{{ model_customization_id }}",{% endif %} - {% if model_invariant_id is not none %}"model-invariant-id": "{{ model_invariant_id }}",{% endif %} - {% if model_version_id is not none %}"model-version-id": "{{ model_version_id }}",{% endif %} - {% if data_owner is not none %}"data-owner": "{{ data_owner }}",{% endif %} - {% if data_source is not none %}"data-source": "{{ data_source }}",{% endif %} - {% if data_source_version is not none %}"data-source-version": "{{ data_source_version }}",{% endif %} + {%- if site_resource_name is not none %}"site-resource-name": "{{ site_resource_name }}",{%- endif %} + {%- if description is not none %}"description": "{{ description }}",{%- endif %} + {%- if site_resource_type is not none %}"type": "{{ site_resource_type }}",{%- endif %} + {%- if role is not none %}"role": "{{ role }}",{%- endif %} + {%- if generated_site_id is not none %}"generated-site-id": "{{ generated_site_id }}",{%- endif %} + {%- if selflink is not none %}"selflink": "{{ selflink }}",{%- endif %} + {%- if operational_status is not none %}"operational-status": "{{ operational_status }}",{%- endif %} + {%- if model_customization_id is not none %}"model-customization-id": "{{ model_customization_id }}",{%- endif %} + {%- if model_invariant_id is not none %}"model-invariant-id": "{{ model_invariant_id }}",{%- endif %} + {%- if model_version_id is not none %}"model-version-id": "{{ model_version_id }}",{%- endif %} + {%- if data_owner is not none %}"data-owner": "{{ data_owner }}",{%- endif %} + {%- if data_source is not none %}"data-source": "{{ data_source }}",{%- endif %} + {%- if data_source_version is not none %}"data-source-version": "{{ data_source_version }}",{%- endif %} "site-resource-id": "{{ site_resource_id }}" }
\ No newline at end of file |