diff --git a/geant/gap_ansible/CHANGELOG.md b/geant/gap_ansible/CHANGELOG.md
index 03eb2a91b90fd40bf1784892f31b2a6d53d97ccb..22fe422aaddc0ad3715c7fb9f47a4d9b47e8e565 100644
--- a/geant/gap_ansible/CHANGELOG.md
+++ b/geant/gap_ansible/CHANGELOG.md
@@ -16,6 +16,18 @@
- Added role `promote_p_to_pe`.
- Updates to `ibgp_update` related to the `promote_p_to_pe`.
+1.0.90:
+- Fix in TWAMP-light server template (set to replace reflector)
+
+1.0.89:
+- Fix in the FW template - corrected duplicated IPV6_ND term.
+
+1.0.88:
+- Fix in the FW template - corrected path to `port_list_entries.j2`
+
+1.0.87:
+- Update in `iptrunk_twamp` role: role vars moved into inventories.
+
1.0.86:
- Update in `iptrunk` vars: `minimum_links` now only come as part of `iptrunk` object from GSO. This will rectify misconfiguration on the Juniper side.
diff --git a/geant/gap_ansible/roles/bc_templates/routers/nokia/filters/fw_filters.j2 b/geant/gap_ansible/roles/bc_templates/routers/nokia/filters/fw_filters.j2
index 02ae6e3d4d26edb2a72f731d43c2c80947e59cec..86e6c990d5b316d047190e13b24796007427f8d5 100644
--- a/geant/gap_ansible/roles/bc_templates/routers/nokia/filters/fw_filters.j2
+++ b/geant/gap_ansible/roles/bc_templates/routers/nokia/filters/fw_filters.j2
@@ -60,28 +60,6 @@
</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 == "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 == "icmp" or term.from.protocol == "ipv6-icmp") %}
{% if term.from.icmp_types is defined %}
diff --git a/geant/gap_ansible/roles/bc_templates/routers/nokia/sdp_mesh.j2 b/geant/gap_ansible/roles/bc_templates/routers/nokia/sdp_mesh.j2
index 4542edbcb10536f7a9dbe870d33fcf54062cabba..07d3f1512f2d17e8f3febcd5abb138cb0c87ee0b 100644
--- a/geant/gap_ansible/roles/bc_templates/routers/nokia/sdp_mesh.j2
+++ b/geant/gap_ansible/roles/bc_templates/routers/nokia/sdp_mesh.j2
@@ -1,4 +1,5 @@
<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 pe_router_list|length != 0 %}
{% 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>
@@ -16,5 +17,6 @@
</far-end>
</sdp>
{% endfor %}
+ {% endif %}
</service>
diff --git a/geant/gap_ansible/roles/ibgp_update/templates/nokia/add_all_p_to_pe.j2 b/geant/gap_ansible/roles/ibgp_update/templates/nokia/add_all_p_to_pe.j2
index f25653e2175d2ac1bd718adf87b122667664c25a..130a52600d14fc957237503b7ba20c08aa2e6ce9 100644
--- a/geant/gap_ansible/roles/ibgp_update/templates/nokia/add_all_p_to_pe.j2
+++ b/geant/gap_ansible/roles/ibgp_update/templates/nokia/add_all_p_to_pe.j2
@@ -10,7 +10,7 @@
<group>{{ geant_bgp_groups.p_only.ipv4 }}</group>
</neighbor>
<neighbor 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">
- <ip-address>{{ p_ipadd.lo4 }}</ip-address>
+ <ip-address>{{ p_ipadd.lo6 }}</ip-address>
<description>{{ p_fqdn }}</description>
<group>{{ geant_bgp_groups.p_only.ipv6 }}</group>
</neighbor>
diff --git a/geant/gap_ansible/roles/iptrunk_twamp/templates/nokia/twamp_light_server.j2 b/geant/gap_ansible/roles/iptrunk_twamp/templates/nokia/twamp_light_server.j2
index c75802c8e2cac04d7cbe619cd2abb5f9cb026bdb..e35a89624976f5781758f6c9124a4eb9a844070a 100644
--- a/geant/gap_ansible/roles/iptrunk_twamp/templates/nokia/twamp_light_server.j2
+++ b/geant/gap_ansible/roles/iptrunk_twamp/templates/nokia/twamp_light_server.j2
@@ -4,7 +4,7 @@
<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>
<twamp-light>
- <reflector>
+ <reflector alu:operation="replace">
<admin-state>enable</admin-state>
<udp-port>{{ nokia_twamp_light.udp_port }}</udp-port>
<prefix>
diff --git a/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml b/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml
index a5c6e954c4150f3380948690e4af2499d64eb71c..8085d754f871a6c689948e1fd130ce95832623cd 100644
--- a/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml
+++ b/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml
@@ -6,30 +6,6 @@
dry_run: "True"
is_verification_workflow: false
-
-nokia_twamp_server:
- max_conn: 1
- max_sess: 1
-
-juniper_twamp_client:
- destination_port: 862
- history_size: 20
- test_count: 0
- test_interval: 30
- data_size: 200
- probe_count: 500
- probe_interval: 1
-
-nokia_twamp_light:
- oam_pm_bin_group: 2
- udp_port: 64364
- test_id: 1
- interval: 1000
- pad_size: 10
- record_stats: delay-and-loss
- trunks_subnet: "10.101.1.0/24"
-
-
side_a_ipv4_address: "{{ subscription.iptrunk.iptrunk_ipv4_network | ansible.utils.ipaddr('net') | ansible.utils.ipaddr('address') }}"
side_b_ipv4_address: "{{ subscription.iptrunk.iptrunk_ipv4_network | ansible.utils.ipaddr('net') | ansible.utils.ipaddr('1') | ansible.utils.ipaddr('address') }}"