Make the term names unique by including the address family for Arista TP.

- This is because the term names are propagated to field-sets and results in a collision when IPv4 and IPv6 policies are rendered together.

PiperOrigin-RevId: 775729103

Author: Capirca Team

capirca/lib/arista_tp.py

@@ -909,8 +909,8 @@ def _TranslatePolicy(self, pol, exp_info):
           # appropriate default term name to be used in this filter.
           default_term = re.match(r"^default\-.*", term.name, re.IGNORECASE)
 
-          # remove if term names become unique to address family.
-          if (filter_type == "mixed" and ft == "inet6"):
+          # make the term names unique to address family.
+          if ft == "inet6":
             term.name = af_map_txt[ft] + "-" + term.name
 
           if default_term:

tests/lib/arista_tp_test.py

@@ -1154,7 +1154,7 @@ def testIcmpInet6Mismatch(self, mock_debug):
     str(atp)
 
     mock_debug.assert_called_once_with(
-        "Term icmptype-mismatch will not be rendered, "
+        "Term ipv6-icmptype-mismatch will not be rendered, "
         "as it has icmp match specified but "
         "the ACL is of inet6 address family.")