`policy_options`: Update tasks to match the new GSO L3 subscription

geant/gap_ansible/roles/policy_options/tasks/calc_nren_communities.yaml

 ---
 - name: Set NREN community names
-  when: not subscription.l3_core_service_type in ['LHCONE']
+  when: not subscription.product.product_type | upper  in ['LHCONE']
   ansible.builtin.set_fact:
     nren_community_names: ["GEANT_{{ partner_name | upper }}", "GEANT_{{ partner_name | upper }}_BLOCK"]
 
 - name: Set NREN community names
-  when: subscription.l3_core_service_type in ['LHCONE']
+  when: subscription.product.product_type | upper  in ['LHCONE']
   ansible.builtin.set_fact:
     nren_community_names: ["GEANT_{{ partner_name | upper }}", "LHCONE_{{ partner_name | upper }}_BLOCK"]
 

geant/gap_ansible/roles/policy_options/tasks/main.yml

@@ -2,7 +2,7 @@
 # tasks file for policy_options
 - name: Set BGP V4 session object to check for custom policies
   when: >
-    subscription.product.product_type == "L3CoreService"
+    subscription.product.product_type | upper in l3_services.keys() | list
   ansible.builtin.set_fact:
     bgp_session_v4: "{{ ap.sbp | json_query(qry) }}"
   vars:
@@ -10,7 +10,7 @@
 
 - name: Set BGP V6 session object to check for custom policies
   when: >
-    subscription.product.product_type == "L3CoreService"
+    subscription.product.product_type | upper in l3_services.keys() | list
   ansible.builtin.set_fact:
     bgp_session_v6: "{{ ap.sbp | json_query(qry) }}"
   vars:
@@ -18,14 +18,14 @@
 
 - name: Calculate NREN-specific communities
   when: >
-    subscription.product.product_type == "L3CoreService"
+    subscription.product.product_type | upper in l3_services.keys() | list
   ansible.builtin.include_tasks: calc_nren_communities.yaml
 
 - name: Load GEANT-IP policies
   when: >
-    subscription.product.product_type == "L3CoreService"
+    subscription.product.product_type | upper in l3_services.keys() | list
     and
-    subscription.l3_core_service_type in l3_service_types.ies
+    subscription.product.product_type | upper in l3_service_types.ies
   block:
     - name: Load GEANT-IP standard policies if selected
       when: >
@@ -43,9 +43,9 @@
 
 - name: Load IAS VRF policies
   when: >
-    subscription.product.product_type == "L3CoreService"
+    subscription.product.product_type | upper in l3_services.keys() | list
     and
-    subscription.l3_core_service_type == "IAS"
+    subscription.product.product_type | upper == "IAS"
   block:
     - name: Load NREN standard VRF policies
       when: >
@@ -63,11 +63,11 @@
 
 - name: Load VRF policies
   when: >
-    subscription.product.product_type == "L3CoreService"
+    subscription.product.product_type | upper in l3_services.keys() | list
     and
-    subscription.l3_core_service_type in l3_service_types.vprn
+    subscription.product.product_type | upper in l3_service_types.vprn
     and
-    not subscription.l3_core_service_type == "IAS"
+    not subscription.product.product_type | upper == "IAS"
   block:
     - name: Load NREN standard VRF policies
       when: >
@@ -83,6 +83,7 @@
         bgp_session_v6.has_custom_policies | ansible.builtin.bool
       ansible.builtin.include_tasks: merge_vrf_custom_vars.yaml
 
+# TODO: Check product_type VRF
 - name: Load Standard Policy Options for creation of VRF {{ subscription.vrf.vrf_name }}
   when: >
     subscription.product.product_type == "VRF"

geant/gap_ansible/roles/policy_options/tasks/merge_ias_vrf_standard_vars.yaml

 ---
