Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sonic-mgmt: fix t0-isolated-d128u128s2 topo #15542

Merged
merged 5 commits into from
Nov 18, 2024
Merged

sonic-mgmt: fix t0-isolated-d128u128s2 topo #15542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29b01dd
sonic-mgmt: fix t0-isolated-d128u128s2 topo
ccroy-arista Oct 25, 2024
e1e6727
Fix pre-commit error on previous commit.
ccroy-arista Nov 13, 2024
f336073
Merge branch 'sonic-net:master' into fix-t0-isolated-d128u128s2-topo
ccroy-arista Nov 14, 2024
f303714
Improve safety against duplication of macs
ccroy-arista Nov 15, 2024
00c4ded
sonic-mgmt: fix typo in t0-isolated-d128u128s1.yml
ccroy-arista Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ansible/roles/eos/templates/t0-isolated-d128u128s2-leaf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
t0-leaf.j2
5 changes: 3 additions & 2 deletions ansible/roles/test/files/helpers/change_mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ INTF_LIST=$(ls /sys/class/net | grep -E "^eth[0-9]+$")

for INTF in ${INTF_LIST}; do
ADDR="$(cat /sys/class/net/${INTF}/address)"
PREFIX="$(cut -c1-15 <<< ${ADDR})"
SUFFIX="$(printf "%02x" ${INTF##eth})"
PREFIX="$(cut -c1-13 <<< ${ADDR})"
INTF_ID=${INTF##eth}
SUFFIX="$(printf "%x:%02x" $(expr ${INTF_ID} / 256) $(expr ${INTF_ID} % 256))"
MAC="${PREFIX}${SUFFIX}"

echo "Update ${INTF} MAC address: ${ADDR}->$MAC"
Expand Down
138 changes: 131 additions & 7 deletions ansible/testbed-new.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,9 @@ veos_groups:
eos:
children: [vms_1, vms_2] # source: sonic-mgmt/veos
vms_2:
host: [VM0200, VM0201, VM0202, VM0203] # source: sonic-mgmt/veos
host: [VM0300, VM0301, VM0302, VM0203] # source: sonic-mgmt/veos
vms_1:
host: [VM0100, VM0101, VM0102, VM0103, VM0104, VM0105, VM0106, VM0107, VM0108, VM0109, VM0110, VM0111, VM0112, VM0113, VM0114, VM0115, VM0116, VM0117, VM0118, VM0119, VM0120, VM0121, VM0122, VM0123, VM0124, VM0125, VM0126, VM0127, VM0128, VM0129, VM0130, VM0131, VM0132, VM0133, VM0134, VM0135, VM0136, VM0137, VM0138, VM0139, VM0140, VM0141, VM0142, VM0143, VM0144, VM0145, VM0146, VM0147, VM0148, VM0149, VM0150, VM0151, VM0152, VM0153, VM0154, VM0155, VM0156, VM0157, VM0158, VM0159, VM0160, VM0161, VM0162, VM0163, VM0164, VM0165, VM0166, VM0167] # source: sonic-mgmt/veos
host: [VM0100, VM0101, VM0102, VM0103, VM0104, VM0105, VM0106, VM0107, VM0108, VM0109, VM0110, VM0111, VM0112, VM0113, VM0114, VM0115, VM0116, VM0117, VM0118, VM0119, VM0120, VM0121, VM0122, VM0123, VM0124, VM0125, VM0126, VM0127, VM0128, VM0129, VM0130, VM0131, VM0132, VM0133, VM0134, VM0135, VM0136, VM0137, VM0138, VM0139, VM0140, VM0141, VM0142, VM0143, VM0144, VM0145, VM0146, VM0147, VM0148, VM0149, VM0150, VM0151, VM0152, VM0153, VM0154, VM0155, VM0156, VM0157, VM0158, VM0159, VM0160, VM0161, VM0162, VM0163, VM0164, VM0165, VM0166, VM0167, VM0168, VM0169, VM0170, VM0171, VM0172, VM0173, VM0174, VM0175, VM0176, VM0177, VM0178, VM0179, VM0180, VM0181, VM0182, VM0183, VM0184, VM0185, VM0186, VM0187, VM0188, VM0189, VM0190, VM0191, VM0192, VM0193, VM0194, VM0195, VM0196, VM0197, VM0198, VM0199, VM0200, VM0201, VM0202, VM0203, VM0204, VM0205, VM0206, VM0207, VM0208, VM0209, VM0210, VM0211, VM0212, VM0213, VM0214, VM0215, VM0216, VM0217, VM0218, VM0219, VM0220, VM0221, VM0222, VM0223, VM0224, VM0225, VM0226, VM0227, VM0228, VM0229] # source: sonic-mgmt/veos
vm_host:
children: [vm_host_1, vm_host_2] # source: sonic-mgmt/veos
vm_host_2:
Expand Down Expand Up @@ -414,15 +414,139 @@ veos:
ansible_host: 10.250.0.68
VM0167:
ansible_host: 10.250.0.69
vms_2:
VM0168:
ansible_host: 10.250.0.70
VM0169:
ansible_host: 10.250.0.71
VM0170:
ansible_host: 10.250.0.72
VM0171:
ansible_host: 10.250.0.73
VM0172:
ansible_host: 10.250.0.74
VM0173:
ansible_host: 10.250.0.75
VM0174:
ansible_host: 10.250.0.76
VM0175:
ansible_host: 10.250.0.77
VM0176:
ansible_host: 10.250.0.78
VM0177:
ansible_host: 10.250.0.79
VM0178:
ansible_host: 10.250.0.80
VM0179:
ansible_host: 10.250.0.81
VM0180:
ansible_host: 10.250.0.82
VM0181:
ansible_host: 10.250.0.83
VM0182:
ansible_host: 10.250.0.84
VM0183:
ansible_host: 10.250.0.85
VM0184:
ansible_host: 10.250.0.86
VM0185:
ansible_host: 10.250.0.87
VM0186:
ansible_host: 10.250.0.88
VM0187:
ansible_host: 10.250.0.89
VM0188:
ansible_host: 10.250.0.90
VM0189:
ansible_host: 10.250.0.91
VM0190:
ansible_host: 10.250.0.92
VM0191:
ansible_host: 10.250.0.93
VM0192:
ansible_host: 10.250.0.94
VM0193:
ansible_host: 10.250.0.95
VM0194:
ansible_host: 10.250.0.96
VM0195:
ansible_host: 10.250.0.97
VM0196:
ansible_host: 10.250.0.98
VM0197:
ansible_host: 10.250.0.99
VM0198:
ansible_host: 10.250.0.100
VM0199:
ansible_host: 10.250.0.101
VM0200:
ansible_host: 10.250.0.51
ansible_host: 10.250.0.102
VM0201:
ansible_host: 10.250.0.52
ansible_host: 10.250.0.103
VM0202:
ansible_host: 10.250.0.53
ansible_host: 10.250.0.104
VM0203:
ansible_host: 10.250.0.54
ansible_host: 10.250.0.105
VM0204:
ansible_host: 10.250.0.106
VM0205:
ansible_host: 10.250.0.107
VM0206:
ansible_host: 10.250.0.108
VM0207:
ansible_host: 10.250.0.109
VM0208:
ansible_host: 10.250.0.110
VM0209:
ansible_host: 10.250.0.111
VM0210:
ansible_host: 10.250.0.112
VM0211:
ansible_host: 10.250.0.113
VM0212:
ansible_host: 10.250.0.114
VM0213:
ansible_host: 10.250.0.115
VM0214:
ansible_host: 10.250.0.116
VM0215:
ansible_host: 10.250.0.117
VM0216:
ansible_host: 10.250.0.118
VM0217:
ansible_host: 10.250.0.119
VM0218:
ansible_host: 10.250.0.120
VM0219:
ansible_host: 10.250.0.121
VM0220:
ansible_host: 10.250.0.122
VM0221:
ansible_host: 10.250.0.123
VM0222:
ansible_host: 10.250.0.124
VM0223:
ansible_host: 10.250.0.125
VM0224:
ansible_host: 10.250.0.126
VM0225:
ansible_host: 10.250.0.127
VM0226:
ansible_host: 10.250.0.128
VM0227:
ansible_host: 10.250.0.129
VM0228:
ansible_host: 10.250.0.130
VM0229:
ansible_host: 10.250.0.131
vms_2:
VM0300:
ansible_host: 10.250.0.252
VM0301:
ansible_host: 10.250.0.253
VM0302:
ansible_host: 10.250.0.254
VM0303:
ansible_host: 10.250.0.255

# testbed dictionary contains information about the testbed
# testbed is used to generate testbed.csv
Expand Down
Loading
Loading