Skip to content

Commit 26efbcf

Browse files
lguohanlguohan
committed
[vstest]: change float division to integer division
Signed-off-by: Guohan Lu <[email protected]>
1 parent 6adaf2e commit 26efbcf

File tree

3 files changed

+51
-51
lines changed

3 files changed

+51
-51
lines changed

‎tests/port_dpb.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def port_split(self, child_ports):
112112
child_port_list = []
113113
port_num = self.get_port_num()
114114
num_lanes = len(self._lanes)
115-
offset = num_lanes/child_ports;
115+
offset = num_lanes//child_ports
116116
lanes_per_child = offset
117117
for i in range(child_ports):
118118
child_port_num = port_num + (i * offset)
@@ -121,7 +121,7 @@ def port_split(self, child_ports):
121121
child_port_lanes = []
122122
for j in range(lanes_per_child):
123123
child_port_lanes.append(self._lanes[(i*offset)+j])
124-
child_port_speed = self._speed/child_ports
124+
child_port_speed = self._speed//child_ports
125125
child_port_index = self._index
126126

127127
child_port = Port(self._dvs, child_port_name)
@@ -219,7 +219,7 @@ def verify_asic_db(self):
219219
(status, fvs) = self._asic_db_ptbl.get(self.get_oid())
220220
assert(status == True)
221221
fvs_dict = self.get_fvs_dict(fvs)
222-
if ("SAI_PORT_ATTR_HW_LANE_LIST" in fvs_dict):
222+
if "SAI_PORT_ATTR_HW_LANE_LIST" in fvs_dict:
223223
assert(fvs_dict['SAI_PORT_ATTR_HW_LANE_LIST'] == self.get_lanes_asic_db_str())
224224
assert(fvs_dict['SAI_PORT_ATTR_SPEED'] == str(self.get_speed()))
225225

