From 16cf6c82fcc7dd7bccdf026ba8e404ec1c99fe6a Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Tue, 28 Mar 2023 14:56:31 +0300 Subject: [PATCH 01/16] [core] bring t0/1 with Accton --- ansible/files/sonic_lab_devices.csv | 20 ++- ansible/files/sonic_lab_links.csv | 1 + ansible/group_vars/eos/creds.yml | 4 + ansible/group_vars/fanout/secrets.yml | 1 + ansible/group_vars/lab/secrets.yml | 1 + ansible/group_vars/vm_host/creds.yml | 1 + ansible/host_vars/STR-ACS-SERV-01.yml | 4 +- ansible/lab | 205 ++++---------------------- ansible/module_utils/port_utils.py | 1 + ansible/setup-management-network.sh | 1 + ansible/testbed-new.yaml | 84 ++++++++++- ansible/testbed.csv | 3 + ansible/testbed.yaml | 30 ++++ ansible/veos | 14 +- 14 files changed, 177 insertions(+), 193 deletions(-) create mode 100644 ansible/group_vars/eos/creds.yml diff --git a/ansible/files/sonic_lab_devices.csv b/ansible/files/sonic_lab_devices.csv index 8b056828b08..9ab584e0aae 100644 --- a/ansible/files/sonic_lab_devices.csv +++ b/ansible/files/sonic_lab_devices.csv @@ -1,8 +1,14 @@ Hostname,ManagementIp,HwSku,Type,Protocol -dev-msn2700-01,10.251.0.188/23,Mellanox-2700,DevSonic, -dev-7260-10,10.251.0.13/23,Arista-7260QX-64,FanoutLeaf, -dev-7260-11,10.251.0.234/23,Arista-7260QX-64,FanoutRoot, -dev-acs-serv-01,10.251.0.245/23,TestServ,Server, -pdu-1,192.168.9.2,Apc,Pdu,snmp -pdu-2,192.168.9.3,Sentry,Pdu,snmp -console-1,192.168.10.1,Cisco,ConsoleServer,ssh +dev-acs-serv-01,192.168.88.21/24,TestServ,Server, # create new file, the same as ansible/host_vars/STR-ACS-SERV-01.yml +# dev-sn2700,,Mellanox-SN2700,FanoutRoot, +dev-sn2700-01,192.168.88.246/24,Mellanox-SN2700,FanoutLeaf, +dev-as7712-32x-01,192.168.88.105/24,Accton-AS7712-32X,DevSonic, + + +# dev-msn2700-01,10.251.0.188/23,Mellanox-2700,DevSonic, +# dev-7260-10,10.251.0.13/23,Arista-7260QX-64,FanoutLeaf, +# dev-7260-11,10.251.0.234/23,Arista-7260QX-64,FanoutRoot, +# dev-acs-serv-01,10.251.0.245/23,TestServ,Server, +# pdu-1,192.168.9.2,Apc,Pdu,snmp +# pdu-2,192.168.9.3,Sentry,Pdu,snmp +# console-1,192.168.10.1,Cisco,ConsoleServer,ssh diff --git a/ansible/files/sonic_lab_links.csv b/ansible/files/sonic_lab_links.csv index 2bcbb6ac51f..7c1d5661e18 100644 --- a/ansible/files/sonic_lab_links.csv +++ b/ansible/files/sonic_lab_links.csv @@ -33,3 +33,4 @@ dev-msn2700-01,Ethernet120,dev-7260-10,Ethernet31,40000,1711,Access dev-msn2700-01,Ethernet124,dev-7260-10,Ethernet32,40000,1712,Access dev-7260-11,Ethernet19,dev-acs-serv-01,p4p1,40000,,Trunk dev-7260-11,Ethernet30,dev-7260-10,Ethernet64,40000,1681-1712,Trunk +#todo(adovhan) add links (dut,fanout) diff --git a/ansible/group_vars/eos/creds.yml b/ansible/group_vars/eos/creds.yml new file mode 100644 index 00000000000..5ec4e9864e2 --- /dev/null +++ b/ansible/group_vars/eos/creds.yml @@ -0,0 +1,4 @@ +--- +ansible_password: 123456 +ansible_user: root + diff --git a/ansible/group_vars/fanout/secrets.yml b/ansible/group_vars/fanout/secrets.yml index 735cd95babc..b1fc15992fb 100644 --- a/ansible/group_vars/fanout/secrets.yml +++ b/ansible/group_vars/fanout/secrets.yml @@ -1,5 +1,6 @@ # Please update the actual username and password according to your lab configuration +#todo(adovhan) set correct creds ansible_ssh_user: user ansible_ssh_pass: password fanout_mlnx_user: admin diff --git a/ansible/group_vars/lab/secrets.yml b/ansible/group_vars/lab/secrets.yml index af2b522ad5c..ea023893606 100644 --- a/ansible/group_vars/lab/secrets.yml +++ b/ansible/group_vars/lab/secrets.yml @@ -1,5 +1,6 @@ ansible_ssh_pass: password ansible_become_pass: password +#todo(adovhan) set correct creds sonicadmin_user: admin sonicadmin_password: password sonicadmin_initial_password: password diff --git a/ansible/group_vars/vm_host/creds.yml b/ansible/group_vars/vm_host/creds.yml index f8edc45dd0b..5154b2659b5 100644 --- a/ansible/group_vars/vm_host/creds.yml +++ b/ansible/group_vars/vm_host/creds.yml @@ -1,4 +1,5 @@ --- +#todo(adovhan) set correct creds ansible_user: use_own_value ansible_password: use_own_value ansible_become_password: use_own_value diff --git a/ansible/host_vars/STR-ACS-SERV-01.yml b/ansible/host_vars/STR-ACS-SERV-01.yml index 33fa32f9244..98139ce10d2 100644 --- a/ansible/host_vars/STR-ACS-SERV-01.yml +++ b/ansible/host_vars/STR-ACS-SERV-01.yml @@ -1,7 +1,7 @@ mgmt_bridge: br1 mgmt_prefixlen: 23 -mgmt_gw: 10.255.0.1 +mgmt_gw: 10.255.0.1 todo(adovhan) set correct ip mgmt_gw_v6: fec0::1 -vm_mgmt_gw: 10.254.0.1 +#vm_mgmt_gw: 10.254.0.1 external_port: p4p1 diff --git a/ansible/lab b/ansible/lab index c62d840d79e..8280e75fc4e 100644 --- a/ansible/lab +++ b/ansible/lab @@ -6,193 +6,40 @@ all: children: sonic: children: - sonic_sn2700_40: - sonic_s6000: - sonic_s6100: - sonic_a7260: - sonic_multi_asic: - sonic_multi_asic_2: - sonic_msft_sup: - sonic_msft_lc_100G: + sonic_as7712: fanout: hosts: - str-7260-10: - ansible_host: 10.251.0.13 - str-7260-11: - ansible_host: 10.251.0.234 - str-msn2700-02: - ansible_host: 10.251.0.235 - os: sonic + dev-sn2700-01: + ansible_host: 192.168.88.246 ptf: hosts: - ptf_ptf1: - ansible_host: 10.255.0.188 + ptf_vms1-1: todo(adovhan) set correct ip + ansible_host: 10.255.0.196 ansible_ssh_user: root ansible_ssh_pass: root - ptf_vms1-1: - ansible_host: 10.255.0.178 - ansible_ssh_user: root - ansible_ssh_pass: root - ptf_vms6-1: - ansible_host: 10.250.0.100 - ansible_ssh_user: root - ansible_ssh_pass: root - -sonic_sn2700_40: - vars: - hwsku: ACS-MSN2700 - iface_speed: 40000 - hosts: - str-msn2700-01: - ansible_host: 10.251.0.188 - model: MSN2700-CS2FO - serial: MT1234X56789 - base_mac: 24:8a:07:12:34:56 - syseeprom_info: - "0x21": "MSN2700" - "0x22": "MSN2700-CS2FO" - "0x23": "MT1234X56789" - "0x24": "24:8a:07:12:34:56" - "0x25": "12/07/2016" - "0x26": "0" - "0x28": "x86_64-mlnx_x86-r0" - "0x29": "2016.11-5.1.0008-9600" - "0x2A": "128" - "0x2B": "Mellanox" - "0xFE": "0xFBA1E964" - -sonic_s6000: - vars: - hwsku: Force10-S6000 - iface_speed: 40000 - hosts: - lab-s6000-01: - ansible_host: 10.251.0.189 - ansible_hostv6: fec0::ffff:afa:9 - vlab-01: - ansible_host: 10.250.0.101 - ansible_hostv6: fec0::ffff:afa:1 - vlab-03: - ansible_host: 10.250.0.105 - ansible_hostv6: fec0::ffff:afa:5 - vlab-04: - ansible_host: 10.250.0.107 - ansible_hostv6: fec0::ffff:afa:7 - vlab-05: - ansible_host: 10.250.0.110 - ansible_hostv6: fec0::ffff:afa:a - vlab-06: - ansible_host: 10.250.0.111 - ansible_hostv6: fec0::ffff:afa:b - vlab-09: - ansible_host: 10.250.0.115 - ansible_hostv6: fec0::ffff:afb:1 - vlab-10: - ansible_host: 10.250.0.117 - ansible_hostv6: fec0::ffff:afb:3 - vlab-t2-01: - ansible_host: 10.250.0.120 - ansible_hostv6: fec0::ffff:afa:10 - vlab-t2-02: - ansible_host: 10.250.0.121 - ansible_hostv6: fec0::ffff:afa:11 - vlab-t2-sup: - ansible_host: 10.250.0.122 - ansible_hostv6: fec0::ffff:afa:12 - card_type: supervisor -sonic_s6100: +sonic_as7712: vars: - hwsku: Force10-S6100 + hwsku: Accton-AS7712-32X iface_speed: 40000 - hosts: - lab-s6100-01: - ansible_host: 10.251.0.190 - vlab-02: - ansible_host: 10.250.0.114 - -sonic_a7260: - vars: - hwsku: Arista-7260CX3-C64 iface_speed: 100000 - hosts: - lab-a7260-01: - ansible_host: 10.251.0.191 - model: DCS-7260CX3-64 - serial: SSJ12345678 - base_mac: 76:34:ab:08:cd:a0 + ansible_user: admin + ansible_password: YourPaSsWoRd + hosts: + dev-as7712-32x-01: + ansible_host: 192.168.88.105 + model: AS7712-32X + serial: 771232X2226050 + base_mac: E0:01:A6:07:1A:E9 syseeprom_info: - "0x21": "DCS-7260CX3-64" - "0x22": "ASY0250504B0" - "0x23": "SSJ12345678" - "0x24": "7634ab08cda0" - "0x25": "2017/06/07 12:36:05" - "0x26": "01" - "0x27": "03.00" - "0x28": "x86_64-arista_7260cx3_64" - "0x2d": "Arista Networks" - "0x2e": "Aboot-norcal7-7.2.3-pcie2x4-12345678" - -sonic_multi_asic: - vars: - hwsku: msft_multi_asic_vs - iface_speed: 40000 - num_asics: 6 - start_topo_service: True - frontend_asics: [0,1,2,3] - loopback4096_ip: [8.0.0.0/32, 8.0.0.1/32, 8.0.0.2/32, 8.0.0.3/32, 8.0.0.4/32, 8.0.0.5/32] - loopback4096_ipv6: [2603:10e2:400::/128, 2603:10e2:400::1/128, 2603:10e2:400::2/128, 2603:10e2:400::3/128, 2603:10e2:400::4/128, 2603:10e2:400::5/128] - hosts: - vlab-07: - ansible_host: 10.250.0.109 - ansible_hostv6: fec0::ffff:afa:9 - -sonic_multi_asic_2: - vars: - hwsku: msft_four_asic_vs - iface_speed: 40000 - num_asics: 4 - start_topo_service: True - frontend_asics: [0,1] - loopback4096_ip: [8.0.0.0/32, 8.0.0.1/32, 8.0.0.2/32, 8.0.0.3/32] - loopback4096_ipv6: [2603:10e2:400::/128, 2603:10e2:400::1/128, 2603:10e2:400::2/128, 2603:10e2:400::3/128] - hosts: - vlab-08: - ansible_host: 10.250.0.112 - ansible_hostv6: fec0::ffff:afa:c - -sonic_msft_sup: - vars: - HwSku: msft-RP-O - slot_num: slot0 - card_type: supervisor - hosts: - lab-msft-sup-1: - ansible_host: 2.2.2.2 - hwsku: msft-RP-O - num_asics: 2 - -sonic_msft_lc_100G: - vars: - switch_type: chassis-packet - num_asics: 2 - frontend_asics: [0,1] - hosts: - lab-msft-lc0-1: - hwsku: msft-LC-48H-O - slot_num: slot1 - loopback4096_ip: [3.3.3.3/32,3.3.3.4/32] - loopback4096_ipv6: [2603:10e2:400::3/128,2603:10e2:400::4/128] - ansible_host: 2.2.2.3 - lab-msft-lc1-1: - hwsku: msft-LC-48H-O - slot_num: slot2 - loopback4096_ip: [3.3.3.5/32,3.3.3.6/32] - loopback4096_ipv6: [2603:10e2:400::5/128,2603:10e2:400::6/128] - ansible_host: 2.2.2.4 - lab-msft-lc2-1: - hwsku: msft-LC-48H-O - slot_num: slot3 - loopback4096_ip: [3.3.3.7/32,3.3.3.8/32] - loopback4096_ipv6: [2603:10e2:400::7/128,2603:10e2:400::8/128] - ansible_host: 2.2.2.5 + "0x21": "7712-32X-O-AC-F" + "0x22": "FP3ZZ7632014A" + "0x23": "771232X2226050" + "0x24": "E0:01:A6:07:1A:E9" + "0x25": "06/25/2022 14:22:59" + "0x26": "" + "0x28": "x86_64-accton_as7712_32x-r0" + "0x29": "2020.08.00.02" + "0x2A": "256" + "0x2B": "Accton" + "0xFE": "0xE0EA6BA7" diff --git a/ansible/module_utils/port_utils.py b/ansible/module_utils/port_utils.py index 5afa087137b..8eafc2dad5e 100644 --- a/ansible/module_utils/port_utils.py +++ b/ansible/module_utils/port_utils.py @@ -164,6 +164,7 @@ def get_port_alias_to_name_map(hwsku, asic_name=None): port_alias_to_name_map["Ethernet%d" % i] = "Ethernet%d" % (i - 1) for i in range(49, 65): port_alias_to_name_map["Ethernet%d/1" % i] = "Ethernet%d" % ((i - 49) * 4 + 48) + # todo(adovhan) use hardcoded mapping in case 'split' is using elif hwsku == "Accton-AS7712-32X": for i in range(1, 33): port_alias_to_name_map["hundredGigE%d" % i] = "Ethernet%d" % ((i - 1) * 4) diff --git a/ansible/setup-management-network.sh b/ansible/setup-management-network.sh index ff58f76b394..a4825a15a80 100755 --- a/ansible/setup-management-network.sh +++ b/ansible/setup-management-network.sh @@ -51,6 +51,7 @@ echo echo "STEP 6: Configuring br1 interface..." echo "Assigning 10.250.0.1/24 to br1" +# todo(adovhan) set correct ip ifconfig br1 10.250.0.1/24 ifconfig br1 inet6 add fec0::1/64 echo "Bringing up br1" diff --git a/ansible/testbed-new.yaml b/ansible/testbed-new.yaml index 90314860142..7813bb01d7c 100644 --- a/ansible/testbed-new.yaml +++ b/ansible/testbed-new.yaml @@ -50,7 +50,13 @@ device_groups: vars: mgmt_subnet_mask_length: "24" # source: sonic-mgmt/ansible/lab sonic: - children: [sonic_s6000, sonic_s6100, sonic_sn2700_40, sonic_a7260] # source: sonic-mgmt/ansible/lab + children: [sonic_s6000, sonic_s6100, sonic_sn2700_40, sonic_a7260, sonic_as7712] # source: sonic-mgmt/ansible/lab + sonic_as7712: + host: [dev-as7712-32x-01] # source: sonic-mgmt/ansible/lab + vars: + hwsku: "Accton-AS7712-32X" # source: sonic-mgmt/ansible/lab + iface_speed: '40000' # source: sonic-mgmt/ansible/lab + iface_speed2: '100000' # source: sonic-mgmt/ansible/lab sonic_s6000: host: [lab-s6000-01,lab-s6000-02] # source: sonic-mgmt/ansible/lab vars: @@ -71,7 +77,7 @@ device_groups: vars: iface_speed: '100000' # source: sonic-mgmt/ansible/lab fanout: - host: [str-7260-10, str-7260-11, str-msn2700-02] # source: sonic-mgmt/ansible/lab + host: [str-7260-10, str-7260-11, str-msn2700-02, dev-sn2700-01] # source: sonic-mgmt/ansible/lab ptf: host: [ptf_ptf1, ptf_vms1-1] # source: sonic-mgmt/ansible/lab @@ -79,6 +85,35 @@ device_groups: # devices is used to export sonic_lab_devices, fanout/secrets, lab/secrets, lab # there are no cross references devices: + dev-as7712-32x-01: + device_type: DevSonic # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv + hwsku: Accton-AS7712-32X # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv + alias: + credentials: + username: admin + password: YourPaSsWoRd + enable_password: + ansible: + ansible_host: 192.168.88.105/24 # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv + ansible_ssh_user: admin + ansible_ssh_pass: YourPaSsWoRd + + dev-sn2700-01: + device_type: FanoutLeaf # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv + hwsku: Mellanox-SN2700 # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv + alias: + credentials: + username: + password: + enable_password: + ansible: + ansible_host: 192.168.88.246/24 # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv + #todo(adovhan) set correct creds + ansible_ssh_user: user # source: sonic-mgmt/ansible/group_vars/fanout/secrets.yml + ansible_ssh_pass: password # source: sonic-mgmt/ansible/group_vars/fanout/secrets.yml + fanout_sonic_user: admin # source: sonic-mgmt/ansible/group_vars/fanout/secrets.yml + fanout_sonic_password: password # source: sonic-mgmt/ansible/group_vars/fanout/secrets.yml + str-msn2700-01: device_type: DevSonic # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv hwsku: Mellanox-2700 # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv @@ -143,7 +178,7 @@ devices: username: password: ansible: - ansible_host: 10.251.0.245/23 # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv + ansible_host: 10.251.0.245/23 # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv # todo(adovhan) set correct ip (testServer) ansible_ssh_pass: password # source: sonic-mgmt/ansible/group_vars/lab/secrets.yml ansible_become_pass: password # source: sonic-mgmt/ansible/group_vars/lab/secrets.yml sonicadmin_user: admin # source: sonic-mgmt/ansible/group_vars/lab/secrets.yml @@ -217,7 +252,7 @@ host_vars: str-acs-serv-01: mgmt_bridge: br1 # source: sonic-mgmt/host_vars mgmt_prefixlen: 24 # source: sonic-mgmt/host_vars - mgmt_gw: 10.250.0.1 # source: sonic-mgmt/host_vars + mgmt_gw: 10.250.0.1 # source: sonic-mgmt/host_vars #todo(adovhan) set correct ip external_port: ens3f0 # source: sonic-mgmt/host_vars # veos_groups is a dictionary that contains all veos groups @@ -425,6 +460,28 @@ veos: # testbed is used to generate testbed.csv # testbed dictionary does not cross reference with other files testbed: + 01-t0: # source: sonic-mgmt/ansible/testbed.csv + group-name: vms1-1 # source: sonic-mgmt/ansible/testbed.csv + topo: t0 # source: sonic-mgmt/ansible/testbed.csv + ptf_image_name: docker-ptf # source: sonic-mgmt/ansible/testbed.csv + ptf: ptf_vms1-1 + ptf_ip: 10.250.128.196/16 # source: sonic-mgmt/ansible/testbed.csv todo(adovhan) set correcr ip + server: server_1 # source: sonic-mgmt/ansible/testbed.csv + vm_base: VM0100 # source: sonic-mgmt/ansible/testbed.csv + dut: dev-as7712-32x-01 # source: sonic-mgmt/ansible/testbed.csv + comment: Hedgehog T0 topology as7712-32x-01 Testbed 01 + + 01-t1: # source: sonic-mgmt/ansible/testbed.csv + group-name: vms1-1 # source: sonic-mgmt/ansible/testbed.csv + topo: t1 # source: sonic-mgmt/ansible/testbed.csv + ptf_image_name: docker-ptf # source: sonic-mgmt/ansible/testbed.csv + ptf: ptf_vms1-1 + ptf_ip: 10.250.128.196/16 # source: sonic-mgmt/ansible/testbed.csv + server: server_1 # source: sonic-mgmt/ansible/testbed.csv + vm_base: VM0100 # source: sonic-mgmt/ansible/testbed.csv + dut: dev-as7712-32x-01 # source: sonic-mgmt/ansible/testbed.csv + comment: Hedgehog T1 topology as7712-32x-01 Testbed 01 + ptf1-m: group-name: ptf1 # source: sonic-mgmt/ansible/testbed.csv topo: ptf32 # source: sonic-mgmt/ansible/testbed.csv @@ -529,6 +586,25 @@ testbed: # topology is used to generate sonic_lab_links # topology dictionary does not cross reference with other files topology: # source: sonic-mgmt/ansible/files/sonic_lab_links.csv + # todo(adovhan) add links (dut, fanout) +# dev-as7712-32x-01: # source: sonic-mgmt/ansible/files/sonic_lab_links.csv # ports that goes to TESTBED SERVER +# interfaces: # DUT/ start device +# Ethernet4: +# EndDevice: dev-sn2700-01 +# EndPort: Ethernet1/2/1 +# Bandwidth: 10000 +# VlanID: 1681 +# VlanMode: Access +# +# +# dev-sn2700-01: # source: sonic-mgmt/ansible/files/sonic_lab_links.csv +# interfaces: # DUT/ start device +# Ethernet1/1: +# EndDevice: str-acs-serv-01 +# EndPort: eno2 +# Bandwidth: 10000 +# VlanID: 1681-1712 +# VlanMode: Trunk str-msn2700-01: # source: sonic-mgmt/ansible/files/sonic_lab_links.csv interfaces: # DUT/ start device Ethernet0: diff --git a/ansible/testbed.csv b/ansible/testbed.csv index 2a9dcf27e55..baaca06d17c 100644 --- a/ansible/testbed.csv +++ b/ansible/testbed.csv @@ -12,3 +12,6 @@ vms-s6100-t1-lag,vms5-1,t1-64-lag,docker-ptf,ptf-unknown,10.255.0.183/24,,server vms-multi-dut,vms1-duts,ptf64,docker-ptf,ptf-unknown,10.255.0.184/24,,server_1,VM0100,[dut-host1;dut-host2],lab,True,Example Multi DUTs testbed vms-example-ixia-1,vms6-1,t0-64,docker-ptf-ixia,example-ixia-ptf-1,10.0.0.30/32,,server_6,VM0600,example-s6100-dut-1,lab,True,superman ixanvl-vs-conf,anvl,ptf32,docker-ptf-anvl,ptf-unknown,10.250.0.100/24,,server_1,,vlab-01,lab,True,Test ptf ANVL SONIC VM +# todo(adovhan) set correct ip (ptf) +01-t0,vms1-1,t0,docker-ptf,ptf_vms1-1,10.250.128.196/16,,server_1,VM0100,dev-as7712-32x-01,lab,False,Hedgehog T0 topology as7712-32x-01 Testbed 01 +01-t1,vms1-1,t1,docker-ptf,ptf_vms1-1,10.250.128.196/16,,server_1,VM0100,dev-as7712-32x-01,lab,False,Hedgehog T1 topology as7712-32x-01 Testbed 01 diff --git a/ansible/testbed.yaml b/ansible/testbed.yaml index 95ac84a88c2..fce6b85d90a 100644 --- a/ansible/testbed.yaml +++ b/ansible/testbed.yaml @@ -1,5 +1,35 @@ --- +- conf-name: 01-t0 + group-name: vms1-1 + topo: t0 + ptf_image_name: docker-ptf + ptf: ptf_vms1-1 + ptf_ip: 10.250.128.196/16 #todo(adovhan) set correct ip(ptf) + ptf_ipv6: + server: server_1 + vm_base: VM0100 + dut: + - dev-as7712-32x-01 + inv_name: lab + auto_recover: 'False' + comment: Hedgehog T0 topology as7712-32x-01 Testbed 01 + +- conf-name: 01-t1 + group-name: vms1-1 + topo: t1 + ptf_image_name: docker-ptf + ptf: ptf_vms1-1 + ptf_ip: 10.250.128.196/16 #todo(adovhan) set correct ip(ptf) + ptf_ipv6: + server: server_1 + vm_base: VM0100 + dut: + - dev-as7712-32x-01 + inv_name: lab + auto_recover: 'False' + comment: Hedgehog T1 topology as7712-32x-01 Testbed 01 + - conf-name: ptf1-m group-name: ptf1 topo: ptf32 diff --git a/ansible/veos b/ansible/veos index 8574ece4655..341aad339a6 100644 --- a/ansible/veos +++ b/ansible/veos @@ -46,11 +46,23 @@ all: children: server_1: server_2: + sonic: + vars: + mgmt_subnet_mask_length: 24 + ansible_connection: multi_passwd_ssh + ansible_altpassword: YourPaSsWoRd + hosts: + dev-as7712-32x-01: + ansible_host: 192.168.88.105 + type: DUT + hwsku: Accton-AS7712-32X + ansible_password: YourPaSsWoRd + ansible_user: admin vm_host_1: hosts: STR-ACS-SERV-01: - ansible_host: 10.251.0.245 + ansible_host: 192.168.88.21 vm_host_2: hosts: From 85a86330db693bb8c74fe6015607de6367c0a4e0 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Tue, 28 Mar 2023 15:21:55 +0300 Subject: [PATCH 02/16] fix testServer name --- ansible/files/sonic_lab_devices.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/files/sonic_lab_devices.csv b/ansible/files/sonic_lab_devices.csv index 9ab584e0aae..e49815febc6 100644 --- a/ansible/files/sonic_lab_devices.csv +++ b/ansible/files/sonic_lab_devices.csv @@ -1,5 +1,5 @@ Hostname,ManagementIp,HwSku,Type,Protocol -dev-acs-serv-01,192.168.88.21/24,TestServ,Server, # create new file, the same as ansible/host_vars/STR-ACS-SERV-01.yml +str-acs-serv-01,192.168.88.21/24,TestServ,Server, # create new file, the same as ansible/host_vars/STR-ACS-SERV-01.yml # dev-sn2700,,Mellanox-SN2700,FanoutRoot, dev-sn2700-01,192.168.88.246/24,Mellanox-SN2700,FanoutLeaf, dev-as7712-32x-01,192.168.88.105/24,Accton-AS7712-32X,DevSonic, From 50d402c333df38daa2650cec9110b53f7ef3a174 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Tue, 28 Mar 2023 16:32:50 +0300 Subject: [PATCH 03/16] add link connection --- ansible/files/lab_connection_graph.xml | 160 +++++++++--------- ansible/files/sonic_lab_devices.csv | 1 + ansible/files/sonic_lab_links.csv | 69 ++++---- ansible/testbed-new.yaml | 222 +++++++++++++++++++++++-- 4 files changed, 315 insertions(+), 137 deletions(-) diff --git a/ansible/files/lab_connection_graph.xml b/ansible/files/lab_connection_graph.xml index 014ae1f539b..b58c1e9811c 100644 --- a/ansible/files/lab_connection_graph.xml +++ b/ansible/files/lab_connection_graph.xml @@ -1,98 +1,90 @@ - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + diff --git a/ansible/files/sonic_lab_devices.csv b/ansible/files/sonic_lab_devices.csv index e49815febc6..6723e92c159 100644 --- a/ansible/files/sonic_lab_devices.csv +++ b/ansible/files/sonic_lab_devices.csv @@ -12,3 +12,4 @@ dev-as7712-32x-01,192.168.88.105/24,Accton-AS7712-32X,DevSonic, # pdu-1,192.168.9.2,Apc,Pdu,snmp # pdu-2,192.168.9.3,Sentry,Pdu,snmp # console-1,192.168.10.1,Cisco,ConsoleServer,ssh +portname="Eth1/ \ No newline at end of file diff --git a/ansible/files/sonic_lab_links.csv b/ansible/files/sonic_lab_links.csv index 7c1d5661e18..ec78d46985e 100644 --- a/ansible/files/sonic_lab_links.csv +++ b/ansible/files/sonic_lab_links.csv @@ -1,36 +1,35 @@ StartDevice,StartPort,EndDevice,EndPort,BandWidth,VlanID,VlanMode -dev-msn2700-01,Ethernet0,dev-7260-10,Ethernet1,40000,1681,Access -dev-msn2700-01,Ethernet4,dev-7260-10,Ethernet2,40000,1682,Access -dev-msn2700-01,Ethernet8,dev-7260-10,Ethernet3,40000,1683,Access -dev-msn2700-01,Ethernet12,dev-7260-10,Ethernet4,40000,1684,Access -dev-msn2700-01,Ethernet16,dev-7260-10,Ethernet5,40000,1685,Access -dev-msn2700-01,Ethernet20,dev-7260-10,Ethernet6,40000,1686,Access -dev-msn2700-01,Ethernet24,dev-7260-10,Ethernet7,40000,1687,Access -dev-msn2700-01,Ethernet28,dev-7260-10,Ethernet8,40000,1688,Access -dev-msn2700-01,Ethernet32,dev-7260-10,Ethernet9,40000,1689,Access -dev-msn2700-01,Ethernet36,dev-7260-10,Ethernet10,40000,1690,Access -dev-msn2700-01,Ethernet40,dev-7260-10,Ethernet11,40000,1691,Access -dev-msn2700-01,Ethernet44,dev-7260-10,Ethernet12,40000,1692,Access -dev-msn2700-01,Ethernet48,dev-7260-10,Ethernet13,40000,1693,Access -dev-msn2700-01,Ethernet52,dev-7260-10,Ethernet14,40000,1694,Access -dev-msn2700-01,Ethernet56,dev-7260-10,Ethernet15,40000,1695,Access -dev-msn2700-01,Ethernet60,dev-7260-10,Ethernet16,40000,1696,Access -dev-msn2700-01,Ethernet64,dev-7260-10,Ethernet17,40000,1697,Access -dev-msn2700-01,Ethernet68,dev-7260-10,Ethernet18,40000,1698,Access -dev-msn2700-01,Ethernet72,dev-7260-10,Ethernet19,40000,1699,Access -dev-msn2700-01,Ethernet76,dev-7260-10,Ethernet20,40000,1700,Access -dev-msn2700-01,Ethernet80,dev-7260-10,Ethernet21,40000,1701,Access -dev-msn2700-01,Ethernet84,dev-7260-10,Ethernet22,40000,1702,Access -dev-msn2700-01,Ethernet88,dev-7260-10,Ethernet23,40000,1703,Access -dev-msn2700-01,Ethernet92,dev-7260-10,Ethernet24,40000,1704,Access -dev-msn2700-01,Ethernet96,dev-7260-10,Ethernet25,40000,1705,Access -dev-msn2700-01,Ethernet100,dev-7260-10,Ethernet26,40000,1706,Access -dev-msn2700-01,Ethernet104,dev-7260-10,Ethernet27,40000,1707,Access -dev-msn2700-01,Ethernet108,dev-7260-10,Ethernet28,40000,1708,Access -dev-msn2700-01,Ethernet112,dev-7260-10,Ethernet29,40000,1709,Access -dev-msn2700-01,Ethernet116,dev-7260-10,Ethernet30,40000,1710,Access -dev-msn2700-01,Ethernet120,dev-7260-10,Ethernet31,40000,1711,Access -dev-msn2700-01,Ethernet124,dev-7260-10,Ethernet32,40000,1712,Access -dev-7260-11,Ethernet19,dev-acs-serv-01,p4p1,40000,,Trunk -dev-7260-11,Ethernet30,dev-7260-10,Ethernet64,40000,1681-1712,Trunk -#todo(adovhan) add links (dut,fanout) +dev-as7712-32x-01,Ethernet0,dev-sn2700-01,Eth1/9/1,10000,1681,Access +dev-as7712-32x-01,Ethernet4,dev-sn2700-01,Eth1/9/2,10000,1682,Access +dev-as7712-32x-01,Ethernet8,dev-sn2700-01,Eth1/9/3,10000,1683,Access +dev-as7712-32x-01,Ethernet12,dev-sn2700-01,Eth1/9/4,10000,1684,Access +dev-as7712-32x-01,Ethernet16,dev-sn2700-01,Eth1/11/1,10000,1685,Access +dev-as7712-32x-01,Ethernet20,dev-sn2700-01,Eth1/11/2,10000,1686,Access +dev-as7712-32x-01,Ethernet24,dev-sn2700-01,Eth1/11/3,10000,1687,Access +dev-as7712-32x-01,Ethernet28,dev-sn2700-01,Eth1/11/4,10000,1688,Access +dev-as7712-32x-01,Ethernet32,dev-sn2700-01,Eth1/13/1,10000,1689,Access +dev-as7712-32x-01,Ethernet36,dev-sn2700-01,Eth1/13/2,10000,1690,Access +dev-as7712-32x-01,Ethernet40,dev-sn2700-01,Eth1/13/3,10000,1691,Access +dev-as7712-32x-01,Ethernet44,dev-sn2700-01,Eth1/13/4,10000,1692,Access +dev-as7712-32x-01,Ethernet48,dev-sn2700-01,Eth1/15/1,10000,1693,Access +dev-as7712-32x-01,Ethernet52,dev-sn2700-01,Eth1/15/2,10000,1694,Access +dev-as7712-32x-01,Ethernet56,dev-sn2700-01,Eth1/15/3,10000,1695,Access +dev-as7712-32x-01,Ethernet60,dev-sn2700-01,Eth1/15/4,10000,1696,Access +dev-as7712-32x-01,Ethernet64,dev-sn2700-01,Eth1/17/1,10000,1697,Access +dev-as7712-32x-01,Ethernet68,dev-sn2700-01,Eth1/17/2,10000,1698,Access +dev-as7712-32x-01,Ethernet72,dev-sn2700-01,Eth1/17/3,10000,1699,Access +dev-as7712-32x-01,Ethernet76,dev-sn2700-01,Eth1/17/4,10000,1700,Access +dev-as7712-32x-01,Ethernet80,dev-sn2700-01,Eth1/19/1,10000,1701,Access +dev-as7712-32x-01,Ethernet84,dev-sn2700-01,Eth1/19/2,10000,1702,Access +dev-as7712-32x-01,Ethernet88,dev-sn2700-01,Eth1/19/3,10000,1703,Access +dev-as7712-32x-01,Ethernet92,dev-sn2700-01,Eth1/19/4,10000,1704,Access +dev-as7712-32x-01,Ethernet96,dev-sn2700-01,Eth1/21/1,10000,1705,Access +dev-as7712-32x-01,Ethernet100,dev-sn2700-01,Eth1/21/2,10000,1706,Access +dev-as7712-32x-01,Ethernet104,dev-sn2700-01,Eth1/21/3,10000,1707,Access +dev-as7712-32x-01,Ethernet108,dev-sn2700-01,Eth1/21/4,10000,1708,Access +dev-as7712-32x-01,Ethernet112,dev-sn2700-01,Eth1/23/1,10000,1709,Access +dev-as7712-32x-01,Ethernet116,dev-sn2700-01,Eth1/23/2,10000,1710,Access +dev-as7712-32x-01,Ethernet120,dev-sn2700-01,Eth1/23/3,10000,1711,Access +dev-as7712-32x-01,Ethernet124,dev-sn2700-01,Eth1/23/4,10000,1712,Access +dev-sn2700-01,Eth1/31,str-acs-serv-01,p4p1,40000,1681-1712,Trunk # Eth1/31? +#todo(adovhan) add links (dut,fanout) p4p1 / Eth1/31 ? \ No newline at end of file diff --git a/ansible/testbed-new.yaml b/ansible/testbed-new.yaml index 7813bb01d7c..c7136604d40 100644 --- a/ansible/testbed-new.yaml +++ b/ansible/testbed-new.yaml @@ -587,24 +587,210 @@ testbed: # topology dictionary does not cross reference with other files topology: # source: sonic-mgmt/ansible/files/sonic_lab_links.csv # todo(adovhan) add links (dut, fanout) -# dev-as7712-32x-01: # source: sonic-mgmt/ansible/files/sonic_lab_links.csv # ports that goes to TESTBED SERVER -# interfaces: # DUT/ start device -# Ethernet4: -# EndDevice: dev-sn2700-01 -# EndPort: Ethernet1/2/1 -# Bandwidth: 10000 -# VlanID: 1681 -# VlanMode: Access -# -# -# dev-sn2700-01: # source: sonic-mgmt/ansible/files/sonic_lab_links.csv -# interfaces: # DUT/ start device -# Ethernet1/1: -# EndDevice: str-acs-serv-01 -# EndPort: eno2 -# Bandwidth: 10000 -# VlanID: 1681-1712 -# VlanMode: Trunk + dev-as7712-32x-01: # source: sonic-mgmt/ansible/files/sonic_lab_links.csv # ports that goes to TESTBED SERVER + interfaces: # DUT/ start device + Ethernet0: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/9/1 + Bandwidth: 10000 + VlanID: 1681 + VlanMode: Access + Ethernet4: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/9/2 + Bandwidth: 10000 + VlanID: 1682 + VlanMode: Access + Ethernet8: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/9/3 + Bandwidth: 10000 + VlanID: 1683 + VlanMode: Access + Ethernet12: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/9/4 + Bandwidth: 10000 + VlanID: 1684 + VlanMode: Access + Ethernet16: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/11/1 + Bandwidth: 10000 + VlanID: 1685 + VlanMode: Access + Ethernet20: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/11/2 + Bandwidth: 10000 + VlanID: 1686 + VlanMode: Access + Ethernet24: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/11/3 + Bandwidth: 10000 + VlanID: 1687 + VlanMode: Access + Ethernet28: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/11/4 + Bandwidth: 10000 + VlanID: 1688 + VlanMode: Access + Ethernet32: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/13/1 + Bandwidth: 10000 + VlanID: 1689 + VlanMode: Access + Ethernet36: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/13/2 + Bandwidth: 10000 + VlanID: 1690 + VlanMode: Access + Ethernet40: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/13/3 + Bandwidth: 10000 + VlanID: 1691 + VlanMode: Access + Ethernet44: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/13/4 + Bandwidth: 10000 + VlanID: 1692 + VlanMode: Access + Ethernet48: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/15/1 + Bandwidth: 10000 + VlanID: 1693 + VlanMode: Access + Ethernet52: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/15/2 + Bandwidth: 10000 + VlanID: 1694 + VlanMode: Access + Ethernet56: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/15/3 + Bandwidth: 10000 + VlanID: 1695 + VlanMode: Access + Ethernet60: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/15/4 + Bandwidth: 10000 + VlanID: 1696 + VlanMode: Access + Ethernet64: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/17/1 + Bandwidth: 10000 + VlanID: 1697 + VlanMode: Access + Ethernet68: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/17/2 + Bandwidth: 10000 + VlanID: 1698 + VlanMode: Access + Ethernet72: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/17/3 + Bandwidth: 10000 + VlanID: 1699 + VlanMode: Access + Ethernet76: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/17/4 + Bandwidth: 10000 + VlanID: 1700 + VlanMode: Access + Ethernet80: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/19/1 + Bandwidth: 10000 + VlanID: 1701 + VlanMode: Access + Ethernet84: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/19/2 + Bandwidth: 10000 + VlanID: 1702 + VlanMode: Access + Ethernet88: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/19/3 + Bandwidth: 10000 + VlanID: 1703 + VlanMode: Access + Ethernet92: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/19/4 + Bandwidth: 10000 + VlanID: 1704 + VlanMode: Access + Ethernet96: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/21/1 + Bandwidth: 10000 + VlanID: 1705 + VlanMode: Access + Ethernet100: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/21/2 + Bandwidth: 10000 + VlanID: 1706 + VlanMode: Access + Ethernet104: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/21/3 + Bandwidth: 10000 + VlanID: 1707 + VlanMode: Access + Ethernet108: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/21/4 + Bandwidth: 10000 + VlanID: 1708 + VlanMode: Access + Ethernet112: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/23/1 + Bandwidth: 10000 + VlanID: 1709 + VlanMode: Access + Ethernet116: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/23/2 + Bandwidth: 10000 + VlanID: 1710 + VlanMode: Access + Ethernet120: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/23/3 + Bandwidth: 10000 + VlanID: 1711 + VlanMode: Access + Ethernet124: + EndDevice: dev-sn2700-01 + EndPort: Ethernet1/23/4 + Bandwidth: 10000 + VlanID: 1712 + VlanMode: Access + + dev-sn2700-01: # source: sonic-mgmt/ansible/files/sonic_lab_links.csv + interfaces: # DUT/ start device + Eth1/31: + EndDevice: str-acs-serv-01 + EndPort: eno2 # todo(adovhan) set correct interface eno2 / Eth1/31 + Bandwidth: 10000 + VlanID: 1681-1712 + VlanMode: Trunk + str-msn2700-01: # source: sonic-mgmt/ansible/files/sonic_lab_links.csv interfaces: # DUT/ start device Ethernet0: From 7c10fe20aacaadd60ac9a25a63937fcfa7c4435e Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Tue, 28 Mar 2023 18:13:32 +0300 Subject: [PATCH 04/16] fix link testServer<->fanout --- ansible/files/lab_connection_graph.xml | 3 +-- ansible/files/sonic_lab_links.csv | 3 +-- ansible/host_vars/STR-ACS-SERV-01.yml | 2 +- ansible/testbed-new.yaml | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ansible/files/lab_connection_graph.xml b/ansible/files/lab_connection_graph.xml index b58c1e9811c..2754d197f64 100644 --- a/ansible/files/lab_connection_graph.xml +++ b/ansible/files/lab_connection_graph.xml @@ -38,8 +38,7 @@ - - + diff --git a/ansible/files/sonic_lab_links.csv b/ansible/files/sonic_lab_links.csv index ec78d46985e..2731d809db6 100644 --- a/ansible/files/sonic_lab_links.csv +++ b/ansible/files/sonic_lab_links.csv @@ -31,5 +31,4 @@ dev-as7712-32x-01,Ethernet112,dev-sn2700-01,Eth1/23/1,10000,1709,Access dev-as7712-32x-01,Ethernet116,dev-sn2700-01,Eth1/23/2,10000,1710,Access dev-as7712-32x-01,Ethernet120,dev-sn2700-01,Eth1/23/3,10000,1711,Access dev-as7712-32x-01,Ethernet124,dev-sn2700-01,Eth1/23/4,10000,1712,Access -dev-sn2700-01,Eth1/31,str-acs-serv-01,p4p1,40000,1681-1712,Trunk # Eth1/31? -#todo(adovhan) add links (dut,fanout) p4p1 / Eth1/31 ? \ No newline at end of file +dev-sn2700-01,Eth1/32/1,str-acs-serv-01,ens3f1,40000,1681-1712,Trunk diff --git a/ansible/host_vars/STR-ACS-SERV-01.yml b/ansible/host_vars/STR-ACS-SERV-01.yml index 98139ce10d2..6b454c5df04 100644 --- a/ansible/host_vars/STR-ACS-SERV-01.yml +++ b/ansible/host_vars/STR-ACS-SERV-01.yml @@ -3,5 +3,5 @@ mgmt_prefixlen: 23 mgmt_gw: 10.255.0.1 todo(adovhan) set correct ip mgmt_gw_v6: fec0::1 #vm_mgmt_gw: 10.254.0.1 -external_port: p4p1 +external_port: ens3f1 diff --git a/ansible/testbed-new.yaml b/ansible/testbed-new.yaml index c7136604d40..16b896dffbc 100644 --- a/ansible/testbed-new.yaml +++ b/ansible/testbed-new.yaml @@ -784,9 +784,9 @@ topology: # source: sonic-mgmt/ansible/files/sonic dev-sn2700-01: # source: sonic-mgmt/ansible/files/sonic_lab_links.csv interfaces: # DUT/ start device - Eth1/31: + Eth1/32/1: EndDevice: str-acs-serv-01 - EndPort: eno2 # todo(adovhan) set correct interface eno2 / Eth1/31 + EndPort: ens3f1 Bandwidth: 10000 VlanID: 1681-1712 VlanMode: Trunk From daf758070fb59d169adf1878721759f4383c4467 Mon Sep 17 00:00:00 2001 From: Maksym Hedeon Date: Thu, 30 Mar 2023 10:17:33 +0300 Subject: [PATCH 05/16] testbed config Signed-off-by: Maksym Hedeon --- ansible/fanout_connect.yml | 2 +- ansible/files/sonic_lab_devices.csv | 4 ++-- ansible/group_vars/lab/lab.yml | 2 +- ansible/group_vars/vm_host/creds.yml | 12 ++++++------ ansible/host_vars/STR-ACS-SERV-01.yml | 5 ++--- ansible/lab | 4 ++-- ansible/roles/vm_set/tasks/main.yml | 4 ++-- ansible/setup-management-network.sh | 4 ++-- ansible/testbed-new.yaml | 4 ++-- ansible/veos | 2 +- ansible/veos_vtb | 6 +++--- setup-container.sh | 9 +++++---- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ansible/fanout_connect.yml b/ansible/fanout_connect.yml index 07d36951b4a..ced46b413a0 100644 --- a/ansible/fanout_connect.yml +++ b/ansible/fanout_connect.yml @@ -12,7 +12,7 @@ server: "{{ inventory_hostname|lower }}" server_port: "{{ external_port }}" - - set_fact: root_fanout_connect=true + - set_fact: root_fanout_connect=false when: root_fanout_connect is not defined - debug: msg="Connect {{ server }}:{{ server_port }} to {{ dut }}" diff --git a/ansible/files/sonic_lab_devices.csv b/ansible/files/sonic_lab_devices.csv index 6723e92c159..1d0d4ba39aa 100644 --- a/ansible/files/sonic_lab_devices.csv +++ b/ansible/files/sonic_lab_devices.csv @@ -1,5 +1,5 @@ Hostname,ManagementIp,HwSku,Type,Protocol -str-acs-serv-01,192.168.88.21/24,TestServ,Server, # create new file, the same as ansible/host_vars/STR-ACS-SERV-01.yml +str-acs-serv-01,10.250.0.1/16,TestServ,Server, # dev-sn2700,,Mellanox-SN2700,FanoutRoot, dev-sn2700-01,192.168.88.246/24,Mellanox-SN2700,FanoutLeaf, dev-as7712-32x-01,192.168.88.105/24,Accton-AS7712-32X,DevSonic, @@ -12,4 +12,4 @@ dev-as7712-32x-01,192.168.88.105/24,Accton-AS7712-32X,DevSonic, # pdu-1,192.168.9.2,Apc,Pdu,snmp # pdu-2,192.168.9.3,Sentry,Pdu,snmp # console-1,192.168.10.1,Cisco,ConsoleServer,ssh -portname="Eth1/ \ No newline at end of file +# portname="Eth1/ \ No newline at end of file diff --git a/ansible/group_vars/lab/lab.yml b/ansible/group_vars/lab/lab.yml index 49027256cb9..53bc9c3773f 100644 --- a/ansible/group_vars/lab/lab.yml +++ b/ansible/group_vars/lab/lab.yml @@ -42,7 +42,7 @@ snmp_rocommunity: public snmp_location: testlab # bgp slb passive range -bgp_slb_passive_range: 10.255.0.0/25 +bgp_slb_passive_range: 10.250.0.0/25 #For Arista fanout switch deployment only fanout_admin_user: "fanoutadminuser" diff --git a/ansible/group_vars/vm_host/creds.yml b/ansible/group_vars/vm_host/creds.yml index 5154b2659b5..c2f5f865341 100644 --- a/ansible/group_vars/vm_host/creds.yml +++ b/ansible/group_vars/vm_host/creds.yml @@ -1,11 +1,11 @@ --- #todo(adovhan) set correct creds -ansible_user: use_own_value -ansible_password: use_own_value -ansible_become_password: use_own_value +ansible_user: hhtestbed +ansible_password: HH.Labs +ansible_become_password: HH.Labs # Use the following username/password variables to login to vm hosts # instead of the default variables (defined above). -vm_host_user: hedgehog -vm_host_password: githedgehog -vm_host_become_password: githedgehog +vm_host_user: hhtestbed +vm_host_password: HH.Labs +vm_host_become_password: HH.Labs diff --git a/ansible/host_vars/STR-ACS-SERV-01.yml b/ansible/host_vars/STR-ACS-SERV-01.yml index 6b454c5df04..f23c71f1677 100644 --- a/ansible/host_vars/STR-ACS-SERV-01.yml +++ b/ansible/host_vars/STR-ACS-SERV-01.yml @@ -1,7 +1,6 @@ mgmt_bridge: br1 -mgmt_prefixlen: 23 -mgmt_gw: 10.255.0.1 todo(adovhan) set correct ip +mgmt_prefixlen: 16 +mgmt_gw: 10.250.0.1 mgmt_gw_v6: fec0::1 #vm_mgmt_gw: 10.254.0.1 external_port: ens3f1 - diff --git a/ansible/lab b/ansible/lab index 8280e75fc4e..fdc0a356c83 100644 --- a/ansible/lab +++ b/ansible/lab @@ -13,8 +13,8 @@ all: ansible_host: 192.168.88.246 ptf: hosts: - ptf_vms1-1: todo(adovhan) set correct ip - ansible_host: 10.255.0.196 + ptf_vms1-1: + ansible_host: 10.250.0.196 ansible_ssh_user: root ansible_ssh_pass: root diff --git a/ansible/roles/vm_set/tasks/main.yml b/ansible/roles/vm_set/tasks/main.yml index 5783f4d3fef..d5b4647a834 100644 --- a/ansible/roles/vm_set/tasks/main.yml +++ b/ansible/roles/vm_set/tasks/main.yml @@ -116,8 +116,8 @@ environment: "{{ proxy_env | default({}) }}" ignore_errors: yes -- include_tasks: docker.yml - when: package_installation|bool +# - include_tasks: docker.yml +# when: package_installation|bool - name: Ensure {{ ansible_user }} in docker,sudo group user: diff --git a/ansible/setup-management-network.sh b/ansible/setup-management-network.sh index a4825a15a80..8428c5e79ff 100755 --- a/ansible/setup-management-network.sh +++ b/ansible/setup-management-network.sh @@ -50,9 +50,9 @@ fi echo echo "STEP 6: Configuring br1 interface..." -echo "Assigning 10.250.0.1/24 to br1" +echo "Assigning 10.250.0.1/16 to br1" # todo(adovhan) set correct ip -ifconfig br1 10.250.0.1/24 +ifconfig br1 10.250.0.1/16 ifconfig br1 inet6 add fec0::1/64 echo "Bringing up br1" ifconfig br1 up diff --git a/ansible/testbed-new.yaml b/ansible/testbed-new.yaml index 16b896dffbc..52bbafbd094 100644 --- a/ansible/testbed-new.yaml +++ b/ansible/testbed-new.yaml @@ -178,7 +178,7 @@ devices: username: password: ansible: - ansible_host: 10.251.0.245/23 # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv # todo(adovhan) set correct ip (testServer) + ansible_host: 10.250.0.1/16 # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv # todo(adovhan) set correct ip (testServer) ansible_ssh_pass: password # source: sonic-mgmt/ansible/group_vars/lab/secrets.yml ansible_become_pass: password # source: sonic-mgmt/ansible/group_vars/lab/secrets.yml sonicadmin_user: admin # source: sonic-mgmt/ansible/group_vars/lab/secrets.yml @@ -251,7 +251,7 @@ devices: host_vars: str-acs-serv-01: mgmt_bridge: br1 # source: sonic-mgmt/host_vars - mgmt_prefixlen: 24 # source: sonic-mgmt/host_vars + mgmt_prefixlen: 16 # source: sonic-mgmt/host_vars mgmt_gw: 10.250.0.1 # source: sonic-mgmt/host_vars #todo(adovhan) set correct ip external_port: ens3f0 # source: sonic-mgmt/host_vars diff --git a/ansible/veos b/ansible/veos index 341aad339a6..ca2313e1aa0 100644 --- a/ansible/veos +++ b/ansible/veos @@ -62,7 +62,7 @@ all: vm_host_1: hosts: STR-ACS-SERV-01: - ansible_host: 192.168.88.21 + ansible_host: 10.250.0.1 vm_host_2: hosts: diff --git a/ansible/veos_vtb b/ansible/veos_vtb index 464325d5fef..a7d29063ca2 100644 --- a/ansible/veos_vtb +++ b/ansible/veos_vtb @@ -256,9 +256,9 @@ server_1: vm_host_1: hosts: STR-ACS-VSERV-01: - ansible_host: 172.17.0.1 - ansible_user: hedgehog - vm_host_user: hedgehog + ansible_host: 10.250.0.1 + ansible_user: hhtestbed + vm_host_user: hhtestbed vms_1: hosts: diff --git a/setup-container.sh b/setup-container.sh index 550f60cfe8c..f512b32dd3f 100755 --- a/setup-container.sh +++ b/setup-container.sh @@ -211,7 +211,8 @@ fi # Environment configuration, skip python virtual environments RUN if [ '{{ USER_NAME }}' != 'AzDevOps' ]; then \ /bin/bash -O extglob -c 'cp -a -f /var/AzDevOps/!(env-*) /home/{{ USER_NAME }}/'; \ -/bin/bash -c 'cp -a -f /var/AzDevOps/{.profile,.local,.ssh} /home/{{ USER_NAME }}/'; \ +for hidden_stuff in '.profile .local .ssh'; do \ +/bin/bash -c 'cp -a -f /var/AzDevOps/$hidden_stuff /home/{{ USER_NAME }}/ || true'; done \ fi # Permissions configuration @@ -251,9 +252,9 @@ fi # Install pyyaml, it used by hedgehog_test_runner.py. do not use env-python3, it is virt env for ptf container. RUN /usr/local/sbin/pip3 install pyyaml -# Download allurectl for uploading test result on 'testops' -RUN /usr/local/sbin/wget https://github.com/allure-framework/allurectl/releases/latest/download/allurectl_linux_386 -O /opt/allurectl -RUN chmod +x /opt/allurectl +# # Download allurectl for uploading test result on 'testops' +# RUN /usr/local/sbin/wget https://github.com/allure-framework/allurectl/releases/latest/download/allurectl_linux_386 -O /opt/allurectl +# RUN chmod +x /opt/allurectl EOF From d602dfa6466170d665088e623c56d891aa01b7a2 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Thu, 30 Mar 2023 10:33:46 +0300 Subject: [PATCH 06/16] fix interface/speed on fanout --- ansible/files/lab_connection_graph.xml | 132 ++++++++++++------------- ansible/files/sonic_lab_links.csv | 66 ++++++------- ansible/testbed-new.yaml | 118 +++++++++++----------- 3 files changed, 158 insertions(+), 158 deletions(-) diff --git a/ansible/files/lab_connection_graph.xml b/ansible/files/lab_connection_graph.xml index 2754d197f64..ed9b744414b 100644 --- a/ansible/files/lab_connection_graph.xml +++ b/ansible/files/lab_connection_graph.xml @@ -6,39 +6,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -49,39 +49,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ansible/files/sonic_lab_links.csv b/ansible/files/sonic_lab_links.csv index 2731d809db6..a42c8737e94 100644 --- a/ansible/files/sonic_lab_links.csv +++ b/ansible/files/sonic_lab_links.csv @@ -1,34 +1,34 @@ StartDevice,StartPort,EndDevice,EndPort,BandWidth,VlanID,VlanMode -dev-as7712-32x-01,Ethernet0,dev-sn2700-01,Eth1/9/1,10000,1681,Access -dev-as7712-32x-01,Ethernet4,dev-sn2700-01,Eth1/9/2,10000,1682,Access -dev-as7712-32x-01,Ethernet8,dev-sn2700-01,Eth1/9/3,10000,1683,Access -dev-as7712-32x-01,Ethernet12,dev-sn2700-01,Eth1/9/4,10000,1684,Access -dev-as7712-32x-01,Ethernet16,dev-sn2700-01,Eth1/11/1,10000,1685,Access -dev-as7712-32x-01,Ethernet20,dev-sn2700-01,Eth1/11/2,10000,1686,Access -dev-as7712-32x-01,Ethernet24,dev-sn2700-01,Eth1/11/3,10000,1687,Access -dev-as7712-32x-01,Ethernet28,dev-sn2700-01,Eth1/11/4,10000,1688,Access -dev-as7712-32x-01,Ethernet32,dev-sn2700-01,Eth1/13/1,10000,1689,Access -dev-as7712-32x-01,Ethernet36,dev-sn2700-01,Eth1/13/2,10000,1690,Access -dev-as7712-32x-01,Ethernet40,dev-sn2700-01,Eth1/13/3,10000,1691,Access -dev-as7712-32x-01,Ethernet44,dev-sn2700-01,Eth1/13/4,10000,1692,Access -dev-as7712-32x-01,Ethernet48,dev-sn2700-01,Eth1/15/1,10000,1693,Access -dev-as7712-32x-01,Ethernet52,dev-sn2700-01,Eth1/15/2,10000,1694,Access -dev-as7712-32x-01,Ethernet56,dev-sn2700-01,Eth1/15/3,10000,1695,Access -dev-as7712-32x-01,Ethernet60,dev-sn2700-01,Eth1/15/4,10000,1696,Access -dev-as7712-32x-01,Ethernet64,dev-sn2700-01,Eth1/17/1,10000,1697,Access -dev-as7712-32x-01,Ethernet68,dev-sn2700-01,Eth1/17/2,10000,1698,Access -dev-as7712-32x-01,Ethernet72,dev-sn2700-01,Eth1/17/3,10000,1699,Access -dev-as7712-32x-01,Ethernet76,dev-sn2700-01,Eth1/17/4,10000,1700,Access -dev-as7712-32x-01,Ethernet80,dev-sn2700-01,Eth1/19/1,10000,1701,Access -dev-as7712-32x-01,Ethernet84,dev-sn2700-01,Eth1/19/2,10000,1702,Access -dev-as7712-32x-01,Ethernet88,dev-sn2700-01,Eth1/19/3,10000,1703,Access -dev-as7712-32x-01,Ethernet92,dev-sn2700-01,Eth1/19/4,10000,1704,Access -dev-as7712-32x-01,Ethernet96,dev-sn2700-01,Eth1/21/1,10000,1705,Access -dev-as7712-32x-01,Ethernet100,dev-sn2700-01,Eth1/21/2,10000,1706,Access -dev-as7712-32x-01,Ethernet104,dev-sn2700-01,Eth1/21/3,10000,1707,Access -dev-as7712-32x-01,Ethernet108,dev-sn2700-01,Eth1/21/4,10000,1708,Access -dev-as7712-32x-01,Ethernet112,dev-sn2700-01,Eth1/23/1,10000,1709,Access -dev-as7712-32x-01,Ethernet116,dev-sn2700-01,Eth1/23/2,10000,1710,Access -dev-as7712-32x-01,Ethernet120,dev-sn2700-01,Eth1/23/3,10000,1711,Access -dev-as7712-32x-01,Ethernet124,dev-sn2700-01,Eth1/23/4,10000,1712,Access -dev-sn2700-01,Eth1/32/1,str-acs-serv-01,ens3f1,40000,1681-1712,Trunk +dev-as7712-32x-01,Ethernet0,dev-sn2700-01,Eth1/1,100000,1681,Access +dev-as7712-32x-01,Ethernet4,dev-sn2700-01,Eth1/2,100000,1682,Access +dev-as7712-32x-01,Ethernet8,dev-sn2700-01,Eth1/3,100000,1683,Access +dev-as7712-32x-01,Ethernet12,dev-sn2700-01,Eth1/4,100000,1684,Access +dev-as7712-32x-01,Ethernet16,dev-sn2700-01,Eth1/5,100000,1685,Access +dev-as7712-32x-01,Ethernet20,dev-sn2700-01,Eth1/6,100000,1686,Access +dev-as7712-32x-01,Ethernet24,dev-sn2700-01,Eth1/7,100000,1687,Access +dev-as7712-32x-01,Ethernet28,dev-sn2700-01,Eth1/8,100000,1688,Access +dev-as7712-32x-01,Ethernet32,dev-sn2700-01,Eth1/9,100000,1689,Access +dev-as7712-32x-01,Ethernet36,dev-sn2700-01,Eth1/10,100000,1690,Access +dev-as7712-32x-01,Ethernet40,dev-sn2700-01,Eth1/11,100000,1691,Access +dev-as7712-32x-01,Ethernet44,dev-sn2700-01,Eth1/12,100000,1692,Access +dev-as7712-32x-01,Ethernet48,dev-sn2700-01,Eth1/13,100000,1693,Access +dev-as7712-32x-01,Ethernet52,dev-sn2700-01,Eth1/14,100000,1694,Access +dev-as7712-32x-01,Ethernet56,dev-sn2700-01,Eth1/15,100000,1695,Access +dev-as7712-32x-01,Ethernet60,dev-sn2700-01,Eth1/16,100000,1696,Access +dev-as7712-32x-01,Ethernet64,dev-sn2700-01,Eth1/17,100000,1697,Access +dev-as7712-32x-01,Ethernet68,dev-sn2700-01,Eth1/18,100000,1698,Access +dev-as7712-32x-01,Ethernet72,dev-sn2700-01,Eth1/19,100000,1699,Access +dev-as7712-32x-01,Ethernet76,dev-sn2700-01,Eth1/20,100000,1700,Access +dev-as7712-32x-01,Ethernet80,dev-sn2700-01,Eth1/21,100000,1701,Access +dev-as7712-32x-01,Ethernet84,dev-sn2700-01,Eth1/22,100000,1702,Access +dev-as7712-32x-01,Ethernet88,dev-sn2700-01,Eth1/23,100000,1703,Access +dev-as7712-32x-01,Ethernet92,dev-sn2700-01,Eth1/24,100000,1704,Access +dev-as7712-32x-01,Ethernet96,dev-sn2700-01,Eth1/25,100000,1705,Access +dev-as7712-32x-01,Ethernet100,dev-sn2700-01,Eth1/26,100000,1706,Access +dev-as7712-32x-01,Ethernet104,dev-sn2700-01,Eth1/27,100000,1707,Access +dev-as7712-32x-01,Ethernet108,dev-sn2700-01,Eth1/28,100000,1708,Access +dev-as7712-32x-01,Ethernet112,dev-sn2700-01,Eth1/29,100000,1709,Access +dev-as7712-32x-01,Ethernet116,dev-sn2700-01,Eth1/30,100000,1710,Access +dev-as7712-32x-01,Ethernet120,dev-sn2700-01,Eth1/31,100000,1711,Access +dev-as7712-32x-01,Ethernet124,dev-sn2700-01,Eth1/32/2,25000,1712,Access +dev-sn2700-01,Eth1/32/1,str-acs-serv-01,ens3f1,25000,1681-1712,Trunk diff --git a/ansible/testbed-new.yaml b/ansible/testbed-new.yaml index 52bbafbd094..3a6cfe33bf1 100644 --- a/ansible/testbed-new.yaml +++ b/ansible/testbed-new.yaml @@ -591,194 +591,194 @@ topology: # source: sonic-mgmt/ansible/files/sonic interfaces: # DUT/ start device Ethernet0: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/9/1 - Bandwidth: 10000 + EndPort: Ethernet1/1 + Bandwidth: 100000 VlanID: 1681 VlanMode: Access Ethernet4: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/9/2 - Bandwidth: 10000 + EndPort: Ethernet1/2 + Bandwidth: 100000 VlanID: 1682 VlanMode: Access Ethernet8: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/9/3 - Bandwidth: 10000 + EndPort: Ethernet1/3 + Bandwidth: 100000 VlanID: 1683 VlanMode: Access Ethernet12: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/9/4 - Bandwidth: 10000 + EndPort: Ethernet1/4 + Bandwidth: 100000 VlanID: 1684 VlanMode: Access Ethernet16: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/11/1 - Bandwidth: 10000 + EndPort: Ethernet1/5 + Bandwidth: 100000 VlanID: 1685 VlanMode: Access Ethernet20: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/11/2 - Bandwidth: 10000 + EndPort: Ethernet1/6 + Bandwidth: 100000 VlanID: 1686 VlanMode: Access Ethernet24: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/11/3 - Bandwidth: 10000 + EndPort: Ethernet1/7 + Bandwidth: 100000 VlanID: 1687 VlanMode: Access Ethernet28: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/11/4 - Bandwidth: 10000 + EndPort: Ethernet1/8 + Bandwidth: 100000 VlanID: 1688 VlanMode: Access Ethernet32: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/13/1 - Bandwidth: 10000 + EndPort: Ethernet1/9 + Bandwidth: 100000 VlanID: 1689 VlanMode: Access Ethernet36: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/13/2 + EndPort: Ethernet1/10 Bandwidth: 10000 VlanID: 1690 VlanMode: Access Ethernet40: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/13/3 - Bandwidth: 10000 + EndPort: Ethernet1/11 + Bandwidth: 100000 VlanID: 1691 VlanMode: Access Ethernet44: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/13/4 + EndPort: Ethernet1/12 Bandwidth: 10000 VlanID: 1692 VlanMode: Access Ethernet48: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/15/1 + EndPort: Ethernet1/13 Bandwidth: 10000 VlanID: 1693 VlanMode: Access Ethernet52: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/15/2 + EndPort: Ethernet1/14 Bandwidth: 10000 VlanID: 1694 VlanMode: Access Ethernet56: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/15/3 - Bandwidth: 10000 + EndPort: Ethernet1/15 + Bandwidth: 100000 VlanID: 1695 VlanMode: Access Ethernet60: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/15/4 - Bandwidth: 10000 + EndPort: Ethernet1/16 + Bandwidth: 100000 VlanID: 1696 VlanMode: Access Ethernet64: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/17/1 - Bandwidth: 10000 + EndPort: Ethernet1/17 + Bandwidth: 100000 VlanID: 1697 VlanMode: Access Ethernet68: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/17/2 - Bandwidth: 10000 + EndPort: Ethernet1/18 + Bandwidth: 100000 VlanID: 1698 VlanMode: Access Ethernet72: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/17/3 - Bandwidth: 10000 + EndPort: Ethernet1/19 + Bandwidth: 100000 VlanID: 1699 VlanMode: Access Ethernet76: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/17/4 - Bandwidth: 10000 + EndPort: Ethernet1/20 + Bandwidth: 100000 VlanID: 1700 VlanMode: Access Ethernet80: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/19/1 - Bandwidth: 10000 + EndPort: Ethernet1/21 + Bandwidth: 100000 VlanID: 1701 VlanMode: Access Ethernet84: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/19/2 - Bandwidth: 10000 + EndPort: Ethernet1/22 + Bandwidth: 100000 VlanID: 1702 VlanMode: Access Ethernet88: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/19/3 - Bandwidth: 10000 + EndPort: Ethernet1/23 + Bandwidth: 100000 VlanID: 1703 VlanMode: Access Ethernet92: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/19/4 + EndPort: Ethernet1/24 Bandwidth: 10000 VlanID: 1704 VlanMode: Access Ethernet96: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/21/1 - Bandwidth: 10000 + EndPort: Ethernet1/25 + Bandwidth: 100000 VlanID: 1705 VlanMode: Access Ethernet100: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/21/2 - Bandwidth: 10000 + EndPort: Ethernet1/26 + Bandwidth: 100000 VlanID: 1706 VlanMode: Access Ethernet104: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/21/3 - Bandwidth: 10000 + EndPort: Ethernet1/27 + Bandwidth: 100000 VlanID: 1707 VlanMode: Access Ethernet108: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/21/4 - Bandwidth: 10000 + EndPort: Ethernet1/28 + Bandwidth: 100000 VlanID: 1708 VlanMode: Access Ethernet112: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/23/1 + EndPort: Ethernet1/29 Bandwidth: 10000 VlanID: 1709 VlanMode: Access Ethernet116: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/23/2 - Bandwidth: 10000 + EndPort: Ethernet1/30 + Bandwidth: 100000 VlanID: 1710 VlanMode: Access Ethernet120: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/23/3 - Bandwidth: 10000 + EndPort: Ethernet1/31 + Bandwidth: 100000 VlanID: 1711 VlanMode: Access Ethernet124: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/23/4 - Bandwidth: 10000 + EndPort: Ethernet1/32/2 + Bandwidth: 25000 VlanID: 1712 VlanMode: Access @@ -787,7 +787,7 @@ topology: # source: sonic-mgmt/ansible/files/sonic Eth1/32/1: EndDevice: str-acs-serv-01 EndPort: ens3f1 - Bandwidth: 10000 + Bandwidth: 25000 VlanID: 1681-1712 VlanMode: Trunk From 2ae1adb28adec1029b6f251b502b476fb0174803 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Tue, 4 Apr 2023 13:14:28 +0300 Subject: [PATCH 07/16] commit missed changes --- ansible/group_vars/lab/secrets.yml | 9 ++++----- ansible/lab | 2 +- ansible/testbed-new.yaml | 12 ++++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/ansible/group_vars/lab/secrets.yml b/ansible/group_vars/lab/secrets.yml index ea023893606..f08c5c6a955 100644 --- a/ansible/group_vars/lab/secrets.yml +++ b/ansible/group_vars/lab/secrets.yml @@ -1,9 +1,8 @@ -ansible_ssh_pass: password -ansible_become_pass: password -#todo(adovhan) set correct creds +ansible_ssh_pass: YourPaSsWoRd +ansible_become_pass: YourPaSsWoRd sonicadmin_user: admin -sonicadmin_password: password -sonicadmin_initial_password: password +sonicadmin_password: YourPaSsWoRd +sonicadmin_initial_password: YourPaSsWoRd console_login: console_telnet: diff --git a/ansible/lab b/ansible/lab index fdc0a356c83..d6d6e9b9967 100644 --- a/ansible/lab +++ b/ansible/lab @@ -14,7 +14,7 @@ all: ptf: hosts: ptf_vms1-1: - ansible_host: 10.250.0.196 + ansible_host: 10.250.128.196 ansible_ssh_user: root ansible_ssh_pass: root diff --git a/ansible/testbed-new.yaml b/ansible/testbed-new.yaml index 3a6cfe33bf1..2fb773eea58 100644 --- a/ansible/testbed-new.yaml +++ b/ansible/testbed-new.yaml @@ -646,7 +646,7 @@ topology: # source: sonic-mgmt/ansible/files/sonic Ethernet36: EndDevice: dev-sn2700-01 EndPort: Ethernet1/10 - Bandwidth: 10000 + Bandwidth: 100000 VlanID: 1690 VlanMode: Access Ethernet40: @@ -658,13 +658,13 @@ topology: # source: sonic-mgmt/ansible/files/sonic Ethernet44: EndDevice: dev-sn2700-01 EndPort: Ethernet1/12 - Bandwidth: 10000 + Bandwidth: 100000 VlanID: 1692 VlanMode: Access Ethernet48: EndDevice: dev-sn2700-01 EndPort: Ethernet1/13 - Bandwidth: 10000 + Bandwidth: 100000 VlanID: 1693 VlanMode: Access Ethernet52: @@ -730,7 +730,7 @@ topology: # source: sonic-mgmt/ansible/files/sonic Ethernet92: EndDevice: dev-sn2700-01 EndPort: Ethernet1/24 - Bandwidth: 10000 + Bandwidth: 100000 VlanID: 1704 VlanMode: Access Ethernet96: @@ -760,7 +760,7 @@ topology: # source: sonic-mgmt/ansible/files/sonic Ethernet112: EndDevice: dev-sn2700-01 EndPort: Ethernet1/29 - Bandwidth: 10000 + Bandwidth: 100000 VlanID: 1709 VlanMode: Access Ethernet116: @@ -772,7 +772,7 @@ topology: # source: sonic-mgmt/ansible/files/sonic Ethernet120: EndDevice: dev-sn2700-01 EndPort: Ethernet1/31 - Bandwidth: 100000 + Bandwidth: 25000 VlanID: 1711 VlanMode: Access Ethernet124: From e0c16e7da226d01b299a2dbec84c7bf03cbc2a86 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Tue, 4 Apr 2023 13:15:05 +0300 Subject: [PATCH 08/16] DO NOT MERGE: update topo_t0 yaml --- ansible/vars/topo_t0.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ansible/vars/topo_t0.yml b/ansible/vars/topo_t0.yml index 9f710db2a98..6d2d7c525fa 100644 --- a/ansible/vars/topo_t0.yml +++ b/ansible/vars/topo_t0.yml @@ -27,12 +27,11 @@ topology: - 24 - 25 - 26 - - 27 disabled_host_interfaces: - 0 - 25 - 26 - - 27 + - 31 VMs: ARISTA01T1: vlans: @@ -48,7 +47,7 @@ topology: vm_offset: 2 ARISTA04T1: vlans: - - 31 + - 27 vm_offset: 3 DUT: vlan_configs: From 0baa008216b223a43c27a651912ad17f6cb9aaf7 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Tue, 4 Apr 2023 14:49:28 +0300 Subject: [PATCH 09/16] fix port name --- ansible/testbed-new.yaml | 64 ++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/ansible/testbed-new.yaml b/ansible/testbed-new.yaml index 2fb773eea58..0a53ae9c153 100644 --- a/ansible/testbed-new.yaml +++ b/ansible/testbed-new.yaml @@ -591,193 +591,193 @@ topology: # source: sonic-mgmt/ansible/files/sonic interfaces: # DUT/ start device Ethernet0: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/1 + EndPort: Eth1/1 Bandwidth: 100000 VlanID: 1681 VlanMode: Access Ethernet4: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/2 + EndPort: Eth1/2 Bandwidth: 100000 VlanID: 1682 VlanMode: Access Ethernet8: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/3 + EndPort: Eth1/3 Bandwidth: 100000 VlanID: 1683 VlanMode: Access Ethernet12: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/4 + EndPort: Eth1/4 Bandwidth: 100000 VlanID: 1684 VlanMode: Access Ethernet16: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/5 + EndPort: Eth1/5 Bandwidth: 100000 VlanID: 1685 VlanMode: Access Ethernet20: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/6 + EndPort: Eth1/6 Bandwidth: 100000 VlanID: 1686 VlanMode: Access Ethernet24: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/7 + EndPort: Eth1/7 Bandwidth: 100000 VlanID: 1687 VlanMode: Access Ethernet28: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/8 + EndPort: Eth1/8 Bandwidth: 100000 VlanID: 1688 VlanMode: Access Ethernet32: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/9 + EndPort: Eth1/9 Bandwidth: 100000 VlanID: 1689 VlanMode: Access Ethernet36: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/10 + EndPort: Eth1/10 Bandwidth: 100000 VlanID: 1690 VlanMode: Access Ethernet40: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/11 + EndPort: Eth1/11 Bandwidth: 100000 VlanID: 1691 VlanMode: Access Ethernet44: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/12 + EndPort: Eth1/12 Bandwidth: 100000 VlanID: 1692 VlanMode: Access Ethernet48: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/13 + EndPort: Eth1/13 Bandwidth: 100000 VlanID: 1693 VlanMode: Access Ethernet52: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/14 + EndPort: Eth1/14 Bandwidth: 10000 VlanID: 1694 VlanMode: Access Ethernet56: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/15 + EndPort: Eth1/15 Bandwidth: 100000 VlanID: 1695 VlanMode: Access Ethernet60: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/16 + EndPort: Eth1/16 Bandwidth: 100000 VlanID: 1696 VlanMode: Access Ethernet64: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/17 + EndPort: Eth1/17 Bandwidth: 100000 VlanID: 1697 VlanMode: Access Ethernet68: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/18 + EndPort: Eth1/18 Bandwidth: 100000 VlanID: 1698 VlanMode: Access Ethernet72: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/19 + EndPort: Eth1/19 Bandwidth: 100000 VlanID: 1699 VlanMode: Access Ethernet76: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/20 + EndPort: Eth1/20 Bandwidth: 100000 VlanID: 1700 VlanMode: Access Ethernet80: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/21 + EndPort: Eth1/21 Bandwidth: 100000 VlanID: 1701 VlanMode: Access Ethernet84: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/22 + EndPort: Eth1/22 Bandwidth: 100000 VlanID: 1702 VlanMode: Access Ethernet88: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/23 + EndPort: Eth1/23 Bandwidth: 100000 VlanID: 1703 VlanMode: Access Ethernet92: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/24 + EndPort: Eth1/24 Bandwidth: 100000 VlanID: 1704 VlanMode: Access Ethernet96: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/25 + EndPort: Eth1/25 Bandwidth: 100000 VlanID: 1705 VlanMode: Access Ethernet100: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/26 + EndPort: Eth1/26 Bandwidth: 100000 VlanID: 1706 VlanMode: Access Ethernet104: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/27 + EndPort: Eth1/27 Bandwidth: 100000 VlanID: 1707 VlanMode: Access Ethernet108: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/28 + EndPort: Eth1/28 Bandwidth: 100000 VlanID: 1708 VlanMode: Access Ethernet112: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/29 + EndPort: Eth1/29 Bandwidth: 100000 VlanID: 1709 VlanMode: Access Ethernet116: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/30 + EndPort: Eth1/30 Bandwidth: 100000 VlanID: 1710 VlanMode: Access Ethernet120: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/31 + EndPort: Eth1/31 Bandwidth: 25000 VlanID: 1711 VlanMode: Access Ethernet124: EndDevice: dev-sn2700-01 - EndPort: Ethernet1/32/2 + EndPort: Eth1/32/2 Bandwidth: 25000 VlanID: 1712 VlanMode: Access From 3d5f8328e97d8acbdf7009560dc3f0ce0bb8677d Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Tue, 4 Apr 2023 16:01:35 +0300 Subject: [PATCH 10/16] add static port mapping in port_utils --- ansible/module_utils/port_utils.py | 36 ++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/ansible/module_utils/port_utils.py b/ansible/module_utils/port_utils.py index 8eafc2dad5e..8bd81296015 100644 --- a/ansible/module_utils/port_utils.py +++ b/ansible/module_utils/port_utils.py @@ -166,8 +166,40 @@ def get_port_alias_to_name_map(hwsku, asic_name=None): port_alias_to_name_map["Ethernet%d/1" % i] = "Ethernet%d" % ((i - 49) * 4 + 48) # todo(adovhan) use hardcoded mapping in case 'split' is using elif hwsku == "Accton-AS7712-32X": - for i in range(1, 33): - port_alias_to_name_map["hundredGigE%d" % i] = "Ethernet%d" % ((i - 1) * 4) + # for i in range(1, 33): + # port_alias_to_name_map["hundredGigE%d" % i] = "Ethernet%d" % ((i - 1) * 4) + port_alias_to_name_map["hundredGigE1"] = "Ethernet0" + port_alias_to_name_map["hundredGigE2"] = "Ethernet4" + port_alias_to_name_map["hundredGigE3"] = "Ethernet8" + port_alias_to_name_map["hundredGigE4"] = "Ethernet12" + port_alias_to_name_map["hundredGigE5"] = "Ethernet16" + port_alias_to_name_map["hundredGigE6"] = "Ethernet20" + port_alias_to_name_map["hundredGigE7"] = "Ethernet24" + port_alias_to_name_map["hundredGigE8"] = "Ethernet28" + port_alias_to_name_map["hundredGigE9"] = "Ethernet32" + port_alias_to_name_map["hundredGigE10"] = "Ethernet36" + port_alias_to_name_map["hundredGigE11"] = "Ethernet40" + port_alias_to_name_map["hundredGigE12"] = "Ethernet44" + port_alias_to_name_map["hundredGigE13"] = "Ethernet48" + port_alias_to_name_map["hundredGigE14"] = "Ethernet52" + port_alias_to_name_map["hundredGigE15"] = "Ethernet56" + port_alias_to_name_map["hundredGigE16"] = "Ethernet60" + port_alias_to_name_map["hundredGigE17"] = "Ethernet64" + port_alias_to_name_map["hundredGigE18"] = "Ethernet68" + port_alias_to_name_map["hundredGigE19"] = "Ethernet72" + port_alias_to_name_map["hundredGigE20"] = "Ethernet76" + port_alias_to_name_map["hundredGigE21"] = "Ethernet80" + port_alias_to_name_map["hundredGigE22"] = "Ethernet84" + port_alias_to_name_map["hundredGigE23"] = "Ethernet88" + port_alias_to_name_map["hundredGigE24"] = "Ethernet92" + port_alias_to_name_map["hundredGigE25"] = "Ethernet96" + port_alias_to_name_map["hundredGigE26"] = "Ethernet100" + port_alias_to_name_map["hundredGigE27"] = "Ethernet104" + port_alias_to_name_map["hundredGigE28"] = "Ethernet108" + port_alias_to_name_map["hundredGigE29"] = "Ethernet112" + port_alias_to_name_map["hundredGigE30"] = "Ethernet116" + port_alias_to_name_map["hundredGigE31"] = "Ethernet120" + port_alias_to_name_map["hundredGigE32"] = "Ethernet124" elif hwsku == "Accton-AS7726-32X": for i in range(1, 33): port_alias_to_name_map["hundredGigE%d" % i] = "Ethernet%d" % ((i - 1) * 4) From a9a17b0cbedfacfacd5d42addb199147da7e8f03 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Tue, 4 Apr 2023 18:38:54 +0300 Subject: [PATCH 11/16] fix name of link (fanout - testServer) --- ansible/files/lab_connection_graph.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/ansible/files/lab_connection_graph.xml b/ansible/files/lab_connection_graph.xml index ed9b744414b..a68dfc44c33 100644 --- a/ansible/files/lab_connection_graph.xml +++ b/ansible/files/lab_connection_graph.xml @@ -38,7 +38,7 @@ - + @@ -70,18 +70,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From 57f7bc40da2a2c32a52df822fef231c46af9d005 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Thu, 6 Apr 2023 11:45:30 +0300 Subject: [PATCH 12/16] change speed for eth/1/32/2 25 -> 100 --- ansible/files/lab_connection_graph.xml | 2 +- ansible/files/sonic_lab_links.csv | 2 +- ansible/testbed-new.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/files/lab_connection_graph.xml b/ansible/files/lab_connection_graph.xml index a68dfc44c33..417675759c5 100644 --- a/ansible/files/lab_connection_graph.xml +++ b/ansible/files/lab_connection_graph.xml @@ -37,7 +37,7 @@ - + diff --git a/ansible/files/sonic_lab_links.csv b/ansible/files/sonic_lab_links.csv index a42c8737e94..e868ec59a32 100644 --- a/ansible/files/sonic_lab_links.csv +++ b/ansible/files/sonic_lab_links.csv @@ -30,5 +30,5 @@ dev-as7712-32x-01,Ethernet108,dev-sn2700-01,Eth1/28,100000,1708,Access dev-as7712-32x-01,Ethernet112,dev-sn2700-01,Eth1/29,100000,1709,Access dev-as7712-32x-01,Ethernet116,dev-sn2700-01,Eth1/30,100000,1710,Access dev-as7712-32x-01,Ethernet120,dev-sn2700-01,Eth1/31,100000,1711,Access -dev-as7712-32x-01,Ethernet124,dev-sn2700-01,Eth1/32/2,25000,1712,Access +dev-as7712-32x-01,Ethernet124,dev-sn2700-01,Eth1/32/2,100000,1712,Access dev-sn2700-01,Eth1/32/1,str-acs-serv-01,ens3f1,25000,1681-1712,Trunk diff --git a/ansible/testbed-new.yaml b/ansible/testbed-new.yaml index 0a53ae9c153..65c9e57af65 100644 --- a/ansible/testbed-new.yaml +++ b/ansible/testbed-new.yaml @@ -772,13 +772,13 @@ topology: # source: sonic-mgmt/ansible/files/sonic Ethernet120: EndDevice: dev-sn2700-01 EndPort: Eth1/31 - Bandwidth: 25000 + Bandwidth: 100000 VlanID: 1711 VlanMode: Access Ethernet124: EndDevice: dev-sn2700-01 EndPort: Eth1/32/2 - Bandwidth: 25000 + Bandwidth: 100000 VlanID: 1712 VlanMode: Access From 4c78db0b4a613812bedeb7ed98642d9ce9298bab Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Thu, 6 Apr 2023 12:03:06 +0300 Subject: [PATCH 13/16] cleanup: remove todo --- ansible/group_vars/fanout/secrets.yml | 5 ++++- ansible/group_vars/vm_host/creds.yml | 1 - ansible/setup-management-network.sh | 1 - ansible/testbed-new.yaml | 16 +++++++--------- ansible/testbed.csv | 1 - ansible/testbed.yaml | 4 ++-- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/ansible/group_vars/fanout/secrets.yml b/ansible/group_vars/fanout/secrets.yml index b1fc15992fb..fd92f02dcb0 100644 --- a/ansible/group_vars/fanout/secrets.yml +++ b/ansible/group_vars/fanout/secrets.yml @@ -1,6 +1,9 @@ # Please update the actual username and password according to your lab configuration -#todo(adovhan) set correct creds +# do not need to set creds, se use static fanout config for sn2700. +# if we want to use dynamic, then update ansible/roles/fanout/tasks/fanout_eos.yml, +# and update corresponding fanout template +# and update creds in ansible/testbed-new.yaml ansible_ssh_user: user ansible_ssh_pass: password fanout_mlnx_user: admin diff --git a/ansible/group_vars/vm_host/creds.yml b/ansible/group_vars/vm_host/creds.yml index c2f5f865341..e64552536fa 100644 --- a/ansible/group_vars/vm_host/creds.yml +++ b/ansible/group_vars/vm_host/creds.yml @@ -1,5 +1,4 @@ --- -#todo(adovhan) set correct creds ansible_user: hhtestbed ansible_password: HH.Labs ansible_become_password: HH.Labs diff --git a/ansible/setup-management-network.sh b/ansible/setup-management-network.sh index 8428c5e79ff..85c455f8839 100755 --- a/ansible/setup-management-network.sh +++ b/ansible/setup-management-network.sh @@ -51,7 +51,6 @@ echo echo "STEP 6: Configuring br1 interface..." echo "Assigning 10.250.0.1/16 to br1" -# todo(adovhan) set correct ip ifconfig br1 10.250.0.1/16 ifconfig br1 inet6 add fec0::1/64 echo "Bringing up br1" diff --git a/ansible/testbed-new.yaml b/ansible/testbed-new.yaml index 65c9e57af65..8effdcd42e5 100644 --- a/ansible/testbed-new.yaml +++ b/ansible/testbed-new.yaml @@ -108,11 +108,10 @@ devices: enable_password: ansible: ansible_host: 192.168.88.246/24 # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv - #todo(adovhan) set correct creds - ansible_ssh_user: user # source: sonic-mgmt/ansible/group_vars/fanout/secrets.yml - ansible_ssh_pass: password # source: sonic-mgmt/ansible/group_vars/fanout/secrets.yml - fanout_sonic_user: admin # source: sonic-mgmt/ansible/group_vars/fanout/secrets.yml - fanout_sonic_password: password # source: sonic-mgmt/ansible/group_vars/fanout/secrets.yml + ansible_ssh_user: user # source: sonic-mgmt/ansible/group_vars/fanout/secrets.yml # do not need to set creds, se use static fanout config. + ansible_ssh_pass: password # source: sonic-mgmt/ansible/group_vars/fanout/secrets.yml # if we want to use dynamic, then update ansible/roles/fanout/tasks/fanout_eos.yml + fanout_sonic_user: admin # source: sonic-mgmt/ansible/group_vars/fanout/secrets.yml # and update corresponding fanout template + fanout_sonic_password: password # source: sonic-mgmt/ansible/group_vars/fanout/secrets.yml # and update ansible/group_vars/fanout/secrets.yml str-msn2700-01: device_type: DevSonic # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv @@ -178,7 +177,7 @@ devices: username: password: ansible: - ansible_host: 10.250.0.1/16 # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv # todo(adovhan) set correct ip (testServer) + ansible_host: 10.250.0.1/16 # source: sonic-mgmt/ansible/files/sonic_lab_devices-github.csv ansible_ssh_pass: password # source: sonic-mgmt/ansible/group_vars/lab/secrets.yml ansible_become_pass: password # source: sonic-mgmt/ansible/group_vars/lab/secrets.yml sonicadmin_user: admin # source: sonic-mgmt/ansible/group_vars/lab/secrets.yml @@ -252,7 +251,7 @@ host_vars: str-acs-serv-01: mgmt_bridge: br1 # source: sonic-mgmt/host_vars mgmt_prefixlen: 16 # source: sonic-mgmt/host_vars - mgmt_gw: 10.250.0.1 # source: sonic-mgmt/host_vars #todo(adovhan) set correct ip + mgmt_gw: 10.250.0.1 # source: sonic-mgmt/host_vars external_port: ens3f0 # source: sonic-mgmt/host_vars # veos_groups is a dictionary that contains all veos groups @@ -465,7 +464,7 @@ testbed: topo: t0 # source: sonic-mgmt/ansible/testbed.csv ptf_image_name: docker-ptf # source: sonic-mgmt/ansible/testbed.csv ptf: ptf_vms1-1 - ptf_ip: 10.250.128.196/16 # source: sonic-mgmt/ansible/testbed.csv todo(adovhan) set correcr ip + ptf_ip: 10.250.128.196/16 # source: sonic-mgmt/ansible/testbed.csv server: server_1 # source: sonic-mgmt/ansible/testbed.csv vm_base: VM0100 # source: sonic-mgmt/ansible/testbed.csv dut: dev-as7712-32x-01 # source: sonic-mgmt/ansible/testbed.csv @@ -586,7 +585,6 @@ testbed: # topology is used to generate sonic_lab_links # topology dictionary does not cross reference with other files topology: # source: sonic-mgmt/ansible/files/sonic_lab_links.csv - # todo(adovhan) add links (dut, fanout) dev-as7712-32x-01: # source: sonic-mgmt/ansible/files/sonic_lab_links.csv # ports that goes to TESTBED SERVER interfaces: # DUT/ start device Ethernet0: diff --git a/ansible/testbed.csv b/ansible/testbed.csv index baaca06d17c..9a52a23b011 100644 --- a/ansible/testbed.csv +++ b/ansible/testbed.csv @@ -12,6 +12,5 @@ vms-s6100-t1-lag,vms5-1,t1-64-lag,docker-ptf,ptf-unknown,10.255.0.183/24,,server vms-multi-dut,vms1-duts,ptf64,docker-ptf,ptf-unknown,10.255.0.184/24,,server_1,VM0100,[dut-host1;dut-host2],lab,True,Example Multi DUTs testbed vms-example-ixia-1,vms6-1,t0-64,docker-ptf-ixia,example-ixia-ptf-1,10.0.0.30/32,,server_6,VM0600,example-s6100-dut-1,lab,True,superman ixanvl-vs-conf,anvl,ptf32,docker-ptf-anvl,ptf-unknown,10.250.0.100/24,,server_1,,vlab-01,lab,True,Test ptf ANVL SONIC VM -# todo(adovhan) set correct ip (ptf) 01-t0,vms1-1,t0,docker-ptf,ptf_vms1-1,10.250.128.196/16,,server_1,VM0100,dev-as7712-32x-01,lab,False,Hedgehog T0 topology as7712-32x-01 Testbed 01 01-t1,vms1-1,t1,docker-ptf,ptf_vms1-1,10.250.128.196/16,,server_1,VM0100,dev-as7712-32x-01,lab,False,Hedgehog T1 topology as7712-32x-01 Testbed 01 diff --git a/ansible/testbed.yaml b/ansible/testbed.yaml index fce6b85d90a..cee58509200 100644 --- a/ansible/testbed.yaml +++ b/ansible/testbed.yaml @@ -5,7 +5,7 @@ topo: t0 ptf_image_name: docker-ptf ptf: ptf_vms1-1 - ptf_ip: 10.250.128.196/16 #todo(adovhan) set correct ip(ptf) + ptf_ip: 10.250.128.196/16 ptf_ipv6: server: server_1 vm_base: VM0100 @@ -20,7 +20,7 @@ topo: t1 ptf_image_name: docker-ptf ptf: ptf_vms1-1 - ptf_ip: 10.250.128.196/16 #todo(adovhan) set correct ip(ptf) + ptf_ip: 10.250.128.196/16 ptf_ipv6: server: server_1 vm_base: VM0100 From 8dd24469f58e97c8447c139c666b7fb66f59c30a Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Thu, 6 Apr 2023 12:08:12 +0300 Subject: [PATCH 14/16] cleanup: revert changes in veos_vtb --- ansible/veos_vtb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/veos_vtb b/ansible/veos_vtb index a7d29063ca2..464325d5fef 100644 --- a/ansible/veos_vtb +++ b/ansible/veos_vtb @@ -256,9 +256,9 @@ server_1: vm_host_1: hosts: STR-ACS-VSERV-01: - ansible_host: 10.250.0.1 - ansible_user: hhtestbed - vm_host_user: hhtestbed + ansible_host: 172.17.0.1 + ansible_user: hedgehog + vm_host_user: hedgehog vms_1: hosts: From f1f10bf347071273677822a5404b8a58df96dc46 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Thu, 6 Apr 2023 12:17:19 +0300 Subject: [PATCH 15/16] cleanup: remove hardcoded port maping for Accton-AS7712-32X --- ansible/module_utils/port_utils.py | 37 ++---------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/ansible/module_utils/port_utils.py b/ansible/module_utils/port_utils.py index 8bd81296015..5afa087137b 100644 --- a/ansible/module_utils/port_utils.py +++ b/ansible/module_utils/port_utils.py @@ -164,42 +164,9 @@ def get_port_alias_to_name_map(hwsku, asic_name=None): port_alias_to_name_map["Ethernet%d" % i] = "Ethernet%d" % (i - 1) for i in range(49, 65): port_alias_to_name_map["Ethernet%d/1" % i] = "Ethernet%d" % ((i - 49) * 4 + 48) - # todo(adovhan) use hardcoded mapping in case 'split' is using elif hwsku == "Accton-AS7712-32X": - # for i in range(1, 33): - # port_alias_to_name_map["hundredGigE%d" % i] = "Ethernet%d" % ((i - 1) * 4) - port_alias_to_name_map["hundredGigE1"] = "Ethernet0" - port_alias_to_name_map["hundredGigE2"] = "Ethernet4" - port_alias_to_name_map["hundredGigE3"] = "Ethernet8" - port_alias_to_name_map["hundredGigE4"] = "Ethernet12" - port_alias_to_name_map["hundredGigE5"] = "Ethernet16" - port_alias_to_name_map["hundredGigE6"] = "Ethernet20" - port_alias_to_name_map["hundredGigE7"] = "Ethernet24" - port_alias_to_name_map["hundredGigE8"] = "Ethernet28" - port_alias_to_name_map["hundredGigE9"] = "Ethernet32" - port_alias_to_name_map["hundredGigE10"] = "Ethernet36" - port_alias_to_name_map["hundredGigE11"] = "Ethernet40" - port_alias_to_name_map["hundredGigE12"] = "Ethernet44" - port_alias_to_name_map["hundredGigE13"] = "Ethernet48" - port_alias_to_name_map["hundredGigE14"] = "Ethernet52" - port_alias_to_name_map["hundredGigE15"] = "Ethernet56" - port_alias_to_name_map["hundredGigE16"] = "Ethernet60" - port_alias_to_name_map["hundredGigE17"] = "Ethernet64" - port_alias_to_name_map["hundredGigE18"] = "Ethernet68" - port_alias_to_name_map["hundredGigE19"] = "Ethernet72" - port_alias_to_name_map["hundredGigE20"] = "Ethernet76" - port_alias_to_name_map["hundredGigE21"] = "Ethernet80" - port_alias_to_name_map["hundredGigE22"] = "Ethernet84" - port_alias_to_name_map["hundredGigE23"] = "Ethernet88" - port_alias_to_name_map["hundredGigE24"] = "Ethernet92" - port_alias_to_name_map["hundredGigE25"] = "Ethernet96" - port_alias_to_name_map["hundredGigE26"] = "Ethernet100" - port_alias_to_name_map["hundredGigE27"] = "Ethernet104" - port_alias_to_name_map["hundredGigE28"] = "Ethernet108" - port_alias_to_name_map["hundredGigE29"] = "Ethernet112" - port_alias_to_name_map["hundredGigE30"] = "Ethernet116" - port_alias_to_name_map["hundredGigE31"] = "Ethernet120" - port_alias_to_name_map["hundredGigE32"] = "Ethernet124" + for i in range(1, 33): + port_alias_to_name_map["hundredGigE%d" % i] = "Ethernet%d" % ((i - 1) * 4) elif hwsku == "Accton-AS7726-32X": for i in range(1, 33): port_alias_to_name_map["hundredGigE%d" % i] = "Ethernet%d" % ((i - 1) * 4) From 7bffb5cc7533094025dfd8f4fbe3cc5fbbb22c13 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Wed, 12 Apr 2023 11:58:24 +0300 Subject: [PATCH 16/16] change group-name, for changing ptf container name --- ansible/testbed-new.yaml | 4 ++-- ansible/testbed.csv | 4 ++-- ansible/testbed.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible/testbed-new.yaml b/ansible/testbed-new.yaml index 8effdcd42e5..137d954917e 100644 --- a/ansible/testbed-new.yaml +++ b/ansible/testbed-new.yaml @@ -460,7 +460,7 @@ veos: # testbed dictionary does not cross reference with other files testbed: 01-t0: # source: sonic-mgmt/ansible/testbed.csv - group-name: vms1-1 # source: sonic-mgmt/ansible/testbed.csv + group-name: vms1-t0 # source: sonic-mgmt/ansible/testbed.csv topo: t0 # source: sonic-mgmt/ansible/testbed.csv ptf_image_name: docker-ptf # source: sonic-mgmt/ansible/testbed.csv ptf: ptf_vms1-1 @@ -471,7 +471,7 @@ testbed: comment: Hedgehog T0 topology as7712-32x-01 Testbed 01 01-t1: # source: sonic-mgmt/ansible/testbed.csv - group-name: vms1-1 # source: sonic-mgmt/ansible/testbed.csv + group-name: vms1-t1 # source: sonic-mgmt/ansible/testbed.csv topo: t1 # source: sonic-mgmt/ansible/testbed.csv ptf_image_name: docker-ptf # source: sonic-mgmt/ansible/testbed.csv ptf: ptf_vms1-1 diff --git a/ansible/testbed.csv b/ansible/testbed.csv index 9a52a23b011..bd30bb7b667 100644 --- a/ansible/testbed.csv +++ b/ansible/testbed.csv @@ -12,5 +12,5 @@ vms-s6100-t1-lag,vms5-1,t1-64-lag,docker-ptf,ptf-unknown,10.255.0.183/24,,server vms-multi-dut,vms1-duts,ptf64,docker-ptf,ptf-unknown,10.255.0.184/24,,server_1,VM0100,[dut-host1;dut-host2],lab,True,Example Multi DUTs testbed vms-example-ixia-1,vms6-1,t0-64,docker-ptf-ixia,example-ixia-ptf-1,10.0.0.30/32,,server_6,VM0600,example-s6100-dut-1,lab,True,superman ixanvl-vs-conf,anvl,ptf32,docker-ptf-anvl,ptf-unknown,10.250.0.100/24,,server_1,,vlab-01,lab,True,Test ptf ANVL SONIC VM -01-t0,vms1-1,t0,docker-ptf,ptf_vms1-1,10.250.128.196/16,,server_1,VM0100,dev-as7712-32x-01,lab,False,Hedgehog T0 topology as7712-32x-01 Testbed 01 -01-t1,vms1-1,t1,docker-ptf,ptf_vms1-1,10.250.128.196/16,,server_1,VM0100,dev-as7712-32x-01,lab,False,Hedgehog T1 topology as7712-32x-01 Testbed 01 +01-t0,vms1-t0,t0,docker-ptf,ptf_vms1-1,10.250.128.196/16,,server_1,VM0100,dev-as7712-32x-01,lab,False,Hedgehog T0 topology as7712-32x-01 Testbed 01 +01-t1,vms1-t1,t1,docker-ptf,ptf_vms1-1,10.250.128.196/16,,server_1,VM0100,dev-as7712-32x-01,lab,False,Hedgehog T1 topology as7712-32x-01 Testbed 01 diff --git a/ansible/testbed.yaml b/ansible/testbed.yaml index cee58509200..886179eb5b8 100644 --- a/ansible/testbed.yaml +++ b/ansible/testbed.yaml @@ -1,7 +1,7 @@ --- - conf-name: 01-t0 - group-name: vms1-1 + group-name: vms1-t0 topo: t0 ptf_image_name: docker-ptf ptf: ptf_vms1-1 @@ -16,7 +16,7 @@ comment: Hedgehog T0 topology as7712-32x-01 Testbed 01 - conf-name: 01-t1 - group-name: vms1-1 + group-name: vms1-t1 topo: t1 ptf_image_name: docker-ptf ptf: ptf_vms1-1