Merge branch 'fix/sr2se-pe-fixes' into 'develop'

Bugfixes for SR2se/PE

See merge request !170

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 %}
+

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

@@ -10,7 +10,9 @@
     <sample-profile>
         <profile-id>{{ profile.id }}</profile-id>
         <sample-rate>{{ profile.sample_rate }}</sample-rate>
+        {% if profile.metering_process is defined %}
         <metering-process>{{ profile.metering_process }}</metering-process>
+        {% endif %}
     </sample-profile>
       {% endfor %}
     {% endif %}

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

 {#This template takes care of hostname, motd, location and other general settings#}
-{% set hostname_as_a_list= inventory_hostname.split('.')%}
-{% set short_hostname= hostname_as_a_list[:3] | join('.')%}
+{% set hostname_as_a_list= inventory_hostname.split('.') %}
+{% set short_hostname= hostname_as_a_list[:3] | join('.') %}
   <system 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">
     <contact alu:operation="replace">{{ nokia_system_contact }}</contact>
-    <name alu:operation="replace">{{ short_hostname}}</name>
+    <name alu:operation="replace">{{ short_hostname }}</name>
     <location alu:operation="replace">{{ nokia_snmp_location }}</location>
     <load-balancing alu:operation="replace">
         <l4-load-balancing>true</l4-load-balancing>