Skip to content

Commit

Permalink
[daemon] small fix for rebase conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
georgeliao committed Nov 2, 2023
1 parent 3523469 commit c9f71b0
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions src/daemon/daemon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2588,7 +2588,8 @@ catch (const std::exception& e)
status_promise->set_value(grpc::Status(grpc::StatusCode::INTERNAL, e.what(), ""));
}

void mp::Daemon::clone(const CloneRequest* request, grpc::ServerReaderWriterInterface<CloneReply, CloneRequest>* server,
void mp::Daemon::clone(const CloneRequest* request,

Check warning on line 2591 in src/daemon/daemon.cpp

View check run for this annotation

Codecov / codecov/patch

src/daemon/daemon.cpp#L2591

Added line #L2591 was not covered by tests
grpc::ServerReaderWriterInterface<CloneReply, CloneRequest>* server,
std::promise<grpc::Status>* status_promise)
{
try
Expand Down Expand Up @@ -2758,20 +2759,19 @@ void mp::Daemon::clone(const CloneRequest* request, grpc::ServerReaderWriterInte
}

// start to construct VirtualMachineDescription
mp::VirtualMachineDescription dest_vm_desc{
dest_vm_spec.num_cores,
dest_vm_spec.mem_size,
dest_vm_spec.disk_space,
destination_name,
dest_vm_spec.default_mac_address,
dest_vm_spec.extra_interfaces,
dest_vm_spec.ssh_username,
fetch_image_for(destination_name, config->factory->fetch_type(), *config->vault),
cloud_init_config_iso_file_path.string().c_str(),
{},
{},
{},
{}};
mp::VirtualMachineDescription dest_vm_desc{dest_vm_spec.num_cores,

Check warning on line 2762 in src/daemon/daemon.cpp

View check run for this annotation

Codecov / codecov/patch

src/daemon/daemon.cpp#L2762

Added line #L2762 was not covered by tests
dest_vm_spec.mem_size,
dest_vm_spec.disk_space,
destination_name,
dest_vm_spec.default_mac_address,
dest_vm_spec.extra_interfaces,
dest_vm_spec.ssh_username,
fetch_image_for(destination_name, *config->factory, *config->vault),
cloud_init_config_iso_file_path.string().c_str(),

Check warning on line 2770 in src/daemon/daemon.cpp

View check run for this annotation

Codecov / codecov/patch

src/daemon/daemon.cpp#L2766-L2770

Added lines #L2766 - L2770 were not covered by tests
{},
{},
{},
{}};

Check warning on line 2774 in src/daemon/daemon.cpp

View check run for this annotation

Codecov / codecov/patch

src/daemon/daemon.cpp#L2774

Added line #L2774 was not covered by tests

operative_instances[destination_name] = config->factory->create_virtual_machine(dest_vm_desc, *this);
init_mounts(destination_name);

Check warning on line 2777 in src/daemon/daemon.cpp

View check run for this annotation

Codecov / codecov/patch

src/daemon/daemon.cpp#L2776-L2777

Added lines #L2776 - L2777 were not covered by tests
Expand Down

0 comments on commit c9f71b0

Please sign in to comment.