consider node/network artifact availability - #158

src/player/actioncontroller/src/manager.rs

@@ -114,18 +114,14 @@ impl ActionControllerManager {
         // To Do.. network, node yaml extract from etcd.
         let etcd_network_key = format!("Network/{}", scenario_name);
         let network_str = match common::etcd::get(&etcd_network_key).await {
-            Ok(value) => value,
-            Err(e) => {
-                return Err(format!("Network key '{}' not found: {}", etcd_network_key, e).into());
-            }
+            Ok(value) => Some(value),
+            Err(_) => None,
         };
 
         let etcd_node_key = format!("Node/{}", scenario_name);
         let node_str = match common::etcd::get(&etcd_node_key).await {
-            Ok(value) => value,
-            Err(e) => {
-                return Err(format!("Network key '{}' not found: {}", etcd_node_key, e).into());
-            }
+            Ok(value) => Some(value),
+            Err(_) => None,
         };
 
         for mi in package.get_models() {
@@ -150,15 +146,19 @@ impl ActionControllerManager {
                     self.start_workload(&model_name, &model_node, &node_type)
                         .await
                         .map_err(|e| format!("Failed to start workload '{}': {}", model_name, e))?;
-                    request_network_pod(
-                        node_str.clone(),
-                        scenario_name.to_string(),
-                        network_str.clone(),
-                    )
-                    .await
-                    .map_err(|e| {
-                        format!("Failed to request network pod for '{}': {}", model_name, e)
-                    })?;
+
+                    // If network and node are specified, request network pod to Pharos
+                    if network_str.is_some() && node_str.is_some() {
+                        request_network_pod(
+                            node_str.clone().unwrap(),
+                            scenario_name.to_string(),
+                            network_str.clone().unwrap(),
+                        )
+                        .await
+                        .map_err(|e| {
+                            format!("Failed to request network pod for '{}': {}", model_name, e)
+                        })?;
+                    }
                 }
                 "terminate" => {
                     self.reload_all_node(&model_name, &model_node).await?;

src/player/filtergateway/src/manager.rs

@@ -77,7 +77,9 @@ impl FilterGatewayManager {
     pub async fn initialize(&self) -> Result<()> {
         println!("FilterGatewayManager init");
         // Initialize vehicle manager
-        let etcd_scenario = Self::read_all_scenario_from_etcd().await.unwrap_or_default();
+        let etcd_scenario = Self::read_all_scenario_from_etcd()
+            .await
+            .unwrap_or_default();
 
         for scenario in etcd_scenario {
             let scenario: Scenario = serde_yaml::from_str(&scenario)?;