Merge branch 'fix/nat-1076-juniper-deactivate-vrf-neighbor' into 'develop'

Fix Juniper routing instance names

See merge request !245

geant/gap_ansible/roles/bgp_config/templates/juniper/deactivate/bgp.j2

@@ -7,9 +7,9 @@
     {% endif %}
   {% elif subscription.l3_core_service_type in l3_service_types.vprn %}
     {% if neighbor.ip_type == 'ipv4' %}
-      deactivate routing-instances {{ subscription.l3_core_service_type }} protocols bgp group {{ bgp.group.ipv4_juniper }} neighbor {{ neighbor.peer_address }}
+      deactivate routing-instances {{ bgp.routing_instance_juniper }} protocols bgp group {{ bgp.group.ipv4_juniper }} neighbor {{ neighbor.peer_address }}
     {% elif neighbor.ip_type == 'ipv6' %}
-      deactivate routing-instances {{ subscription.l3_core_service_type }} protocols bgp group {{ bgp.group.ipv6_juniper }} neighbor {{ neighbor.peer_address }}
+      deactivate routing-instances {{ bgp.routing_instance_juniper }} protocols bgp group {{ bgp.group.ipv6_juniper }} neighbor {{ neighbor.peer_address }}
     {% endif %}
   {% endif %}
 {% endfor %}