lag: Remove 'lag' link type, cleanup virtual links

netsim/ansible/templates/lag/arubacx.j2

@@ -10,7 +10,7 @@ interface lag {{ intf.lag.mlag.ifindex }}
     description VSX ISL
 
 !
-{%   for ch in ([intf]+interfaces) if ch==intf or ch.lag._parentindex|default(False) == intf.linkindex %}
+{%   for ch in ([intf]+interfaces) if ch==intf or ch.lag._peerlink|default(0) == intf.linkindex %}
 interface {{ ch.ifname }}
     no shutdown
     description {{ ch.name }} (ISL in lag {{intf.lag.mlag.ifindex }})
@@ -54,7 +54,7 @@ interface {{ intf.ifname }}{{ mclag_intf }}{{ mclag_intf_static }}
     no shutdown
 
 !
-{%   for ch in interfaces if ch.lag._parentindex|default(False) == intf.linkindex %}
+{%   for ch in interfaces if ch.lag._parentindex|default(False) == intf.lag.ifindex %}
 !
 interface {{ ch.ifname }}
     description {{ ch.name }} in lag {{ intf.lag.ifindex }}

netsim/ansible/templates/lag/cumulus.j2

@@ -12,7 +12,7 @@ iface {{ data.ifname }}
   pre-up ip link add {{ data.ifname }} type bond
   bond-slaves {%-
     for i in interfaces
-      if i.lag._parentindex|default(False) == data.linkindex %} {{ i.ifname }}{%- endfor %}
+      if i.lag._parentindex|default(False) == data.lag.ifindex %} {{ i.ifname }}{%- endfor %}
 {%    set _lacp = data.lag.lacp|default(lag.lacp) %}
 {%    if _lacp=='slow' %}
   bond-lacp-rate slow

netsim/ansible/templates/lag/cumulus_nvue.j2

@@ -6,7 +6,7 @@
           member:
 {% for intf in interfaces if intf.lag.mlag.peergroup is defined %}
             {{ intf.ifname }}: {}
-{%   for ch in interfaces if ch.lag._parentindex|default(False) == intf.linkindex %}
+{%   for ch in interfaces if ch.lag._peerlink|default(0) == intf.linkindex %}
             {{ ch.ifname }}: {}
 {%   endfor %}
 {% endfor %}
@@ -42,7 +42,7 @@
           mode: static
 {%  endif %}
           member:
-{%  for c in interfaces if c.lag._parentindex|default(False) == i.linkindex %}
+{%  for c in interfaces if c.lag._parentindex|default(False) == i.lag.ifindex %}
             {{ c.ifname }}: {}
 {%  endfor %}
 {% endfor %}

netsim/ansible/templates/lag/dellos10.j2

@@ -5,7 +5,7 @@ vlt-domain {{ intf.lag.mlag.peergroup }}
  backup destination {{ intf.lag.mlag.peer }}
  vlt-mac {{ intf.lag.mlag.mac | hwaddr('linux') }}
  discovery-interface {{ intf.ifname }}
-{%   for ch in interfaces if ch.lag._parentindex|default(False) == intf.linkindex %}
+{%   for ch in interfaces if ch.lag._peerlink|default(0) == intf.linkindex %}
  discovery-interface {{ ch.ifname }}
 {%   endfor %}
 {% endfor %}
@@ -23,7 +23,7 @@ interface {{ intf.ifname }}
  description "{{ intf.name }}"
 {%  endif %}
 !
-{%  for ch in interfaces if ch.lag._parentindex|default(False) == intf.linkindex %}
+{%  for ch in interfaces if ch.lag._parentindex|default(False) == intf.lag.ifindex %}
 {%   set _lag_mode = 
       'on' if intf.lag.lacp|default('') == 'off' else
       'active' if intf.lag.lacp_mode|default('') == 'active' else 

netsim/ansible/templates/lag/eos.j2

@@ -26,7 +26,7 @@ mlag
  peer-link port-channel {{ intf.lag.mlag.ifindex }}
  no shutdown
 !
-{%   for ch in ([intf]+interfaces) if ch==intf or ch.lag._parentindex|default(False) == intf.linkindex %}
+{%   for ch in ([intf]+interfaces) if ch==intf or ch.lag._peerlink|default(0) == intf.linkindex %}
 interface {{ ch.ifname }}
  description {{ ch.name }} (peerlink in channel-group {{intf.lag.mlag.ifindex }})
  channel-group {{ intf.lag.mlag.ifindex }} mode active
@@ -47,7 +47,7 @@ interface {{ intf.ifname }}
  description {{ intf.name }}
 {%  endif %}
 !
-{%   for ch in interfaces if ch.lag._parentindex|default(False) == intf.linkindex %}
+{%   for ch in interfaces if ch.lag._parentindex|default(False) == intf.lag.ifindex %}
 !
 {%     set _lag_mode = 
          'on' if intf.lag.lacp|default('') == 'off' else

netsim/ansible/templates/lag/frr.j2

@@ -1 +1 @@
-{% include "linux.j2" %}
+{% include "linux.j2" %}

netsim/ansible/templates/lag/linux.j2

@@ -12,7 +12,7 @@ ethtool -s {{ l.ifname }} autoneg off speed 1000 duplex full
 {%     endif %}
 ip link set dev {{ l.ifname }} down
 ip link set dev {{ l.ifname }} master {%
-       for i in interfaces if i.type=='lag' and i.linkindex==l.lag._parentindex %}{{ i.ifname }}
+       for i in interfaces if i.type=='lag' and i.lag.ifindex==l.lag._parentindex %}{{ i.ifname }}
 {%     endfor %}
 {%   endif %}
 ip link set dev {{ l.ifname }} up

netsim/defaults/attributes.yml

@@ -60,7 +60,7 @@ link:                       # Global link attributes
     _alt_types: [ bool_false, prefix_str, named_pfx ]
   role: id
   pool: id
-  type: { type: str, valid_values: [ lan, p2p, stub, loopback, tunnel, vlan_member, lag ] }
+  type: { type: str, valid_values: [ lan, p2p, stub, loopback, tunnel, vlan_member ] }
   unnumbered: bool
   interfaces:
   mtu: { type: int, min_value: 64, max_value: 65535 }