Skip to content

Commit

Permalink
cleanContext moved to openevec from eden
Browse files Browse the repository at this point in the history 
cleanContext is only used in OpenEVEC EdenClean function.
Tightly coupled functions should be in one module. Also,
there is cloudPrepare function which uses viper, which
we will change

Signed-off-by: Pavel Abramov <[email protected]>
  • Loading branch information
@uncleDecart
uncleDecart committed Nov 21, 2023
1 parent 66f750b commit f435517
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 104 deletions.
101 changes: 0 additions & 101 deletions pkg/eden/eden.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"time"

"github.com/lf-edge/eden/eserver/api"
"github.com/lf-edge/eden/pkg/controller"
"github.com/lf-edge/eden/pkg/defaults"
"github.com/lf-edge/eden/pkg/edensdn"
"github.com/lf-edge/eden/pkg/models"
Expand Down Expand Up @@ -764,106 +763,6 @@ func MakeEveInRepo(desc utils.EVEDescription, dist string) (image, additional st
return
}

// CleanContext cleanup only context data
func CleanContext(eveDist, certsDist, imagesDist, evePID, eveUUID, sdnPID, vmName string, configSaved string, remote bool) (err error) {
edenDir, err := utils.DefaultEdenDir()
if err != nil {
return fmt.Errorf("CleanContext: %s", err)
}
eveStatusFile := filepath.Join(edenDir, fmt.Sprintf("state-%s.yml", eveUUID))
if _, err = os.Stat(eveStatusFile); !os.IsNotExist(err) {
ctrl, err := controller.CloudPrepare()
if err != nil {
return fmt.Errorf("CleanContext: error in CloudPrepare: %s", err)
}
log.Debugf("Get devUUID for onboardUUID %s", eveUUID)
devUUID, err := ctrl.DeviceGetByOnboardUUID(eveUUID)
if err != nil {
return fmt.Errorf("CleanContext: %s", err)
}
log.Debugf("Deleting devUUID %s", devUUID)
if err := ctrl.DeviceRemove(devUUID); err != nil {
log.Errorf("CleanContext: %s", err)
}
log.Debugf("Deleting onboardUUID %s", eveUUID)
if err := ctrl.OnboardRemove(eveUUID); err != nil {
log.Errorf("CleanContext: %s", err)
}
localViper := viper.New()
localViper.SetConfigFile(eveStatusFile)
if err := localViper.ReadInConfig(); err != nil {
log.Debug(err)
} else {
eveConfigFile := localViper.GetString("eve-config")
if _, err = os.Stat(eveConfigFile); !os.IsNotExist(err) {
if err := os.Remove(eveConfigFile); err != nil {
log.Debug(err)
}
}
}
if err = os.RemoveAll(eveStatusFile); err != nil {
return fmt.Errorf("CleanContext: error in %s delete: %s", eveStatusFile, err)
}
}
if !remote {
devModel := viper.GetString("eve.devModel")
switch devModel {
case defaults.DefaultVBoxModel:
if err := StopEVEVBox(vmName); err != nil {
log.Infof("cannot stop EVE: %s", err)
} else {
log.Infof("EVE stopped")
}
if err := DeleteEVEVBox(vmName); err != nil {
log.Infof("cannot delete EVE: %s", err)
}
case defaults.DefaultParallelsModel:
if err := StopEVEParallels(vmName); err != nil {
log.Infof("cannot stop EVE: %s", err)
} else {
log.Infof("EVE stopped")
}
if err := DeleteEVEParallels(vmName); err != nil {
log.Infof("cannot delete EVE: %s", err)
}
default:
if err := StopEVEQemu(evePID); err != nil {
log.Infof("cannot stop EVE: %s", err)
} else {
log.Infof("EVE stopped")
}
err := StopSWTPM(filepath.Join(imagesDist, "swtpm"))
if err != nil {
log.Errorf("cannot stop swtpm: %s", err)
} else {
log.Infof("swtpm is stopping")
}
}
StopSDN(devModel, sdnPID)
}
if _, err = os.Stat(eveDist); !os.IsNotExist(err) {
if err = os.RemoveAll(eveDist); err != nil {
return fmt.Errorf("CleanContext: error in %s delete: %s", eveDist, err)
}
}
if _, err = os.Stat(certsDist); !os.IsNotExist(err) {
if err = os.RemoveAll(certsDist); err != nil {
return fmt.Errorf("CleanContext: error in %s delete: %s", certsDist, err)
}
}
if _, err = os.Stat(imagesDist); !os.IsNotExist(err) {
if err = os.RemoveAll(imagesDist); err != nil {
return fmt.Errorf("CleanContext: error in %s delete: %s", imagesDist, err)
}
}
if _, err = os.Stat(configSaved); !os.IsNotExist(err) {
if err = os.RemoveAll(configSaved); err != nil {
return fmt.Errorf("CleanContext: error in %s delete: %s", configSaved, err)
}
}
return nil
}

