Linter corrections

Signed-off-by: Guvenc Gulce <[email protected]>

Author: guvenc

cli/src/vm_commands.rs

@@ -8,10 +8,10 @@ use crossterm::tty::IsTty;
 use feos_proto::vm_service::{
     net_config, stream_vm_console_request as console_input, vm_service_client::VmServiceClient,
     AttachConsoleMessage, AttachDiskRequest, AttachNicRequest, ConsoleData, CpuConfig,
-    CreateVmRequest, DeleteVmRequest, DiskConfig, GetVmRequest, ListVmsRequest, MemoryConfig,
-    NetConfig, PauseVmRequest, PingVmRequest, DetachDiskRequest, DetachNicRequest, ResumeVmRequest,
-    ShutdownVmRequest, StartVmRequest, StreamVmConsoleRequest, StreamVmEventsRequest, TapConfig,
-    VfioPciConfig, VmConfig, VmState, VmStateChangedEvent,
+    CreateVmRequest, DeleteVmRequest, DetachDiskRequest, DetachNicRequest, DiskConfig,
+    GetVmRequest, ListVmsRequest, MemoryConfig, NetConfig, PauseVmRequest, PingVmRequest,
+    ResumeVmRequest, ShutdownVmRequest, StartVmRequest, StreamVmConsoleRequest,
+    StreamVmEventsRequest, TapConfig, VfioPciConfig, VmConfig, VmState, VmStateChangedEvent,
 };
 use prost::Message;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};

feos/services/vm-service/src/api.rs

@@ -5,11 +5,11 @@ use crate::Command;
 use feos_proto::vm_service::{
     vm_service_server::VmService, AttachDiskRequest, AttachDiskResponse, AttachNicRequest,
     AttachNicResponse, CreateVmRequest, CreateVmResponse, DeleteVmRequest, DeleteVmResponse,
-    GetVmRequest, ListVmsRequest, ListVmsResponse, PauseVmRequest, PauseVmResponse, PingVmRequest,
-    PingVmResponse, DetachDiskRequest, DetachDiskResponse, DetachNicRequest, DetachNicResponse,
-    ResumeVmRequest, ResumeVmResponse, ShutdownVmRequest, ShutdownVmResponse, StartVmRequest,
-    StartVmResponse, StreamVmConsoleRequest, StreamVmConsoleResponse, StreamVmEventsRequest,
-    VmEvent, VmInfo,
+    DetachDiskRequest, DetachDiskResponse, DetachNicRequest, DetachNicResponse, GetVmRequest,
+    ListVmsRequest, ListVmsResponse, PauseVmRequest, PauseVmResponse, PingVmRequest,
+    PingVmResponse, ResumeVmRequest, ResumeVmResponse, ShutdownVmRequest, ShutdownVmResponse,
+    StartVmRequest, StartVmResponse, StreamVmConsoleRequest, StreamVmConsoleResponse,
+    StreamVmEventsRequest, VmEvent, VmInfo,
 };
 use log::info;
 use std::pin::Pin;

feos/services/vm-service/src/dispatcher.rs

