diff --git a/geant/gap_ansible/roles/bc_templates/routers/nokia/base_config.j2 b/geant/gap_ansible/roles/bc_templates/routers/nokia/base_config.j2 index 12bb30fdc06e97a93f49237cb045fc7cccdf4924..ab210fa590930bf07a4350cdf6b9509abdb8eb6a 100644 --- a/geant/gap_ansible/roles/bc_templates/routers/nokia/base_config.j2 +++ b/geant/gap_ansible/roles/bc_templates/routers/nokia/base_config.j2 @@ -15,7 +15,7 @@ {% include 'cflowd.j2' %} {% include 'filter_log.j2' %} {% include 'policy_options/policy_options.j2' %} - {% include 'service_vprn.j2' %} + {% include 'service.j2' %} {% include 'router/routing_options.j2' %} {% endif %} {# This is because `ip_prefix_list` is related to what defined in VPRN apply_paths #} diff --git a/geant/gap_ansible/roles/bc_templates/routers/nokia/pe_promotion_base_vprn.j2 b/geant/gap_ansible/roles/bc_templates/routers/nokia/pe_promotion_base_vprn.j2 index f8467b331828c1df32a19da5ba3d008a6a4126a1..869fbfe7042fe7db14bcd9844a9f7431561af550 100644 --- a/geant/gap_ansible/roles/bc_templates/routers/nokia/pe_promotion_base_vprn.j2 +++ b/geant/gap_ansible/roles/bc_templates/routers/nokia/pe_promotion_base_vprn.j2 @@ -1,5 +1,5 @@ <config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:alu="urn:ietf:params:xml:ns:netconf:base:1.0"> <configure xmlns="urn:nokia.com:sros:ns:yang:sr:conf"> - {% include 'service_vprn.j2' %} + {% include 'service.j2' %} </configure> </config> diff --git a/geant/gap_ansible/roles/bc_templates/routers/nokia/router/ies.j2 b/geant/gap_ansible/roles/bc_templates/routers/nokia/router/ies.j2 new file mode 100644 index 0000000000000000000000000000000000000000..2a024feb8a7eff8372633550d05a61b3dff7e51f --- /dev/null +++ b/geant/gap_ansible/roles/bc_templates/routers/nokia/router/ies.j2 @@ -0,0 +1,11 @@ +{% for ies in pe_ies %} +<ies xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes"> + <service-name>{{ ies.name }}</service-name> + <admin-state>{{ ies.admin_state | default('enable') }}</admin-state> + {% if ies.description is defined %} + <description>{{ ies.description }}</description> + {% endif %} + <service-id>{{ ies.service_id }}</service-id> + <customer>{{ ies.customer_id }}</customer> +</ies> +{% endfor %} diff --git a/geant/gap_ansible/roles/bc_templates/routers/nokia/service_vprn.j2 b/geant/gap_ansible/roles/bc_templates/routers/nokia/service.j2 similarity index 94% rename from geant/gap_ansible/roles/bc_templates/routers/nokia/service_vprn.j2 rename to geant/gap_ansible/roles/bc_templates/routers/nokia/service.j2 index b588b730f0ec2ae552edd44345b70f9b2800fd42..8959e97aaf09b0e1dc824a3cf66262fd0ac0ac3c 100644 --- a/geant/gap_ansible/roles/bc_templates/routers/nokia/service_vprn.j2 +++ b/geant/gap_ansible/roles/bc_templates/routers/nokia/service.j2 @@ -6,6 +6,7 @@ <end>{{ pe_service.md_auto_id.service_id_range.end | default('19999') }}</end> </service-id-range> </md-auto-id> + {% include 'router/ies.j2' %} {% include 'router/vprn.j2' %} </service> {% if is_pe_promotion_wf %}