mirror of
https://github.com/psviderski/uncloud.git
synced 2026-08-28 03:53:33 +00:00
cleanup
This commit is contained in:
@@ -782,187 +782,3 @@ func TestVolumeScheduler_Schedule(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestVolumeScheduler_getAllVolumesAndSpecs(t *testing.T) {
|
||||
serviceSpecs := map[string]api.ServiceSpec{
|
||||
"service1": {
|
||||
Name: "service1",
|
||||
Container: api.ContainerSpec{
|
||||
VolumeMounts: []api.VolumeMount{
|
||||
{
|
||||
VolumeName: "vol1",
|
||||
ContainerPath: "/data",
|
||||
},
|
||||
},
|
||||
},
|
||||
Volumes: []api.VolumeSpec{
|
||||
{
|
||||
Name: "vol1",
|
||||
Type: api.VolumeTypeVolume,
|
||||
},
|
||||
},
|
||||
},
|
||||
"service2": {
|
||||
Name: "service2",
|
||||
Container: api.ContainerSpec{
|
||||
VolumeMounts: []api.VolumeMount{
|
||||
{
|
||||
VolumeName: "vol2",
|
||||
ContainerPath: "/data",
|
||||
},
|
||||
},
|
||||
},
|
||||
Volumes: []api.VolumeSpec{
|
||||
{
|
||||
Name: "vol2",
|
||||
Type: api.VolumeTypeVolume,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
// Convert map to slice
|
||||
specsList := make([]api.ServiceSpec, 0, len(serviceSpecs))
|
||||
for _, spec := range serviceSpecs {
|
||||
specsList = append(specsList, spec)
|
||||
}
|
||||
scheduler, err := NewVolumeSchedulerWithMachines(nil, specsList)
|
||||
assert.NoError(t, err)
|
||||
volumes, specs := scheduler.getAllVolumesAndSpecs()
|
||||
|
||||
assert.Len(t, volumes, 2)
|
||||
assert.Contains(t, volumes, "vol1")
|
||||
assert.Contains(t, volumes, "vol2")
|
||||
|
||||
assert.Len(t, specs, 2)
|
||||
assert.Equal(t, api.VolumeSpec{Name: "vol1", Type: api.VolumeTypeVolume}, specs["vol1"])
|
||||
assert.Equal(t, api.VolumeSpec{Name: "vol2", Type: api.VolumeTypeVolume}, specs["vol2"])
|
||||
}
|
||||
|
||||
func TestVolumeScheduler_getVolumeLocations(t *testing.T) {
|
||||
machines := []*Machine{
|
||||
{
|
||||
Info: &pb.MachineInfo{
|
||||
Id: "machine1",
|
||||
Name: "machine1",
|
||||
},
|
||||
Volumes: []volume.Volume{
|
||||
{
|
||||
Name: "vol1",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Info: &pb.MachineInfo{
|
||||
Id: "machine2",
|
||||
Name: "machine2",
|
||||
},
|
||||
Volumes: []volume.Volume{
|
||||
{
|
||||
Name: "vol2",
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
allVolumes := map[string]struct{}{
|
||||
"vol1": {},
|
||||
"vol2": {},
|
||||
"vol3": {},
|
||||
}
|
||||
|
||||
scheduler, err := NewVolumeSchedulerWithMachines(machines, nil)
|
||||
assert.NoError(t, err)
|
||||
locations := scheduler.getVolumeLocations(allVolumes)
|
||||
|
||||
assert.Len(t, locations, 3)
|
||||
assert.Equal(t, []string{"machine1"}, locations["vol1"])
|
||||
assert.Equal(t, []string{"machine2"}, locations["vol2"])
|
||||
assert.Empty(t, locations["vol3"])
|
||||
}
|
||||
|
||||
func TestVolumeScheduler_getVolumeServices(t *testing.T) {
|
||||
serviceSpecs := map[string]api.ServiceSpec{
|
||||
"service1": {
|
||||
Name: "service1",
|
||||
Container: api.ContainerSpec{
|
||||
VolumeMounts: []api.VolumeMount{
|
||||
{
|
||||
VolumeName: "vol1",
|
||||
ContainerPath: "/data",
|
||||
},
|
||||
},
|
||||
},
|
||||
Volumes: []api.VolumeSpec{
|
||||
{
|
||||
Name: "vol1",
|
||||
Type: api.VolumeTypeVolume,
|
||||
},
|
||||
},
|
||||
},
|
||||
"service2": {
|
||||
Name: "service2",
|
||||
Container: api.ContainerSpec{
|
||||
VolumeMounts: []api.VolumeMount{
|
||||
{
|
||||
VolumeName: "vol1",
|
||||
ContainerPath: "/data",
|
||||
},
|
||||
{
|
||||
VolumeName: "vol2",
|
||||
ContainerPath: "/data2",
|
||||
},
|
||||
},
|
||||
},
|
||||
Volumes: []api.VolumeSpec{
|
||||
{
|
||||
Name: "vol1",
|
||||
Type: api.VolumeTypeVolume,
|
||||
},
|
||||
{
|
||||
Name: "vol2",
|
||||
Type: api.VolumeTypeVolume,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
allVolumes := map[string]struct{}{
|
||||
"vol1": {},
|
||||
"vol2": {},
|
||||
}
|
||||
|
||||
// Convert map to slice
|
||||
specsList := make([]api.ServiceSpec, 0, len(serviceSpecs))
|
||||
for _, spec := range serviceSpecs {
|
||||
specsList = append(specsList, spec)
|
||||
}
|
||||
scheduler, err := NewVolumeSchedulerWithMachines(nil, specsList)
|
||||
assert.NoError(t, err)
|
||||
services := scheduler.getVolumeServices(allVolumes)
|
||||
|
||||
assert.Len(t, services, 2)
|
||||
assert.ElementsMatch(t, []string{"service1", "service2"}, services["vol1"])
|
||||
assert.ElementsMatch(t, []string{"service2"}, services["vol2"])
|
||||
}
|
||||
|
||||
func TestVolumeScheduler_intersectMachines(t *testing.T) {
|
||||
scheduler := &VolumeScheduler{}
|
||||
|
||||
a := []string{"machine1", "machine2", "machine3"}
|
||||
b := []string{"machine2", "machine3", "machine4"}
|
||||
|
||||
result := scheduler.intersectMachines(a, b)
|
||||
assert.ElementsMatch(t, []string{"machine2", "machine3"}, result)
|
||||
|
||||
// Empty intersection
|
||||
c := []string{"machine5", "machine6"}
|
||||
result = scheduler.intersectMachines(a, c)
|
||||
assert.Empty(t, result)
|
||||
|
||||
// One empty slice
|
||||
result = scheduler.intersectMachines(a, []string{})
|
||||
assert.Empty(t, result)
|
||||
result = scheduler.intersectMachines([]string{}, b)
|
||||
assert.Empty(t, result)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user