chore: rebase okd installation with refactoring on core types

harmony/src/modules/okd/installation.rs

@@ -51,6 +51,7 @@
 use async_trait::async_trait;
 use derive_new::new;
 use harmony_macros::ip;
+use harmony_types::id::Id;
 use log::info;
 use serde::{Deserialize, Serialize};
 
@@ -200,7 +201,7 @@ impl<T: Topology + DnsServer> Interpret<T> for OKDInstallationInterpret {
         self.status.clone()
     }
 
-    fn get_children(&self) -> Vec<crate::domain::data::Id> {
+    fn get_children(&self) -> Vec<Id> {
         vec![]
     }
 
@@ -324,7 +325,7 @@ impl<T: Topology + DnsServer> Interpret<T> for OKDSetup01InventoryDnsInterpret {
         self.status.clone()
     }
 
-    fn get_children(&self) -> Vec<crate::domain::data::Id> {
+    fn get_children(&self) -> Vec<Id> {
         vec![]
     }
 
@@ -420,7 +421,7 @@ impl<T: Topology> Interpret<T> for OKDSetup01InventoryInterpret {
         self.status.clone()
     }
 
-    fn get_children(&self) -> Vec<crate::domain::data::Id> {
+    fn get_children(&self) -> Vec<Id> {
         vec![]
     }
 
@@ -513,7 +514,7 @@ impl<T: Topology> Interpret<T> for OKDSetup02BootstrapInterpret {
         self.status.clone()
     }
 
-    fn get_children(&self) -> Vec<crate::domain::data::Id> {
+    fn get_children(&self) -> Vec<Id> {
         vec![]
     }
 
@@ -595,7 +596,7 @@ impl<T: Topology> Interpret<T> for OKDSetup03ControlPlaneInterpret {
         self.status.clone()
     }
 
-    fn get_children(&self) -> Vec<crate::domain::data::Id> {
+    fn get_children(&self) -> Vec<Id> {
         vec![]
     }
 
@@ -669,7 +670,7 @@ impl<T: Topology> Interpret<T> for OKDSetup04WorkersInterpret {
         self.status.clone()
     }
 
-    fn get_children(&self) -> Vec<crate::domain::data::Id> {
+    fn get_children(&self) -> Vec<Id> {
         vec![]
     }
 
@@ -741,7 +742,7 @@ impl<T: Topology> Interpret<T> for OKDSetup05SanityCheckInterpret {
         self.status.clone()
     }
 
-    fn get_children(&self) -> Vec<crate::domain::data::Id> {
+    fn get_children(&self) -> Vec<Id> {
         vec![]
     }
 
@@ -819,7 +820,7 @@ impl<T: Topology> Interpret<T> for OKDSetup06InstallationReportInterpret {
         self.status.clone()
     }
 
-    fn get_children(&self) -> Vec<crate::domain::data::Id> {
+    fn get_children(&self) -> Vec<Id> {
         vec![]
     }
 

harmony/src/modules/okd/mod.rs

@@ -2,7 +2,7 @@ pub mod bootstrap_dhcp;
 pub mod bootstrap_load_balancer;
 pub mod dhcp;
 pub mod dns;
-pub mod ipxe;
 pub mod installation;
+pub mod ipxe;
 pub mod load_balancer;
 pub mod upgrade;