fix: Resolved comments and CI test

Signed-off-by: Utkarsh Bhatt <utkarsh.bhatt@canonical.com>

Author: UtkarshBhatthere

.github/workflows/tests.yml

@@ -1235,7 +1235,9 @@ jobs:
           fetch-depth: 0
 
       - name: Copy utils
-        run: cp tests/scripts/actionutils.sh $HOME
+        run: |
+          cp tests/scripts/actionutils.sh $HOME
+          cp tests/scripts/adoptutils.sh $HOME
 
       - name: Clear FORWARD firewall rules
         run: ~/actionutils.sh cleaript

microceph/cmd/microcephd/bootstrapper.go

@@ -40,15 +40,13 @@ var GetBootstrapper = func(bd common.BootstrapConfig, state interfaces.StateInte
 	return bootstrapper, nil
 }
 
-// ##### Validation methods for various members of the bootstrap config structure #####
-
 // PopulateDefaultNetworkParams provides missing network parameters with default values.
 func PopulateDefaultNetworkParams(state interfaces.StateInterface, monIP *string, publicNet *string, clusterNet *string) error {
 	var err error
 
-	if len(*monIP) != 0 {
-		logger.Debugf("mon ip provided as %s, will be used to deduce public network not provided", *monIP)
-	} else { // Initialise mon-ip if not provided.
+	logger.Debugf("Provided Bootstrap params: mon ip (%s), public net (%s), cluster net (%s)", *monIP, *publicNet, *clusterNet)
+
+	if len(*monIP) == 0 { // Initialise mon-ip if not provided.
 		if len(*publicNet) == 0 {
 			// Use default value if public address is also not provided.
 			*monIP = state.ClusterState().Address().Hostname()
@@ -100,6 +98,8 @@ func StripV2OnlyMonIP(monIP string) string {
 	return monIP
 }
 
+// ##### Validation methods for various members of the bootstrap config structure #####
+
 // ValidateNetworkParams validates network parameters for bootstrap and assign default values if needed.
 func ValidateNetworkParams(state interfaces.StateInterface, monIP *string, publicNet *string, clusterNet *string) error {
 	var err error

microceph/cmd/microcephd/hooks.go

@@ -12,9 +12,9 @@ import (
 
 // PreInit is run before the daemon is initialized on bootstrap and join.
 func PreInit(ctx context.Context, s state.State, bootstrap bool, initConfig map[string]string) error {
-	logger.Debugf("Executed Hook: PreInit (bootstrap=%v)", bootstrap)
+	logger.Infof("Executed Hook: PreInit with %+v", initConfig)
 	if bootstrap {
-		logger.Debugf("PreInit for bootstrap: %v", initConfig)
+		logger.Infof("PreInit for bootstrap: %v", initConfig)
 		// Parse Bootstrap API parameters
 		bd := common.BootstrapConfig{}
 		common.DecodeBootstrapConfig(initConfig, &bd)
@@ -33,7 +33,7 @@ func PreInit(ctx context.Context, s state.State, bootstrap bool, initConfig map[
 
 // PostBootstrap is run after the daemon is initialized and bootstrapped.
 func PostBootstrap(ctx context.Context, s state.State, initConfig map[string]string) error {
-	logger.Debug("Executed Hook: PostBootstrap")
+	logger.Infof("Executing Hook: PostBootstrap with %+v", initConfig)
 	// Parse Bootstrap API parameters
 	bd := common.BootstrapConfig{}
 	common.DecodeBootstrapConfig(initConfig, &bd)
@@ -48,13 +48,13 @@ func PostBootstrap(ctx context.Context, s state.State, initConfig map[string]str
 }
 
 func PostJoin(ctx context.Context, s state.State, initConfig map[string]string) error {
-	logger.Debug("Executed Hook: PostJoin")
+	logger.Infof("Executing Hook: PostJoin with %+v", initConfig)
 	interf := interfaces.CephState{State: s}
 	return ceph.Join(ctx, interf)
 }
 
 func OnStart(ctx context.Context, s state.State) error {
-	logger.Debug("Executed Hook: OnStart")
+	logger.Info("Executing Hook: OnStart")
 	interf := interfaces.CephState{State: s}
 	return ceph.Start(ctx, interf)
 }

microceph/cmd/microcephd/simple_bootstrapper.go

@@ -38,14 +38,16 @@ func (sb *SimpleBootstrapper) Prefill(bd common.BootstrapConfig, state interface
 	}
 
 	PopulateV2OnlyMonIP(&sb.MonIP, sb.V2Only)
+
+	logger.Debugf("SB: Prefill finished with %+v", sb)
 	return nil
 }
 
 // Precheck verifies all provided values are correct before bootstrapping.
 func (sb *SimpleBootstrapper) Precheck(ctx context.Context, state interfaces.StateInterface) error {
 	var err error
 
-	logger.Debugf("Initiating precheck for simple bootstrap: %v", sb)
+	logger.Debugf("Initiating precheck for simple bootstrap: %+v", sb)
 
 	// drop v2 vectors before validation
 	monIP := sb.MonIP