align wslc_schema struct names with docker_schema (#40465)
beena352 committed
May 8, 2026 at 12:28 UTC
e0f59f947e3d45b0e2321252608bdbdce95daeda
3 files changed
+19
-19
src/windows/inc/wslc_schema.h
+14
-14
@@ -38,7 +38,7 @@ struct InspectMount
38
NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(InspectMount, Type, Source, Destination, ReadWrite);
39
};
40
41
-struct InspectState
41
+struct ContainerInspectState
42
{
43
std::string Status;
44
bool Running{};
@@ -46,7 +46,7 @@ struct InspectState
46
std::string StartedAt;
47
std::string FinishedAt;
48
49
- NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(InspectState, Status, Running, ExitCode, StartedAt, FinishedAt);
49
+ NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(ContainerInspectState, Status, Running, ExitCode, StartedAt, FinishedAt);
50
};
51
52
struct Ulimit
@@ -68,7 +68,7 @@ struct InspectHostConfig
68
NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(InspectHostConfig, NetworkMode, Memory, NanoCpus, Ulimits);
69
};
70
71
-struct InspectContainerConfig
71
+struct ContainerConfig
72
{
73
std::optional<std::vector<std::string>> Env;
74
std::optional<std::vector<std::string>> Cmd;
@@ -76,7 +76,7 @@ struct InspectContainerConfig
76
std::string User;
77
std::string WorkingDir;
78
79
- NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(InspectContainerConfig, Env, Cmd, Entrypoint, User, WorkingDir);
79
+ NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(ContainerConfig, Env, Cmd, Entrypoint, User, WorkingDir);
80
};
81
82
struct InspectContainer
@@ -85,9 +85,9 @@ struct InspectContainer
85
std::string Name;
86
std::string Created;
87
std::string Image;
88
- InspectState State;
88
+ ContainerInspectState State;
89
InspectHostConfig HostConfig;
90
- InspectContainerConfig Config;
90
+ ContainerConfig Config;
91
std::map<std::string, std::vector<InspectPortBinding>> Ports;
92
std::vector<InspectMount> Mounts;
93
std::map<std::string, std::string> Labels;
@@ -138,33 +138,33 @@ struct InspectVolume
138
NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(InspectVolume, Name, Driver, CreatedAt, DriverOpts, Labels, Status);
139
};
140
141
-struct InspectIPAMConfig
141
+struct IPAMConfig
142
{
143
std::string Subnet;
144
std::string Gateway;
145
146
- NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(InspectIPAMConfig, Subnet, Gateway);
146
+ NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(IPAMConfig, Subnet, Gateway);
147
};
148
149
-struct InspectIPAM
149
+struct IPAM
150
{
151
std::string Driver;
152
- std::optional<std::vector<InspectIPAMConfig>> Config;
152
+ std::optional<std::vector<IPAMConfig>> Config;
153
154
- NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(InspectIPAM, Driver, Config);
154
+ NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(IPAM, Driver, Config);
155
};
156
157
-struct InspectNetwork
157
+struct Network
158
{
159
std::string Id;
160
std::string Name;
161
std::string Driver;
162
std::string Scope;
163
bool Internal{};
164
- InspectIPAM IPAM;
164
+ IPAM IPAM;
165
std::map<std::string, std::string> Labels;
166
167
- NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(InspectNetwork, Id, Name, Driver, Scope, Internal, IPAM, Labels);
167
+ NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Network, Id, Name, Driver, Scope, Internal, IPAM, Labels);
168
};
169
170
} // namespace wsl::windows::common::wslc_schema
src/windows/wslcsession/WSLCSession.cpp
+2
-2
@@ -2248,7 +2248,7 @@ try
2248
2249
const auto& entry = it->second;
2250
2251
- wslc_schema::InspectNetwork result;
2251
+ wslc_schema::Network result;
2252
result.Id = entry.Id;
2253
result.Name = name;
2254
result.Driver = entry.Driver;
@@ -2262,7 +2262,7 @@ try
2262
auto& configs = result.IPAM.Config.emplace();
2263
for (const auto& cfg : *entry.IPAM.Config)
2264
{
2265
- wslc_schema::InspectIPAMConfig inspectCfg;
2265
+ wslc_schema::IPAMConfig inspectCfg;
2266
inspectCfg.Subnet = cfg.Subnet;
2267
inspectCfg.Gateway = cfg.Gateway;
2268
configs.push_back(std::move(inspectCfg));
test/windows/WSLCTests.cpp
+3
-3
@@ -4439,7 +4439,7 @@ class WSLCTests
4439
VERIFY_SUCCEEDED(m_defaultSession->InspectNetwork(networkName.c_str(), &output));
4440
VERIFY_IS_NOT_NULL(output.get());
4441
4442
- auto inspect = wsl::shared::FromJson<wsl::windows::common::wslc_schema::InspectNetwork>(output.get());
4442
+ auto inspect = wsl::shared::FromJson<wsl::windows::common::wslc_schema::Network>(output.get());
4443
VERIFY_IS_TRUE(inspect.IPAM.Config.has_value());
4444
VERIFY_ARE_EQUAL(1u, inspect.IPAM.Config->size());
4445
VERIFY_ARE_EQUAL(std::string("172.31.0.0/16"), inspect.IPAM.Config->at(0).Subnet);
@@ -4539,7 +4539,7 @@ class WSLCTests
4539
VERIFY_SUCCEEDED(m_defaultSession->InspectNetwork(networkName.c_str(), &output));
4540
VERIFY_IS_NOT_NULL(output.get());
4541
4542
- auto inspect = wsl::shared::FromJson<wsl::windows::common::wslc_schema::InspectNetwork>(output.get());
4542
+ auto inspect = wsl::shared::FromJson<wsl::windows::common::wslc_schema::Network>(output.get());
4543
VERIFY_ARE_EQUAL(inspect.Name, networkName);
4544
VERIFY_ARE_EQUAL(inspect.Driver, std::string("bridge"));
4545
VERIFY_IS_FALSE(inspect.Id.empty());
@@ -4567,7 +4567,7 @@ class WSLCTests
4567
VERIFY_SUCCEEDED(m_defaultSession->InspectNetwork(networkName.c_str(), &output));
4568
VERIFY_IS_NOT_NULL(output.get());
4569
4570
- auto inspect = wsl::shared::FromJson<wsl::windows::common::wslc_schema::InspectNetwork>(output.get());
4570
+ auto inspect = wsl::shared::FromJson<wsl::windows::common::wslc_schema::Network>(output.get());
4571
VERIFY_ARE_EQUAL(inspect.Name, networkName);
4572
VERIFY_ARE_EQUAL(inspect.Driver, std::string("bridge"));
4573
VERIFY_IS_TRUE(inspect.IPAM.Config.has_value());