Skip to content

Commit a09ed02

Browse files
xwjiang-msxwjiang-ms
committed
fix error
Signed-off-by: xiaweijiang <[email protected]>
1 parent a46d425 commit a09ed02

File tree

2 files changed

+65
-63
lines changed

2 files changed

+65
-63
lines changed

‎scripts/route_check.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ def get_crm_nexthop_group_usage(namespace):
830830
nh_group_available = None
831831

832832
if stats_found:
833-
for field, value in crm_stats_values:
833+
for field, value in crm_stats_values.items():
834834
print_message(syslog.LOG_DEBUG, "CRM field: {}, value: {}".format(field, value))
835835
if field == 'crm_stats_nexthop_group_used':
836836
nh_group_used = int(value)

‎tests/route_check_test_data.py‎

Lines changed: 64 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
SEPARATOR = ":"
3030
DEVICE_METADATA = "DEVICE_METADATA"
3131
MUX_CABLE = "MUX_CABLE"
32+
CRM_TABLE = 'CRM'
33+
CRM_STATS = 'STATS'
3234

3335
LOCALHOST = "localhost"
3436

@@ -81,8 +83,8 @@
8183
}
8284
},
8385
COUNTERS_DB: {
84-
"CRM": {
85-
"STATS": {
86+
CRM_TABLE: {
87+
CRM_STATS: {
8688
"crm_stats_nexthop_group_used": "20",
8789
"crm_stats_nexthop_group_available": "80"
8890
}
@@ -120,8 +122,8 @@
120122
}
121123
},
122124
COUNTERS_DB: {
123-
"CRM": {
124-
"STATS": {
125+
CRM_TABLE: {
126+
CRM_STATS: {
125127
"crm_stats_nexthop_group_used": "20",
126128
"crm_stats_nexthop_group_available": "80"
127129
}
@@ -175,8 +177,8 @@
175177
}
176178
},
177179
COUNTERS_DB: {
178-
"CRM": {
179-
"STATS": {
180+
CRM_TABLE: {
181+
CRM_STATS: {
180182
"crm_stats_nexthop_group_used": "20",
181183
"crm_stats_nexthop_group_available": "80"
182184
}
@@ -233,8 +235,8 @@
233235
}
234236
},
235237
COUNTERS_DB: {
236-
"CRM": {
237-
"STATS": {
238+
CRM_TABLE: {
239+
CRM_STATS: {
238240
"crm_stats_nexthop_group_used": "20",
239241
"crm_stats_nexthop_group_available": "80"
240242
}
@@ -283,8 +285,8 @@
283285
}
284286
},
285287
COUNTERS_DB: {
286-
"CRM": {
287-
"STATS": {
288+
CRM_TABLE: {
289+
CRM_STATS: {
288290
"crm_stats_nexthop_group_used": "20",
289291
"crm_stats_nexthop_group_available": "80"
290292
}
@@ -324,8 +326,8 @@
324326
}
325327
},
326328
COUNTERS_DB: {
327-
"CRM": {
328-
"STATS": {
329+
CRM_TABLE: {
330+
CRM_STATS: {
329331
"crm_stats_nexthop_group_used": "20",
330332
"crm_stats_nexthop_group_available": "80"
331333
}
@@ -382,8 +384,8 @@
382384
}
383385
},
384386
COUNTERS_DB: {
385-
"CRM": {
386-
"STATS": {
387+
CRM_TABLE: {
388+
CRM_STATS: {
387389
"crm_stats_nexthop_group_used": "20",
388390
"crm_stats_nexthop_group_available": "80"
389391
}
@@ -420,8 +422,8 @@
420422
}
421423
},
422424
COUNTERS_DB: {
423-
"CRM": {
424-
"STATS": {
425+
CRM_TABLE: {
426+
CRM_STATS: {
425427
"crm_stats_nexthop_group_used": "20",
426428
"crm_stats_nexthop_group_available": "80"
427429
}
@@ -459,8 +461,8 @@
459461
}
460462
},
461463
COUNTERS_DB: {
462-
"CRM": {
463-
"STATS": {
464+
CRM_TABLE: {
465+
CRM_STATS: {
464466
"crm_stats_nexthop_group_used": "20",
465467
"crm_stats_nexthop_group_available": "80"
466468
}
@@ -511,8 +513,8 @@
511513
}
512514
},
513515
COUNTERS_DB: {
514-
"CRM": {
515-
"STATS": {
516+
CRM_TABLE: {
517+
CRM_STATS: {
516518
"crm_stats_nexthop_group_used": "20",
517519
"crm_stats_nexthop_group_available": "80"
518520
}
@@ -548,8 +550,8 @@
548550
}
549551
},
550552
COUNTERS_DB: {
551-
"CRM": {
552-
"STATS": {
553+
CRM_TABLE: {
554+
CRM_STATS: {
553555
"crm_stats_nexthop_group_used": "20",
554556
"crm_stats_nexthop_group_available": "80"
555557
}
@@ -613,8 +615,8 @@
613615
}
614616
},
615617
COUNTERS_DB: {
616-
"CRM": {
617-
"STATS": {
618+
CRM_TABLE: {
619+
CRM_STATS: {
618620
"crm_stats_nexthop_group_used": "20",
619621
"crm_stats_nexthop_group_available": "80"
620622
}
@@ -693,8 +695,8 @@
693695
}
694696
},
695697
COUNTERS_DB: {
696-
"CRM": {
697-
"STATS": {
698+
CRM_TABLE: {
699+
CRM_STATS: {
698700
"crm_stats_nexthop_group_used": "20",
699701
"crm_stats_nexthop_group_available": "80"
700702
}
@@ -749,8 +751,8 @@
749751
}
750752
},
751753
COUNTERS_DB: {
752-
"CRM": {
753-
"STATS": {
754+
CRM_TABLE: {
755+
CRM_STATS: {
754756
"crm_stats_nexthop_group_used": "20",
755757
"crm_stats_nexthop_group_available": "80"
756758
}
@@ -805,8 +807,8 @@
805807
}
806808
},
807809
COUNTERS_DB: {
808-
"CRM": {
809-
"STATS": {
810+
CRM_TABLE: {
811+
CRM_STATS: {
810812
"crm_stats_nexthop_group_used": "20",
811813
"crm_stats_nexthop_group_available": "80"
812814
}
@@ -862,8 +864,8 @@
862864
}
863865
},
864866
COUNTERS_DB: {
865-
"CRM": {
866-
"STATS": {
867+
CRM_TABLE: {
868+
CRM_STATS: {
867869
"crm_stats_nexthop_group_used": "20",
868870
"crm_stats_nexthop_group_available": "80"
869871
}
@@ -902,8 +904,8 @@
902904
}
903905
},
904906
COUNTERS_DB: {
905-
"CRM": {
906-
"STATS": {
907+
CRM_TABLE: {
908+
CRM_STATS: {
907909
"crm_stats_nexthop_group_used": "20",
908910
"crm_stats_nexthop_group_available": "80"
909911
}
@@ -965,8 +967,8 @@
965967
}
966968
},
967969
COUNTERS_DB: {
968-
"CRM": {
969-
"STATS": {
970+
CRM_TABLE: {
971+
CRM_STATS: {
970972
"crm_stats_nexthop_group_used": "20",
971973
"crm_stats_nexthop_group_available": "80"
972974
}
@@ -1012,8 +1014,8 @@
10121014
}
10131015
},
10141016
COUNTERS_DB: {
1015-
"CRM": {
1016-
"STATS": {
1017+
CRM_TABLE: {
1018+
CRM_STATS: {
10171019
"crm_stats_nexthop_group_used": "20",
10181020
"crm_stats_nexthop_group_available": "80"
10191021
}
@@ -1099,8 +1101,8 @@
10991101
}
11001102
},
11011103
COUNTERS_DB: {
1102-
"CRM": {
1103-
"STATS": {
1104+
CRM_TABLE: {
1105+
CRM_STATS: {
11041106
"crm_stats_nexthop_group_used": "20",
11051107
"crm_stats_nexthop_group_available": "80"
11061108
}
@@ -1182,8 +1184,8 @@
11821184
}
11831185
},
11841186
COUNTERS_DB: {
1185-
"CRM": {
1186-
"STATS": {
1187+
CRM_TABLE: {
1188+
CRM_STATS: {
11871189
"crm_stats_nexthop_group_used": "20",
11881190
"crm_stats_nexthop_group_available": "80"
11891191
}
@@ -1254,8 +1256,8 @@
12541256
}
12551257
},
12561258
COUNTERS_DB: {
1257-
"CRM": {
1258-
"STATS": {
1259+
CRM_TABLE: {
1260+
CRM_STATS: {
12591261
"crm_stats_nexthop_group_used": "20",
12601262
"crm_stats_nexthop_group_available": "80"
12611263
}
@@ -1324,8 +1326,8 @@
13241326
}
13251327
},
13261328
COUNTERS_DB: {
1327-
"CRM": {
1328-
"STATS": {
1329+
CRM_TABLE: {
1330+
CRM_STATS: {
13291331
"crm_stats_nexthop_group_used": "20",
13301332
"crm_stats_nexthop_group_available": "80"
13311333
}
@@ -1386,8 +1388,8 @@
13861388
}
13871389
},
13881390
COUNTERS_DB: {
1389-
"CRM": {
1390-
"STATS": {
1391+
CRM_TABLE: {
1392+
CRM_STATS: {
13911393
"crm_stats_nexthop_group_used": "20",
13921394
"crm_stats_nexthop_group_available": "80"
13931395
}
@@ -1455,8 +1457,8 @@
14551457
}
14561458
},
14571459
COUNTERS_DB: {
1458-
"CRM": {
1459-
"STATS": {
1460+
CRM_TABLE: {
1461+
CRM_STATS: {
14601462
"crm_stats_nexthop_group_used": "20",
14611463
"crm_stats_nexthop_group_available": "80"
14621464
}
@@ -1533,8 +1535,8 @@
15331535
}
15341536
},
15351537
COUNTERS_DB: {
1536-
"CRM": {
1537-
"STATS": {
1538+
CRM_TABLE: {
1539+
CRM_STATS: {
15381540
"crm_stats_nexthop_group_used": "20",
15391541
"crm_stats_nexthop_group_available": "80"
15401542
}
@@ -1592,8 +1594,8 @@
15921594
}
15931595
},
15941596
COUNTERS_DB: {
1595-
"CRM": {
1596-
"STATS": {
1597+
CRM_TABLE: {
1598+
CRM_STATS: {
15971599
"crm_stats_nexthop_group_used": "20",
15981600
"crm_stats_nexthop_group_available": "80"
15991601
}
@@ -1679,8 +1681,8 @@
16791681
}
16801682
},
16811683
COUNTERS_DB: {
1682-
"CRM": {
1683-
"STATS": {
1684+
CRM_TABLE: {
1685+
CRM_STATS: {
16841686
"crm_stats_nexthop_group_used": "20",
16851687
"crm_stats_nexthop_group_available": "80"
16861688
}
@@ -1772,8 +1774,8 @@
17721774
}
17731775
},
17741776
COUNTERS_DB: {
1775-
"CRM": {
1776-
"STATS": {
1777+
CRM_TABLE: {
1778+
CRM_STATS: {
17771779
"crm_stats_nexthop_group_used": "20",
17781780
"crm_stats_nexthop_group_available": "80"
17791781
}
@@ -1876,8 +1878,8 @@
18761878
}
18771879
},
18781880
COUNTERS_DB: {
1879-
"CRM": {
1880-
"STATS": {
1881+
CRM_TABLE: {
1882+
CRM_STATS: {
18811883
"crm_stats_nexthop_group_used": "20",
18821884
"crm_stats_nexthop_group_available": "80"
18831885
}
@@ -1968,8 +1970,8 @@
19681970
}
19691971
},
19701972
COUNTERS_DB: {
1971-
"CRM": {
1972-
"STATS": {
1973+
CRM_TABLE: {
1974+
CRM_STATS: {
19731975
"crm_stats_nexthop_group_used": "85",
19741976
"crm_stats_nexthop_group_available": "15"
19751977
}

0 commit comments

Comments
 (0)