‎tests/test_port_dpb.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def test_port_breakout_one(self, dvs):
6363
#print "**** 4X10G --> 4X25G passed ****"
6464
dpb.breakin(dvs, ["Ethernet0", "Ethernet1", "Ethernet2", "Ethernet3"])
6565
#print "**** 4X25G --> 1X100G passed ****"
66-
dpb.breakout(dvs, "Ethernet0", maxBreakOut/2)
66+
dpb.breakout(dvs, "Ethernet0", maxBreakOut//2)
6767
#print "**** 1X100G --> 2X50G passed ****"
6868
dpb.breakin(dvs, ["Ethernet0", "Ethernet2"])
6969
#print "**** 2X50G --> 1X100G passed ****"

‎tests/test_warm_reboot.py

+47-47
Original file line numberDiff line numberDiff line change
@@ -209,31 +209,31 @@ def setup_initial_neighbors(dvs):
209209
for i in range(8, 8+NUM_INTF):
210210
for j in range(NUM_NEIGH_PER_INTF):
211211
dvs.servers[i].runcmd("ip addr add {}.0.0.{}/24 dev eth0".format(i*4, j+2))
212-
dvs.servers[i].runcmd("ip -6 addr add {}00::{}/64 dev eth0".format(i*4,j+2))
212+
dvs.servers[i].runcmd("ip -6 addr add {}00::{}/64 dev eth0".format(i*4, j+2))
213213

214214
time.sleep(1)
215215

216216
for i in range(8, 8+NUM_INTF):
217217
for j in range(NUM_NEIGH_PER_INTF):
218-
dvs.runcmd(['sh', '-c', "ping -c 1 -W 0 -q {}.0.0.{} > /dev/null 2>&1".format(i*4,j+2)])
219-
dvs.runcmd(['sh', '-c', "ping6 -c 1 -W 0 -q {}00::{} > /dev/null 2>&1".format(i*4,j+2)])
218+
dvs.runcmd(['sh', '-c', "ping -c 1 -W 0 -q {}.0.0.{} > /dev/null 2>&1".format(i*4, j+2)])
219+
dvs.runcmd(['sh', '-c', "ping6 -c 1 -W 0 -q {}00::{} > /dev/null 2>&1".format(i*4, j+2)])
220220

221221
# Del half of the ips and a new half of the ips
222222
# note: the first ipv4 can not be deleted only
223223
def del_and_add_neighbors(dvs):
224224
for i in range(8, 8+NUM_INTF):
225-
for j in range(NUM_NEIGH_PER_INTF/2):
226-
dvs.servers[i].runcmd("ip addr del {}.0.0.{}/24 dev eth0".format(i*4, j+NUM_NEIGH_PER_INTF/2+2))
227-
dvs.servers[i].runcmd("ip -6 addr del {}00::{}/64 dev eth0".format(i*4,j+NUM_NEIGH_PER_INTF/2+2))
225+
for j in range(NUM_NEIGH_PER_INTF//2):
226+
dvs.servers[i].runcmd("ip addr del {}.0.0.{}/24 dev eth0".format(i*4, j+NUM_NEIGH_PER_INTF//2+2))
227+
dvs.servers[i].runcmd("ip -6 addr del {}00::{}/64 dev eth0".format(i*4, j+NUM_NEIGH_PER_INTF//2+2))
228228
dvs.servers[i].runcmd("ip addr add {}.0.0.{}/24 dev eth0".format(i*4, j+NUM_NEIGH_PER_INTF+2))
229-
dvs.servers[i].runcmd("ip -6 addr add {}00::{}/64 dev eth0".format(i*4,j+NUM_NEIGH_PER_INTF+2))
229+
dvs.servers[i].runcmd("ip -6 addr add {}00::{}/64 dev eth0".format(i*4, j+NUM_NEIGH_PER_INTF+2))
230230

231231
#ping new IPs
232232
def ping_new_ips(dvs):
233233
for i in range(8, 8+NUM_INTF):
234-
for j in range(NUM_NEIGH_PER_INTF/2):
235-
dvs.runcmd(['sh', '-c', "ping -c 1 -W 0 -q {}.0.0.{} > /dev/null 2>&1".format(i*4,j+NUM_NEIGH_PER_INTF+2)])
236-
dvs.runcmd(['sh', '-c', "ping6 -c 1 -W 0 -q {}00::{} > /dev/null 2>&1".format(i*4,j+NUM_NEIGH_PER_INTF+2)])
234+
for j in range(NUM_NEIGH_PER_INTF//2):
235+
dvs.runcmd(['sh', '-c', "ping -c 1 -W 0 -q {}.0.0.{} > /dev/null 2>&1".format(i*4, j+NUM_NEIGH_PER_INTF+2)])
236+
dvs.runcmd(['sh', '-c', "ping6 -c 1 -W 0 -q {}00::{} > /dev/null 2>&1".format(i*4, j+NUM_NEIGH_PER_INTF+2)])
237237

238238

239239
class TestWarmReboot(object):
@@ -488,10 +488,10 @@ def test_swss_neighbor_syncup(self, dvs, testlog):
488488
macs = ["00:00:00:00:24:02", "00:00:00:00:24:03", "00:00:00:00:28:02", "00:00:00:00:28:03"]
489489

490490
for i in range(len(ips)):
491-
dvs.runcmd("ip neigh add {} dev {} lladdr {} nud reachable".format(ips[i], intfs[i/2], macs[i]))
491+
dvs.runcmd("ip neigh add {} dev {} lladdr {} nud reachable".format(ips[i], intfs[i//2], macs[i]))
492492

493493
for i in range(len(v6ips)):
494-
dvs.runcmd("ip -6 neigh add {} dev {} lladdr {} nud reachable".format(v6ips[i], intfs[i/2], macs[i]))
494+
dvs.runcmd("ip -6 neigh add {} dev {} lladdr {} nud reachable".format(v6ips[i], intfs[i//2], macs[i]))
495495

496496
time.sleep(1)
497497

@@ -500,7 +500,7 @@ def test_swss_neighbor_syncup(self, dvs, testlog):
500500
tbl = swsscommon.Table(db, "NEIGH_TABLE")
501501

502502
for i in range(len(ips)):
503-
(status, fvs) = tbl.get("{}:{}".format(intfs[i/2], ips[i]))
503+
(status, fvs) = tbl.get("{}:{}".format(intfs[i//2], ips[i]))
504504
assert status == True
505505

506506
for v in fvs:
@@ -510,7 +510,7 @@ def test_swss_neighbor_syncup(self, dvs, testlog):
510510
assert v[1] == "IPv4"
511511

512512
for i in range(len(v6ips)):
513-
(status, fvs) = tbl.get("{}:{}".format(intfs[i/2], v6ips[i]))
513+
(status, fvs) = tbl.get("{}:{}".format(intfs[i//2], v6ips[i]))
514514
assert status == True
515515

516516
for v in fvs:
@@ -539,7 +539,7 @@ def test_swss_neighbor_syncup(self, dvs, testlog):
539539

540540
# Check the neighbor entries are still in appDB correctly
541541
for i in range(len(ips)):
542-
(status, fvs) = tbl.get("{}:{}".format(intfs[i/2], ips[i]))
542+
(status, fvs) = tbl.get("{}:{}".format(intfs[i//2], ips[i]))
543543
assert status == True
544544

545545
for v in fvs:
@@ -549,7 +549,7 @@ def test_swss_neighbor_syncup(self, dvs, testlog):
549549
assert v[1] == "IPv4"
550550

551551
for i in range(len(v6ips)):
552-
(status, fvs) = tbl.get("{}:{}".format(intfs[i/2], v6ips[i]))
552+
(status, fvs) = tbl.get("{}:{}".format(intfs[i//2], v6ips[i]))
553553
assert status == True
554554

555555
for v in fvs:
@@ -586,10 +586,10 @@ def test_swss_neighbor_syncup(self, dvs, testlog):
586586

587587
# delete even nummber of ipv4/ipv6 neighbor entries from each interface
588588
for i in range(0, len(ips), 2):
589-
dvs.runcmd("ip neigh del {} dev {}".format(ips[i], intfs[i/2]))
589+
dvs.runcmd("ip neigh del {} dev {}".format(ips[i], intfs[i//2]))
590590

591591
for i in range(0, len(v6ips), 2):
592-
dvs.runcmd("ip -6 neigh del {} dev {}".format(v6ips[i], intfs[i/2]))
592+
dvs.runcmd("ip -6 neigh del {} dev {}".format(v6ips[i], intfs[i//2]))
593593

594594
# start neighsyncd again
595595
start_neighsyncd(dvs)
@@ -598,7 +598,7 @@ def test_swss_neighbor_syncup(self, dvs, testlog):
598598

599599
# check ipv4 and ipv6 neighbors
600600
for i in range(len(ips)):
601-
(status, fvs) = tbl.get("{}:{}".format(intfs[i/2], ips[i]))
601+
(status, fvs) = tbl.get("{}:{}".format(intfs[i//2], ips[i]))
602602
#should not see deleted neighbor entries
603603
if i % 2 == 0:
604604
assert status == False
@@ -614,7 +614,7 @@ def test_swss_neighbor_syncup(self, dvs, testlog):
614614
assert v[1] == "IPv4"
615615

616616
for i in range(len(v6ips)):
617-
(status, fvs) = tbl.get("{}:{}".format(intfs[i/2], v6ips[i]))
617+
(status, fvs) = tbl.get("{}:{}".format(intfs[i//2], v6ips[i]))
618618
#should not see deleted neighbor entries
619619
if i % 2 == 0:
620620
assert status == False
@@ -663,17 +663,17 @@ def test_swss_neighbor_syncup(self, dvs, testlog):
663663
(rc, output) = dvs.runcmd(['sh', '-c', "ip -4 neigh | grep {}".format(ips[i])])
664664
print(output)
665665
if output:
666-
dvs.runcmd("ip neigh change {} dev {} lladdr {} nud reachable".format(ips[i], intfs[i/2], macs[i]))
666+
dvs.runcmd("ip neigh change {} dev {} lladdr {} nud reachable".format(ips[i], intfs[i//2], macs[i]))
667667
else:
668-
dvs.runcmd("ip neigh add {} dev {} lladdr {} nud reachable".format(ips[i], intfs[i/2], macs[i]))
668+
dvs.runcmd("ip neigh add {} dev {} lladdr {} nud reachable".format(ips[i], intfs[i//2], macs[i]))
669669

670670
for i in range(0, len(v6ips), 2):
671671
(rc, output) = dvs.runcmd(['sh', '-c', "ip -6 neigh | grep {}".format(v6ips[i])])
672672
print(output)
673673
if output:
674-
dvs.runcmd("ip -6 neigh change {} dev {} lladdr {} nud reachable".format(v6ips[i], intfs[i/2], macs[i]))
674+
dvs.runcmd("ip -6 neigh change {} dev {} lladdr {} nud reachable".format(v6ips[i], intfs[i//2], macs[i]))
675675
else:
676-
dvs.runcmd("ip -6 neigh add {} dev {} lladdr {} nud reachable".format(v6ips[i], intfs[i/2], macs[i]))
676+
dvs.runcmd("ip -6 neigh add {} dev {} lladdr {} nud reachable".format(v6ips[i], intfs[i//2], macs[i]))
677677

678678
# start neighsyncd again
679679
start_neighsyncd(dvs)
@@ -685,7 +685,7 @@ def test_swss_neighbor_syncup(self, dvs, testlog):
685685

686686
# check ipv4 and ipv6 neighbors, should see all neighbors
687687
for i in range(len(ips)):
688-
(status, fvs) = tbl.get("{}:{}".format(intfs[i/2], ips[i]))
688+
(status, fvs) = tbl.get("{}:{}".format(intfs[i//2], ips[i]))
689689
assert status == True
690690
for v in fvs:
691691
if v[0] == "neigh":
@@ -694,7 +694,7 @@ def test_swss_neighbor_syncup(self, dvs, testlog):
694694
assert v[1] == "IPv4"
695695

696696
for i in range(len(v6ips)):
697-
(status, fvs) = tbl.get("{}:{}".format(intfs[i/2], v6ips[i]))
697+
(status, fvs) = tbl.get("{}:{}".format(intfs[i//2], v6ips[i]))
698698
assert status == True
699699
for v in fvs:
700700
if v[0] == "neigh":
@@ -740,15 +740,15 @@ def test_swss_neighbor_syncup(self, dvs, testlog):
740740

741741
for i in range(len(ips)):
742742
if i % 2 == 0:
743-
dvs.runcmd("ip neigh change {} dev {} lladdr {} nud reachable".format(ips[i], intfs[i/2], newmacs[i]))
743+
dvs.runcmd("ip neigh change {} dev {} lladdr {} nud reachable".format(ips[i], intfs[i//2], newmacs[i]))
744744
else:
745-
dvs.runcmd("ip neigh del {} dev {}".format(ips[i], intfs[i/2]))
745+
dvs.runcmd("ip neigh del {} dev {}".format(ips[i], intfs[i//2]))
746746

747747
for i in range(len(v6ips)):
748748
if i % 2 == 0:
749-
dvs.runcmd("ip -6 neigh change {} dev {} lladdr {} nud reachable".format(v6ips[i], intfs[i/2], newmacs[i]))
749+
dvs.runcmd("ip -6 neigh change {} dev {} lladdr {} nud reachable".format(v6ips[i], intfs[i//2], newmacs[i]))
750750
else:
751-
dvs.runcmd("ip -6 neigh del {} dev {}".format(v6ips[i], intfs[i/2]))
751+
dvs.runcmd("ip -6 neigh del {} dev {}".format(v6ips[i], intfs[i//2]))
752752

753753
# start neighsyncd again
754754
start_neighsyncd(dvs)
@@ -765,28 +765,28 @@ def test_swss_neighbor_syncup(self, dvs, testlog):
765765
# check ipv4 and ipv6 neighbors, should see all neighbors with updated info
766766
for i in range(len(ips)):
767767
if i % 2 == 0:
768-
(status, fvs) = tbl.get("{}:{}".format(intfs[i/2], ips[i]))
768+
(status, fvs) = tbl.get("{}:{}".format(intfs[i//2], ips[i]))
769769
assert status == True
770770
for v in fvs:
771771
if v[0] == "neigh":
772772
assert v[1] == newmacs[i]
773773
if v[0] == "family":
774774
assert v[1] == "IPv4"
775775
else:
776-
(status, fvs) = tbl.get("{}:{}".format(intfs[i/2], ips[i]))
776+
(status, fvs) = tbl.get("{}:{}".format(intfs[i//2], ips[i]))
777777
assert status == False
778778

779779
for i in range(len(v6ips)):
780780
if i % 2 == 0:
781-
(status, fvs) = tbl.get("{}:{}".format(intfs[i/2], v6ips[i]))
781+
(status, fvs) = tbl.get("{}:{}".format(intfs[i//2], v6ips[i]))
782782
assert status == True
783783
for v in fvs:
784784
if v[0] == "neigh":
785785
assert v[1] == newmacs[i]
786786
if v[0] == "family":
787787
assert v[1] == "IPv6"
788788
else:
789-
(status, fvs) = tbl.get("{}:{}".format(intfs[i/2], v6ips[i]))
789+
(status, fvs) = tbl.get("{}:{}".format(intfs[i//2], v6ips[i]))
790790
assert status == False
791791

792792
time.sleep(2)
@@ -1947,11 +1947,11 @@ def test_system_warmreboot_neighbor_syncup(self, dvs, testlog):
19471947
# should finish the store within 10 seconds
19481948
time.sleep(10)
19491949

1950-
check_kernel_reachable_v4_neigh_num(dvs, NUM_OF_NEIGHS/2)
1951-
check_kernel_reachable_v6_neigh_num(dvs, NUM_OF_NEIGHS/2)
1950+
check_kernel_reachable_v4_neigh_num(dvs, NUM_OF_NEIGHS//2)
1951+
check_kernel_reachable_v6_neigh_num(dvs, NUM_OF_NEIGHS//2)
19521952

1953-
check_kernel_stale_v4_neigh_num(dvs, NUM_OF_NEIGHS/2)
1954-
check_kernel_stale_v6_neigh_num(dvs, NUM_OF_NEIGHS/2)
1953+
check_kernel_stale_v4_neigh_num(dvs, NUM_OF_NEIGHS//2)
1954+
check_kernel_stale_v6_neigh_num(dvs, NUM_OF_NEIGHS//2)
19551955

19561956
# check syslog and sairedis.rec file for activities
19571957
check_syslog_for_neighbor_entry(dvs, marker, 0, 0, "ipv4")
@@ -1972,17 +1972,17 @@ def test_system_warmreboot_neighbor_syncup(self, dvs, testlog):
19721972
check_kernel_reachable_v4_neigh_num(dvs, NUM_OF_NEIGHS)
19731973
check_kernel_reachable_v6_neigh_num(dvs, NUM_OF_NEIGHS)
19741974

1975-
check_redis_neigh_entries(dvs, tbl, 2*(NUM_OF_NEIGHS+NUM_OF_NEIGHS/2))
1975+
check_redis_neigh_entries(dvs, tbl, 2*(NUM_OF_NEIGHS+NUM_OF_NEIGHS//2))
19761976

19771977
(nadd, ndel) = dvs.CountSubscribedObjects(pubsub)
19781978
assert nadd == NUM_OF_NEIGHS #ipv4 and ipv6
19791979
assert ndel == 0
19801980

19811981
# Remove stale entries manually
19821982
for i in range(8, 8+NUM_INTF):
1983-
for j in range(NUM_NEIGH_PER_INTF/2):
1984-
dvs.runcmd(['sh', '-c', "ip neigh del {}.0.0.{} dev Ethernet{}".format(i*4,j+NUM_NEIGH_PER_INTF/2+2, i*4)])
1985-
dvs.runcmd(['sh', '-c', "ip -6 neigh del {}00::{} dev Ethernet{}".format(i*4,j+NUM_NEIGH_PER_INTF/2+2, i*4)])
1983+
for j in range(NUM_NEIGH_PER_INTF//2):
1984+
dvs.runcmd(['sh', '-c', "ip neigh del {}.0.0.{} dev Ethernet{}".format(i*4, j+NUM_NEIGH_PER_INTF//2+2, i*4)])
1985+
dvs.runcmd(['sh', '-c', "ip -6 neigh del {}00::{} dev Ethernet{}".format(i*4, j+NUM_NEIGH_PER_INTF//2+2, i*4)])
19861986

19871987
time.sleep(5)
19881988

@@ -2022,7 +2022,7 @@ def test_system_warmreboot_neighbor_syncup(self, dvs, testlog):
20222022
check_kernel_reachable_neigh_num(dvs, 0)
20232023

20242024
# bring down half of the links
2025-
for i in range(8, 8+NUM_INTF/2):
2025+
for i in range(8, 8+NUM_INTF//2):
20262026
dvs.runcmd("ip link set down dev Ethernet{}".format(i*4))
20272027

20282028
# start neighsyncd and restore_neighbors
@@ -2032,8 +2032,8 @@ def test_system_warmreboot_neighbor_syncup(self, dvs, testlog):
20322032
# restore for up interfaces should be done within 10 seconds
20332033
time.sleep(10)
20342034

2035-
check_kernel_reachable_v4_neigh_num(dvs, NUM_OF_NEIGHS/2)
2036-
check_kernel_reachable_v6_neigh_num(dvs, NUM_OF_NEIGHS/2)
2035+
check_kernel_reachable_v4_neigh_num(dvs, NUM_OF_NEIGHS//2)
2036+
check_kernel_reachable_v6_neigh_num(dvs, NUM_OF_NEIGHS//2)
20372037

20382038
restoretbl = swsscommon.Table(state_db, swsscommon.STATE_NEIGH_RESTORE_TABLE_NAME)
20392039

@@ -2048,8 +2048,8 @@ def test_system_warmreboot_neighbor_syncup(self, dvs, testlog):
20482048

20492049

20502050
# check syslog and sairedis.rec file for activities
2051-
#check_syslog_for_neighbor_entry(dvs, marker, 0, NUM_OF_NEIGHS/2, "ipv4")
2052-
#check_syslog_for_neighbor_entry(dvs, marker, 0, NUM_OF_NEIGHS/2, "ipv6")
2051+
#check_syslog_for_neighbor_entry(dvs, marker, 0, NUM_OF_NEIGHS//2, "ipv4")
2052+
#check_syslog_for_neighbor_entry(dvs, marker, 0, NUM_OF_NEIGHS//2, "ipv6")
20532053
(nadd, ndel) = dvs.CountSubscribedObjects(pubsub)
20542054
assert nadd == 0
20552055
assert ndel == NUM_OF_NEIGHS

0 commit comments

Comments
 (0)