diff --git a/src/clouds/defs.rs b/src/clouds/defs.rs index 7621fc6..f6ac6ee 100644 --- a/src/clouds/defs.rs +++ b/src/clouds/defs.rs @@ -282,12 +282,13 @@ impl Cloud { pub struct TsksrvcInfo { pub name: String, pub info: serde_yaml::Value, + pub srvc: TskSrvc, } #[derive(Clone, Debug, Serialize, Deserialize, Default)] pub struct AppsrvcInfo { pub name: String, - pub target: String, pub info: serde_yaml::Value, + pub srvc: App, } #[derive(Clone, Debug, Serialize, Deserialize, Default)] pub struct SrvcsHostInfo { diff --git a/src/clouds/on_clouds.rs b/src/clouds/on_clouds.rs index e92edc5..5df9879 100644 --- a/src/clouds/on_clouds.rs +++ b/src/clouds/on_clouds.rs @@ -269,6 +269,7 @@ pub async fn parse_srvr_tsksrvcs(hostname: &str, sshaccess: &SSHAccess, tsksrvcs eprintln!("run_ssh_on_srvr os: {}",e); serde_yaml::Value::default() }), + srvc: TskSrvc::default(), }); }, "floatip" => { @@ -280,6 +281,7 @@ pub async fn parse_srvr_tsksrvcs(hostname: &str, sshaccess: &SSHAccess, tsksrvcs eprintln!("run_ssh_on_srvr floatip: {}",e); serde_yaml::Value::default() }), + srvc: TskSrvc::default(), }); }, "kubernetes_pods" => { @@ -291,6 +293,7 @@ pub async fn parse_srvr_tsksrvcs(hostname: &str, sshaccess: &SSHAccess, tsksrvcs eprintln!("run_ssh_on_srvr kubernetes_pods: {}",e); serde_yaml::Value::default() }), + srvc: TskSrvc::default(), }); }, _ => { continue; } @@ -314,6 +317,7 @@ pub async fn parse_srvr_tsksrvcs(hostname: &str, sshaccess: &SSHAccess, tsksrvcs eprintln!("run_ssh_on_srvr for {}: {}",&tsksrvc.name,e); serde_yaml::Value::default() }), + srvc: tsksrvc.to_owned(), }); } } @@ -358,6 +362,7 @@ pub async fn liveness_srvr_tsksrvcs(source: &str, cntrllrs: &Vec, tsksr eprintln!("Serde liveness Error: {} {} -> {}",&source,&serverstring,e); serde_yaml::Value::default() }), + srvc: tsksrvc.to_owned(), }); }, } @@ -378,7 +383,7 @@ pub async fn parse_srvr_appsrvcs(hostname: &str, sshaccess: &SSHAccess, appsrvcs eprintln!("run_ssh_on_srvr for {}: {}",&appsrvc.name,e); serde_yaml::Value::default() }), - target: format!("{}",&appsrvc.target), + srvc: appsrvc.to_owned(), }); } } @@ -422,7 +427,7 @@ pub async fn liveness_srvr_appsrvcs(source: &str, cntrllrs: &Vec, appsr eprintln!("Serde liveness Error: {} {} -> {}",&source,&serverstring,e); serde_yaml::Value::default() }), - target: format!("{}",&appsrvc.target), + srvc: appsrvc.to_owned(), }); // }, // }