Skip to content

Commit af7732b

Browse files
committed
[hyperv-hcs] Reflect main branch changes
1 parent 866020f commit af7732b

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

src/platform/backends/hyperv_api/hcs_virtual_machine.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,7 @@ std::vector<hcn::CreateEndpointParameters> HCSVirtualMachine::make_endpoint_para
343343
std::ranges::transform(description.extra_interfaces,
344344
std::back_inserter(params),
345345
[](const auto& v) -> hcn::CreateEndpointParameters {
346-
return {.network_guid =
347-
multipass::utils::make_uuid(v.id).toStdString(),
346+
return {.network_guid = multipass::utils::make_uuid(v.id),
348347
.endpoint_guid = mac2uuid(v.mac_address),
349348
.mac_address = replace_colon_with_dash(v.mac_address)};
350349
});

src/platform/backends/hyperv_api/hcs_virtual_machine_factory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ std::string HCSVirtualMachineFactory::create_bridge_with(const NetworkInterfaceI
205205
hcn::CreateNetworkParameters network_params{};
206206
network_params.name = vswitch_name;
207207
network_params.type = hcn::HcnNetworkType::Transparent();
208-
network_params.guid = utils::make_uuid(network_params.name).toStdString();
208+
network_params.guid = utils::make_uuid(network_params.name);
209209
hcn::HcnNetworkPolicy policy{hcn::HcnNetworkPolicyType::NetAdapterName(),
210210
hcn::HcnNetworkPolicyNetAdapterName{intf.id}};
211211
network_params.policies.push_back(policy);

tests/unit/hyperv_api/test_ut_hyperv_hcs_virtual_machine_factory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ TEST_F(HyperVHCSVirtualMachineFactory_UnitTests, create_virtual_machine)
202202
constexpr auto expected_name = "Multipass vSwitch (bbaa)";
203203
EXPECT_EQ(params.name, expected_name);
204204
EXPECT_EQ(params.type, mhv::hcn::HcnNetworkType::Transparent());
205-
EXPECT_EQ(params.guid, multipass::utils::make_uuid(expected_name).toStdString());
205+
EXPECT_EQ(params.guid, multipass::utils::make_uuid(expected_name));
206206
ASSERT_EQ(params.policies.size(), 1);
207207
EXPECT_EQ(params.policies[0].type,
208208
mhv::hcn::HcnNetworkPolicyType::NetAdapterName());

0 commit comments

Comments
 (0)