Destination class Accounting

geant/gap_ansible/roles/bc_templates/routers/nokia/router/bgp_group.j2

@@ -5,6 +5,9 @@
                     {% if group.auth_key is defined %}
                     <authentication-key>{{ group.auth_key }}</authentication-key>
                     {% endif %}
+                    {% if group.vpn_apply_import is defined %}
+                    <vpn-apply-import>{{ group.vpn_apply_import|quote }}</vpn-apply-import>
+                    {% endif %}
                     {% if group.nhs is defined %}
                     <next-hop-self>{{ group.nhs }}</next-hop-self>
                     {% endif %}
@@ -31,7 +34,7 @@
                     </local-as>
                     {% endif %}
                     {% if group.capability_neg is defined %}
-                    <capability-negotiation>{{ group.capability_neg }}</capability-negotiation>
+                    <capability-negotiation>{{ group.capability_neg|quote }}</capability-negotiation>
                     {% endif %}
                     {% if bgp_group_context != 'vprn' %}
                       {% if (group.local_address is defined) and group.local_address == 'ipv4' %}