Merge pull request #285 from akshaylg0314/main

feat(api)-Define more REST APIs DELETE POST on SettingsService for Dashboard[#264]

Author: youngtaekiim

src/Makefile

@@ -12,6 +12,7 @@ clean:
 	cargo clean --manifest-path=player/Cargo.toml
 	cargo clean --manifest-path=server/Cargo.toml
 	cargo clean --manifest-path=tools/Cargo.toml
+        cargo clean --manifest-path=agent/Cargo.toml
 
 .PHONY: tool
 tool:
@@ -23,10 +24,12 @@ fmt:
 	cd player && cargo fmt
 	cd server && cargo fmt
 	cd tools && cargo fmt
+        cd agent && cargo fmt
 
 .PHONY: clippy
 clippy:
 	cd common && cargo clippy
 	cd player && cargo clippy
 	cd server && cargo clippy
-	cd tools && cargo clippy
+	cd tools && cargo clippy
+        cd agent && cargo clippy

src/agent/nodeagent/src/bluechi/filemaker.rs

@@ -43,18 +43,18 @@ pub async fn make_symlink(node_name: &str, model_name: &str) -> common::Result<(
         crate::config::Config::get().get_yaml_storage(),
         model_name
     );
-    
+
     // Make sure original file exists
     if !std::path::Path::new(&original).exists() {
         return Err(format!("Original file '{}' does not exist", original).into());
     }
-    
+
     // Make sure SYSTEMD_PATH exists
     if !std::path::Path::new(SYSTEMD_PATH).exists() {
         println!("Creating directory: {}", SYSTEMD_PATH);
         std::fs::create_dir_all(SYSTEMD_PATH)?;
     }
-    
+
     let link = format!("{}{}.kube", SYSTEMD_PATH, model_name);
 
     // Remove existing symlink if it exists

src/agent/nodeagent/src/config.rs

@@ -1,12 +1,11 @@
+use if_addrs::{get_if_addrs, Interface};
 use serde::Deserialize;
 use std::fs::File;
 use std::io::Read;
 use std::path::Path;
 use std::sync::OnceLock;
-use if_addrs::{Interface, get_if_addrs};
 use thiserror::Error;
 
-
 // Global config instance
 static NODEAGENT_CONFIG: OnceLock<Config> = OnceLock::new();
 
@@ -90,7 +89,7 @@ impl Config {
         if !self.nodeagent.node_ip.is_empty() {
             return self.nodeagent.node_ip.clone();
         }
-        
+
         // Otherwise try to get the first non-loopback IPv4 address
         if let Ok(interfaces) = get_network_interfaces() {
             for iface in interfaces {
@@ -101,7 +100,7 @@ impl Config {
                 }
             }
         }
-        
+
         // Fallback to master_ip if we couldn't determine the host IP
         self.nodeagent.master_ip.clone()
     }

src/agent/nodeagent/src/grpc/receiver.rs

@@ -68,7 +68,7 @@ impl NodeAgentConnection for NodeAgentReceiver {
         // This is typically called by the master node, not the node itself
         let config = crate::config::Config::get();
         let master_ip = config.nodeagent.master_ip.clone();
-        
+
         let response = NodeRegistrationResponse {
             success: true,
             message: "Node registration processed".to_string(),
@@ -115,7 +115,7 @@ impl NodeAgentConnection for NodeAgentReceiver {
 
         let config = crate::config::Config::get();
         let master_ip = config.nodeagent.master_ip.clone();
-        
+
         let response = HeartbeatResponse {
             ack: true,
             updated_config: Some(common::nodeagent::ClusterConfig {

src/agent/nodeagent/src/grpc/sender.rs

@@ -76,7 +76,7 @@ impl NodeAgentSender {
         let config = crate::config::Config::get();
         let master_ip = config.nodeagent.master_ip.clone();
         let addr = format!("http://{}:47003", master_ip);
-        
+
         let client = MonitoringServerConnectionClient::connect(addr).await;
 
         match client {
@@ -115,7 +115,7 @@ impl NodeAgentSender {
         let config = crate::config::Config::get();
         let master_ip = config.nodeagent.master_ip.clone();
         let addr = format!("http://{}:47098", master_ip);
-        
+
         let client = ApiServerConnectionClient::connect(addr).await;
 
         match client {
@@ -147,7 +147,7 @@ impl NodeAgentSender {
         let config = crate::config::Config::get();
         let master_ip = config.nodeagent.master_ip.clone();
         let master_endpoint = format!("http://{}:47098", master_ip);
-        
+
         Ok(tonic::Response::new(HeartbeatResponse {
             ack: true,
             updated_config: Some(common::nodeagent::ClusterConfig {

src/agent/nodeagent/src/main.rs

@@ -3,9 +3,9 @@
 //! This file sets up the asynchronous runtime, initializes the manager and gRPC server,
 //! and launches both concurrently. It also provides unit tests for initialization.
 
+use clap::Parser;
 use common::nodeagent::HandleYamlRequest;
 use common::nodeagent::NodeRegistrationRequest;
-use clap::Parser;
 use std::path::PathBuf;
 mod bluechi;
 pub mod config;
@@ -46,15 +46,15 @@ async fn launch_manager(
                 metadata: std::collections::HashMap::new(),
                 resources: None,
                 node_type: match config.nodeagent.node_type.as_str() {
-                    "cloud" => 1, // NodeType::Cloud as i32
+                    "cloud" => 1,   // NodeType::Cloud as i32
                     "vehicle" => 2, // NodeType::Vehicle as i32
-                    _ => 0, // NodeType::Unspecified as i32
+                    _ => 0,         // NodeType::Unspecified as i32
                 },
                 node_role: match config.nodeagent.node_role.as_str() {
-                    "master" => 1, // NodeRole::Master as i32
+                    "master" => 1,    // NodeRole::Master as i32
                     "nodeagent" => 2, // NodeRole::Nodeagent as i32
-                    "bluechi" => 3, // NodeRole::Bluechi as i32
-                    _ => 0, // NodeRole::Unspecified as i32
+                    "bluechi" => 3,   // NodeRole::Bluechi as i32
+                    _ => 0,           // NodeRole::Unspecified as i32
                 },
             };
 
@@ -128,7 +128,10 @@ async fn initialize(tx_grpc: Sender<HandleYamlRequest>, hostname: String, config
         .parse()
         .expect("nodeagent address parsing error");
     println!("NodeAgent listening on {}", addr);
-    println!("NodeAgent config - master_ip: {}, grpc_port: {}", config.nodeagent.master_ip, config.nodeagent.grpc_port);
+    println!(
+        "NodeAgent config - master_ip: {}, grpc_port: {}",
+        config.nodeagent.master_ip, config.nodeagent.grpc_port
+    );
 
     let _ = Server::builder()
         .add_service(NodeAgentConnectionServer::new(server))

src/common/src/lib.rs

@@ -84,21 +84,21 @@ pub mod monitoringserver {
 pub mod nodeagent {
     tonic::include_proto!("nodeagent");
 
-//     pub fn open_server() -> String {
-//         super::open_server(47004)
-//     }
+    //     pub fn open_server() -> String {
+    //         super::open_server(47004)
+    //     }
 
-//     pub fn open_guest_server() -> String {
-//         super::open_guest_server(47004)
-//     }
+    //     pub fn open_guest_server() -> String {
+    //         super::open_guest_server(47004)
+    //     }
 
-//     pub fn connect_server() -> String {
-//         super::connect_server(47004)
-//     }
+    //     pub fn connect_server() -> String {
+    //         super::connect_server(47004)
+    //     }
 
-//     pub fn connect_guest_server() -> String {
-//         super::connect_guest_server(47004)
-//     }
+    //     pub fn connect_guest_server() -> String {
+    //         super::connect_guest_server(47004)
+    //     }
 }
 
 pub mod policymanager {

src/common/src/setting.rs

@@ -89,21 +89,6 @@ mod tests {
         assert!(std::ptr::eq(config1, config2));
     }
 
-    // Test handling of multiple guests in the settings
-    #[tokio::test]
-    async fn test_parse_settings_yaml_multiple_guests() {
-        // Verify that multiple guests are correctly parsed
-        let settings = parse_settings_yaml();
-        if let Some(guests) = settings.guest {
-            assert!(guests.len() > 1);
-            for guest in guests {
-                assert_ne!(guest.name, "");
-                assert_ne!(guest.ip, "");
-                assert_ne!(guest.r#type, "");
-            }
-        }
-    }
-
     // Test concurrent access to `get_config`
     #[tokio::test]
     async fn test_get_config_concurrent_access() {
@@ -158,44 +143,6 @@ mod tests {
         assert!(valid_types.contains(&settings.host.r#type.as_str()));
     }
 
-    // Test handling of a settings file with guests having invalid types
-    #[tokio::test]
-    async fn test_parse_settings_yaml_invalid_guest_types() {
-        // Verify that guest types are valid
-        let settings = parse_settings_yaml();
-        if let Some(guests) = settings.guest {
-            let valid_types = vec!["nodeagent", "zoneagent", "cloudagent"];
-            for guest in guests {
-                assert!(valid_types.contains(&guest.r#type.as_str()));
-            }
-        }
-    }
-
-    // Test handling of a settings file with guests having missing names
-    #[tokio::test]
-    async fn test_parse_settings_yaml_guest_missing_names() {
-        // Verify that guest names are not missing
-        let settings = parse_settings_yaml();
-        if let Some(guests) = settings.guest {
-            for guest in guests {
-                assert_ne!(guest.name, "");
-            }
-        }
-    }
-
-    // Test handling of a settings file with guests having duplicate IPs
-    #[tokio::test]
-    async fn test_parse_settings_yaml_guest_duplicate_ips() {
-        // Verify that guest IPs are unique
-        let settings = parse_settings_yaml();
-        if let Some(guests) = settings.guest {
-            let mut ips: Vec<String> = guests.iter().map(|guest| guest.ip.clone()).collect();
-            ips.sort();
-            ips.dedup();
-            assert_eq!(ips.len(), guests.len());
-        }
-    }
-
     // Test handling of invalid YAML file path
     #[tokio::test]
     async fn test_parse_settings_yaml_invalid_file_path() {

src/player/actioncontroller/src/grpc/sender/policymanager.rs

@@ -68,7 +68,6 @@ pub async fn check_policy(scenario_name: String) -> Result<()> {
     }
 }
 
-
 // ===========================
 // UNIT TESTS
 // ===========================
@@ -98,31 +97,4 @@ mod tests {
         let result = check_policy(scenario_name).await;
         assert!(result.is_err());
     }
-
-    #[tokio::test]
-    async fn test_handle_workload_success() {
-        let workload_name = "test-workload".to_string();
-        let action = 1;
-        let description = "example description".to_string();
-
-        let result = handle_yaml(workload_name).await;
-        if let Err(ref e) = result {
-            println!("Error in test_handle_workload_success: {:?}", e);
-        } else {
-            println!("test_handle_workload_success successful");
-        }
-        assert!(result.is_ok());
-    }
-
-    #[tokio::test]
-    async fn test_handle_workload_failure_invalid_workload() {
-        // Sending invalid workload_name and invalid action to trigger failure
-        let workload_name = "".to_string(); // Invalid empty workload
-        let action = -999; // Invalid action code
-        let description = "".to_string(); // Empty description
-
-        let result = handle_yaml(workload_name).await;
-
-        assert!(result.is_err());
-    }
 }

src/player/actioncontroller/src/main.rs

@@ -20,19 +20,19 @@ async fn initialize(skip_grpc: bool) -> Result<(), Box<dyn Error>> {
     // 기본 설정 정보에서 노드 역할 확인
     let config = common::setting::get_config();
     let mut manager = manager::ActionControllerManager::new();
-    
+
     // 설정 파일의 호스트 정보 확인 (노드 역할 사전 설정)
     let hostname = &config.host.name;
     let node_type = &config.host.r#type;
-    
+
     if node_type == "bluechi" {
         println!("Adding {} to bluechi_nodes from settings.yaml", hostname);
         manager.bluechi_nodes.push(hostname.clone());
     } else {
         println!("Adding {} to nodeagent_nodes from settings.yaml", hostname);
         manager.nodeagent_nodes.push(hostname.clone());
     }
-    
+
     // gRPC 서버 초기화 (테스트 모드가 아닌 경우)
     if !skip_grpc {
         grpc::init(manager).await?;