Skip to content

Commit 0b13f42

Browse files
adameatadameat
committed
canonize tests
1 parent a86bd03 commit 0b13f42

File tree

2 files changed

+19
-42
lines changed

2 files changed

+19
-42
lines changed

‎ydb/core/viewer/tests/canondata/result.json

Lines changed: 16 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1762,7 +1762,6 @@
17621762
"ROT": "not-zero-number-text"
17631763
},
17641764
"MapVersions": "not-empty-object",
1765-
"MemoryTotal": "not-zero-number-text",
17661765
"NetworkUtilization": "number",
17671766
"NetworkWriteThroughput": "text",
17681767
"NodesAlive": 3,
@@ -2359,7 +2358,6 @@
23592358
"Unit": "1"
23602359
},
23612360
"MaxDiskUsage": "not-zero-number",
2362-
"MemoryLimit": "not-zero-number-text",
23632361
"NodeId": 1,
23642362
"NumberOfCpus": "not-zero-number",
23652363
"PoolStats": [
@@ -2394,7 +2392,7 @@
23942392
"Usage": "number"
23952393
}
23962394
],
2397-
"RealNumberOfCpus": 128,
2395+
"RealNumberOfCpus": "not-zero-number",
23982396
"Roles": "not-empty-array",
23992397
"StartTime": "not-zero-number-text",
24002398
"SystemState": "Green",
@@ -2432,7 +2430,6 @@
24322430
"Host": "text",
24332431
"LoadAverage": "not-empty-array",
24342432
"Location": {},
2435-
"MemoryLimit": "not-zero-number-text",
24362433
"NodeId": 50000,
24372434
"NumberOfCpus": "not-zero-number",
24382435
"PoolStats": [
@@ -2467,7 +2464,7 @@
24672464
"Usage": "number"
24682465
}
24692466
],
2470-
"RealNumberOfCpus": 128,
2467+
"RealNumberOfCpus": "not-zero-number",
24712468
"Roles": "not-empty-array",
24722469
"StartTime": "not-zero-number-text",
24732470
"SystemState": "Green",
@@ -2508,7 +2505,6 @@
25082505
"Host": "text",
25092506
"LoadAverage": "not-empty-array",
25102507
"Location": {},
2511-
"MemoryLimit": "not-zero-number-text",
25122508
"NodeId": 50001,
25132509
"NumberOfCpus": "not-zero-number",
25142510
"PoolStats": [
@@ -2543,7 +2539,7 @@
25432539
"Usage": "number"
25442540
}
25452541
],
2546-
"RealNumberOfCpus": 128,
2542+
"RealNumberOfCpus": "not-zero-number",
25472543
"Roles": "not-empty-array",
25482544
"StartTime": "not-zero-number-text",
25492545
"SystemState": "Green",
@@ -2587,7 +2583,6 @@
25872583
"Host": "text",
25882584
"LoadAverage": "not-empty-array",
25892585
"Location": {},
2590-
"MemoryLimit": "not-zero-number-text",
25912586
"NodeId": 50001,
25922587
"NumberOfCpus": "not-zero-number",
25932588
"PoolStats": [
@@ -2622,7 +2617,7 @@
26222617
"Usage": "number"
26232618
}
26242619
],
2625-
"RealNumberOfCpus": 128,
2620+
"RealNumberOfCpus": "not-zero-number",
26262621
"Roles": "not-empty-array",
26272622
"StartTime": "not-zero-number-text",
26282623
"SystemState": "Green",
@@ -2783,7 +2778,6 @@
27832778
"Unit": "1"
27842779
},
27852780
"MaxDiskUsage": "not-zero-number",
2786-
"MemoryLimit": "not-zero-number-text",
27872781
"MemoryStats": "not-empty-object",
27882782
"NodeId": 1,
27892783
"NumberOfCpus": "not-zero-number",
@@ -2819,7 +2813,7 @@
28192813
"Usage": "number"
28202814
}
28212815
],
2822-
"RealNumberOfCpus": 128,
2816+
"RealNumberOfCpus": "not-zero-number",
28232817
"Roles": "not-empty-array",
28242818
"StartTime": "not-zero-number-text",
28252819
"SystemState": "Green",
@@ -3126,7 +3120,6 @@
31263120
"Host": "text",
31273121
"LoadAverage": "not-empty-array",
31283122
"Location": {},
3129-
"MemoryLimit": "not-zero-number-text",
31303123
"MemoryStats": "not-empty-object",
31313124
"NodeId": 50000,
31323125
"NumberOfCpus": "not-zero-number",
@@ -3162,7 +3155,7 @@
31623155
"Usage": "number"
31633156
}
31643157
],
3165-
"RealNumberOfCpus": 128,
3158+
"RealNumberOfCpus": "not-zero-number",
31663159
"Roles": "not-empty-array",
31673160
"StartTime": "not-zero-number-text",
31683161
"SystemState": "Green",
@@ -3327,7 +3320,6 @@
33273320
"Host": "text",
33283321
"LoadAverage": "not-empty-array",
33293322
"Location": {},
3330-
"MemoryLimit": "not-zero-number-text",
33313323
"MemoryStats": "not-empty-object",
33323324
"NodeId": 50001,
33333325
"NumberOfCpus": "not-zero-number",
@@ -3363,7 +3355,7 @@
33633355
"Usage": "number"
33643356
}
33653357
],
3366-
"RealNumberOfCpus": 128,
3358+
"RealNumberOfCpus": "not-zero-number",
33673359
"Roles": "not-empty-array",
33683360
"StartTime": "not-zero-number-text",
33693361
"SystemState": "Green",
@@ -3518,7 +3510,6 @@
35183510
"Host": "text",
35193511
"LoadAverage": "not-empty-array",
35203512
"Location": {},
3521-
"MemoryLimit": "not-zero-number-text",
35223513
"MemoryStats": "not-empty-object",
35233514
"NodeId": 50001,
35243515
"NumberOfCpus": "not-zero-number",
@@ -3554,7 +3545,7 @@
35543545
"Usage": "number"
35553546
}
35563547
],
3557-
"RealNumberOfCpus": 128,
3548+
"RealNumberOfCpus": "not-zero-number",
35583549
"Roles": "not-empty-array",
35593550
"StartTime": "not-zero-number-text",
35603551
"SystemState": "Green",
@@ -3895,7 +3886,6 @@
38953886
"Unit": "1"
38963887
},
38973888
"MaxDiskUsage": "not-zero-number",
3898-
"MemoryLimit": "not-zero-number-text",
38993889
"NodeId": 1,
39003890
"NumberOfCpus": "not-zero-number",
39013891
"PoolStats": [
@@ -3930,7 +3920,7 @@
39303920
"Usage": "number"
39313921
}
39323922
],
3933-
"RealNumberOfCpus": 128,
3923+
"RealNumberOfCpus": "not-zero-number",
39343924
"Roles": "not-empty-array",
39353925
"StartTime": "not-zero-number-text",
39363926
"SystemState": "Green",
@@ -3974,7 +3964,6 @@
39743964
"Unit": "1"
39753965
},
39763966
"MaxDiskUsage": "not-zero-number",
3977-
"MemoryLimit": "not-zero-number-text",
39783967
"NodeId": 1,
39793968
"NumberOfCpus": "not-zero-number",
39803969
"PoolStats": [
@@ -4009,7 +3998,7 @@
40093998
"Usage": "number"
40103999
}
40114000
],
4012-
"RealNumberOfCpus": 128,
4001+
"RealNumberOfCpus": "not-zero-number",
40134002
"Roles": "not-empty-array",
40144003
"StartTime": "not-zero-number-text",
40154004
"SystemState": "Green",
@@ -4053,7 +4042,6 @@
40534042
"Unit": "1"
40544043
},
40554044
"MaxDiskUsage": "not-zero-number",
4056-
"MemoryLimit": "not-zero-number-text",
40574045
"NodeId": 1,
40584046
"NumberOfCpus": "not-zero-number",
40594047
"PoolStats": [
@@ -4088,7 +4076,7 @@
40884076
"Usage": "number"
40894077
}
40904078
],
4091-
"RealNumberOfCpus": 128,
4079+
"RealNumberOfCpus": "not-zero-number",
40924080
"Roles": "not-empty-array",
40934081
"StartTime": "not-zero-number-text",
40944082
"SystemState": "Green",
@@ -4135,7 +4123,6 @@
41354123
"Unit": "1"
41364124
},
41374125
"MaxDiskUsage": "not-zero-number",
4138-
"MemoryLimit": "not-zero-number-text",
41394126
"NodeId": 1,
41404127
"NumberOfCpus": "not-zero-number",
41414128
"PoolStats": [
@@ -4170,7 +4157,7 @@
41704157
"Usage": "number"
41714158
}
41724159
],
4173-
"RealNumberOfCpus": 128,
4160+
"RealNumberOfCpus": "not-zero-number",
41744161
"Roles": "not-empty-array",
41754162
"StartTime": "not-zero-number-text",
41764163
"SystemState": "Green",
@@ -4328,7 +4315,6 @@
43284315
"Unit": "1"
43294316
},
43304317
"MaxDiskUsage": "not-zero-number",
4331-
"MemoryLimit": "not-zero-number-text",
43324318
"MemoryStats": "not-empty-object",
43334319
"NodeId": 1,
43344320
"NumberOfCpus": "not-zero-number",
@@ -4364,7 +4350,7 @@
43644350
"Usage": "number"
43654351
}
43664352
],
4367-
"RealNumberOfCpus": 128,
4353+
"RealNumberOfCpus": "not-zero-number",
43684354
"Roles": "not-empty-array",
43694355
"StartTime": "not-zero-number-text",
43704356
"SystemState": "Green",
@@ -4697,7 +4683,6 @@
46974683
"Unit": "1"
46984684
},
46994685
"MaxDiskUsage": "not-zero-number",
4700-
"MemoryLimit": "not-zero-number-text",
47014686
"MemoryStats": "not-empty-object",
47024687
"NodeId": 1,
47034688
"NumberOfCpus": "not-zero-number",
@@ -4733,7 +4718,7 @@
47334718
"Usage": "number"
47344719
}
47354720
],
4736-
"RealNumberOfCpus": 128,
4721+
"RealNumberOfCpus": "not-zero-number",
47374722
"Roles": "not-empty-array",
47384723
"StartTime": "not-zero-number-text",
47394724
"SystemState": "Green",
@@ -5066,7 +5051,6 @@
50665051
"Unit": "1"
50675052
},
50685053
"MaxDiskUsage": "not-zero-number",
5069-
"MemoryLimit": "not-zero-number-text",
50705054
"MemoryStats": "not-empty-object",
50715055
"NodeId": 1,
50725056
"NumberOfCpus": "not-zero-number",
@@ -5102,7 +5086,7 @@
51025086
"Usage": "number"
51035087
}
51045088
],
5105-
"RealNumberOfCpus": 128,
5089+
"RealNumberOfCpus": "not-zero-number",
51065090
"Roles": "not-empty-array",
51075091
"StartTime": "not-zero-number-text",
51085092
"SystemState": "Green",
@@ -5435,7 +5419,6 @@
54355419
"Unit": "1"
54365420
},
54375421
"MaxDiskUsage": "not-zero-number",
5438-
"MemoryLimit": "not-zero-number-text",
54395422
"MemoryStats": "not-empty-object",
54405423
"NodeId": 1,
54415424
"NumberOfCpus": "not-zero-number",
@@ -5471,7 +5454,7 @@
54715454
"Usage": "number"
54725455
}
54735456
],
5474-
"RealNumberOfCpus": 128,
5457+
"RealNumberOfCpus": "not-zero-number",
54755458
"Roles": "not-empty-array",
54765459
"StartTime": "not-zero-number-text",
54775460
"SystemState": "Green",
@@ -5687,7 +5670,6 @@
56875670
"Rack": "",
56885671
"Unit": "0"
56895672
},
5690-
"MemoryLimit": "not-zero-number-text",
56915673
"NodeId": 50001,
56925674
"NumberOfCpus": "not-zero-number",
56935675
"PoolStats": [
@@ -5753,7 +5735,6 @@
57535735
"Rack": "",
57545736
"Unit": "0"
57555737
},
5756-
"MemoryLimit": "not-zero-number-text",
57575738
"NodeId": 50000,
57585739
"NumberOfCpus": "not-zero-number",
57595740
"PoolStats": [
@@ -5820,7 +5801,6 @@
58205801
"Unit": "1"
58215802
},
58225803
"MaxDiskUsage": "not-zero-number",
5823-
"MemoryLimit": "not-zero-number-text",
58245804
"NodeId": 1,
58255805
"NumberOfCpus": "not-zero-number",
58265806
"PoolStats": [
@@ -6554,7 +6534,6 @@
65546534
"CoresUsed": "not-zero-number",
65556535
"CreateTime": "not-zero-number-text",
65566536
"Id": "72075186232723360-1",
6557-
"MemoryLimit": "not-zero-number-text",
65586537
"MemoryStats": {},
65596538
"Metrics": {},
65606539
"Name": "/Root",
@@ -6601,7 +6580,6 @@
66016580
"CoresUsed": "not-zero-number",
66026581
"DatabaseQuotas": {},
66036582
"Id": "72075186232723360-6",
6604-
"MemoryLimit": "not-zero-number-text",
66056583
"MemoryStats": {},
66066584
"Metrics": "not-empty-object",
66076585
"Name": "/Root/dedicated_db",
@@ -6688,7 +6666,6 @@
66886666
"CoresUsed": "not-zero-number",
66896667
"DatabaseQuotas": {},
66906668
"Id": "72075186232723360-7",
6691-
"MemoryLimit": "not-zero-number-text",
66926669
"MemoryStats": {},
66936670
"Metrics": "not-empty-object",
66946671
"Name": "/Root/shared_db",
@@ -6755,7 +6732,6 @@
67556732
"CoresUsed": "not-zero-number",
67566733
"CreateTime": "not-zero-number-text",
67576734
"Id": "72075186232723360-1",
6758-
"MemoryLimit": "not-zero-number-text",
67596735
"MemoryStats": {},
67606736
"Metrics": {},
67616737
"Name": "/Root",
@@ -6806,7 +6782,6 @@
68066782
"CoresUsed": "not-zero-number",
68076783
"DatabaseQuotas": {},
68086784
"Id": "72075186232723360-6",
6809-
"MemoryLimit": "not-zero-number-text",
68106785
"MemoryStats": {},
68116786
"Metrics": "not-empty-object",
68126787
"Name": "/Root/dedicated_db",
@@ -6900,7 +6875,6 @@
69006875
"CoresUsed": "not-zero-number",
69016876
"DatabaseQuotas": {},
69026877
"Id": "72075186232723360-7",
6903-
"MemoryLimit": "not-zero-number-text",
69046878
"MemoryStats": {},
69056879
"Metrics": "not-empty-object",
69066880
"Name": "/Root/shared_db",

‎ydb/core/viewer/tests/test.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ def normalize_result_nodes(result):
357357
'MemoryTotal',
358358
'MemoryLimit',
359359
'NumberOfCpus',
360+
'RealNumberOfCpus',
360361
'CoresUsed',
361362
'CoresTotal',
362363
'CreateTime',
@@ -414,6 +415,8 @@ def normalize_result_replication(result):
414415
def normalize_result(result):
415416
delete_keys_recursively(result, ['Version',
416417
'MemoryUsed',
418+
'MemoryTotal',
419+
'MemoryLimit',
417420
'WriteThroughput',
418421
'ReadThroughput',
419422
'Read',

0 commit comments

Comments
 (0)