Use the state.State enum to represent the state of the VM

crc-org · Oct 15, 2020 · 8bd35f1 · 8bd35f1
1 parent 5fbba96
commit 8bd35f1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/cmd/crc/cmd/status.go b/cmd/crc/cmd/status.go
@@ -60,7 +60,7 @@ func runStatus(writer io.Writer, client machine.Client, cacheDir, outputFormat s
 		return fmt.Errorf("Error finding size of cache: %s", err.Error())
 	}
 	status := &status{
-		CrcStatus:        clusterStatus.CrcStatus,
+		CrcStatus:        clusterStatus.CrcStatus.String(),
 		OpenShiftStatus:  clusterStatus.OpenshiftStatus,
 		OpenShiftVersion: clusterStatus.OpenshiftVersion,
 		DiskUsage:        clusterStatus.DiskUse,

diff --git a/pkg/crc/api/adapter.go b/pkg/crc/api/adapter.go
@@ -87,7 +87,7 @@ func (a *Adapter) Start(startConfig machine.StartConfig) StartResult {
 	}
 	return StartResult{
 		Name:           startConfig.Name,
-		Status:         res.Status,
+		Status:         res.Status.String(),
 		ClusterConfig:  res.ClusterConfig,
 		KubeletStarted: res.KubeletStarted,
 	}
@@ -104,7 +104,7 @@ func (a *Adapter) Status() ClusterStatusResult {
 	}
 	return ClusterStatusResult{
 		Name:             constants.DefaultName,
-		CrcStatus:        res.CrcStatus,
+		CrcStatus:        res.CrcStatus.String(),
 		OpenshiftStatus:  res.OpenshiftStatus,
 		OpenshiftVersion: res.OpenshiftVersion,
 		DiskUse:          res.DiskUse,

diff --git a/pkg/crc/machine/fakemachine/client.go b/pkg/crc/machine/fakemachine/client.go
@@ -85,7 +85,7 @@ func (c *Client) Status(name string) (*machine.ClusterStatusResult, error) {
 		return nil, errors.New("broken")
 	}
 	return &machine.ClusterStatusResult{
-		CrcStatus:        "Running",
+		CrcStatus:        state.Running,
 		OpenshiftStatus:  "Running",
 		OpenshiftVersion: "4.5.1",
 		DiskUse:          10_000_000_000,

diff --git a/pkg/crc/machine/machine.go b/pkg/crc/machine/machine.go
@@ -213,7 +213,7 @@ func (client *client) Start(startConfig StartConfig) (*StartResult, error) {
 				return nil, errors.Wrap(err, "Cannot create cluster configuration")
 			}
 			return &StartResult{
-				Status:         vmState.String(),
+				Status:         vmState,
 				ClusterConfig:  *clusterConfig,
 				KubeletStarted: true,
 			}, nil
@@ -398,7 +398,7 @@ func (client *client) Start(startConfig StartConfig) (*StartResult, error) {
 	return &StartResult{
 		KubeletStarted: true,
 		ClusterConfig:  *clusterConfig,
-		Status:         vmState.String(),
+		Status:         vmState,
 	}, nil
 }
 
@@ -558,7 +558,7 @@ func (client *client) Status(name string) (*ClusterStatusResult, error) {
 		}
 	}
 	return &ClusterStatusResult{
-		CrcStatus:        vmStatus.String(),
+		CrcStatus:        vmStatus,
 		OpenshiftStatus:  openshiftStatus,
 		OpenshiftVersion: openshiftVersion,
 		DiskUse:          diskUse,

diff --git a/pkg/crc/machine/types.go b/pkg/crc/machine/types.go
@@ -35,7 +35,7 @@ type ClusterConfig struct {
 }
 
 type StartResult struct {
-	Status         string
+	Status         state.State
 	ClusterConfig  ClusterConfig
 	KubeletStarted bool
 }
@@ -48,7 +48,7 @@ type StopResult struct {
 }
 
 type ClusterStatusResult struct {
-	CrcStatus        string
+	CrcStatus        state.State
 	OpenshiftStatus  string
 	OpenshiftVersion string
 	DiskUse          int64