Merge branch 'feature/qinq-encap' into 'develop'

sbp.j2: add config to support q-in-q

See merge request !243

geant/gap_ansible/roles/sbp/templates/nokia/deploy/sbp.j2

@@ -35,7 +35,9 @@
                         </sampling>
                     </cflowd-parameters>
                     <sap>
-                      {% if ap.sbp.is_tagged %}
+                      {% if ap.sbp.edge_port.encapsulation == 'qinq' %}
+                        <sap-id>{{ lag_name }}:{{ ap.sbp.vlan_id }}.0</sap-id>
+                      {% elif ap.sbp.is_tagged %}
                         <sap-id>{{ lag_name }}:{{ ap.sbp.vlan_id }}</sap-id>
                       {% else %}
                         <sap-id>{{ lag_name }}</sap-id>