[lxd] Move link finding to net info struct

canonical · Apr 29, 2021 · 6699815 · 6699815
1 parent f07ce5b
commit 6699815
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/include/multipass/network_interface_info.h b/include/multipass/network_interface_info.h
@@ -21,13 +21,20 @@
 #include <multipass/ip_address.h>
 #include <multipass/optional.h>
 
+#include <algorithm>
 #include <string>
 #include <vector>
 
 namespace multipass
 {
 struct NetworkInterfaceInfo
 {
+    bool has_link(const std::string& net) const
+    {
+        auto end = links.cend();
+        return std::find(links.cbegin(), end, net) != end;
+    }
+
     std::string id;
     std::string type;
     std::string description;

diff --git a/src/platform/backends/lxd/lxd_virtual_machine_factory.cpp b/src/platform/backends/lxd/lxd_virtual_machine_factory.cpp
@@ -200,9 +200,7 @@ void mp::LXDVirtualMachineFactory::prepare_networking(std::vector<NetworkInterfa
         if (it != host_nets.end() && it->type == "ethernet")
         {
             it = std::find_if(host_nets.cbegin(), host_nets.cend(), [&net](const mp::NetworkInterfaceInfo& info) {
-                const auto& end = info.links.cend();
-                return info.type == "bridge" &&
-                       std::find(info.links.cbegin(), end, net.id) != end; // TODO@ricab move in
+                return info.type == "bridge" && info.has_link(net.id);
             });
             net.id = it != host_nets.cend() ? it->id : mp::backend::create_bridge_with(net.id);
         }