support for not all DUT ports connected to a fanout switch

[sanmalho-git]

Description of PR

Summary:
Fixes # (issue)

Type of change

• Bug fix
• Testbed and Framework(new/improvement)
• Test case(new/improvement)

Approach

What is the motivation for this PR?

Currently, it is required that all ports on DUT are in use and are connected to a fanout. However, there is a need to be able to run tests where all ports are not in use. Specifically, when dealing with

• New Sonic devices
• Sonic device with a front panel port used for in-band management
• Chassis with lots of ports and multiple asics, were every port on every asic is not required to be covered
• Chassis as a DUT, where the number of ports can be in hundreds
• Expensive, high speed ports like 400G (hard to go from 400G down to 1/10G)

So, need to add support where not all DUT ports are connected to fanout and are thus not part of the testing.

How did you do it?

conn_graph_facts:

conn_graph_facts.py returns device_vlan_map_list. This used to be a dictionary with key being hostname and value being a list of vlanids for the fanout ports. Have modified this where the value instead of being a list of vlanids, it is a dictionary with key being the port_index and the value being the vlan id. This port_index is what gets put in the topology file. We get the port by looking at the host_port_vlans defined in the conn_graph for that device. This host_port_vlans has key being the Ethernet port (like Ethernet10) and value being a dictionary with key 'vlanlist' being a the list of fanout vlans. We check against all the ports 'vlanlist' to get the port on the DUT that connects to this fanout vlan, and then split on 'Ethernet' to get the port index.

For example - lets say on dut with hostname "dut1", we have port Ethernet10 connected to fanout w/ vlan 120, and Ethernet11 connected to fanout w/ vlan 121, then we would have:

  "host_port_vlans":
    {
      "Ethernet10": {
         "mode": "Access",
         "vlanids": "120",
         "vlanlist": [
            120
         ]
      },
      "Ethernet11": {
         "mode": "Access",
         "vlanids": "121",
         "vlanlist": [
            121
         ]
      }
   }

  "VlanList": [
     120,
     121
  ]

For vlan 120 in VlanList, we would iterate through host_port_vlans to find the port that has vlan 120 - in our case "Ethernet10". The port_index would then be "10". Similarly, for vlan 121, the port_index would be "Ethernet11".

So, returned device_vlan_map_list would be:

    "dut1" : {
       "10" : 120,
       "11" : 121
    }

vlan_port/kvm_port/mellanox_simx_port:

• Updated to return (dut_fp_ports) a dictionary with key being the port index (same as in the topo file) and vlan being the port - instead of the just the list of ports.

bind/unbind vm_topology:

• vlan_index is now a string in the dictionary of dut_fp_ports
• updated regexp for checking valid vlan for multi-dut to be of the format '.@'

remove_dut_port.yml (bug fix):

• set cmd to "remove" instead of "create" in vlan_port module call.

How did you verify/test it?

Tested against pizza box DUT with all DUT ports connected to a fanout, and also against another DUT where we have only 4 of the 52 ports connected to a different fanout.

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

[lgtm-com]

This pull request introduces 1 alert when merging 0f8b9b63e5d7623089902177c3c239bbb15c5a55 into 1317643 - view on LGTM.com

new alerts:

• 1 for Unused import

[sanmalho-git]

@lolyu can you please review these changes.

[lolyu]

Please fix the conflict.

[sanmalho-git]

@lolyu - I have re-based and fixed the merge conflict. Also, the module_utils PR has been merged into master. So, moved the common code of port_alias_to_name_map between conn_graph_facts and minigraph_facts to module_utils/port_utils.py.

Can you please give it a final review before we merge this PR into master.

[lgtm-com]

This pull request introduces 2 alerts when merging 0b6cca041aa089844b773558e362a8e01995d606 into f5537b1 - view on LGTM.com

new alerts:

• 2 for Unused import

[lolyu]

Retest this please

[lolyu]

LGTM

[lolyu]

Thanks, @sanmalho-git.