diff --git a/geant/gap_ansible/playbooks/promote_p_to_pe.yaml b/geant/gap_ansible/playbooks/promote_p_to_pe.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..36378edc87d61aaf79b4936acb5c0c0eab42d7fe
--- /dev/null
+++ b/geant/gap_ansible/playbooks/promote_p_to_pe.yaml
@@ -0,0 +1,5 @@
+- name: Promote P router to PE
+ hosts: all
+ gather_facts: false
+ roles:
+ - ../roles/promote_p_to_pe
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/README.md b/geant/gap_ansible/roles/promote_p_to_pe/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..225dd44b9fc5b3abff7e9c68ff9e91d505cdd5f0
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/README.md
@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+ - hosts: servers
+ roles:
+ - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/defaults/main.yml b/geant/gap_ansible/roles/promote_p_to_pe/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..dc98c08359701e76a50d8ee490bfc3a191f71c0f
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+# defaults file for promote_p_to_pe
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/handlers/main.yml b/geant/gap_ansible/roles/promote_p_to_pe/handlers/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..591996568dfda14b77abd24049b68e265cb8ccad
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for promote_p_to_pe
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/meta/main.yml b/geant/gap_ansible/roles/promote_p_to_pe/meta/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..36d899dd86d8c01083aefc8c7000b2cf64cacd75
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/meta/main.yml
@@ -0,0 +1,35 @@
+galaxy_info:
+ author: A. Kurbatov
+ description: GEANT Orchestration and Automation Team
+ company: GEANT
+
+ # If the issue tracker for your role is not on github, uncomment the
+ # next line and provide a value
+ # issue_tracker_url: http://example.com/issue/tracker
+
+ # Choose a valid license ID from https://spdx.org - some suggested licenses:
+ # - BSD-3-Clause (default)
+ # - MIT
+ # - GPL-2.0-or-later
+ # - GPL-3.0-only
+ # - Apache-2.0
+ # - CC-BY-4.0
+ license: MIT
+
+ min_ansible_version: '2.10'
+
+ # If this a Container Enabled role, provide the minimum Ansible Container version.
+ # min_ansible_container_version:
+
+ galaxy_tags:
+ - network
+ # List tags for your role here, one per line. A tag is a keyword that describes
+ # and categorizes the role. Users find roles by searching for tags. Be sure to
+ # remove the '[]' above, if you add tags to this list.
+ #
+ # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+ # Maximum 20 tags per role.
+
+dependencies: []
+ # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+ # if you add dependencies to this list.
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/tasks/compile_pe_base_config.yaml b/geant/gap_ansible/roles/promote_p_to_pe/tasks/compile_pe_base_config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f14a00493df274d110c3adddf481e7907893f197
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/tasks/compile_pe_base_config.yaml
@@ -0,0 +1,32 @@
+- name: Merge the variables
+ ansible.builtin.include_tasks: merge_variables.yaml
+
+- name: Set ansible host to localhost to compile config when router is offline
+ when:
+ subscription.router.router_access_via_ts | ansible.builtin.bool
+ ansible.builtin.set_fact:
+ ansible_host: "localhost"
+ ansible_connection: local
+
+- name: Create a folder for all the things
+ ansible.builtin.file:
+ path: "/var/tmp/ansible_run_{{ opid }}"
+ state: directory
+ mode: '0755'
+ delegate_to: localhost
+
+- name: Print the template in "/var/tmp/ansible_run_{{ opid }}/base_config.conf"
+ ansible.builtin.template:
+ src: "routers/{{ subscription.router.vendor }}/pe_base_config.j2"
+ dest: "/var/tmp/ansible_run_{{ opid }}/pe_base_config.conf"
+ lstrip_blocks: true
+ trim_blocks: true
+ mode: '0755'
+ delegate_to: localhost
+
+- name: Set back ansible_host to target terminal server if needed
+ when:
+ subscription.router.router_access_via_ts | ansible.builtin.bool
+ ansible.builtin.set_fact:
+ ansible_host: "{{ subscription.router.router_site.site_ts_address }}"
+ ansible_connection: netconf
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/tasks/configure_isis_overload.yaml b/geant/gap_ansible/roles/promote_p_to_pe/tasks/configure_isis_overload.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6b37deb703982954e030efd352d35cf3174243a5
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/tasks/configure_isis_overload.yaml
@@ -0,0 +1,9 @@
+- name: Deploy ISIS overload on "{{ inventory_hostname }}" [AND COMMIT][NOKIA]
+ geant.gap_ansible.nokia_netconf_config:
+ format: xml
+ default_operation: merge
+ content: "{{ lookup('ansible.builtin.template', 'routers/{{ subscription.router.vendor }}/router/isis_overload.j2') }}"
+ commit: true
+ commit_comment: "{{ commit_comment }}"
+ diff: true
+ check_mode: false
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/tasks/delete_default_routes.yaml b/geant/gap_ansible/roles/promote_p_to_pe/tasks/delete_default_routes.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f3a7cc4359b5f8ae25fca0cbfc9fd396a8adea13
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/tasks/delete_default_routes.yaml
@@ -0,0 +1,21 @@
+- name: Delete default routes on "{{ inventory_hostname }}" [CHECK ONLY][NOKIA]
+ when: dry_run | ansible.builtin.bool
+ geant.gap_ansible.nokia_netconf_config:
+ format: xml
+ default_operation: merge
+ content: "{{ lookup('ansible.builtin.template', 'routers/{{ subscription.router.vendor }}/router/delete_default_static_routes.j2') }}"
+ commit: true
+ validate: true
+ diff: true
+ check_mode: true
+
+- name: Delete default routes on "{{ inventory_hostname }}" [AND COMMIT][NOKIA]
+ when: not (dry_run | ansible.builtin.bool)
+ geant.gap_ansible.nokia_netconf_config:
+ format: xml
+ default_operation: merge
+ content: "{{ lookup('ansible.builtin.template', 'routers/{{ subscription.router.vendor }}/router/delete_default_static_routes.j2') }}"
+ commit: true
+ commit_comment: "{{ commit_comment }}"
+ diff: true
+ check_mode: false
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/tasks/deploy_pe_base_config.yaml b/geant/gap_ansible/roles/promote_p_to_pe/tasks/deploy_pe_base_config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..be782b820d47bcf5b2bc92fa789f6c0e61e8d88c
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/tasks/deploy_pe_base_config.yaml
@@ -0,0 +1,31 @@
+- name: Deploy base_config on "{{ inventory_hostname }}" [CHECK ONLY][NOKIA]
+ when: dry_run | ansible.builtin.bool
+ geant.gap_ansible.nokia_netconf_config:
+ format: xml
+ default_operation: merge
+ content: "{{ lookup('ansible.builtin.template', 'routers/{{ subscription.router.vendor }}/pe_base_config.j2') }}"
+ commit: true
+ validate: true
+ diff: true
+ register: output
+ check_mode: true
+
+
+# - name: Fail if there is any diff
+# ansible.builtin.fail:
+# msg: Base config drift detected!!!
+# when: >
+# output.changed | ansible.builtin.bool
+# and
+# is_verification_workflow | ansible.builtin.bool
+
+- name: Deploy base_config on "{{ inventory_hostname }}" [AND COMMIT][NOKIA]
+ when: not (dry_run | ansible.builtin.bool)
+ geant.gap_ansible.nokia_netconf_config:
+ format: xml
+ default_operation: merge
+ content: "{{ lookup('ansible.builtin.template', 'routers/{{ subscription.router.vendor }}/pe_base_config.j2') }}"
+ commit: true
+ commit_comment: "{{ commit_comment }}"
+ diff: true
+ check_mode: false
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/tasks/main.yml b/geant/gap_ansible/roles/promote_p_to_pe/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..66e43782295efd679aaabd030fd607a697e32e76
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/tasks/main.yml
@@ -0,0 +1,61 @@
+---
+# tasks file for P to PE
+- name: Print the usage
+ when: (verb is not defined) or (verb not in verbs)
+ ansible.builtin.debug:
+ msg:
+ - "'verb' keyword is mandatory. Usage: -e verb=$verb"
+
+- name: Print defined verbs
+ when: (verb is not defined) or (verb not in verbs)
+ ansible.builtin.debug:
+ msg:
+ - "Allowed verb: {{ item }}"
+ loop: "{{ verbs }}"
+
+- name: Stop if arguments are incorrect
+ when: (verb is not defined) or (verb not in verbs)
+ ansible.builtin.meta: end_play
+
+- name: Import routers variables
+ ansible.builtin.include_vars:
+ dir: /opt/ansible_inventory/group_vars/routers
+
+- name: Import variables from 'all'
+ ansible.builtin.include_vars:
+ dir: /opt/ansible_inventory/group_vars/all
+
+- name: Set ansible_host to terminal server when router is offline
+ when: subscription.router.router_access_via_ts | ansible.builtin.bool
+ ansible.builtin.set_fact:
+ ansible_host: "{{ subscription.router.router_site.site_ts_address }}"
+ ansible_port: "{{ subscription.router.router_ts_port }}"
+
+- name: Load netconf connection config
+ ansible.builtin.set_fact:
+ ansible_connection: "{{ netconf_access[subscription.router.vendor].ansible_connection }}"
+ ansible_network_os: "{{ netconf_access[subscription.router.vendor].ansible_network_os }}"
+
+- name: Generate an ID for this run
+ ansible.builtin.set_fact:
+ opid: "{{ lookup('community.general.random_string', length=18, special=false) }}"
+
+- name: Print the ID
+ ansible.builtin.debug:
+ msg: "{{ opid }}"
+
+- name: Include ISIS overload tasks
+ when: verb in ['set_isis_overload', 'remove_isis_overload']
+ ansible.builtin.include_tasks: configure_isis_overload.yaml
+
+- name: Include templates compilation
+ when: verb == 'deploy_pe_base_config'
+ ansible.builtin.include_tasks: compile_pe_base_config.yaml
+
+- name: Include deploy if selected
+ when: verb == 'deploy_pe_base_config'
+ ansible.builtin.include_tasks: deploy_pe_base_config.yaml
+
+- name: Include deletion of default static routes
+ when: verb == "delete_default_routes"
+ ansible.builtin.include_tasks: delete_default_routes.yaml
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/tasks/merge_variables.yaml b/geant/gap_ansible/roles/promote_p_to_pe/tasks/merge_variables.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..30bb080f3926225a360c06dceb050a218e6c7d41
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/tasks/merge_variables.yaml
@@ -0,0 +1,26 @@
+#
+# Preparation of PE-specific vars. E.g. PE CPM filters are extension of P CPM filters.
+#
+- name: Merge Nokia P CPM filters
+ ansible.builtin.set_fact:
+ cpm_filters: "{{ lookup('community.general.merge_variables', 'cpmf__to_merge', pattern_type='suffix') }}"
+
+- name: Prepare PE-specific base config vars
+ when: verb == "deploy_pe_base_config"
+ block:
+ - name: Merge Nokia PE additional CPM filters
+ ansible.builtin.set_fact:
+ pe_cpm: "{{ lookup('community.general.merge_variables', 'cpm_pe__to_merge') }}"
+
+ - name: Combine P and PE CPM filters
+ ansible.builtin.set_fact:
+ cpm_filters: "{{ [cpm_filters, pe_cpm] | community.general.lists_mergeby('family',
+ list_merge='append') }}"
+ - name: Combine P and PE prefix-lists
+ ansible.builtin.set_fact:
+ nokia_prefix_lists: "{{ [nokia_prefix_lists, nokia_pe_prefix_lists] | community.general.lists_mergeby('name',
+ list_merge='append') }}"
+
+ - name: Select SDP params for l2ciruit-type
+ ansible.builtin.set_fact:
+ sdp_type: "{{ (sdp_types | selectattr('id', 'equalto', '1'))[0] }}"
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/cflowd.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/cflowd.j2
new file mode 100644
index 0000000000000000000000000000000000000000..ef8dcc9feaa4c0f5bb8e225f3e5e546dc432b375
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/cflowd.j2
@@ -0,0 +1,29 @@
+<cflowd 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" alu:operation="replace">
+ <cache-size>{{ cflowd.basic.cache_size }}</cache-size>
+ <enhanced-distribution>{{ cflowd.basic.enhanced_distribution }}</enhanced-distribution>
+ <overflow>{{ cflowd.basic.overflow }}</overflow>
+ <template-retransmit>{{ cflowd.basic.template_retransmit }}</template-retransmit>
+ <active-flow-timeout>{{ cflowd.basic.active_flow_timeout }}</active-flow-timeout>
+ <inactive-flow-timeout>{{ cflowd.basic.inactive_flow_timeout }}</inactive-flow-timeout>
+ {% if cflowd.sample_profiles is defined %}
+ {% for profile in cflowd.sample_profiles %}
+ <sample-profile>
+ <profile-id>{{ profile.id }}</profile-id>
+ <sample-rate>{{ profile.sample_rate }}</sample-rate>
+ <metering-process>{{ profile.metering_process }}</metering-process>
+ </sample-profile>
+ {% endfor %}
+ {% endif %}
+ {% if cflowd.collectors is defined %}
+ {% for collector in cflowd.collectors %}
+ <collector>
+ <ip-address>{{ collector.ip }}</ip-address>
+ <port>{{ collector.port }}</port>
+ <description>{{ collector.description }}</description>
+ <template-set>{{ collector.template_set }}</template-set>
+ <version>{{ collector.version }}</version>
+ </collector>
+ {% endfor %}
+ {% endif %}
+</cflowd>
+
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/cpm_filters.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/cpm_filters.j2
new file mode 100644
index 0000000000000000000000000000000000000000..f7a35874dadee962cf9b5440db091dfba84de7f6
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/cpm_filters.j2
@@ -0,0 +1,12 @@
+{% with is_cpm_filter=true, filters=cpm_filters %}
+{% include "filters/port_list_definitions.j2" %}
+
+<system>
+ <security>
+ <cpm-filter 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">
+ <default-action>{{ cpm_filter_policy.default_action }}</default-action>
+ {% include "filters/fw_filters.j2" %}
+ </cpm-filter>
+{% endwith %}
+ </security>
+</system>
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/fw_filters.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/fw_filters.j2
new file mode 100644
index 0000000000000000000000000000000000000000..77d8bb9607f10c2f61ee1466f16bfb46ad9877eb
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/fw_filters.j2
@@ -0,0 +1,248 @@
+{# Template is meant to be called from either gen_filters.j2 or cmp_filters.j2 #}
+{% for filter in filters %}
+ {% if filter.family == "ipv4" %}
+ <ip-filter alu:operation="replace">
+ {% elif filter.family == "ipv6" %}
+ <ipv6-filter alu:operation="replace">
+ {% endif %}
+ {% if not is_cpm_filter %}
+ <filter-name>{{ filter.name }}</filter-name>
+ {% endif %}
+ {% if filter.offset is defined %}
+ {% set ns3 = namespace(entry_id = filter.offset | int) %}
+ {% else %}
+ {% set ns3 = namespace(entry_id = 10 | int) %}
+ {% endif %}
+ {% if is_cpm_filter %}
+ <admin-state>{{ filter.admin_state }}</admin-state>
+ {% endif %}
+ {% for term in filter.terms %}
+ {% if term.offset is defined %}
+ {% set ns3 = namespace(entry_id = term.offset | int) %}
+ {% endif %}
+ {% if term.from is not defined %}
+ <entry>
+ <entry-id>{{ ns3.entry_id }}</entry-id>
+ <description>{{ term.name }}</description>
+ {% if term.log is defined %}
+ <log>{{ term.log }}</log>
+ {% endif %}
+ <action>
+ <{{term.action}}></{{term.action}}>
+ </action>
+ </entry>
+ {% endif %}
+
+ {% if term.from is defined %}
+ {# This is the case for TCP_ESTABLISHED #}
+ {% if term.from.protocol is defined and term.from.protocol == "tcp" and term.from.tcp_flag is defined %}
+ <entry>
+ <entry-id>{{ ns3.entry_id }}</entry-id>
+ <description>{{ term.name }}</description>
+ {% if term.log is defined %}
+ <log>{{ term.log }}</log>
+ {% endif %}
+ <match>
+ {% if filter.family == "ipv4" %}
+ <protocol>{{ term.from.protocol }}</protocol>
+ {% else %}
+ <next-header>{{ term.from.protocol }}</next-header>
+ {% endif %}
+ <tcp-flags>
+ <{{ term.from.tcp_flag }}>true</{{ term.from.tcp_flag }}>
+ </tcp-flags>
+ </match>
+ <action>
+ <{{ term.action }}></{{ term.action }}>
+ </action>
+ </entry>
+ {% set ns3.entry_id = ns3.entry_id + 10 %}
+ {% endif %}
+ {# This is to cover CPM-ipv6 ND case where dst_prefix_list is defined, but not src_prefix_list #}
+ {% if term.from.protocol is defined and term.from.protocol == "ipv6-icmp" and term.from.dst_prefix_list is defined %}
+ {% for dst_prefix_list_item in term.from.dst_prefix_list %}
+ <entry>
+ <entry-id>{{ ns3.entry_id }}</entry-id>
+ <description>{{ term.name }}</description>
+ {% if term.log is defined %}
+ <log>{{ term.log }}</log>
+ {% endif %}
+ <match>
+ <next-header>{{ term.from.protocol }}</next-header>
+ <dst-ip>
+ <ipv6-prefix-list>{{term.from.dst_prefix_list[loop.index0]}}</ipv6-prefix-list>
+ </dst-ip>
+ </match>
+ <action>
+ <{{ term.action }}></{{ term.action }}>
+ </action>
+ </entry>
+ {% set ns3.entry_id = ns3.entry_id + 10 %}
+ {% endfor %}
+ {% endif %}
+ {# Generic ICMP filters with ICMP types #}
+ {% if term.from.protocol is defined and (term.from.protocol == "icmp" or term.from.protocol == "ipv6-icmp") %}
+ {% if term.from.icmp_types is defined %}
+ {% for icmp_type in term.from.icmp_types %}
+ <entry>
+ <entry-id>{{ ns3.entry_id }}</entry-id>
+ <description>{{ term.name }}</description>
+ {% if term.log is defined %}
+ <log>{{ term.log }}</log>
+ {% endif %}
+ <match>
+ {% if filter.family == "ipv4" %}
+ <protocol>{{ term.from.protocol }}</protocol>
+ {% else %}
+ <next-header>{{ term.from.protocol }}</next-header>
+ {% endif %}
+ <icmp>
+ <type>{{ icmp_type }}</type>
+ </icmp>
+ </match>
+ <action>
+ <{{ term.action }}></{{ term.action }}>
+ </action>
+ </entry>
+ {% set ns3.entry_id = ns3.entry_id + 10 %}
+ {% endfor %}
+ {% endif %}
+ {% endif %}
+ {# Case when only need to match on protocol, e.g. PIM #}
+ {% if term.from.protocol is defined and term.from.protocol in ['pim', '58'] %}
+ <entry>
+ <entry-id>{{ ns3.entry_id }}</entry-id>
+ <description>{{ term.name }}</description>
+ {% if term.log is defined %}
+ <log>{{ term.log }}</log>
+ {% endif %}
+ <match>
+ {% if filter.family == "ipv4" %}
+ <protocol>{{ term.from.protocol }}</protocol>
+ {% else %}
+ <next-header>{{ term.from.protocol }}</next-header>
+ {% endif %}
+ </match>
+ <action>
+ <{{ term.action }}></{{ term.action }}>
+ </action>
+ </entry>
+ {% set ns3.entry_id = ns3.entry_id + 10 %}
+ {% endif %}
+ {# Case when both src_prefix_list and dst_prefix_list are defined #}
+ {% if term.from.src_prefix_list is defined %}
+ {% for src_prefix_list_item in term.from.src_prefix_list%}
+ {% set src_index = loop.index0 %}
+ {% if term.from.dst_prefix_list is defined %}
+ {% for dst_prefix_list_item in term.from.dst_prefix_list %}
+ <entry>
+ <entry-id>{{ ns3.entry_id }}</entry-id>
+ <description>{{ term.name }}</description>
+ {% if term.log is defined %}
+ <log>{{ term.log }}</log>
+ {% endif %}
+ <match>
+ {% if term.from.protocol is defined %}
+ {% if filter.family == "ipv4" %}
+ <protocol>{{term.from.protocol}}</protocol>
+ {% else %}
+ <next-header>{{ term.from.protocol }}</next-header>
+ {% endif %}
+ {% endif %}
+ {% include 'filters/port_list_entries.j2' %}
+ <src-ip>
+ {% if filter.family == "ipv4" %}
+ <ip-prefix-list>{{term.from.src_prefix_list[src_index]}}</ip-prefix-list>
+ {% else %}
+ <ipv6-prefix-list>{{term.from.src_prefix_list[src_index]}}</ipv6-prefix-list>
+ {% endif %}
+ </src-ip>
+ <dst-ip>
+ {% if filter.family == "ipv4" %}
+ <ip-prefix-list>{{term.from.dst_prefix_list[loop.index0]}}</ip-prefix-list>
+ {% else %}
+ <ipv6-prefix-list>{{term.from.dst_prefix_list[loop.index0]}}</ipv6-prefix-list>
+ {% endif %}
+ </dst-ip>
+ </match>
+ {% set ns3.entry_id = ns3.entry_id + 10 %}
+ <action>
+ <{{term.action}}></{{term.action}}>
+ </action>
+ </entry>
+ {% endfor %}
+ {% else %}
+{# This is the case of CPM-filters, where destination prefix is not defined #}
+ <entry>
+ <entry-id> {{ ns3.entry_id }} </entry-id>
+ <description>{{ term.name }}</description>
+ {% if term.log is defined %}
+ <log>{{ term.log }}</log>
+ {% endif %}
+ <match>
+ {% if term.from.protocol is defined %}
+ {% if filter.family == "ipv4" %}
+ <protocol>{{term.from.protocol}}</protocol>
+ {% else %}
+ <next-header>{{ term.from.protocol }}</next-header>
+ {% endif %}
+ {% endif %}
+ {% include 'filters/port_list_entries.j2' %}
+ <src-ip>
+ {% if filter.family == "ipv4" %}
+ <ip-prefix-list>{{term.from.src_prefix_list[src_index]}}</ip-prefix-list>
+ {% else %}
+ <ipv6-prefix-list>{{term.from.src_prefix_list[src_index]}}</ipv6-prefix-list>
+ {% endif %}
+ </src-ip>
+ </match>
+ {% set ns3.entry_id = ns3.entry_id + 10 %}
+ <action>
+ <{{term.action}}></{{term.action}}>
+ </action>
+ </entry>
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+ {# Case where only DST prefix list is defined #}
+ {% if term.from.dst_prefix_list is defined %}
+ {% for dst_prefix_list_item in term.from.dst_prefix_list %}
+ <entry>
+ <entry-id>{{ ns3.entry_id }}</entry-id>
+ <description>{{ term.name }}</description>
+ {% if term.log is defined %}
+ <log>{{ term.log }}</log>
+ {% endif %}
+ <match>
+ {% if term.from.protocol is defined %}
+ {% if filter.family == "ipv4" %}
+ <protocol>{{term.from.protocol}}</protocol>
+ {% else %}
+ <next-header>{{ term.from.protocol }}</next-header>
+ {% endif %}
+ {% endif %}
+ {% include 'port_list_entries.j2' %}
+ <dst-ip>
+ {% if filter.family == "ipv4" %}
+ <ip-prefix-list>{{term.from.dst_prefix_list[loop.index0]}}</ip-prefix-list>
+ {% else %}
+ <ipv6-prefix-list>{{term.from.dst_prefix_list[loop.index0]}}</ipv6-prefix-list>
+ {% endif %}
+ </dst-ip>
+ </match>
+ {% set ns3.entry_id = ns3.entry_id + 10 %}
+ <action>
+ <{{term.action}}></{{term.action}}>
+ </action>
+ </entry>
+ {% endfor %}
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+{# Terms end #}
+ {% if filter.family == "ipv4" %}
+ </ip-filter>
+ {% elif filter.family == "ipv6" %}
+ </ipv6-filter>
+ {% endif %}
+{% endfor %}
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/gen_filters.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/gen_filters.j2
new file mode 100644
index 0000000000000000000000000000000000000000..b25f975f8641f0f5056b545b2e8fc35bbb594b3e
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/gen_filters.j2
@@ -0,0 +1,9 @@
+{# This template takes care of configuring connectors and breakouts #}
+
+{% with is_cpm_filter=False, filters=gen_filters %}
+{% include "filters/port_list_definitions.j2" %}
+<filter 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">
+ {% include "filters/fw_filters.j2" %}
+</filter>
+{% endwith %}
+
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/port_list_definitions.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/port_list_definitions.j2
new file mode 100644
index 0000000000000000000000000000000000000000..34c35ad8a8badead9cdc176196453a482ee03b37
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/port_list_definitions.j2
@@ -0,0 +1,66 @@
+{# This template takes care of configuring connectors and breakouts #}
+<filter 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">
+ <match-list>
+ {% for filter in filters %}
+ {% for term in filter.terms %}
+ {% if term.from.port is defined and term.from.port.__class__.__name__ == 'list'%}
+ <port-list>
+ <port-list-name>{{filter.name}}-{{term.name}}-PORTS</port-list-name>
+ {%for port in term.from.port %}
+ <port>
+ <value>{{port}}</value>
+ </port>
+ {% endfor %}
+ </port-list>
+ {% endif %}
+ {% if term.from.src_port is defined and term.from.src_port.__class__.__name__ == 'list'%}
+ <port-list>
+ <port-list-name>{{filter.name}}-{{term.name}}-SRC_PORTS</port-list-name>
+ {%for port in term.from.src_port %}
+ <port>
+ <value>{{port}}</value>
+ </port>
+ {% endfor %}
+ </port-list>
+ {% endif %}
+ {% if term.from.dst_port is defined and term.from.dst_port.__class__.__name__ == 'list'%}
+ <port-list>
+ <port-list-name>{{filter.name}}-{{term.name}}-DST_PORTS</port-list-name>
+ {%for port in term.from.dst_port %}
+ <port>
+ <value>{{port}}</value>
+ </port>
+ {% endfor %}
+ </port-list>
+ {% endif %}
+ {% if term.from.port_range is defined %}
+ <port-list>
+ <port-list-name>{{filter.name}}-{{term.name}}-PORT_RANGE</port-list-name>
+ <range>
+ <start>{{ term.from.port_range.start }}</start>
+ <end>{{ term.from.port_range.end }}</end>
+ </range>
+ </port-list>
+ {% endif %}
+ {% if term.from.src_port_range is defined %}
+ <port-list>
+ <port-list-name>{{filter.name}}-{{term.name}}-SRC_PORT_RANGE</port-list-name>
+ <range>
+ <start>{{ term.from.src_port_range.start }}</start>
+ <end>{{ term.from.src_port_range.end }}</end>
+ </range>
+ </port-list>
+ {% endif %}
+ {% if term.from.dst_port_range is defined %}
+ <port-list>
+ <port-list-name>{{filter.name}}-{{term.name}}-DST_PORT_RANGE</port-list-name>
+ <range>
+ <start>{{ term.from.dst_port_range.start }}</start>
+ <end>{{ term.from.dst_port_range.end }}</end>
+ </range>
+ </port-list>
+ {% endif %}
+ {% endfor %}
+ {% endfor %}
+ </match-list>
+</filter>
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/port_list_entries.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/port_list_entries.j2
new file mode 100644
index 0000000000000000000000000000000000000000..4f3352655be583736e811c58adb6546645841bdd
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/filters/port_list_entries.j2
@@ -0,0 +1,48 @@
+{#This is the case it's a port-list #}
+{% if term.from.port is defined and term.from.port.__class__.__name__ == 'list'%}
+ <port>
+ <port-list>{{filter.name}}-{{term.name}}-PORTS</port-list>
+ </port>
+{% endif %}
+{% if term.from.src_port is defined and term.from.src_port.__class__.__name__ == 'list'%}
+ <src-port>
+ <port-list>{{filter.name}}-{{term.name}}-SRC_PORTS</port-list>
+ </src-port>
+{% endif %}
+{% if term.from.dst_port is defined and term.from.dst_port.__class__.__name__ == 'list'%}
+ <dst-port>
+ <port-list>{{filter.name}}-{{term.name}}-DST_PORTS</port-list>
+ </dst-port>
+{% endif %}
+{#This is the case it's a single port #}
+{% if term.from.port is defined and term.from.port.__class__.__name__ != 'list'%}
+ <port>
+ <eq>{{term.from.port}}</eq>
+ </port>
+{% endif %}
+{% if term.from.src_port is defined and term.from.src_port.__class__.__name__ != 'list'%}
+ <src-port>
+ <eq>{{term.from.src_port}}</eq>
+ </src-port>
+{% endif %}
+{% if term.from.dst_port is defined and term.from.dst_port.__class__.__name__ != 'list'%}
+ <dst-port>
+ <eq>{{term.from.dst_port}}</eq>
+ </dst-port>
+{% endif %}
+ {# Port range #}
+ {% if term.from.port_range is defined %}
+ <port>
+ <port-list>{{filter.name}}-{{term.name}}-PORT_RANGE</port-list>
+ </port>
+{% endif %}
+{% if term.from.src_port_range is defined %}
+ <src-port>
+ <port-list>{{filter.name}}-{{term.name}}-SRC_PORT_RANGE</port-list>
+ </src-port>
+{% endif %}
+{% if term.from.dst_port_range is defined %}
+ <dst-port>
+ <port-list>{{filter.name}}-{{term.name}}-DST_PORT_RANGE</port-list>
+ </dst-port>
+{% endif %}
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/pe_base_config.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/pe_base_config.j2
new file mode 100644
index 0000000000000000000000000000000000000000..0df1cfb3413c3ab8e04c6a31491f2cb3997703eb
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/pe_base_config.j2
@@ -0,0 +1,18 @@
+<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 'ip_prefix_list.j2' %}
+ {% include 'filters/cpm_filters.j2' %}
+ {% 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>
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/policy_options/policy_options.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/policy_options/policy_options.j2
new file mode 100644
index 0000000000000000000000000000000000000000..089e202d432ee0dbfcfebe1165471795a542e00a
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/policy_options/policy_options.j2
@@ -0,0 +1,39 @@
+<policy-options 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 nokia_po_prefix_lists is defined %}
+ {% for prefix_list in nokia_po_prefix_lists %}
+ <prefix-list alu:operation="replace">
+ <name>{{ prefix_list.name }}</name>
+ {% for prefix in prefix_list.prefixes %}
+ <prefix>
+ <ip-prefix>{{ prefix.ip }}</ip-prefix>
+ <type>{{ prefix.type }}</type>
+ {% if prefix.type == 'range' %}
+ <start-length>{{ prefix.range_start_length }}</start-length>
+ <end-length>{{ prefix.range_end_length }}</end-length>
+ {% endif %}
+ {% endfor %}
+ </prefix-list>
+ {% endfor %}
+ {% endif %}
+ {# Communities #}
+ {% if nokia_po_communities is defined %}
+ {% for community in nokia_po_communities %}
+ <community alu:operation="replace">
+ <name>{{ community.name }}</name>
+ <member>
+ <member>{{ community.member }}</member>
+ </member>
+ </community>
+ {% endfor %}
+ {% endif %}
+ {# AS paths #}
+ {% if nokia_po_as_paths is defined %}
+ {% for as_path in nokia_po_as_paths %}
+ <as-path alu:operation="replace">
+ <name>{{ as_path.name }}</name>
+ <expression>{{ as_path.expression}}</expression>
+ </as-path>
+ {% endfor %}
+ {% endif %}
+</policy-options>
+
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/policy_options/policy_statements.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/policy_options/policy_statements.j2
new file mode 100644
index 0000000000000000000000000000000000000000..1da7e3215916eb8ee3807e4b3f7e01d50b066f27
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/policy_options/policy_statements.j2
@@ -0,0 +1,65 @@
+<policy-options 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 nokia_po_policy_statements is defined %}
+ {% for pol in nokia_po_policy_statements %}
+ <policy-statement alu:operation="replace">
+ <name>{{ pol.name }}</name>
+ <entry-type>{{ pol.entry_type }}</entry-type>
+ {% for entry in pol.entries %}
+ <entry-name>{{ entry.name }}</entry-name>
+ {% if entry.from is defined %}
+ <from>
+ {% if entry.from.as_path is defined %}
+ <as-path>
+ {% if entry.from.as_path.name is defined %}
+ <name>{{ entry.from.as_path.name }}</name>
+ {% endif %}
+ {% if entry.from.as_path.length is defined %}
+ <length>
+ <value>{{ entry.from.as_path.length }}</value>
+ </length>
+ {% endif %}
+ </as-path>
+ {% endif %}
+ {% if entry.from.prefix_list is defined %}
+ {% for pl in entry.from.prefix_list %}
+ <prefix_list>{{ pl }}</prefix_list>
+ {% endfor %}
+ {% endif %}
+ {% if entry.from.community is defined %}
+ <community>
+ <name>{{ entry.from.community }}</name>
+ </community>
+ {% endif %}
+ {% if entry.from.origin_validation_state is defined %}
+ <origin-validation-state>{{ entry.from.origin_validation_state }}</origin-validation-state>
+ {% endif %}
+ {% if entry.from.protocol is defined %}
+ {% for proto in entry.from.protocol %}
+ <protocol>
+ <name>{{ proto }}</name>
+ </protocol>
+ {% endfor %}
+ {% endif %}
+ </from>
+ {% endif %}
+ <action>
+ <action-type>{{ entry.action_type }}</action-type>
+ {% if entry.action is defined %}
+ {% for action_item in entry.action %}
+ {% for act_k, act_v in action_item.items() %}
+ {% if act_k == "community_add" %}
+ <community>
+ <add>{{ act_v }}</add>
+ </community>
+ {% else %}
+ <{{ act_k }}>{{ act_v }}</{{act_k }}>
+ {% endif %}
+ {% endfor %}
+ {% endfor %}
+ {% endif %}
+ </action>
+ {% endfor %}
+ </policy-statement>
+ {% endfor %}
+ {% endif %}
+</policy-options>
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/base_bgp.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/base_bgp.j2
new file mode 100644
index 0000000000000000000000000000000000000000..4aa655073bd8cc4f70a8357ccbc285e68b568282
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/base_bgp.j2
@@ -0,0 +1,35 @@
+ <bgp 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 pe_bgp_base.best_path_selection is defined %}
+ <best-path-selection>
+ {% for bps in pe_bgp_base.best_path_selection %}
+ <{{ bps }}>true</{{ bps }}>
+ {% endfor %}
+ </best-path-selection>
+ {% endif %}
+ {% if pe_bgp_base.error_handling is defined %}
+ <error-handling>
+ <{{ pe_bgp_base.error_handling }}>true</{{ pe_bgp_base.error_handling }}>
+ </error-handling>
+ {% endif %}
+ {% if pe_bgp_base.next_hop_resolution.shortcut_tunnel is defined %}
+ <next-hop-resolution>
+ <shortcut-tunnel>
+ {% for nhr in pe_bgp_base.next_hop_resolution.shortcut_tunnel %}
+ <family>
+ <family-type>{{ nhr.type }}</family-type>
+ <resolution-filter>
+ <{{ nhr.resolution_filter }}>true</{{ nhr.resolution_filter }}>
+ </resolution-filter>
+ </family>
+ {% endfor %}
+ </shortcut-tunnel>
+ </next-hop-resolution>
+ {% endif %}
+{% with bgp_obj=pe_bgp_tools %}
+ {% include "router/bgp_group.j2" %}
+ {% include "router/bgp_neighbor.j2" %}
+{% endwith %}
+{% with bgp_obj=pe_bgp_internal %}
+ {% include "router/bgp_group.j2" %}
+{% endwith %}
+ </bgp>
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/base_static_routes.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/base_static_routes.j2
new file mode 100644
index 0000000000000000000000000000000000000000..437738fe2a78567504cfd1bfbe69d4605ab9dfb7
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/base_static_routes.j2
@@ -0,0 +1,6 @@
+ <static-routes 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">
+ {% with static_routes_obj=nokia_pe_static_routes %}
+ {% include 'router/static_routes.j2' %}
+ {% endwith %}
+ </static-routes>
+
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/bgp_group.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/bgp_group.j2
new file mode 100644
index 0000000000000000000000000000000000000000..fad9162f1e2e78301f789d2a5ba8f00292cac42f
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/bgp_group.j2
@@ -0,0 +1,81 @@
+ {% for group in bgp_obj.groups %}
+ <group alu:operation="replace">
+ <group-name>{{ group.name }}</group-name>
+ <admin-state>{{ group.admin_state | default('enable') }}</admin-state>
+ {% if group.nhs is defined %}
+ <next-hop-self>{{ group.nhs }}</next-hop-self>
+ {% endif %}
+ <type>{{ group.type }}</type>
+ {% if group.bfd_liveness is defined %}
+ <bfd-liveness>{{ group.bfd_liveness }}</bfd-liveness>
+ {% endif %}
+ {% if group.ebgp_default_reject is defined %}
+ <ebgp-default-reject-policy>
+ {% for pk, pv in group.ebgp_default_reject.items() %}
+ <{{ pk }}>{{ pv }}</{{ pk }}>
+ {% endfor %}
+ </ebgp-default-reject-policy>
+ {% endif %}
+ {% if group.peer_as is defined %}
+ <peer-as>{{ group.peer_as }}</peer-as>
+ {% endif %}
+ {% if group.local_as is defined %}
+ <local-as>
+ <as-number>{{ group.local_as }}</as-number>
+ {% if group.prepend_global_as is defined %}
+ <prepend-global-as>{{ group.prepend_global_as }}</prepend-global-as>
+ {% endif %}
+ </local-as>
+ {% endif %}
+ {% if group.capability_neg is defined %}
+ <capability-negotiation>{{ group.capability_neg }}</capability-negotiation>
+ {% endif %}
+ {% if bgp_group_context != 'vprn' %}
+ {% if (group.local_address is defined) and group.local_address == 'ipv4' %}
+ <local-address>{{ lo_ipv4_address }}</local-address>
+ {% elif (group.local_address is defined) and group.local_address == 'ipv6' %}
+ <local-address>{{ lo_ipv6_address }}</local-address>
+ {% endif %}
+ {% endif %}
+ {% if group.hold_time is defined %}
+ <hold-time>
+ <seconds>{{ group.hold_time }}</seconds>
+ </hold-time>
+ {% endif %}
+ {% if group.origin_validattion is defined %}
+ <origin-validation>
+ {% for ov in group.origin_validattion %}
+ <{{ ov }}>true</{{ ov }}>
+ {% endfor %}
+ </origin-validation>
+ {% endif %}
+ {% if group.send_communities is defined %}
+ <send-communities>
+ {% for sc_k, sc_v in group.send_communities.items() %}
+ <{{ sc_k }}>{{ sc_v }}</{{ sc_k }}>
+ {% endfor %}
+ </send-communities>
+ {% endif %}
+ {% if group.families is defined %}
+ <family>
+ {% for family in group.families %}
+ <{{ family }}>true</{{ family }}>
+ {% endfor %}
+ </family>
+ {% endif %}
+ {% if group.policies.import is defined %}
+ <import>
+ {% for imp_pol in group.policies.import %}
+ <policy>{{ imp_pol }}</policy>
+ {% endfor %}
+ </import>
+ {% endif %}
+ {% if group.policies.export is defined %}
+ <export>
+ {% for exp_pol in group.policies.export %}
+ <policy>{{ exp_pol }}</policy>
+ {% endfor %}
+ </export>
+ {% endif %}
+ </group>
+ {% endfor %}
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/bgp_neighbor.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/bgp_neighbor.j2
new file mode 100644
index 0000000000000000000000000000000000000000..12bf86f8dacf9a58ce21291381ee6b0c2faaf8fe
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/bgp_neighbor.j2
@@ -0,0 +1,29 @@
+ {% for neighbor in bgp_obj.neighbors %}
+ <neighbor alu:operation="replace">
+ <ip-address>{{ neighbor.ip }}</ip-address>
+ <description>{{ neighbor.description }}</description>
+ <group>{{ neighbor.group }}</group>
+ {% if neighbor.families is defined %}
+ <family>
+ {% for family in neighbor.families %}
+ <{{ family }}>true</{{ family }}>
+ {% endfor %}
+ </family>
+ {% endif %}
+ {% if neighbor.policies.import is defined %}
+ <import>
+ {% for imp_pol in neighbor.policies.import %}
+ <policy>{{ imp_pol }}</policy>
+ {% endfor %}
+ </import>
+ {% endif %}
+ {% if neighbor.policies.export is defined %}
+ <export>
+ {% for exp_pol in neighbor.policies.export %}
+ <policy>{{ exp_pol }}</policy>
+ {% endfor %}
+ </export>
+ {% endif %}
+ </neighbor>
+ {% endfor %}
+
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/delete_default_static_routes.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/delete_default_static_routes.j2
new file mode 100644
index 0000000000000000000000000000000000000000..31db5e033c5f6f3f628b808108fb783e96e74dec
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/delete_default_static_routes.j2
@@ -0,0 +1,14 @@
+<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">
+ <router 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">
+ <router-name>Base</router-name>
+ <static-routes 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">
+ {% for route in nokia_static_routes %}
+ <route alu:operation="delete">
+ <ip-prefix>{{ route.ip_prefix }}</ip-prefix>
+ </route>
+ {% endfor %}
+ </static-routes>
+ </router>
+ </configure>
+</config>
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/flowspec.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/flowspec.j2
new file mode 100644
index 0000000000000000000000000000000000000000..22a7f05d5b0a130f242c812860b429d45d4113d6
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/flowspec.j2
@@ -0,0 +1,5 @@
+
+<flowspec alu:operation="replace">
+ <ip-filter-max-size>{{ nokia_flowspec.ip_filter_max_size }}</ip-filter-max-size>
+ <ipv6-filter-max-size>{{ nokia_flowspec.ipv6_filter_max_size }}</ipv6-filter-max-size>
+</flowspec>
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/isis_overload.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/isis_overload.j2
new file mode 100644
index 0000000000000000000000000000000000000000..e2301caa6576e7c4efc3ec225b72b9fdc917587a
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/isis_overload.j2
@@ -0,0 +1,14 @@
+<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">
+ <router 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">
+ <router-name>Base</router-name>
+ <isis 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 set_isis_overload is defined %}
+ <overload></overload>
+ {% elif remove_isis_overload is defined %}
+ <overload alu:operation="delete"></overload>
+ {% endif %}
+ </isis>
+ </router>
+ </configure>
+</config>
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/ldp.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/ldp.j2
new file mode 100644
index 0000000000000000000000000000000000000000..b6799a52d39c32426ca9b388939f68a84bd64a9d
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/ldp.j2
@@ -0,0 +1,7 @@
+ <ldp 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">
+ <admin-state>enable</admin-state>
+ <targeted-session>
+ <sdp-auto-targeted-session>true</sdp-auto-targeted-session>
+ </targeted-session>
+ </ldp>
+
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/router_base.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/router_base.j2
new file mode 100644
index 0000000000000000000000000000000000000000..961cd5c7fc65c621a9f90d808aec3f3aa2eaa3d7
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/router_base.j2
@@ -0,0 +1,8 @@
+ <router 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">
+ <router-name>Base</router-name>
+ {% include 'router/static_routes.j2' %}
+ {% include 'router/bgp.j2' %}
+ {% include 'router/flowspec.j2' %}
+ {% include 'router/ldp.j2' %}
+ {% include 'router/rpki.j2' %}
+ </router>
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/rpki.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/rpki.j2
new file mode 100644
index 0000000000000000000000000000000000000000..3f60b99b1ecbcb90195f0810e302535a8da461a2
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/rpki.j2
@@ -0,0 +1,13 @@
+<origin-validation 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">
+ {% for validator in pe_rpki.validators %}
+ <rpki-session alu:operation="replace">
+ <ip-address>{{ validator.ip }}</ip-address>
+ <admin-state>{{ validator.admin_state | default('enable') }}</admin-state>
+ <connect-retry>{{ validator.connect_retry }}</connect-retry>
+ <local-address>{{ lo_ipv4_address }}</local-address>
+ <port>{{ validator.port }}</port>
+ <stale-time>{{ validator.stale_time }}</stale-time>
+ </rpki-session>
+ {% endfor %}
+</origin-validation>
+
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/static_routes.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/static_routes.j2
new file mode 100644
index 0000000000000000000000000000000000000000..2b16762a899bc74abf3c4a618ef5faf6b8d7319a
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/static_routes.j2
@@ -0,0 +1,36 @@
+ {% for route in static_routes_obj %}
+ <route alu:operation="replace">
+ <ip-prefix>{{ route.ip_prefix }}</ip-prefix>
+ <route-type>{{ route.route_type }}</route-type>
+ {% if route.indirect is defined %}
+ {% for ir in route.indirect %}
+ <indirect>
+ <ip-address>{{ ir.next_hop }}</ip-address>
+ <admin-state>{{ ir.admin_state }}</admin-state>
+ {% if ir.description is defined %}
+ <description>{{ ir.description }}</description>
+ {% endif %}
+ {% if ir.preference is defined %}
+ <preference>{{ ir.preference }}</preference>
+ {% endif %}
+ </indirect>
+ {% endfor %}
+ {% endif %}
+ {# Blackhole #}
+ {% if route.blackhole is defined %}
+ <blackhole>
+ <admin-state>{{ route.blackhole.admin_state }}</admin-state>
+ {% if route.blackhole.description is defined %}
+ <description>{{ route.blackhole.description }}</description>
+ {% endif %}
+ </blackhole>
+ {% endif %}
+ {# Communities #}
+ {% if route.communities is defined %}
+ {% for community in route.communities %}
+ <community>{{ community }}</community>
+ {% endfor %}
+ {% endif %}
+ </route>
+ {% endfor %}
+
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/vprn.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/vprn.j2
new file mode 100644
index 0000000000000000000000000000000000000000..4444e061cfb8461b071afa7a41b9d158c0ce0f78
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/vprn.j2
@@ -0,0 +1,61 @@
+<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">
+ {% for vprn in pe_vprns %}
+ <vprn alu:operation="replace">
+ <service-name>{{ vprn.name }}</service-name>
+ <admin-state>{{ vprn.admin_state | default('enable') }}</admin-state>
+ {% if vprn.description is defined %}
+ <description>{{ vprn.description }}</description>
+ {% endif %}
+ <service-id>{{ vprn.service_id }}</service-id>
+ <customer>{{ vprn.customer_id }}</customer>
+ <autonomous-system>{{ vprn.asn }}</autonomous-system>
+ <bgp-ipvpn>
+ <mpls>
+ <admin-state>enable</admin-state>
+ <route-distinguisher>{{ vprn.bgp_ipvpn.mpls.rd }}</route-distinguisher>
+ <vrf-target>
+ <community>{{ vprn.bgp_ipvpn.mpls.target }}</community>
+ </vrf-target>
+ <auto-bind-tunnel>
+ <resolution>{{ vprn.bgp_ipvpn.mpls.auto_bind_tunnel.resolution }}</resolution>
+ <resolution-filter>
+ <{{ vprn.bgp_ipvpn.mpls.auto_bind_tunnel.resolution_filter }}>true</{{ vprn.bgp_ipvpn.mpls.auto_bind_tunnel.resolution_filter }}>
+ </resolution-filter>
+ </auto-bind-tunnel>
+ </mpls>
+ </bgp-ipvpn>
+ <bgp>
+ {% if vprn.bgp.families is defined %}
+ <family>
+ {% for fam in vprn.bgp.families %}
+ <{{ fam }}>true</{{ fam }}>
+ {% endfor %}
+ </family>
+ {% endif %}
+ {% if vprn.bgp.best_path_selection is defined %}
+ <best-path-selection>
+ {% for bps in vprn.bgp.best_path_selection %}
+ <{{ bps }}>true</{{ bps }}>
+ {% endfor %}
+ </best-path-selection>
+ {% endif %}
+ {% with bgp_obj=vprn.bgp, bgp_group_context='vprn' %}
+ {% include 'bgp_group.j2' %}
+ {% endwith %}
+ </bgp>
+ {% if vprn.static_routes is defined %}
+ <static-routes>
+ {% with static_routes_obj=vprn.static_routes %}
+ {% include 'static_routes.j2' %}
+ {% endwith %}
+ </static-routes>
+ {% endif %}
+ {% if vprn.flowspec is defined %}
+ <flowspec>
+ <ip-filter-max-size>{{ vprn.flowspec.ip_filter_max_size }}</ip-filter-max-size>
+ <ipv6-filter-max-size>{{ vprn.flowspec.ipv6_filter_max_size }}</ipv6-filter-max-size>
+ </flowspec>
+ {% endif %}
+ </vprn>
+ {% endfor %}
+</service>
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/sdp_mesh.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/sdp_mesh.j2
new file mode 100644
index 0000000000000000000000000000000000000000..dc40ca874f3d958194a3b24c15e4968a088c915a
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/sdp_mesh.j2
@@ -0,0 +1,20 @@
+<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>
+
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/vars/main.yml b/geant/gap_ansible/roles/promote_p_to_pe/vars/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a940cf7c144cef578cb82042450a5500ff445a09
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/vars/main.yml
@@ -0,0 +1,11 @@
+---
+# vars file for promote_p_to_pe
+dry_run: true
+verbs:
+ - set_isis_overload # Drain traffic to/from the router by setting ISIS overload
+ - remove_isis_overload # Remove overload bit from ISIS config
+ - deploy_pe_base_config # Deploy PE-specific base config on top of existing P-only config
+ - delete_default_routes # Delete default static routes configured as part P base-config
+
+lo_ipv4_address: "{{ subscription.router.router_lo_ipv4_address }}"
+lo_ipv6_address: "{{ subscription.router.router_lo_ipv6_address }}"