Changes moved to a different PR : sonic-net#17530

Author: judyjoseph

ansible/config_sonic_basedon_testbed.yml

@@ -590,6 +590,7 @@
           topo_name: "{{ topo }}"
           port_index_map: "{{ port_index_map | default({}) }}"
         become: true
+        when: "'t2' not in topo"
 
       - name: Copy macsec profile json to dut
         copy: src=../tests/common/macsec/profile.json

ansible/library/generate_golden_config_db.py

@@ -386,7 +386,7 @@ def generate(self):
         elif self.topo_name == "t1-28-lag" or self.topo_name == "smartswitch-t1":
             config = self.generate_smartswitch_golden_config_db()
             self.module.run_command("sudo rm -f {}".format(TEMP_SMARTSWITCH_CONFIG_PATH))
-        elif "t2" in self.topo_name and self.macsec_profile:
+        elif "t2" in self.topo_name:
             config = self.generate_t2_golden_config_db()
             self.module.run_command("sudo rm -f {}".format(MACSEC_PROFILE_PATH))
             self.module.run_command("sudo rm -f {}".format(GOLDEN_CONFIG_TEMPLATE_PATH))

ansible/library/get_macsec_profile.py

@@ -5,48 +5,22 @@
 from ansible.module_utils.basic import AnsibleModule
 
 
-def convert_to_eos(cipher_name):
-    # Set the cipher suite as 256 xpn by default
-    eos_cipher_name = 'aes256-gcm-xpn'
-
-    if cipher_name == 'GCM-AES-XPN-256':
-        eos_cipher_name = 'aes256-gcm-xpn'
-    elif cipher_name == 'GCM-AES-128':
-        eos_cipher_name = 'aes128-gcm'
-    elif cipher_name == 'GCM-AES-256':
-        eos_cipher_name = 'aes256-gcm'
-    elif cipher_name == 'GCM-AES-XPN-128':
-        eos_cipher_name = 'aes128-gcm-xpn'
-
-    return eos_cipher_name
-
-
-# This API support EoS based templates now
-def get_macsec_profile(module, macsec_profile, vm_type):
+def get_macsec_profile(module, macsec_profile):
     with open('/tmp/profile.json') as f:
         macsec_profiles = json.load(f)
 
         profile = macsec_profiles.get(macsec_profile)
         if profile:
             profile['macsec_profile'] = macsec_profile
 
-            # Currently handling ceos, add more cases for vsonic etc
-            if vm_type == 'ceos':
-                # Get the cipher suite in eos terminology
-                eos_cipher_suite_name = convert_to_eos(profile['cipher_suite'])
-                profile['cipher_suite'] = eos_cipher_suite_name
-
     return profile
 
 
 def main():
-    module = AnsibleModule(argument_spec=dict(
-                           macsec_profile=dict(required=True, type='str'),
-                           vm_type=dict(required=True, type='str')))
+    module = AnsibleModule(argument_spec=dict(macsec_profile=dict(required=True, type='str')))
 
     macsec_profile = module.params['macsec_profile']
-    vm_type = module.params['vm_type']
-    module.exit_json(profile=get_macsec_profile(module, macsec_profile, vm_type), changed=False)
+    module.exit_json(profile=get_macsec_profile(module, macsec_profile), changed=False)
 
 
 if __name__ == "__main__":

ansible/roles/eos/tasks/ceos_config.yml

@@ -42,7 +42,6 @@
 - name: Get the macsec profile data from profile_name
   get_macsec_profile:
     macsec_profile: "{{ macsec_profile }}"
-    vm_type: "{{ vm_type }}"
   register: profile_raw
   become: true
   when: "'t2' == base_topo and enable_macsec is defined"

ansible/templates/minigraph_link_meta.j2

@@ -1,7 +1,6 @@
 {%- set ns = namespace(link_metadata_defined=False) -%}
 
-{% if 'dualtor' in topo or
-      (macsec_card is defined and enable_macsec is defined and macsec_card == True and 't2' in topo) %}
+{%- if 'dualtor' in topo or (macsec_card is defined and macsec_card == True and 't2' in topo) -%}
     {% set ns.link_metadata_defined = True %}
 {%- endif -%}
 
@@ -39,7 +38,7 @@
       </a:LinkMetadata>
 {% endfor %}
 {% endif %}
-{% if macsec_card is defined and enable_macsec is defined  and macsec_card == True and 't2' in topo %}
+{% if macsec_card is defined and macsec_card == True and 't2' in topo %}
 {% for index in range(vms_number) %}
 {% set vm_intfs=vm_topo_config['vm'][vms[index]]['intfs'][dut_index|int]|sort %}
 {% set dut_intfs=vm_topo_config['vm'][vms[index]]['interface_indexes'][dut_index|int]|sort %}

ansible/templates/minigraph_meta.j2

@@ -226,7 +226,7 @@
             <a:Value>{{ switch_type }}</a:Value>
          </a:DeviceProperty>
 {% endif %}
-{% if macsec_card is defined and enable_macsec is defined and macsec_card == True and 't2' in topo %}
+{% if macsec_card is defined and macsec_card == True and 't2' in topo %}
     <a:DeviceProperty>
       <a:Name>MacSecProfile</a:Name>
       <a:Value>PrimaryKey="MACSEC_PROFILE" FallbackKey="macsec-profile2" MacsecPolicy=""</a:Value>