Bugfixes for SR2se/PE

Test results for real SR2se HW:

• changes to cflowd template
• updated cards template to account for xiom specifics
• general cleanup

geant/gap_ansible/roles/bc_templates/routers/nokia/cards.j2

@@ -3,18 +3,37 @@
 {% else %}
   {% set cards=nokia_cards.sr7 %}
 {% endif %}
+
   {% for card in cards %}
   <card 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">
       <slot-number>{{ card.slot }}</slot-number>
       <admin-state>enable</admin-state>
       <card-type>{{ card.card_type }}</card-type>
-  {%     for mda in card.mdas %}
+    {% if card.xiom is defined %}
+    {#Xiom is the SR2se specific config#}
+      <xiom>
+          <xiom-slot>{{ card.xiom.slot }}</xiom-slot>
+          <level>{{ card.xiom.level }}</level>
+          <xiom-type>{{ card.xiom.type }}</xiom-type>
+      {% for mda in card.mdas %}
+          <mda>
+              <mda-slot>{{mda.mda_slot}}</mda-slot>
+              <admin-state>enable</admin-state>
+              <mda-type>{{ mda.mda_type }}</mda-type>
+          </mda>
+      {% endfor %}
+      </xiom>
+    {% else %}
+    {#The rest is for SR7#}
+      {% for mda in card.mdas %}
       <mda>
           <mda-slot>{{mda.mda_slot}}</mda-slot>
           <admin-state>enable</admin-state>
           <mda-type>{{ mda.mda_type }}</mda-type>
           <level>{{ mda.mda_level }}</level>
       </mda>
-  {%     endfor %}
+      {% endfor %}
+    {% endif %}
   </card>
   {% endfor %}
+