[connectivity] Migrate remaining usages of io1 to io2

Bug: 324111518
Change-Id: I5c1bf6aa4ea9c04a648631e2bbb2062bfa41c41e
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1200345
Reviewed-by: Bruno Dal Bo <[email protected]>
Commit-Queue: Brandon Castellano <[email protected]>

Author: Breakthrough

src/connectivity/bluetooth/tools/bt-hci-emulator/src/main.rs

@@ -31,7 +31,7 @@ async fn main() -> Result<(), Error> {
         }
     };
 
-    let dev_dir = fuchsia_fs::directory::open_in_namespace(DEV_DIR, fuchsia_fs::OpenFlags::empty())
+    let dev_dir = fuchsia_fs::directory::open_in_namespace(DEV_DIR, fuchsia_fs::PERM_READABLE)
         .with_context(|| format!("failed to open {}", DEV_DIR))?;
 
     let emulator = Emulator::create_and_publish(dev_dir).await?;

src/connectivity/network/netstack-proxy/src/main.rs

@@ -101,15 +101,16 @@ pub async fn main() -> std::process::ExitCode {
     let scope = vfs::execution_scope::ExecutionScope::new();
 
     let (svc_dir, server_end) = fidl::endpoints::create_endpoints::<fidl_fuchsia_io::NodeMarker>();
-
-    svc.open(
+    let flags = fidl_fuchsia_io::PERM_READABLE
+        | fidl_fuchsia_io::PERM_WRITABLE
+        | fidl_fuchsia_io::PERM_EXECUTABLE;
+    svc.open3(
         scope.clone(),
-        fidl_fuchsia_io::OpenFlags::RIGHT_READABLE
-            | fidl_fuchsia_io::OpenFlags::RIGHT_WRITABLE
-            | fidl_fuchsia_io::OpenFlags::RIGHT_EXECUTABLE,
         vfs::path::Path::dot(),
-        server_end,
-    );
+        flags.clone(),
+        &mut vfs::ObjectRequest::new(flags, &Default::default(), server_end.into_channel()),
+    )
+    .expect("failed to create connection to service directory");
 
     actions.push(fdio::SpawnAction::add_namespace_entry(c"/svc", svc_dir.into_channel().into()));
 

src/connectivity/network/testing/netemul/service/src/main.rs

@@ -734,11 +734,17 @@ impl ManagedRealm {
                         })?;
                 }
                 ManagedRealmRequest::GetDevfs { devfs: server_end, control_handle: _ } => {
-                    let () = devfs.clone().open(
+                    let flags = fio::PERM_READABLE | fio::Flags::PROTOCOL_DIRECTORY;
+                    // On errors `server_end` will be closed with an epitaph.
+                    let _ = devfs.clone().open3(
                         vfs::execution_scope::ExecutionScope::new(),
-                        fio::OpenFlags::RIGHT_READABLE | fio::OpenFlags::DIRECTORY,
                         vfs::path::Path::dot(),
-                        server_end.into_channel().into(),
+                        flags,
+                        &mut vfs::ObjectRequest::new(
+                            flags,
+                            &Default::default(),
+                            server_end.into_channel(),
+                        ),
                     );
                 }
                 ManagedRealmRequest::AddDevice { path, device, responder } => {
@@ -922,16 +928,15 @@ impl ManagedRealm {
                     directory,
                     control_handle: _,
                 } => {
-                    let flags = fio::OpenFlags::RIGHT_READABLE | fio::OpenFlags::DIRECTORY;
-
+                    let flags = fio::PERM_READABLE | fio::Flags::PROTOCOL_DIRECTORY;
                     realm
                         .root
                         .get_exposed_dir()
-                        .open(
-                            flags,
-                            fio::ModeType::empty(),
+                        .open3(
                             &format!("{child_name}-diagnostics"),
-                            ServerEnd::new(directory.into_channel()),
+                            flags,
+                            &Default::default(),
+                            directory.into_channel(),
                         )
                         .context(format!("opening diagnostics dir for {child_name}"))?;
                 }
@@ -2686,11 +2691,11 @@ mod tests {
 
         let (network, server_end) = fidl::endpoints::create_proxy::<fio::DirectoryMarker>();
         let () = devfs
-            .open(
-                fio::OpenFlags::RIGHT_READABLE | fio::OpenFlags::DIRECTORY,
-                fio::ModeType::empty(),
+            .open3(
                 &ethernet_path,
-                server_end.into_channel().into(),
+                fio::PERM_READABLE | fio::Flags::PROTOCOL_DIRECTORY,
+                &Default::default(),
+                server_end.into_channel(),
             )
             .expect("calling open");
         let mut watcher = fvfs_watcher::Watcher::new(&network).await.expect("watcher creation");

src/connectivity/network/testing/network-test-realm/ffx/BUILD.gn

@@ -19,7 +19,6 @@ ffx_plugin("ffx_net_test_realm") {
   ]
   deps = [
     "//sdk/fidl/fuchsia.developer.remotecontrol:fuchsia.developer.remotecontrol_rust",
-    "//sdk/fidl/fuchsia.io:fuchsia.io_rust",
     "//sdk/fidl/fuchsia.net:fuchsia.net_rust",
     "//sdk/fidl/fuchsia.net.dhcpv6:fuchsia.net.dhcpv6_rust",
     "//sdk/fidl/fuchsia.sys2:fuchsia.sys2_rust",

src/connectivity/network/testing/network-test-realm/ffx/src/lib.rs

@@ -11,7 +11,7 @@ use log::error;
 use target_holders::RemoteControlProxyHolder;
 use {
     ffx_net_test_realm_args as ntr_args, fidl_fuchsia_developer_remotecontrol as fremotecontrol,
-    fidl_fuchsia_io as fio, fidl_fuchsia_net as fnet, fidl_fuchsia_net_dhcpv6 as fnet_dhcpv6,
+    fidl_fuchsia_net as fnet, fidl_fuchsia_net_dhcpv6 as fnet_dhcpv6,
     fidl_fuchsia_net_dhcpv6_ext as fnet_dhcpv6_ext, fidl_fuchsia_net_ext as fnet_ext,
     fidl_fuchsia_net_test_realm as fntr, fidl_fuchsia_sys2 as fsys,
 };
@@ -22,12 +22,11 @@ async fn connect_to_protocol<S: fidl::endpoints::DiscoverableProtocolMarker>(
 ) -> anyhow::Result<S::Proxy> {
     let (proxy, server_end) = fidl::endpoints::create_proxy::<S>();
     remote_control
-        .deprecated_open_capability(
+        .connect_capability(
             moniker,
             fsys::OpenDirType::ExposedDir,
             S::PROTOCOL_NAME,
             server_end.into_channel(),
-            fio::OpenFlags::empty(),
         )
         .await?
         .map_err(|e| {

src/connectivity/wlan/wlandevicemonitor/src/device_watch.rs

@@ -87,7 +87,7 @@ mod tests {
     use vfs::directory::entry_container::Directory;
     use vfs::execution_scope::ExecutionScope;
     use vfs::path::Path;
-    use vfs::pseudo_directory;
+    use vfs::{pseudo_directory, ObjectRequest};
     use wlan_common::test_utils::ExpectWithin;
 
     #[fasync::run_singlethreaded(test)]
@@ -152,13 +152,15 @@ mod tests {
 
     fn serve_and_bind_vfs(vfs_dir: Arc<dyn Directory>, path: &'static str) {
         let (client, server) = fidl::endpoints::create_endpoints();
-        let scope = ExecutionScope::new();
-        vfs_dir.open(
-            scope.clone(),
-            fidl_fuchsia_io::OpenFlags::RIGHT_READABLE | fidl_fuchsia_io::OpenFlags::DIRECTORY,
-            Path::dot(),
-            fidl::endpoints::ServerEnd::new(server.into_channel()),
-        );
+        let flags = fio::PERM_READABLE | fio::Flags::PROTOCOL_DIRECTORY;
+        vfs_dir
+            .open3(
+                ExecutionScope::new(),
+                Path::dot(),
+                flags,
+                &mut ObjectRequest::new(flags, &Default::default(), server.into_channel()),
+            )
+            .expect("failed to serve root directory");
 
         let ns = fdio::Namespace::installed().expect("failed to get installed namespace");
         ns.bind(path, client).expect("Failed to bind dev in namespace");