@@ -4,8 +4,8 @@
 use crate::{
     dispatcher_handlers::{
         handle_attach_disk_command, handle_attach_nic_command, handle_create_vm_command,
-        handle_delete_vm_command, handle_get_vm_command, handle_list_vms_command,
-        handle_pause_vm_command, handle_detach_disk_command, handle_detach_nic_command,
+        handle_delete_vm_command, handle_detach_disk_command, handle_detach_nic_command,
+        handle_get_vm_command, handle_list_vms_command, handle_pause_vm_command,
         handle_resume_vm_command, handle_shutdown_vm_command, handle_start_vm_command,
         handle_stream_vm_console_command, handle_stream_vm_events_command,
         perform_startup_sanity_check,

feos/services/vm-service/src/dispatcher_handlers.rs

@@ -12,9 +12,9 @@ use feos_proto::{
     vm_service::{
         net_config, stream_vm_console_request as console_input, AttachConsoleMessage,
         AttachDiskRequest, AttachDiskResponse, AttachNicRequest, AttachNicResponse,
-        CreateVmRequest, CreateVmResponse, DeleteVmRequest, DeleteVmResponse, GetVmRequest,
-        ListVmsRequest, ListVmsResponse, PauseVmRequest, PauseVmResponse, DetachDiskRequest,
-        DetachDiskResponse, DetachNicRequest, DetachNicResponse, ResumeVmRequest, ResumeVmResponse,
+        CreateVmRequest, CreateVmResponse, DeleteVmRequest, DeleteVmResponse, DetachDiskRequest,
+        DetachDiskResponse, DetachNicRequest, DetachNicResponse, GetVmRequest, ListVmsRequest,
+        ListVmsResponse, PauseVmRequest, PauseVmResponse, ResumeVmRequest, ResumeVmResponse,
         ShutdownVmRequest, ShutdownVmResponse, StartVmRequest, StartVmResponse,
         StreamVmConsoleRequest, StreamVmConsoleResponse, StreamVmEventsRequest, VmEvent, VmInfo,
         VmState, VmStateChangedEvent,

feos/services/vm-service/src/lib.rs

@@ -4,9 +4,9 @@
 use crate::error::VmServiceError;
 use feos_proto::vm_service::{
     AttachDiskRequest, AttachDiskResponse, AttachNicRequest, AttachNicResponse, CreateVmRequest,
-    CreateVmResponse, DeleteVmRequest, DeleteVmResponse, GetVmRequest, ListVmsRequest,
-    ListVmsResponse, PauseVmRequest, PauseVmResponse, PingVmRequest, PingVmResponse,
-    DetachDiskRequest, DetachDiskResponse, DetachNicRequest, DetachNicResponse, ResumeVmRequest,
+    CreateVmResponse, DeleteVmRequest, DeleteVmResponse, DetachDiskRequest, DetachDiskResponse,
+    DetachNicRequest, DetachNicResponse, GetVmRequest, ListVmsRequest, ListVmsResponse,
+    PauseVmRequest, PauseVmResponse, PingVmRequest, PingVmResponse, ResumeVmRequest,
     ResumeVmResponse, ShutdownVmRequest, ShutdownVmResponse, StartVmRequest, StartVmResponse,
     StreamVmConsoleRequest, StreamVmConsoleResponse, StreamVmEventsRequest, VmEvent, VmInfo,
 };

feos/services/vm-service/src/vmm/ch_adapter.rs

@@ -12,9 +12,9 @@ use cloud_hypervisor_client::{
 };
 use feos_proto::vm_service::{
     net_config, AttachDiskRequest, AttachDiskResponse, AttachNicRequest, AttachNicResponse,
-    CreateVmRequest, DeleteVmRequest, DeleteVmResponse, GetVmRequest, PauseVmRequest,
-    PauseVmResponse, PingVmRequest, PingVmResponse, DetachDiskRequest, DetachDiskResponse,
-    DetachNicRequest, DetachNicResponse, ResumeVmRequest, ResumeVmResponse, ShutdownVmRequest,
+    CreateVmRequest, DeleteVmRequest, DeleteVmResponse, DetachDiskRequest, DetachDiskResponse,
+    DetachNicRequest, DetachNicResponse, GetVmRequest, PauseVmRequest, PauseVmResponse,
+    PingVmRequest, PingVmResponse, ResumeVmRequest, ResumeVmResponse, ShutdownVmRequest,
     ShutdownVmResponse, StartVmRequest, StartVmResponse, VmConfig, VmInfo, VmState,
 };
 use hyper_util::client::legacy::Client;

feos/services/vm-service/src/vmm/mod.rs

@@ -4,9 +4,9 @@
 use crate::VmEventWrapper;
 use feos_proto::vm_service::{
     AttachDiskRequest, AttachDiskResponse, AttachNicRequest, AttachNicResponse, CreateVmRequest,
-    DeleteVmRequest, DeleteVmResponse, GetVmRequest, PauseVmRequest, PauseVmResponse,
-    PingVmRequest, PingVmResponse, DetachDiskRequest, DetachDiskResponse, DetachNicRequest,
-    DetachNicResponse, ResumeVmRequest, ResumeVmResponse, ShutdownVmRequest, ShutdownVmResponse,
+    DeleteVmRequest, DeleteVmResponse, DetachDiskRequest, DetachDiskResponse, DetachNicRequest,
+    DetachNicResponse, GetVmRequest, PauseVmRequest, PauseVmResponse, PingVmRequest,
+    PingVmResponse, ResumeVmRequest, ResumeVmResponse, ShutdownVmRequest, ShutdownVmResponse,
     StartVmRequest, StartVmResponse, VmEvent, VmInfo, VmStateChangedEvent,
 };
 use prost::Message;

feos/services/vm-service/src/worker.rs

@@ -10,12 +10,11 @@ use feos_proto::{
     vm_service::{
         stream_vm_console_request as console_input, AttachDiskRequest, AttachDiskResponse,
         AttachNicRequest, AttachNicResponse, ConsoleData, CreateVmRequest, CreateVmResponse,
-        DeleteVmRequest, DeleteVmResponse, GetVmRequest, PauseVmRequest, PauseVmResponse,
-        PingVmRequest, PingVmResponse, DetachDiskRequest, DetachDiskResponse, DetachNicRequest,
-        DetachNicResponse, ResumeVmRequest, ResumeVmResponse, ShutdownVmRequest,
-        ShutdownVmResponse, StartVmRequest, StartVmResponse, StreamVmConsoleRequest,
-        StreamVmConsoleResponse, StreamVmEventsRequest, VmEvent, VmInfo, VmState,
-        VmStateChangedEvent,
+        DeleteVmRequest, DeleteVmResponse, DetachDiskRequest, DetachDiskResponse, DetachNicRequest,
+        DetachNicResponse, GetVmRequest, PauseVmRequest, PauseVmResponse, PingVmRequest,
+        PingVmResponse, ResumeVmRequest, ResumeVmResponse, ShutdownVmRequest, ShutdownVmResponse,
+        StartVmRequest, StartVmResponse, StreamVmConsoleRequest, StreamVmConsoleResponse,
+        StreamVmEventsRequest, VmEvent, VmInfo, VmState, VmStateChangedEvent,
     },
 };
 use log::{error, info, warn};

feos/tests/integration/vm_tests.rs

@@ -6,9 +6,9 @@ use super::{ensure_server, get_public_clients, skip_if_ch_binary_missing, TEST_I
 use anyhow::{Context, Result};
 use feos_proto::vm_service::{
     net_config, stream_vm_console_request as console_input, AttachConsoleMessage, AttachNicRequest,
-    CpuConfig, CreateVmRequest, DeleteVmRequest, GetVmRequest, MemoryConfig, NetConfig,
-    PauseVmRequest, PingVmRequest, DetachNicRequest, ResumeVmRequest, ShutdownVmRequest,
-    StartVmRequest, StreamVmConsoleRequest, StreamVmEventsRequest, TapConfig, VmConfig, VmState,
+    CpuConfig, CreateVmRequest, DeleteVmRequest, DetachNicRequest, GetVmRequest, MemoryConfig,
+    NetConfig, PauseVmRequest, PingVmRequest, ResumeVmRequest, ShutdownVmRequest, StartVmRequest,
+    StreamVmConsoleRequest, StreamVmEventsRequest, TapConfig, VmConfig, VmState,
 };
 use log::info;
 use nix::sys::signal::{kill, Signal};