fix: Made GetBootstrapper a private member of main module

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

Author: UtkarshBhatthere

microceph/cmd/microcephd/bootstrapper.go

@@ -18,8 +18,8 @@ type Bootstrapper interface {
 	Bootstrap(ctx context.Context, state interfaces.StateInterface) error
 }
 
-// GetBootstrapper returns a bootstrapper implementation based on the bootstrap parameters.
-var GetBootstrapper = func(bd common.BootstrapConfig, state interfaces.StateInterface) (Bootstrapper, error) {
+// getBootstrapper returns a bootstrapper implementation based on the bootstrap parameters.
+var getBootstrapper = func(bd common.BootstrapConfig, state interfaces.StateInterface) (Bootstrapper, error) {
 	var bootstrapper Bootstrapper
 
 	if len(bd.AdoptFSID) != 0 && len(bd.AdoptMonHosts) != 0 && len(bd.AdoptAdminKey) != 0 {

microceph/cmd/microcephd/hooks.go

@@ -19,7 +19,7 @@ func PreInit(ctx context.Context, s state.State, bootstrap bool, initConfig map[
 		bd := common.BootstrapConfig{}
 		common.DecodeBootstrapConfig(initConfig, &bd)
 
-		bootstrapper, err := GetBootstrapper(bd, interfaces.CephState{State: s})
+		bootstrapper, err := getBootstrapper(bd, interfaces.CephState{State: s})
 		if err != nil {
 			logger.Errorf("failed to get bootstrapper: %v", err)
 			return err
@@ -38,7 +38,7 @@ func PostBootstrap(ctx context.Context, s state.State, initConfig map[string]str
 	bd := common.BootstrapConfig{}
 	common.DecodeBootstrapConfig(initConfig, &bd)
 
-	bootstrapper, err := GetBootstrapper(bd, interfaces.CephState{State: s})
+	bootstrapper, err := getBootstrapper(bd, interfaces.CephState{State: s})
 	if err != nil {
 		logger.Errorf("failed to get bootstrapper: %v", err)
 		return err

microceph/cmd/microcephd/hooks_test.go

@@ -46,7 +46,7 @@ func (s *hooksSuite) TestPreInit() {
 
 	bootstrapper.On("Precheck", mock.Anything, mock.Anything).Return(nil).Once()
 
-	GetBootstrapper = func(bd common.BootstrapConfig, state interfaces.StateInterface) (Bootstrapper, error) {
+	getBootstrapper = func(bd common.BootstrapConfig, state interfaces.StateInterface) (Bootstrapper, error) {
 		return bootstrapper, nil
 	}
 
@@ -60,7 +60,7 @@ func (s *hooksSuite) TestPostBootstrap() {
 
 	bootstrapper.On("Bootstrap", mock.Anything, mock.Anything).Return(nil).Once()
 
-	GetBootstrapper = func(bd common.BootstrapConfig, state interfaces.StateInterface) (Bootstrapper, error) {
+	getBootstrapper = func(bd common.BootstrapConfig, state interfaces.StateInterface) (Bootstrapper, error) {
 		return bootstrapper, nil
 	}
 

tests/scripts/adoptutils.sh

@@ -18,6 +18,21 @@ function create_cephadm_vm() {
   lxc storage volume attach default $name-1 $name
   lxc storage volume attach default $name-2 $name
   lxc storage volume attach default $name-3 $name
+
+  status=$(lxc ls | grep $name | cut -d" " -f 4)
+  for i in $(seq 1 10); do
+    if [[ $status != "RUNNING" ]]; then
+      echo "waiting."
+      sleep 20s
+    fi
+    status=$(lxc ls | grep $name | cut -d" " -f 4)
+  done
+
+  status=$(lxc ls | grep $name | cut -d" " -f 4)
+  if [[ $status != "RUNNING" ]]; then
+    echo "Timeout waiting for machine"
+    exit 1
+  fi
 }
 
 function bootstrap_cephadm() {