// StopEden teardown Eden
func StopEden(adamRm, redisRm, registryRm, eserverRm, eveRemote bool,
evePidFile, swtpmPidFile, sdnPidFile, devModel, vmName string) {
Expand Down
109 changes: 106 additions & 3 deletions pkg/openevec/eden.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"strconv"
"strings"

"github.com/lf-edge/eden/pkg/controller"
"github.com/lf-edge/eden/pkg/controller/eflowlog"
"github.com/lf-edge/eden/pkg/controller/einfo"
"github.com/lf-edge/eden/pkg/controller/elog"
Expand Down Expand Up @@ -512,8 +513,7 @@ func (openEVEC *OpenEVEC) EdenClean(configName, configDist, vmName string, curre
} else {
log.Infof("Adam is running and accessible on port %d", cfg.Adam.Port)
}
if err := eden.CleanContext(cfg.Eve.Dist, cfg.Eden.CertsDir, filepath.Dir(cfg.Eve.ImageFile), cfg.Eve.Pid, cfg.Eve.CertsUUID,
cfg.Sdn.PidFile, vmName, configSaved, cfg.Eve.Remote); err != nil {
if err := openEVEC.cleanContext(vmName, configSaved); err != nil {
return fmt.Errorf("cannot CleanContext: %w", err)
}
} else {
Expand All @@ -527,6 +527,109 @@ func (openEVEC *OpenEVEC) EdenClean(configName, configDist, vmName string, curre
return nil
}

func (openEVEC *OpenEVEC) cleanContext(vmName string, configSaved string) (err error) {
cfg := openEVEC.cfg
imagesDist := filepath.Dir(cfg.Eve.ImageFile)

edenDir, err := utils.DefaultEdenDir()
if err != nil {
return fmt.Errorf("CleanContext: %s", err)
}

eveStatusFile := filepath.Join(edenDir, fmt.Sprintf("state-%s.yml", cfg.Eve.CertsUUID))
if _, err = os.Stat(eveStatusFile); !os.IsNotExist(err) {
ctrl, err := controller.CloudPrepare()
if err != nil {
return fmt.Errorf("CleanContext: error in CloudPrepare: %s", err)
}
log.Debugf("Get devUUID for onboardUUID %s", cfg.Eve.CertsUUID)
devUUID, err := ctrl.DeviceGetByOnboardUUID(cfg.Eve.CertsUUID)
if err != nil {
return fmt.Errorf("CleanContext: %s", err)
}
log.Debugf("Deleting devUUID %s", devUUID)
if err := ctrl.DeviceRemove(devUUID); err != nil {
log.Errorf("CleanContext: %s", err)
}
log.Debugf("Deleting onboardUUID %s", cfg.Eve.CertsUUID)
if err := ctrl.OnboardRemove(cfg.Eve.CertsUUID); err != nil {
log.Errorf("CleanContext: %s", err)
}
localViper := viper.New()
localViper.SetConfigFile(eveStatusFile)
if err := localViper.ReadInConfig(); err != nil {
log.Debug(err)
} else {
eveConfigFile := localViper.GetString("eve-config")
if _, err = os.Stat(eveConfigFile); !os.IsNotExist(err) {
if err := os.Remove(eveConfigFile); err != nil {
log.Debug(err)
}
}
}
if err = os.RemoveAll(eveStatusFile); err != nil {
return fmt.Errorf("CleanContext: error in %s delete: %s", eveStatusFile, err)
}
}
if !cfg.Eve.Remote {
devModel := viper.GetString("eve.devModel")
switch devModel {
case defaults.DefaultVBoxModel:
if err := eden.StopEVEVBox(vmName); err != nil {
log.Infof("cannot stop EVE: %s", err)
} else {
log.Infof("EVE stopped")
}
if err := eden.DeleteEVEVBox(vmName); err != nil {
log.Infof("cannot delete EVE: %s", err)
}
case defaults.DefaultParallelsModel:
if err := eden.StopEVEParallels(vmName); err != nil {
log.Infof("cannot stop EVE: %s", err)
} else {
log.Infof("EVE stopped")
}
if err := eden.DeleteEVEParallels(vmName); err != nil {
log.Infof("cannot delete EVE: %s", err)
}
default:
if err := eden.StopEVEQemu(cfg.Eve.Pid); err != nil {
log.Infof("cannot stop EVE: %s", err)
} else {
log.Infof("EVE stopped")
}
err := eden.StopSWTPM(filepath.Join(imagesDist, "swtpm"))
if err != nil {
log.Errorf("cannot stop swtpm: %s", err)
} else {
log.Infof("swtpm is stopping")
}
}
eden.StopSDN(devModel, cfg.Sdn.PidFile)
}
if _, err = os.Stat(cfg.Eve.Dist); !os.IsNotExist(err) {
if err = os.RemoveAll(cfg.Eve.Dist); err != nil {
return fmt.Errorf("CleanContext: error in %s delete: %s", cfg.Eve.Dist, err)
}
}
if _, err = os.Stat(cfg.Eden.CertsDir); !os.IsNotExist(err) {
if err = os.RemoveAll(cfg.Eden.CertsDir); err != nil {
return fmt.Errorf("CleanContext: error in %s delete: %s", cfg.Eden.CertsDir, err)
}
}
if _, err = os.Stat(imagesDist); !os.IsNotExist(err) {
if err = os.RemoveAll(imagesDist); err != nil {
return fmt.Errorf("CleanContext: error in %s delete: %s", imagesDist, err)
}
}
if _, err = os.Stat(configSaved); !os.IsNotExist(err) {
if err = os.RemoveAll(configSaved); err != nil {
return fmt.Errorf("CleanContext: error in %s delete: %s", configSaved, err)
}
}
return nil
}

func (openEVEC *OpenEVEC) EdenInfo(outputFormat types.OutputFormat, infoTail uint, follow bool, printFields []string, args []string) error {
changer := &adamChanger{}
ctrl, devFirst, err := changer.getControllerAndDevFromConfig(openEVEC.cfg)
Expand Down Expand Up @@ -779,7 +882,7 @@ func (openEVEC *OpenEVEC) EdenImport(tarFile string, rewriteRoot bool) error {
log.Infof("Adam is running and accessible on port %d", cfg.Adam.Port)
}
changer := &adamChanger{}
ctrl, err := changer.getController()
ctrl, err := changer.getController(cfg)
if err != nil {
return err
}
Expand Down

0 comments on commit f435517

Please sign in to comment.