-- name: Load Standard Policy Options prefix lists for VRF {{ subscription.l3_core_service_type }}
+- name: Load Standard Policy Options prefix lists for VRF {{ subscription.product.product_type | upper }}
   ansible.builtin.set_fact:
     po_final_prefix_lists: "{{ lookup('community.general.merge_variables', 'STANDARD_VRF_PO_PREFIX_LISTS') }}"
 
 - name: Set the policy name based on the partner "ias_flavour" for {{ partner_name | upper }}
   ansible.builtin.set_fact:
-    po_policy_name: "STANDARD_VRF_PO_POLICIES_{{ partner.ias_flavour }}"
+    po_policy_name: "STANDARD_VRF_PO_POLICIES_{{ subscription[subscription_key].ias_flavor }}"
 
-- name: Load Standard Policy Options policies for {{ partner.ias_flavour }}
+- name: Load Standard Policy Options policies for {{ subscription[subscription_key].ias_flavor }}
   ansible.builtin.set_fact:
     po_final_policies: "{{ lookup('community.general.merge_variables', po_policy_name) }}"
 
@@ -53,7 +53,7 @@
   ansible.builtin.set_fact:
     po_final_policies: "{{ [po_final_policies, po_policy_default_route_v6] | community.general.lists_mergeby('name') }}"
 
-- name: Load Standard Policy Options prefix lists for VRF {{ subscription.l3_core_service_type }}
+- name: Load Standard Policy Options prefix lists for VRF {{ subscription.product.product_type | upper }}
   ansible.builtin.set_fact:
     po_vrf_communities: "{{ lookup('community.general.merge_variables', 'STANDARD_VRF_COMMUNITIES') }}"
 

geant/gap_ansible/roles/policy_options/tasks/merge_vrf_custom_vars.yaml

 ---
-- name: Load Standard Policy Options prefix lists for VRF {{ subscription.l3_core_service_type }}
+- name: Load Standard Policy Options prefix lists for VRF {{ subscription.product.product_type | upper }}
   ansible.builtin.set_fact:
     po_final_prefix_lists: "{{ lookup('community.general.merge_variables', 'STANDARD_VRF_PO_PREFIX_LISTS') }}"
 
-- name: Load Standard Policy Options policies for VRF {{ subscription.l3_core_service_type }}
+- name: Load Standard Policy Options policies for VRF {{ subscription.product.product_type | upper }}
   ansible.builtin.set_fact:
     po_final_policies: "{{ lookup('community.general.merge_variables', 'CUSTOM_VRF_PO_POLICIES') }}"
 
-- name: Load Standard Policy Options prefix lists for VRF {{ subscription.l3_core_service_type }}
+- name: Load Standard Policy Options prefix lists for VRF {{ subscription.product.product_type | upper }}
   ansible.builtin.set_fact:
     po_vrf_communities: "{{ lookup('community.general.merge_variables', 'STANDARD_VRF_COMMUNITIES') }}"
 

geant/gap_ansible/roles/policy_options/tasks/merge_vrf_standard_vars.yaml

 ---
-- name: Load Standard Policy Options prefix lists for VRF {{ subscription.l3_core_service_type }}
+- name: Load Standard Policy Options prefix lists for VRF {{ subscription.product.product_type | upper }}
   ansible.builtin.set_fact:
     po_final_prefix_lists: "{{ lookup('community.general.merge_variables', 'STANDARD_VRF_PO_PREFIX_LISTS') }}"
 
-- name: Load Standard Policy Options policies for VRF {{ subscription.l3_core_service_type }}
+- name: Load Standard Policy Options policies for VRF {{ subscription.product.product_type | upper }}
   ansible.builtin.set_fact:
     po_final_policies: "{{ lookup('community.general.merge_variables', 'STANDARD_VRF_PO_POLICIES') }}"
 
-- name: Load Standard Policy Options prefix lists for VRF {{ subscription.l3_core_service_type }}
+- name: Load Standard Policy Options prefix lists for VRF {{ subscription.product.product_type | upper }}
   ansible.builtin.set_fact:
     po_vrf_communities: "{{ lookup('community.general.merge_variables', 'STANDARD_VRF_COMMUNITIES') }}"