updates and fixes to various templates

geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/ip_prefix_list.j2

+../../../../base_config/templates/routers/nokia/ip_prefix_list.j2
\ No newline at end of file

geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/pe_base_config.j2

@@ -6,14 +6,5 @@
        {% include 'cflowd.j2' %}
        {% include 'router/router_base.j2' %}
        {% include 'sdp_mesh.j2' %}
-       {#{% include 'general.j2' %}#}
-       {#{% include 'chassis.j2' %}#}
-       {#{% include 'sfm.j2' %}#}
-       {#{% include 'cards.j2' %}#}
-       {#{% include 'connectors.j2' %}#}
-       {#{% include 'ntp.j2' %}#}
-       {#{% include 'syslog/syslog.j2' %}#}
-       {#{% include 'system/security/security.j2' %}#}
-       {#{% include 'qos/qos.j2' %}#}
    </configure>
 </config>

geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/pe_base_vprn.j2

+<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 'router/vprn.j2' %}
+   </configure>
+</config>

geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/pe_update_sdp.j2

+<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 'sdp_mesh.j2' %}
+   </configure>
+</config>

geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/sdp_mesh.j2

-<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">
-    <sdp>
-        {% for pe_fqdn, pe_addr in pe_router_list.items() %}
-        {% set sdp_id = pe_addr.lo4 | replace(sdp_prefix_regex, '') | replace('.', '') + sdp_type.id %}
-        <sdp-id>{{ sdp_id }}</sdp-id>
-        <admin-state>enable</admin-state>
-        <description>SDP_{{ sdp_id }}</description>
-        <delivery-type>mpls</delivery-type>
-        <path-mtu>{{ sdp_type.path_mtu }}</path-mtu>
-        {% if sdp_type.signaling is defined %}
-        <signaling>{{ sdp_type.signaling}}</signaling>
-        {% endif %}
-        <sr-isis>{{ sdp_type.sr_isis | lower }}</sr-isis>
-        <far-end>
-            <ip-address>{{ pe_addr.lo4 }}</ip-address>
-        </far-end>
-        {% endfor %}
-    </sdp>
-</service>
-
+    <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">
+        <sdp>
+            {% for pe_fqdn, pe_addr in pe_router_list.items() %}
+            {% set sdp_id = pe_addr.lo4 | replace(sdp_prefix_regex, '') | replace('.', '') + sdp_type.id %}
+            <sdp-id>{{ sdp_id }}</sdp-id>
+            <admin-state>enable</admin-state>
+            <description>SDP_{{ sdp_id }}</description>
+            <delivery-type>mpls</delivery-type>
+            <path-mtu>{{ sdp_type.path_mtu }}</path-mtu>
+            {% if sdp_type.signaling is defined %}
+            <signaling>{{ sdp_type.signaling}}</signaling>
+            {% endif %}
+            <sr-isis>{{ sdp_type.sr_isis | lower }}</sr-isis>
+            <far-end>
+                <ip-address>{{ pe_addr.lo4 }}</ip-address>
+            </far-end>
+            {% endfor %}
+        </sdp>
+    </service>
+