Merge pull request #283 from eclipse-pullpiri/clustering

Author: youngtaekiim

doc/scripts/install_nodeagent.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # install_nodeagent.sh - NodeAgent installation script
-# Usage: ./install_nodeagent.sh <master_node_ip> [node_type]
+# Usage: ./install_nodeagent.sh --master <master_ip> --node <node_ip> [--role <node_role>] [--type <node_type>]
 
 # Exit on error
 set -e
@@ -11,9 +11,54 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
+# Initialize variables
+MASTER_IP=""
+NODE_IP=""
+NODE_NAME=$(hostname)  # Always use system hostname
+NODE_ROLE="nodeagent"  # Default node role (master, nodeagent, bluechi)
+NODE_TYPE="vehicle"  # Default node type (vehicle, cloud)
+
+# Process command line arguments
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --master)
+            MASTER_IP="$2"
+            shift 2
+            ;;
+        --node)
+            NODE_IP="$2"
+            shift 2
+            ;;
+        --role)
+            NODE_ROLE="$2"
+            # Validate node role
+            if [[ ! "$NODE_ROLE" =~ ^(master|nodeagent|bluechi)$ ]]; then
+                echo "Error: Invalid node role '$NODE_ROLE'. Must be one of: master, nodeagent, bluechi"
+                exit 1
+            fi
+            shift 2
+            ;;
+        --type)
+            NODE_TYPE="$2"
+            # Validate node type
+            if [[ ! "$NODE_TYPE" =~ ^(vehicle|cloud|master|nodeagent|bluechi)$ ]]; then
+                echo "Error: Invalid node type '$NODE_TYPE'. Must be one of: vehicle, cloud, master, nodeagent, bluechi"
+                exit 1
+            fi
+            shift 2
+            ;;
+        *)
+            echo "Unknown option: $1"
+            echo "Usage: $0 --master <master_ip> --node <node_ip> [--role <node_role>] [--type <node_type>]"
+            exit 1
+            ;;
+    esac
+done
+
 # Parameter validation
-if [ $# -lt 1 ]; then
-    echo "Usage: $0 <master_node_ip> [node_type(sub|master)]"
+if [ -z "$MASTER_IP" ] || [ -z "$NODE_IP" ]; then
+    echo "Error: Both --master and --node options are required."
+    echo "Usage: $0 --master <master_ip> --node <node_ip> [--role <node_role>] [--type <node_type>]"
     exit 1
 fi
 
@@ -114,10 +159,9 @@ install_required_packages() {
     fi
 }
 
-# Parameter settings
-MASTER_IP=$1
-NODE_TYPE=${2:-"sub"}
-GRPC_PORT=${3:-"47098"}
+# Parameter settings already processed from command line
+# MASTER_IP and NODE_IP are set from command line arguments
+GRPC_PORT="47004"
 #DOWNLOAD_URL="https://github.com/piccolo-framework/piccolo/releases/download/latest"
 DOWNLOAD_URL="https://raw.githubusercontent.com/eclipse-pullpiri/pullpiri/main/examples/binarys"
 CHECKSUM_URL="${DOWNLOAD_URL}"  # Define CHECKSUM_URL
@@ -244,15 +288,16 @@ chmod +x /usr/local/bin/node_ready_check.sh
 echo "Creating configuration file..."
 cat > ${CONFIG_DIR}/nodeagent.yaml << EOF
 nodeagent:
+  node_name: "${NODE_NAME}"
   node_type: "${NODE_TYPE}"
+  node_role: "${NODE_ROLE}"
   master_ip: "${MASTER_IP}"
+  node_ip: "${NODE_IP}"
   grpc_port: ${GRPC_PORT}
   log_level: "info"
   metrics:
     collection_interval: 5
     batch_size: 50
-  etcd:
-    endpoint: "${MASTER_IP}:2379"
   system:
     hostname: "$(hostname)"
     platform: "$(uname -s)"
@@ -300,6 +345,7 @@ Restart=on-failure
 RestartSec=10
 Environment=RUST_LOG=info
 Environment=MASTER_NODE_IP=${MASTER_IP}
+Environment=NODE_IP=${NODE_IP}
 Environment=GRPC_PORT=${GRPC_PORT}
 
 # Security hardening settings
@@ -375,6 +421,7 @@ echo "Installation Summary:"
 echo "- Installation directory: ${INSTALL_DIR}"
 echo "- Configuration file: ${CONFIG_DIR}/nodeagent.yaml"
 echo "- Master node: ${MASTER_IP}:${GRPC_PORT}"
+echo "- Node IP: ${NODE_IP}"
 echo "- Node type: ${NODE_TYPE}"
 echo "- Status: $ERROR_COUNT errors, $WARNING_COUNT warnings"
 

examples/binarys/nodeagent-linux-amd64

@@ -3,14 +3,12 @@
 
 .PHONY: default build
 build:
-	cargo build --manifest-path=agent/Cargo.toml
 	cargo build --manifest-path=player/Cargo.toml
 	cargo build --manifest-path=server/Cargo.toml
 
 .PHONY: clean
 clean:
 	cargo clean --manifest-path=common/Cargo.toml
-	cargo clean --manifest-path=agent/Cargo.toml
 	cargo clean --manifest-path=player/Cargo.toml
 	cargo clean --manifest-path=server/Cargo.toml
 	cargo clean --manifest-path=tools/Cargo.toml
@@ -22,15 +20,13 @@ tool:
 .PHONY: fmt
 fmt:
 	cd common && cargo fmt
-	cd agent && cargo fmt
 	cd player && cargo fmt
 	cd server && cargo fmt
 	cd tools && cargo fmt
 
 .PHONY: clippy
 clippy:
 	cd common && cargo clippy
-	cd agent && cargo clippy
 	cd player && cargo clippy
 	cd server && cargo clippy
 	cd tools && cargo clippy

src/Makefile

@@ -17,3 +17,5 @@ hyperlocal = { version = "0.8", features = ["client"] }
 thiserror = "1.0"
 once_cell = "1.19.0"
 sysinfo = "0.36.1"
+if-addrs = "0.10.1"
+hostname = "0.3.1"

src/agent/Cargo.lock

@@ -43,8 +43,27 @@ 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
+    if std::path::Path::new(&link).exists() {
+        println!("Removing existing symlink: {}", link);
+        std::fs::remove_file(&link)?;
+    }
+
+    println!("Creating symlink from {} to {}", original, link);
     std::os::unix::fs::symlink(original, link)?;
 
     Ok(())