diff --git a/geant/gap_ansible/roles/sbp/templates/deploy_sbp.j2 b/geant/gap_ansible/roles/sbp/templates/deploy_sbp.j2 index cda9f6d5aa5535caa4783b0ddaacf0dde42ce9de..7aa5ef4bcdbac3daa6950773a4b4e35e1b1b94a1 100644 --- a/geant/gap_ansible/roles/sbp/templates/deploy_sbp.j2 +++ b/geant/gap_ansible/roles/sbp/templates/deploy_sbp.j2 @@ -4,11 +4,20 @@ {% endif %} <service 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"> + {% if subscription.l3_core_service_type in ['GEANT_IP', 'GEANT IP'] %} <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_re_name }}</service-name> + <service-name>{{ ies_re_name }}</service-name> + {% elif subscription.l3_core_service_type in ['LHCONE'] %} + <vprn 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>{{ vprn_name }}</service-name> + {% endif %} <interface alu:operation="replace"> <interface-name>{{ lag_name }}.{{ ap.sbp.vlan_id }}</interface-name> + {% if subscription.l3_core_service_type in ['GEANT_IP', 'GEANT IP'] %} <description>SRV_GLOBAL CUSTOMER {{ partner_name }} #{{ partner_name }}-{{ ap.ap_type }} ${{ ap.sbp.gs_id }} | ASN{{ partner.asn }} | </description> + {% elif subscription.l3_core_service_type in ['LHCONE'] %} + <description>SRV_L3VPN CUSTOMER {{ partner_name }} #{{ partner_name }}-{{ ap.ap_type }} ${{ ap.sbp.gs_id }} | ASN{{ partner.asn }} | </description> + {% endif %} <ip-mtu>{{ sbp_params.ip_mtu }}</ip-mtu> <sap> {% if ap.sbp.is_tagged %} @@ -19,14 +28,24 @@ <admin-state>enable</admin-state> <ingress> <filter> + {% if subscription.l3_core_service_type in ['GEANT_IP', 'GEANT IP'] %} <ip>{{ partner_name | upper }}_EDGE_IN</ip> <ipv6>{{ partner_name | upper }}_EDGE_IN_V6</ipv6> + {% elif subscription.l3_core_service_type in ['LHCONE'] %} + <ip>LHCONE_{{ partner_name | upper }}_IN</ip> + <ipv6>LHCONE_{{ partner_name | upper }}_IN_V6</ipv6> + {% endif %} </filter> </ingress> <egress> <filter> + {% if subscription.l3_core_service_type in ['GEANT_IP', 'GEANT IP'] %} <ip>{{ partner_name | upper }}_EDGE_OUT</ip> <ipv6>{{ partner_name | upper }}_EDGE_OUT_V6</ipv6> + {% elif subscription.l3_core_service_type in ['LHCONE'] %} + <ip>LHCONE_{{ partner_name | upper }}_OUT</ip> + <ipv6>LHCONE_{{ partner_name | upper }}_OUT_V6</ipv6> + {% endif %} </filter> </egress> </sap> @@ -83,7 +102,11 @@ </address> </ipv6> </interface> + {% if subscription.l3_core_service_type in ['GEANT_IP', 'GEANT IP'] %} </ies> + {% elif subscription.l3_core_service_type in ['LHCONE'] %} + </vprn> + {% endif %} </service> {% if is_standalone_run %}