Convert all alloc drivers to using Result.

Converting everything here requires some careful logic changes; this
part should be relatively straightforward.

Author: 3405691582

base/cvd/allocd/BUILD.bazel

@@ -52,6 +52,7 @@ cc_library(
         "alloc_driver.h",
     ],
     deps = [
+        "//cuttlefish/result",
         "@abseil-cpp//absl/strings:str_format",
         "@abseil-cpp//absl/log",
     ],

base/cvd/allocd/alloc_driver.h

@@ -17,21 +17,24 @@
 #include <string>
 #include <string_view>
 
+#include "cuttlefish/result/result.h"
+
 namespace cuttlefish {
 
 inline constexpr char kCvdNetworkGroupName[] = "cvdnetwork";
 
-bool AddTapIface(std::string_view name);
-bool ShutdownIface(std::string_view name);
-bool BringUpIface(std::string_view name);
-bool AddGateway(std::string_view name, std::string_view gateway,
-                std::string_view netmask);
-bool DestroyGateway(std::string_view name, std::string_view gateway,
-                    std::string_view netmask);
-bool LinkTapToBridge(std::string_view tap_name, std::string_view bridge_name);
-bool DeleteIface(std::string_view name);
-bool BridgeExists(std::string_view name);
-bool CreateBridge(std::string_view name);
-bool IptableConfig(std::string_view network, bool add);
+Result<void> AddTapIface(std::string_view name);
+Result<void> ShutdownIface(std::string_view name);
+Result<void> BringUpIface(std::string_view name);
+Result<void> AddGateway(std::string_view name, std::string_view gateway,
+                        std::string_view netmask);
+Result<void> DestroyGateway(std::string_view name, std::string_view gateway,
+                            std::string_view netmask);
+Result<void> LinkTapToBridge(std::string_view tap_name,
+                             std::string_view bridge_name);
+Result<void> DeleteIface(std::string_view name);
+Result<bool> BridgeExists(std::string_view name);
+Result<void> CreateBridge(std::string_view name);
+Result<void> IptableConfig(std::string_view network, bool add);
 
 }  // namespace cuttlefish

base/cvd/allocd/alloc_iproute2.cpp

@@ -22,118 +22,117 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 
+#include "cuttlefish/result/result.h"
+
 namespace cuttlefish {
 
 extern int RunExternalCommand(const std::string& name);
 
-bool AddTapIface(std::string_view name) {
+Result<void> AddTapIface(std::string_view name) {
   std::stringstream ss;
   ss << "ip tuntap add dev " << name << " mode tap group cvdnetwork vnet_hdr";
   auto add_command = ss.str();
   LOG(INFO) << "Create tap interface: " << add_command;
   int status = RunExternalCommand(add_command);
-  return status == 0;
+  CF_EXPECT_EQ(status, 0);
+  return {};
 }
 
-bool ShutdownIface(std::string_view name) {
+Result<void> ShutdownIface(std::string_view name) {
   std::stringstream ss;
   ss << "ip link set dev " << name << " down";
   auto link_command = ss.str();
   LOG(INFO) << "Shutdown tap interface: " << link_command;
   int status = RunExternalCommand(link_command);
-
-  return status == 0;
+  CF_EXPECT_EQ(status, 0);
+  return {};
 }
 
-bool BringUpIface(std::string_view name) {
+Result<void> BringUpIface(std::string_view name) {
   std::stringstream ss;
   ss << "ip link set dev " << name << " up";
   auto link_command = ss.str();
   LOG(INFO) << "Bring up tap interface: " << link_command;
   int status = RunExternalCommand(link_command);
-
-  return status == 0;
+  CF_EXPECT_EQ(status, 0);
+  return {};
 }
 
-bool AddGateway(std::string_view name, std::string_view gateway,
-                std::string_view netmask) {
+Result<void> AddGateway(std::string_view name, std::string_view gateway,
+                        std::string_view netmask) {
   std::stringstream ss;
   ss << "ip addr add " << gateway << netmask << " broadcast + dev " << name;
   auto command = ss.str();
   LOG(INFO) << "setup gateway: " << command;
   int status = RunExternalCommand(command);
-
-  return status == 0;
+  CF_EXPECT_EQ(status, 0);
+  return {};
 }
 
-bool DestroyGateway(std::string_view name, std::string_view gateway,
-                    std::string_view netmask) {
+Result<void> DestroyGateway(std::string_view name, std::string_view gateway,
+                            std::string_view netmask) {
   std::stringstream ss;
   ss << "ip addr del " << gateway << netmask << " broadcast + dev " << name;
   auto command = ss.str();
   LOG(INFO) << "removing gateway: " << command;
   int status = RunExternalCommand(command);
-
-  return status == 0;
+  CF_EXPECT_EQ(status, 0);
+  return {};
 }
 
-bool LinkTapToBridge(std::string_view tap_name,
-                     std::string_view bridge_name) {
+Result<void> LinkTapToBridge(std::string_view tap_name,
+                             std::string_view bridge_name) {
   std::stringstream ss;
   ss << "ip link set dev " << tap_name << " master " << bridge_name;
   auto command = ss.str();
   int status = RunExternalCommand(command);
-
-  return status == 0;
+  CF_EXPECT_EQ(status, 0);
+  return {};
 }
 
-bool DeleteIface(std::string_view name) {
+Result<void> DeleteIface(std::string_view name) {
   std::stringstream ss;
   ss << "ip link delete " << name;
   auto link_command = ss.str();
   LOG(INFO) << "Delete tap interface: " << link_command;
   int status = RunExternalCommand(link_command);
-
-  return status == 0;
+  CF_EXPECT_EQ(status, 0);
+  return {};
 }
 
-bool BridgeExists(std::string_view name) {
+Result<bool> BridgeExists(std::string_view name) {
   std::stringstream ss;
   ss << "ip link show " << name << " >/dev/null";
 
   auto command = ss.str();
   LOG(INFO) << "bridge exists: " << command;
   int status = RunExternalCommand(command);
-
   return status == 0;
 }
 
-bool CreateBridge(std::string_view name) {
+Result<void> CreateBridge(std::string_view name) {
   std::stringstream ss;
   ss << "ip link add name " << name
      << " type bridge forward_delay 0 stp_state 0";
 
   auto command = ss.str();
   LOG(INFO) << "create bridge: " << command;
   int status = RunExternalCommand(command);
-
-  if (status != 0) {
-    return false;
-  }
-
-  return BringUpIface(name);
+  CF_EXPECT_EQ(status, 0);
+  CF_EXPECT(BringUpIface(name));
+  return {};
 }
 
-bool IptableConfig(std::string_view network, bool add) {
+Result<void> IptableConfig(std::string_view network, bool add) {
   std::stringstream ss;
   ss << "iptables -t nat " << (add ? "-A" : "-D") << " POSTROUTING -s "
      << network << " -j MASQUERADE";
 
   auto command = ss.str();
   LOG(INFO) << "iptable_config: " << command;
   int status = RunExternalCommand(command);
-
-  return status == 0;
+  CF_EXPECT_EQ(status, 0);
+  return {};
 }
 
 }  // namespace cuttlefish