Base-config cleanup

General and validation-related cleanup

geant/gap_ansible/roles/base_config/tasks/deploy_base_config.yaml

@@ -49,7 +49,7 @@
 
 - name: Fail if there is any diff
   ansible.builtin.fail:
-    msg: There are diffs!!!!
+    msg: Base config drift detected!!!
   when: >
     output.changed | ansible.builtin.bool
     and

geant/gap_ansible/roles/base_config/templates/routers/nokia/general.j2

@@ -5,7 +5,7 @@
     <contact alu:operation="replace">{{ nokia_system_contact }}</contact>
     <name alu:operation="replace">{{ short_hostname}}</name>
     <location alu:operation="replace">{{ nokia_snmp_location }}</location>
-    <load-balancing>
+    <load-balancing alu:operation="replace">
         <l4-load-balancing>true</l4-load-balancing>
         <lsr-load-balancing>lbl-ip-l4-teid</lsr-load-balancing>
         <system-ip-load-balancing>true</system-ip-load-balancing>

geant/gap_ansible/roles/base_config/templates/routers/nokia/qos/qos.j2

@@ -32,7 +32,7 @@
       {% endfor %}
     {% endfor %}
     </network-queue>
-    <network alu:operation="replace">    
+    <network alu:operation="replace">
     {% for net_pol in nokia_qos_network_policies %}
       <network-policy-name>{{ net_pol.name }}</network-policy-name>
       <description>{{ net_pol.description }}</description>
@@ -46,7 +46,7 @@
         <dscp>
           <dscp-name>{{ dscp.name}}</dscp-name>
           <fc>{{ dscp.fc }}</fc>
-          <profile>{{ dscp.profile }}</profile>              
+          <profile>{{ dscp.profile }}</profile>
         </dscp>
         {% endfor %}
         {% for lsp_exp in net_pol.ingress.lsp_exp %}

geant/gap_ansible/roles/base_config/templates/routers/nokia/router/router_base.j2

@@ -20,10 +20,10 @@
                 </ipv6>
             </interface>
             <mpls-labels 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">
-                <static-label-range>9968</static-label-range>
+                <static-label-range>{{ mpls_labels.static_label_range }}</static-label-range>
                 <sr-labels>
-                    <start>10000</start>
-                    <end>19999</end>
+                    <start>{{ mpls_labels.sr_label_start }}</start>
+                    <end>{{ mpls_labels.sr_label_end }}</end>
                 </sr-labels>
             </mpls-labels>
             <mpls 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">