diff options
Diffstat (limited to 'src/onapsdk/sdnc/templates')
3 files changed, 9 insertions, 9 deletions
diff --git a/src/onapsdk/sdnc/templates/create_node_netconf_api.json.j2 b/src/onapsdk/sdnc/templates/create_node_netconf_api.json.j2 index 26d4c51..70127a6 100644 --- a/src/onapsdk/sdnc/templates/create_node_netconf_api.json.j2 +++ b/src/onapsdk/sdnc/templates/create_node_netconf_api.json.j2 @@ -9,21 +9,21 @@ {%- elif key == "netconf-node-topology:port" %}"{{key}}": {{port_}} {%- elif key == "netconf-node-topology:username" %}"{{key}}": "{{username_}}" {%- elif key == "netconf-node-topology:password" %}"{{key}}": "{{password_}}" - {%- else %}"{{key}}": + {% else %}"{{key}}": {%- if value is number %}{{value}} {%- elif value is boolean %}{{value}} {%- elif value is string %}{{value}} {%- elif value is mapping %}{{value|replace("'",'"')|replace("True","true")|replace("False","false")}} {%- endif %} {%- endif %} - {%- else %} + {% else %} {%- if key == "node-id" %} "{{key}}": "{{node_id}}", {%- elif key == "netconf-node-topology:host" %}"{{key}}": "{{host_}}", {%- elif key == "netconf-node-topology:port" %}"{{key}}": {{port_}}, {%- elif key == "netconf-node-topology:username" %}"{{key}}": "{{username_}}", {%- elif key == "netconf-node-topology:password" %}"{{key}}": "{{password_}}", - {%- else %}"{{key}}": + {% else %}"{{key}}": {%- if value is number %}{{value}}, {%- elif value is boolean %}{{value|replace("True","true")}}, {%- elif value is string %}"{{value}}", diff --git a/src/onapsdk/sdnc/templates/create_service_gr_api.json.j2 b/src/onapsdk/sdnc/templates/create_service_gr_api.json.j2 index 5f575be..f50ffbf 100644 --- a/src/onapsdk/sdnc/templates/create_service_gr_api.json.j2 +++ b/src/onapsdk/sdnc/templates/create_service_gr_api.json.j2 @@ -6,13 +6,13 @@ "{{key}}": {%- if value is mapping %}{{value|replace("'",'"')|replace("True","true")|replace("False","false")}} {%- elif value == "" %}{} - {%- else %}"{{value}}" + {% else %}"{{value}}" {%- endif %} - {%- else %} + {% else %} "{{key}}": {%- if value is mapping %}{{value|replace("'",'"')|replace("True","true")|replace("False","false")}}, {%- elif value == "" %}{}, - {%- else %}"{{value}}", + {% else %}"{{value}}", {%- endif %} {%- endif %} {%- endfor %} diff --git a/src/onapsdk/sdnc/templates/instantiate_network_ala_carte_upload_preload_gr_api.json.j2 b/src/onapsdk/sdnc/templates/instantiate_network_ala_carte_upload_preload_gr_api.json.j2 index 9eead38..3690714 100644 --- a/src/onapsdk/sdnc/templates/instantiate_network_ala_carte_upload_preload_gr_api.json.j2 +++ b/src/onapsdk/sdnc/templates/instantiate_network_ala_carte_upload_preload_gr_api.json.j2 @@ -21,15 +21,15 @@ "start-address": "{{ subnet.start_address }}", "cidr-mask": "{{ subnet.cidr_mask }}", "ip-version": "{{ subnet.ip_version }}", - {% if subnet.dhcp_enabled %} + {%- if subnet.dhcp_enabled %} "dhcp-enabled": "Y", "dhcp-start-address": "{{ subnet.dhcp_start_address }}", "dhcp-end-address": "{{ subnet.dhcp_end_address }}", {% else %} "dhcp-enabled": "N", - {% endif %} + {%- endif %} "gateway-address": "{{ subnet.gateway_address }}" - }{% if not loop.last %},{% endif %} + }{%- if not loop.last %},{%- endif %} {% endfor %} ] }, |