epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for file editor

Browse Source
This commit is contained in:
marcos
2018-01-05 13:13:07 -03:00
parent f564f1fd28
commit 386bd87385
32 changed files with 621 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scheduler/task/check_swarm_ports_test.go
View File

@@ -42,7 +42,7 @@ func TestCheckSwarmPorts_RunWhenManager(t *testing.T) {
}
f.On("GetForInstance", i).Return(d, nil)
d.On("GetDaemonInfo").Return(info, nil)
d.On("DaemonInfo").Return(info, nil)
d.On("GetSwarmPorts").Return([]string{"aaaabbbb_node1", "aaaabbbb_node2"}, []uint16{8080, 9090}, nil)
e.M.On("Emit", CheckSwarmPortsEvent, "aaaabbbbcccc", []interface{}{ClusterPorts{Manager: i.Name, Instances: []string{i.Name, "aaaabbbb_node2"}, Ports: []int{8080, 9090}}}).Return()

2
scheduler/task/check_swarm_status.go
View File

@@ -49,7 +49,7 @@ func NewCheckSwarmStatus(e event.EventApi, f docker.FactoryApi) *checkSwarmStatu
func getDockerSwarmStatus(ctx context.Context, client docker.DockerApi) (ClusterStatus, error) {
status := ClusterStatus{}
info, err := client.GetDaemonInfo()
info, err := client.DaemonInfo()
if err != nil {
return status, err
}

8
scheduler/task/check_swarm_status_test.go
View File

@@ -40,7 +40,7 @@ func TestCheckSwarmStatus_RunWhenInactive(t *testing.T) {
}
f.On("GetForInstance", i).Return(d, nil)
d.On("GetDaemonInfo").Return(infoInactive, nil)
d.On("DaemonInfo").Return(infoInactive, nil)
e.M.On("Emit", CheckSwarmStatusEvent, "aaabbbccc", []interface{}{ClusterStatus{IsManager: false, IsWorker: false, Instance: "node1"}}).Return()
task := NewCheckSwarmStatus(e, f)
@@ -71,7 +71,7 @@ func TestCheckSwarmStatus_RunWhenLocked(t *testing.T) {
}
f.On("GetForInstance", i).Return(d, nil)
d.On("GetDaemonInfo").Return(infoLocked, nil)
d.On("DaemonInfo").Return(infoLocked, nil)
e.M.On("Emit", CheckSwarmStatusEvent, "aaabbbccc", []interface{}{ClusterStatus{IsManager: false, IsWorker: false, Instance: "node1"}}).Return()
task := NewCheckSwarmStatus(e, f)
@@ -103,7 +103,7 @@ func TestCheckSwarmStatus_RunWhenManager(t *testing.T) {
}
f.On("GetForInstance", i).Return(d, nil)
d.On("GetDaemonInfo").Return(infoLocked, nil)
d.On("DaemonInfo").Return(infoLocked, nil)
e.M.On("Emit", CheckSwarmStatusEvent, "aaabbbccc", []interface{}{ClusterStatus{IsManager: true, IsWorker: false, Instance: "node1"}}).Return()
task := NewCheckSwarmStatus(e, f)
@@ -135,7 +135,7 @@ func TestCheckSwarmStatus_RunWhenWorker(t *testing.T) {
}
f.On("GetForInstance", i).Return(d, nil)
d.On("GetDaemonInfo").Return(infoLocked, nil)
d.On("DaemonInfo").Return(infoLocked, nil)
e.M.On("Emit", CheckSwarmStatusEvent, "aaabbbccc", []interface{}{ClusterStatus{IsManager: false, IsWorker: true, Instance: "node1"}}).Return()
task := NewCheckSwarmStatus(e, f)

2
scheduler/task/collect_stats.go
View File

@@ -91,7 +91,7 @@ func (t *collectStats) Run(ctx context.Context, instance *types.Instance) error
log.Println(err)
return err
}
reader, err := dockerClient.GetContainerStats(instance.Name)
reader, err := dockerClient.ContainerStats(instance.Name)
if err != nil {
log.Println("Error while trying to collect instance stats", err)
return err

2
scheduler/task/collect_stats_test.go
View File

@@ -65,7 +65,7 @@ func TestCollectStats_Run(t *testing.T) {
s.On("SessionGet", i.SessionId).Return(sess, nil)
f.On("GetForSession", sess).Return(d, nil)
d.On("GetContainerStats", i.Name).Return(nopCloser{bytes.NewReader(b)}, nil)
d.On("ContainerStats", i.Name).Return(nopCloser{bytes.NewReader(b)}, nil)
e.M.On("Emit", CollectStatsEvent, "aaaabbbbcccc", []interface{}{InstanceStats{Instance: i.Name, Mem: "0.00% (0B / 0B)", Cpu: "0.00%"}}).Return()
task := NewCollectStats(e, f, s)