Skip to content

Commit cb44db4

Browse files
EnjectionEnjection
authored
[Configs Refactor] Fix ut_transform (#1973)
1 parent eda9c35 commit cb44db4

File tree

51 files changed

+1191
-23154
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1191
-23154
lines changed

‎ydb/library/yaml_config/ut_transform/canondata/result.json

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,106 @@
11
{
2-
"test_transform.TestYamlConfigTransformations.test_basic": [
2+
"test_transform.TestYamlConfigTransformations.test_basic[args0-dump]": [
33
{
4-
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic/single-node-with-file.yaml.result.json"
4+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/single-node-with-file.yaml.result.json"
55
},
66
{
7-
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic/single-node-in-memory.yaml.result.json"
7+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/single-node-in-memory.yaml.result.json"
88
},
99
{
10-
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic/simple.yaml.result.json"
10+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/simple.yaml.result.json"
1111
},
1212
{
13-
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic/nvme.yaml.result.json"
13+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/nvme.yaml.result.json"
1414
},
1515
{
16-
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic/mirror-3dc-9-nodes.yaml.result.json"
16+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/mirror-3dc-9-nodes.yaml.result.json"
1717
},
1818
{
19-
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic/mirror-3dc-3-nodes.yaml.result.json"
19+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/mirror-3dc-3-nodes.yaml.result.json"
2020
},
2121
{
22-
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic/mirror-3dc-3-nodes-in-memory.yaml.result.json"
22+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/mirror-3dc-3-nodes-in-memory.yaml.result.json"
2323
},
2424
{
25-
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic/block-4-2.yaml.result.json"
25+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/block-4-2.yaml.result.json"
2626
}
2727
],
28-
"test_transform.TestYamlConfigTransformations.test_deprecated": [
28+
"test_transform.TestYamlConfigTransformations.test_basic[args0-dump_ds_init]": [
2929
{
30-
"uri": "file://test_transform.TestYamlConfigTransformations.test_deprecated/single-node-with-file.yaml.result.json"
30+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_ds_init_/single-node-with-file.yaml.result.json"
3131
},
3232
{
33-
"uri": "file://test_transform.TestYamlConfigTransformations.test_deprecated/single-node-in-memory.yaml.result.json"
33+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_ds_init_/single-node-in-memory.yaml.result.json"
3434
},
3535
{
36-
"uri": "file://test_transform.TestYamlConfigTransformations.test_deprecated/simple.yaml.result.json"
36+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_ds_init_/simple.yaml.result.json"
3737
},
3838
{
39-
"uri": "file://test_transform.TestYamlConfigTransformations.test_deprecated/nvme.yaml.result.json"
39+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_ds_init_/nvme.yaml.result.json"
4040
},
4141
{
42-
"uri": "file://test_transform.TestYamlConfigTransformations.test_deprecated/mirror-3dc-9-nodes.yaml.result.json"
42+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_ds_init_/mirror-3dc-9-nodes.yaml.result.json"
4343
},
4444
{
45-
"uri": "file://test_transform.TestYamlConfigTransformations.test_deprecated/mirror-3dc-3-nodes.yaml.result.json"
45+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_ds_init_/mirror-3dc-3-nodes.yaml.result.json"
4646
},
4747
{
48-
"uri": "file://test_transform.TestYamlConfigTransformations.test_deprecated/mirror-3dc-3-nodes-in-memory.yaml.result.json"
48+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_ds_init_/mirror-3dc-3-nodes-in-memory.yaml.result.json"
4949
},
5050
{
51-
"uri": "file://test_transform.TestYamlConfigTransformations.test_deprecated/block-4-2.yaml.result.json"
51+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args0-dump_ds_init_/block-4-2.yaml.result.json"
5252
}
5353
],
54-
"test_transform.TestYamlConfigTransformations.test_ds_init_basic": [
54+
"test_transform.TestYamlConfigTransformations.test_basic[args1-dump]": [
5555
{
56-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_basic/single-node-with-file.yaml.ds_init.result.json"
56+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_/single-node-with-file.yaml.result.json"
5757
},
5858
{
59-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_basic/single-node-in-memory.yaml.ds_init.result.json"
59+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_/single-node-in-memory.yaml.result.json"
6060
},
6161
{
62-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_basic/simple.yaml.ds_init.result.json"
62+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_/simple.yaml.result.json"
6363
},
6464
{
65-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_basic/nvme.yaml.ds_init.result.json"
65+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_/nvme.yaml.result.json"
6666
},
6767
{
68-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_basic/mirror-3dc-9-nodes.yaml.ds_init.result.json"
68+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_/mirror-3dc-9-nodes.yaml.result.json"
6969
},
7070
{
71-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_basic/mirror-3dc-3-nodes.yaml.ds_init.result.json"
71+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_/mirror-3dc-3-nodes.yaml.result.json"
7272
},
7373
{
74-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_basic/mirror-3dc-3-nodes-in-memory.yaml.ds_init.result.json"
74+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_/mirror-3dc-3-nodes-in-memory.yaml.result.json"
7575
},
7676
{
77-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_basic/block-4-2.yaml.ds_init.result.json"
77+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_/block-4-2.yaml.result.json"
7878
}
7979
],
80-
"test_transform.TestYamlConfigTransformations.test_ds_init_deprecated": [
80+
"test_transform.TestYamlConfigTransformations.test_basic[args1-dump_ds_init]": [
8181
{
82-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_deprecated/single-node-with-file.yaml.ds_init.result.json"
82+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_ds_init_/single-node-with-file.yaml.result.json"
8383
},
8484
{
85-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_deprecated/single-node-in-memory.yaml.ds_init.result.json"
85+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_ds_init_/single-node-in-memory.yaml.result.json"
8686
},
8787
{
88-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_deprecated/simple.yaml.ds_init.result.json"
88+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_ds_init_/simple.yaml.result.json"
8989
},
9090
{
91-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_deprecated/nvme.yaml.ds_init.result.json"
91+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_ds_init_/nvme.yaml.result.json"
9292
},
9393
{
94-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_deprecated/mirror-3dc-9-nodes.yaml.ds_init.result.json"
94+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_ds_init_/mirror-3dc-9-nodes.yaml.result.json"
9595
},
9696
{
97-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_deprecated/mirror-3dc-3-nodes.yaml.ds_init.result.json"
97+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_ds_init_/mirror-3dc-3-nodes.yaml.result.json"
9898
},
9999
{
100-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_deprecated/mirror-3dc-3-nodes-in-memory.yaml.ds_init.result.json"
100+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_ds_init_/mirror-3dc-3-nodes-in-memory.yaml.result.json"
101101
},
102102
{
103-
"uri": "file://test_transform.TestYamlConfigTransformations.test_ds_init_deprecated/block-4-2.yaml.ds_init.result.json"
103+
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_ds_init_/block-4-2.yaml.result.json"
104104
}
105105
]
106106
}

‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic/block-4-2.yaml.result.json renamed to ‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/block-4-2.yaml.result.json

File renamed without changes.

‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic/mirror-3dc-3-nodes-in-memory.yaml.result.json renamed to ‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/mirror-3dc-3-nodes-in-memory.yaml.result.json

File renamed without changes.

‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic/mirror-3dc-3-nodes.yaml.result.json renamed to ‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/mirror-3dc-3-nodes.yaml.result.json

File renamed without changes.

‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic/mirror-3dc-9-nodes.yaml.result.json renamed to ‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/mirror-3dc-9-nodes.yaml.result.json

File renamed without changes.

‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic/nvme.yaml.result.json renamed to ‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/nvme.yaml.result.json

File renamed without changes.

‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic/simple.yaml.result.json renamed to ‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/simple.yaml.result.json

File renamed without changes.

‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic/single-node-in-memory.yaml.result.json renamed to ‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/single-node-in-memory.yaml.result.json

File renamed without changes.

‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic/single-node-with-file.yaml.result.json renamed to ‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/single-node-with-file.yaml.result.json

File renamed without changes.

‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_ds_init_/block-4-2.yaml.result.json

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
{
2+
"Command":
3+
[
4+
{
5+
"DefineHostConfig":
6+
{
7+
"HostConfigId":1,
8+
"Drive":
9+
[
10+
{
11+
"Path":"/dev/disk/by-partlabel/ydb_disk_ssd_01",
12+
"Type":"SSD"
13+
},
14+
{
15+
"Path":"/dev/disk/by-partlabel/ydb_disk_ssd_02",
16+
"Type":"SSD"
17+
}
18+
],
19+
"ItemConfigGeneration":18446744073709551615
20+
}
21+
},
22+
{
23+
"DefineBox":
24+
{
25+
"BoxId":1,
26+
"Host":
27+
[
28+
{
29+
"Key":
30+
{
31+
"Fqdn":"ydb-node-zone-a-1.local",
32+
"IcPort":19001,
33+
"NodeId":1
34+
},
35+
"HostConfigId":1
36+
},
37+
{
38+
"Key":
39+
{
40+
"Fqdn":"ydb-node-zone-a-2.local",
41+
"IcPort":19001,
42+
"NodeId":2
43+
},
44+
"HostConfigId":1
45+
},
46+
{
47+
"Key":
48+
{
49+
"Fqdn":"ydb-node-zone-a-3.local",
50+
"IcPort":19001,
51+
"NodeId":3
52+
},
53+
"HostConfigId":1
54+
},
55+
{
56+
"Key":
57+
{
58+
"Fqdn":"ydb-node-zone-a-4.local",
59+
"IcPort":19001,
60+
"NodeId":4
61+
},
62+
"HostConfigId":1
63+
},
64+
{
65+
"Key":
66+
{
67+
"Fqdn":"ydb-node-zone-a-5.local",
68+
"IcPort":19001,
69+
"NodeId":5
70+
},
71+
"HostConfigId":1
72+
},
73+
{
74+
"Key":
75+
{
76+
"Fqdn":"ydb-node-zone-a-6.local",
77+
"IcPort":19001,
78+
"NodeId":6
79+
},
80+
"HostConfigId":1
81+
},
82+
{
83+
"Key":
84+
{
85+
"Fqdn":"ydb-node-zone-a-7.local",
86+
"IcPort":19001,
87+
"NodeId":7
88+
},
89+
"HostConfigId":1
90+
},
91+
{
92+
"Key":
93+
{
94+
"Fqdn":"ydb-node-zone-a-8.local",
95+
"IcPort":19001,
96+
"NodeId":8
97+
},
98+
"HostConfigId":1
99+
}
100+
]
101+
}
102+
}
103+
]
104+
}

‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_ds_init_/mirror-3dc-3-nodes-in-memory.yaml.result.json

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"Command":
3+
[
4+
{
5+
"DefineHostConfig":
6+
{
7+
"HostConfigId":1,
8+
"Drive":
9+
[
10+
{
11+
"Path":"SectorMap:1:64",
12+
"Type":"SSD"
13+
},
14+
{
15+
"Path":"SectorMap:2:64",
16+
"Type":"SSD"
17+
},
18+
{
19+
"Path":"SectorMap:3:64",
20+
"Type":"SSD"
21+
}
22+
],
23+
"ItemConfigGeneration":18446744073709551615
24+
}
25+
},
26+
{
27+
"DefineBox":
28+
{
29+
"BoxId":1,
30+
"Host":
31+
[
32+
{
33+
"Key":
34+
{
35+
"Fqdn":"localhost",
36+
"IcPort":19001,
37+
"NodeId":1
38+
},
39+
"HostConfigId":1
40+
},
41+
{
42+
"Key":
43+
{
44+
"Fqdn":"localhost",
45+
"IcPort":19002,
46+
"NodeId":2
47+
},
48+
"HostConfigId":1
49+
},
50+
{
51+
"Key":
52+
{
53+
"Fqdn":"localhost",
54+
"IcPort":19003,
55+
"NodeId":3
56+
},
57+
"HostConfigId":1
58+
}
59+
]
60+
}
61+
}
62+
]
63+
}

‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_ds_init_/mirror-3dc-3-nodes.yaml.result.json

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"Command":
3+
[
4+
{
5+
"DefineHostConfig":
6+
{
7+
"HostConfigId":1,
8+
"Drive":
9+
[
10+
{
11+
"Path":"/dev/disk/by-partlabel/ydb_disk_ssd_01",
12+
"Type":"SSD"
13+
},
14+
{
15+
"Path":"/dev/disk/by-partlabel/ydb_disk_ssd_02",
16+
"Type":"SSD"
17+
},
18+
{
19+
"Path":"/dev/disk/by-partlabel/ydb_disk_ssd_03",
20+
"Type":"SSD"
21+
}
22+
],
23+
"ItemConfigGeneration":18446744073709551615
24+
}
25+
},
26+
{
27+
"DefineBox":
28+
{
29+
"BoxId":1,
30+
"Host":
31+
[
32+
{
33+
"Key":
34+
{
35+
"Fqdn":"ydb-node-zone-a.local",
36+
"IcPort":19001,
37+
"NodeId":1
38+
},
39+
"HostConfigId":1
40+
},
41+
{
42+
"Key":
43+
{
44+
"Fqdn":"ydb-node-zone-b.local",
45+
"IcPort":19001,
46+
"NodeId":2
47+
},
48+
"HostConfigId":1
49+
},
50+
{
51+
"Key":
52+
{
53+
"Fqdn":"ydb-node-zone-c.local",
54+
"IcPort":19001,
55+
"NodeId":3
56+
},
57+
"HostConfigId":1
58+
}
59+
]
60+
}
61+
}
62+
]
63+
}

0 commit comments

Comments
 (0)