RF: Replace routing.community.x.type with ...cl_type (#2845)

We'll need the 'type' attribute to implement extended/large community
ACLs, so we have to rename the existing 'type' attribute (with values
'standard'/'extended' based on Cisco IOS CLI). 'cl_type' was chosen
to mean 'community list type'

Author: ipspace

netsim/ansible/templates/routing/arubacx.j2

@@ -14,7 +14,7 @@ ip aspath-list {{ asp_name }} {{ asp_line.action }} {{ asp_line.path }}
 {% if routing.community|default({}) %}
 {%   for c_name,c_value in routing.community.items() %}
 {%     for c_line in c_value.value %}
-ip community-list {{ c_value.type }} {{ c_name }} {{ c_line.action }} {{ c_line._value }}
+ip community-list {{ c_value.cl_type }} {{ c_name }} {{ c_line.action }} {{ c_line._value }}
 {%     endfor %}
 {%   endfor %}
 {% endif %}

netsim/ansible/templates/routing/dellos10.j2

@@ -23,7 +23,7 @@ ip as-path access-list {{ asp_name }} {{ asp_line.action }} {{ asp_line.path }}
 {%   for c_name,c_value in routing.community.items() %}
 !
 {%     for c_line in c_value.value %}
-! Ignoring '{{ c_value.type }}' if not 'standard'
+! Ignoring '{{ c_value.cl_type }}' if not 'standard'
 ip community-list standard {{ c_name }} {{ c_line.action }} {{ c_line._value }}
 {%     endfor %}
 {%   endfor %}

netsim/ansible/templates/routing/frr.j2

@@ -26,7 +26,7 @@ bgp as-path access-list {{ asp_name }} {{ asp_line.action }} {{ asp_line.path }}
 {%   for c_name,c_value in routing.community.items() %}
 !
 {%     for c_line in c_value.value %}
-bgp community-list {{ c_value.type }} {{ c_name }} {{ c_line.action }} {{ c_line._value }}
+bgp community-list {{ c_value.cl_type }} {{ c_name }} {{ c_line.action }} {{ c_line._value }}
 {%     endfor %}
 {%   endfor %}
 {% endif %}

netsim/ansible/templates/routing/ios.j2

@@ -26,7 +26,7 @@ ip as-path access-list {{ routing._numobj.aspath[asp_name] }} {{ asp_line.action
 {%   for c_name,c_value in routing.community.items() %}
 !
 {%     for c_line in c_value.value %}
-ip community-list {{ c_value.type }} {{ c_name }} {{ c_line.action }} {{ c_line._value }}
+ip community-list {{ c_value.cl_type }} {{ c_name }} {{ c_line.action }} {{ c_line._value }}
 {%     endfor %}
 {%   endfor %}
 {% endif %}

netsim/devices/dellos10.py

@@ -83,9 +83,9 @@ def check_vrrp_on_virtual_networks(node:Box, topology: Box) -> None:
 """
 def check_expanded_communities(node:Box, topology: Box) -> None:
   for c_name,c_value in node.get('routing.community',{}).items():
-    if c_value.get('type',None) != 'standard':
+    if c_value.get('cl_type',None) != 'standard':
       report_quirk(
-        f"Dell OS10 (node {node.name}) does not support communities of type '{c_value.type}'",
+        f"Dell OS10 (node {node.name}) does not support expanded BGP community lists",
         quirk='non-standard_communities',
         node=node)
 

netsim/modules/routing/clist.py

@@ -51,11 +51,11 @@ def replace_community_delete(node: Box, p_name: str, p_entry: Box, topology: Box
         category=log.IncorrectType,
         module='routing')
     else:
-      clist += [ { 'type': 'standard', 'action': 'permit', '_value': i } for i in p_entry.delete.community[type] ]
+      clist += [ { 'action': 'permit', '_value': i } for i in p_entry.delete.community[type] ]
 
   if clist:
     cname = f"DEL_{p_name}_{p_entry.sequence}"
-    node.routing.community[cname] = { 'action': 'permit', 'type': 'standard', 'value': clist }
+    node.routing.community[cname] = { 'action': 'permit', 'cl_type': 'standard', 'value': clist }
     p_entry.delete.community.list = cname
 
   for kw in ['standard','large','extended']:
@@ -121,7 +121,7 @@ def expand_community_list(p_name: str,o_name: str,node: Box,topology: Box) -> ty
         module='routing')
     regexp = regexp or bool(p_clist.value[p_idx].get('regexp',False))
 
-  p_clist.type = 'expanded' if regexp else 'standard'       # Set clist type for devices that use standard/expanded
+  p_clist.cl_type = 'expanded' if regexp else 'standard'    # Set clist type for devices that use standard/expanded
   p_clist.regexp = 'regexp' if regexp else ''               # And regexp flag for devices that use something else
 
   return None                                               # Message to caller: no need to do additional checks

tests/topology/expected/rp-clist-expansion.yml

@@ -41,15 +41,15 @@ nodes:
     routing:
       community:
         cg1:
+          cl_type: standard
           regexp: ''
-          type: standard
           value:
           - _value: 65000:100
             action: permit
             sequence: 10
         cl2:
+          cl_type: standard
           regexp: ''
-          type: standard
           value:
           - _value: 65000:100
             action: permit
@@ -58,16 +58,16 @@ nodes:
             action: permit
             sequence: 20
         cl3:
+          cl_type: expanded
           regexp: regexp
-          type: expanded
           value:
           - _value: _65000:10[1-2]_
             action: permit
             regexp: _65000:10[1-2]_
             sequence: 10
         cl4:
+          cl_type: standard
           regexp: ''
-          type: standard
           value:
           - _value: 65000:104
             action: permit
@@ -79,8 +79,8 @@ nodes:
             action: permit
             sequence: 30
         cl5:
+          cl_type: expanded
           regexp: regexp
-          type: expanded
           value:
           - _value: 65000:100 65001:100
             action: deny
@@ -93,8 +93,8 @@ nodes:
             action: permit
             sequence: 100
         cl6:
+          cl_type: expanded
           regexp: regexp
-          type: expanded
           value:
           - _value: 65000:100 65001:100
             action: deny
@@ -104,8 +104,8 @@ nodes:
             regexp: .*
             sequence: 20
         cl7:
+          cl_type: standard
           regexp: ''
-          type: standard
           value:
           - _value: 65000:106
             action: permit