update node code refactor (#239)

baetyl · Mar 9, 2021 · e87d1ee · e87d1ee
1 parent 032d786
commit e87d1ee
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 25 deletions.
diff --git a/spec/v1/node.go b/spec/v1/node.go
@@ -53,6 +53,7 @@ type Node struct {
 	Version           string                 `json:"version,omitempty" yaml:"version,omitempty"`
 	CreationTimestamp time.Time              `json:"createTime,omitempty" yaml:"createTime,omitempty"`
 	Accelerator       string                 `json:"accelerator,omitempty" yaml:"accelerator,omitempty"`
+	Mode              SyncMode               `json:"mode,omitempty" yaml:"mode,omitempty"`
 	Cluster           bool                   `json:"cluster,omitempty" yaml:"cluster,omitempty"`
 	Labels            map[string]string      `json:"labels,omitempty" yaml:"labels,omitempty" validate:"omitempty,validLabels"`
 	Annotations       map[string]string      `json:"annotations,omitempty" yaml:"annotations,omitempty"`
@@ -275,28 +276,6 @@ func (n *Node) View(timeout time.Duration) (*NodeView, error) {
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
-	// default mode is cloud
-	view.Mode = CloudMode
-	if attr := n.Attributes; attr != nil {
-		if modeVal, ok := attr[KeySyncMode]; ok {
-			if mode, ok := modeVal.(string); ok {
-				view.Mode = SyncMode(mode)
-			}
-		}
-		if val, ok := attr[KeyAccelerator]; ok {
-			view.Accelerator, _ = val.(string)
-		}
-		if val, ok := attr[KeyOptionalSysApps]; ok {
-			view.SysApps = make([]string, 0)
-			if ss, ok := val.([]interface{}); ok {
-				for _, d := range ss {
-					if s, ok := d.(string); ok {
-						view.SysApps = append(view.SysApps, s)
-					}
-				}
-			}
-		}
-	}
 	if err = view.populateNodeStats(timeout); err != nil {
 		return nil, errors.Trace(err)
 	}

diff --git a/spec/v1/node_test.go b/spec/v1/node_test.go
@@ -385,7 +385,6 @@ func TestTranslateNodeToNodeReportView(t *testing.T) {
 	assert.Equal(t, view.Report.SysAppStats[1].InstanceStats["core-testnode4"].Usage[string(coreV1.ResourceCPU)], "0.009")
 	assert.Equal(t, view.Report.SysAppStats[1].InstanceStats["core-testnode4"].Usage[string(coreV1.ResourceMemory)], "8916992")
 	assert.Equal(t, view.Ready, false)
-	assert.Equal(t, view.Mode, CloudMode)
 	assert.Equal(t, view.Report.SysAppStats[0].Status, Status(""))
 	assert.Equal(t, view.Report.SysAppStats[1].Status, Status(""))
 	assert.Equal(t, view.Report.AppStats[0].Status, Status(""))
@@ -543,7 +542,6 @@ func TestTranslateNodeToNodeReportViewRunning(t *testing.T) {
 	assert.Equal(t, view.Report.SysAppStats[1].InstanceStats["core-testnode4"].Usage[string(coreV1.ResourceMemory)], "8916992")
 	assert.Equal(t, 2, view.Report.NodeInsNum["master"])
 	assert.True(t, view.Ready)
-	assert.Equal(t, view.Mode, LocalMode)
 	assert.Equal(t, view.Report.SysAppStats[0].Status, Status("Running"))
 	assert.Equal(t, view.Report.SysAppStats[1].Status, Status("Running"))
 	assert.Equal(t, view.Report.AppStats[0].Status, Status("Running"))
@@ -1006,7 +1004,6 @@ func TestCompatibleSingleNode(t *testing.T) {
 	assert.Equal(t, view.Report.SysAppStats[1].InstanceStats["core-testnode4"].Usage[string(coreV1.ResourceCPU)], "0.009")
 	assert.Equal(t, view.Report.SysAppStats[1].InstanceStats["core-testnode4"].Usage[string(coreV1.ResourceMemory)], "8916992")
 	assert.Equal(t, view.Ready, true)
-	assert.Equal(t, view.Mode, LocalMode)
 	assert.Equal(t, view.Report.SysAppStats[0].Status, Status("Running"))
 	assert.Equal(t, view.Report.SysAppStats[1].Status, Status("Running"))
 	assert.Equal(t, view.Report.AppStats[0].Status, Status("Running"))