fix t0-isolated-d96u32s2 topo (sonic-net#17110)

What is the motivation for this PR?
Fixed port mapping: first 16 ports are uplink, the rest of the ports are downlink.
Updated generate_topo.py to match with the correct port-mapping.

How did you verify/test it?
Verified in local testbed.

Author: sdszhang

ansible/generate_topo.py

@@ -31,6 +31,10 @@
                          "panel_port_step": 2},
     'o128':             {"ds_breakout": 2, "us_breakout": 2, "ds_link_step": 1, "us_link_step": 1,
                          "panel_port_step": 1},
+    'o128t0':           {"ds_breakout": 2, "us_breakout": 2, "ds_link_step": 1, "us_link_step": 1,
+                         'uplink_ports': list(range(16)), 'peer_ports': [64, 65],
+                         'skip_ports': [],
+                         "panel_port_step": 1},
     'c256-sparse':      {"ds_breakout": 8, "us_breakout": 8, "ds_link_step": 8, "us_link_step": 8,
                          "panel_port_step": 2},
     'c224o8-sparse':    {"ds_breakout": 8, "us_breakout": 2, "ds_link_step": 8, "us_link_step": 2,
@@ -108,6 +112,9 @@ class HostInterface:
     def __init__(self, port_id: int):
         self.port_id = port_id
 
+    def __repr__(self):
+        return f"HostInterface(port_id={self.port_id})"
+
 
 class Vlan:
     """ Class to represent a VLAN in the topology """
@@ -292,14 +299,16 @@ def main(role: str, keyword: str, template: str, port_count: int, uplinks: str,
     - ./generate_topo.py -r t1 -k isolated -t t1-isolated -c 64 -u 12,16,44,48 -l 'c224o8'
     - ./generate_topo.py -r t1 -k isolated -t t1-isolated -c 64 -u 12,16,44,48 -l 'c224o8-sparse' -s 16,44,48
     - ./generate_topo.py -r t0 -k isolated -t t0-isolated -c 64 -u 25,26,27,28,29,30,31,32 -l 'o128'
+    - ./generate_topo.py -r t0 -k isolated -t t0-isolated -c 64 -p 64,65 -l 'o128t0'
     - ./generate_topo.py -r t0 -k isolated -t t0-isolated -c 64 -u 8,10,12,14,16,18,20,22,40,42,44,46,48,50,52,54 \
         -p 64,65 -l 'c256'
     - ./generate_topo.py -r t0 -k isolated -t t0-isolated -c 64 -u 8,10,12,14,16,18,20,22,40,42,44,46,48,50,52,54 \
         -p 64,65 -l 'c256-sparse'
     """
-    uplink_ports = [int(port) for port in uplinks.split(",")] if uplinks != "" else []
-    peer_ports = [int(port) for port in peers.split(",")] if peers != "" else []
-    skip_ports = [int(port) for port in skips.split(",")] if skips != "" else []
+    uplink_ports = [int(port) for port in uplinks.split(",")] if uplinks != "" else \
+        hw_port_cfg[link_cfg]['uplink_ports']
+    peer_ports = [int(port) for port in peers.split(",")] if peers != "" else hw_port_cfg[link_cfg]['peer_ports']
+    skip_ports = [int(port) for port in skips.split(",")] if skips != "" else hw_port_cfg[link_cfg]['skip_ports']
 
     vm_list, downlinkif_list, uplinkif_list = generate_topo(role, port_count, uplink_ports, peer_ports,
                                                             skip_ports, link_cfg)

ansible/vars/topo_t0-isolated-d96u32s2.yml

@@ -1,30 +1,14 @@
 topology:
   host_interfaces:
-    - 0
-    - 1
-    - 2
-    - 3
-    - 4
-    - 5
-    - 6
-    - 7
-    - 8
-    - 9
-    - 10
-    - 11
-    - 12
-    - 13
-    - 14
-    - 15
-    - 16
-    - 17
-    - 18
-    - 19
-    - 20
-    - 21
-    - 22
-    - 23
-    - 24
+    - 32
+    - 33
+    - 34
+    - 35
+    - 36
+    - 37
+    - 38
+    - 39
+    - 40
     - 41
     - 42
     - 43
@@ -73,6 +57,22 @@ topology:
     - 86
     - 87
     - 88
+    - 89
+    - 90
+    - 91
+    - 92
+    - 93
+    - 94
+    - 95
+    - 96
+    - 97
+    - 98
+    - 99
+    - 100
+    - 101
+    - 102
+    - 103
+    - 104
     - 105
     - 106
     - 107
@@ -99,131 +99,131 @@ topology:
   VMs:
     ARISTA01T1:
       vlans:
-        - 25
+        - 0
       vm_offset: 0
     ARISTA02T1:
       vlans:
-        - 26
+        - 1
       vm_offset: 1
     ARISTA03T1:
       vlans:
-        - 27
+        - 2
       vm_offset: 2
     ARISTA04T1:
       vlans:
-        - 28
+        - 3
       vm_offset: 3
     ARISTA05T1:
       vlans:
-        - 29
+        - 4
       vm_offset: 4
     ARISTA06T1:
       vlans:
-        - 30
+        - 5
       vm_offset: 5
     ARISTA07T1:
       vlans:
-        - 31
+        - 6
       vm_offset: 6
     ARISTA08T1:
       vlans:
-        - 32
+        - 7
       vm_offset: 7
     ARISTA09T1:
       vlans:
-        - 33
+        - 8
       vm_offset: 8
     ARISTA10T1:
       vlans:
-        - 34
+        - 9
       vm_offset: 9
     ARISTA11T1:
       vlans:
-        - 35
+        - 10
       vm_offset: 10
     ARISTA12T1:
       vlans:
-        - 36
+        - 11
       vm_offset: 11
     ARISTA13T1:
       vlans:
-        - 37
+        - 12
       vm_offset: 12
     ARISTA14T1:
       vlans:
-        - 38
+        - 13
       vm_offset: 13
     ARISTA15T1:
       vlans:
-        - 39
+        - 14
       vm_offset: 14
     ARISTA16T1:
       vlans:
-        - 40
+        - 15
       vm_offset: 15
     ARISTA17T1:
       vlans:
-        - 89
+        - 16
       vm_offset: 16
     ARISTA18T1:
       vlans:
-        - 90
+        - 17
       vm_offset: 17
     ARISTA19T1:
       vlans:
-        - 91
+        - 18
       vm_offset: 18
     ARISTA20T1:
       vlans:
-        - 92
+        - 19
       vm_offset: 19
     ARISTA21T1:
       vlans:
-        - 93
+        - 20
       vm_offset: 20
     ARISTA22T1:
       vlans:
-        - 94
+        - 21
       vm_offset: 21
     ARISTA23T1:
       vlans:
-        - 95
+        - 22
       vm_offset: 22
     ARISTA24T1:
       vlans:
-        - 96
+        - 23
       vm_offset: 23
     ARISTA25T1:
       vlans:
-        - 97
+        - 24
       vm_offset: 24
     ARISTA26T1:
       vlans:
-        - 98
+        - 25
       vm_offset: 25
     ARISTA27T1:
       vlans:
-        - 99
+        - 26
       vm_offset: 26
     ARISTA28T1:
       vlans:
-        - 100
+        - 27
       vm_offset: 27
     ARISTA29T1:
       vlans:
-        - 101
+        - 28
       vm_offset: 28
     ARISTA30T1:
       vlans:
-        - 102
+        - 29
       vm_offset: 29
     ARISTA31T1:
       vlans:
-        - 103
+        - 30
       vm_offset: 30
     ARISTA32T1:
       vlans:
-        - 104
+        - 31
       vm_offset: 31
     ARISTA01PT0:
       vlans:
@@ -239,45 +239,45 @@ topology:
       one_vlan_a:
         Vlan1000:
           id: 1000
-          intfs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127]
+          intfs: [32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127]
           prefix: 192.168.0.1/21
           prefix_v6: fc02:1000::1/64
           tag: 1000
       two_vlan_a:
         Vlan1000:
           id: 1000
-          intfs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63]
+          intfs: [32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79]
           prefix: 192.168.0.1/22
           prefix_v6: fc02:100::1/64
           tag: 1000
         Vlan1100:
           id: 1100
-          intfs: [64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127]
+          intfs: [80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127]
           prefix: 192.168.4.1/22
           prefix_v6: fc02:101::1/64
           tag: 1100
       four_vlan_a:
         Vlan1000:
           id: 1000
-          intfs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
+          intfs: [32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55]
           prefix: 192.168.0.1/22
           prefix_v6: fc02:100::1/64
           tag: 1000
         Vlan1100:
           id: 1100
-          intfs: [24, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63]
+          intfs: [56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79]
           prefix: 192.168.4.1/22
           prefix_v6: fc02:101::1/64
           tag: 1100
         Vlan1200:
           id: 1200
-          intfs: [64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87]
+          intfs: [80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103]
           prefix: 192.168.8.1/22
           prefix_v6: fc02:102::1/64
           tag: 1200
         Vlan1300:
           id: 1300
-          intfs: [88, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127]
+          intfs: [104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127]
           prefix: 192.168.12.1/22
           prefix_v6: fc02:103::1/64
           tag: 1300
@@ -915,34 +915,34 @@ configuration:
       asn: 65100
       peers:
         65100:
-          - 10.0.0.64
-          - fc00::81
+          - 10.0.1.0
+          - fc00::201
     interfaces:
       Loopback0:
-        ipv4: 100.1.0.33/32
-        ipv6: 2064:100:0:21::/128
+        ipv4: 100.1.0.129/32
+        ipv6: 2064:100:0:81::/128
       Ethernet1:
-        ipv4: 10.0.0.65/31
-        ipv6: fc00::82/126
+        ipv4: 10.0.1.1/31
+        ipv6: fc00::202/126
     bp_interface:
-      ipv4: 10.10.246.34/24
-      ipv6: fc0a::22/64
+      ipv4: 10.10.246.130/24
+      ipv6: fc0a::82/64
   ARISTA02PT0:
     properties:
     - common
     bgp:
       asn: 65100
       peers:
         65100:
-          - 10.0.0.66
-          - fc00::85
+          - 10.0.1.2
+          - fc00::205
     interfaces:
       Loopback0:
-        ipv4: 100.1.0.34/32
-        ipv6: 2064:100:0:22::/128
+        ipv4: 100.1.0.130/32
+        ipv6: 2064:100:0:82::/128
       Ethernet1:
-        ipv4: 10.0.0.67/31
-        ipv6: fc00::86/126
+        ipv4: 10.0.1.3/31
+        ipv6: fc00::206/126
     bp_interface:
-      ipv4: 10.10.246.35/24
-      ipv6: fc0a::23/64
+      ipv4: 10.10.246.131/24
+      ipv6: fc0a::83/64