Merge branch 'feature/pe-base-config' into 'develop'

PE base config - integrated into `base_config` role.

See merge request !167

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

@@ -29,7 +29,7 @@
     cpm_filters: "{{ lookup('community.general.merge_variables', 'cpmf__to_merge', pattern_type='suffix') }}"
 
 - name: Prepare PE-specific vars
-  when: verb == "deploy_pe_base_config"
+  when: router_role == "pe"
   block:
     - name: Merge Nokia PE CPM filters
       ansible.builtin.set_fact:
@@ -39,7 +39,17 @@
       ansible.builtin.set_fact:
         cpm_filters: "{{ [cpm_filters, pe_cpm] | community.general.lists_mergeby('family',
                                                                                   list_merge='append') }}"
+
     - name: Merge P and PE prefix-lists
       ansible.builtin.set_fact:
-        nokia_prefix_lists: "{{ [nokia_prefix_lists, nokia_pe_prefix_lists] | community.general.lists_mergeby('name',
+        nokia_prefix_lists: "{{ [nokia_prefix_lists, nokia_pe_prefix_lists, nokia_pe_ias_prefix_lists] | community.general.lists_mergeby('name',
                                                                                               list_merge='append') }}"
+
+    - name: Merge P and PE source-addresses
+      ansible.builtin.set_fact:
+        nokia_applications: "{{ [nokia_applications, nokia_pe_applications] | community.general.lists_mergeby('name', list_merge='append') }}"
+
+
+    - name: Select SDP params for l2ciruit-type
+      ansible.builtin.set_fact:
+        sdp_type: "{{ (sdp_types | selectattr('id', 'equalto', '1'))[0] }}"

geant/gap_ansible/roles/base_config/templates

+../bc_templates
\ No newline at end of file

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

-              <bgp 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">
-                <error-handling alu:operation="replace">
-                    <update-fault-tolerance>true</update-fault-tolerance>
-                </error-handling>
-                <local-as alu:operation="replace">
-                    <as-number>{{ geant_re_as_number }}</as-number>
-                </local-as>
-                <group alu:operation="replace">
-                    <group-name>iGEANT-P-ONLY</group-name>
-                    <admin-state>enable</admin-state>
-                    <next-hop-self>true</next-hop-self>
-                    <type>internal</type>
-                    <peer-as>{{ geant_re_as_number }}</peer-as>
-                    <capability-negotiation>true</capability-negotiation>
-                    <local-address>{{ lo_ipv4_address }}</local-address>
-                    <family>
-                        <mcast-ipv4>true</mcast-ipv4>
-                    </family>
-                </group>
-                <group alu:operation="replace">
-                    <group-name>iGEANT6-P-ONLY</group-name>
-                    <next-hop-self>true</next-hop-self>
-                    <type>internal</type>
-                    <peer-as>{{ geant_re_as_number }}</peer-as>
-                    <capability-negotiation>true</capability-negotiation>
-                    <local-address>{{ lo_ipv6_address }}</local-address>
-                    <family>
-                        <mcast-ipv6>true</mcast-ipv6>
-                    </family>
-                </group>
-            {# Here goes the neighbors#}
-            </bgp>

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

-          <static-routes 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">
-          {% for route in nokia_static_routes %}
-            <route> 
-              <ip-prefix>{{ route.ip_prefix }}</ip-prefix>
-              <route-type>{{ route.route_type }}</route-type>
-              {% if route.indirect is defined %}
-                {% for ir in route.indirect %}
-              <indirect>
-                <ip-address>{{ ir.next_hop }}</ip-address>
-                <admin-state>{{ ir.admin_state }}</admin-state>
-                  {% if ir.description is defined %}
-                <description>{{ ir.description }}</description>
-                  {% endif %}
-                  {% if ir.preference is defined %}
-                 <preference>{{ ir.preference }}</preference>
-                  {% endif %}
-              </indirect>
-                {% endfor %}
-              {% endif %}
-            </route>
-          {% endfor %}
-          </static-routes> 
-

geant/gap_ansible/roles/base_config/vars/main.yml

@@ -16,6 +16,8 @@ lt_ipv4_network: "{{ wfo_router.router.router_ias_lt_ipv4_network }}"
 lt_ipv6_network: "{{ wfo_router.router.router_ias_lt_ipv6_network }}"
 site_country_code: "{{ wfo_router.router.router_site.site_country_code }}"
 is_ias_connected: "{{ wfo_router.router.is_ias_connected }}"
+router_tier: "{{ wfo_router.router.router_site.site_tier }}"
+router_role: "{{ wfo_router.router.router_role }}"
 
 mytemplates:
   template_name: base_config