rename scheduler fake listers

Signed-off-by: Zou Nengren <zouyee1989@gmail.com>
This commit is contained in:
zouyee
2019-10-25 13:09:01 +08:00
parent 51c8bd3113
commit b86dbb97df
11 changed files with 108 additions and 162 deletions

View File

@@ -4302,7 +4302,7 @@ func createPodWithVolume(pod, pv, pvc string) *v1.Pod {
}
func TestVolumeZonePredicate(t *testing.T) {
pvInfo := fakelisters.PersistentVolumeInfo{
pvLister := fakelisters.PersistentVolumeLister{
{
ObjectMeta: metav1.ObjectMeta{Name: "Vol_1", Labels: map[string]string{v1.LabelZoneFailureDomain: "us-west1-a"}},
},
@@ -4314,7 +4314,7 @@ func TestVolumeZonePredicate(t *testing.T) {
},
}
pvcInfo := fakelisters.PersistentVolumeClaimInfo{
pvcLister := fakelisters.PersistentVolumeClaimLister{
{
ObjectMeta: metav1.ObjectMeta{Name: "PVC_1", Namespace: "default"},
Spec: v1.PersistentVolumeClaimSpec{VolumeName: "Vol_1"},
@@ -4412,7 +4412,7 @@ func TestVolumeZonePredicate(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
fit := NewVolumeZonePredicate(pvInfo, pvcInfo, nil)
fit := NewVolumeZonePredicate(pvLister, pvcLister, nil)
node := &schedulernodeinfo.NodeInfo{}
node.SetNode(test.Node)
@@ -4431,7 +4431,7 @@ func TestVolumeZonePredicate(t *testing.T) {
}
func TestVolumeZonePredicateMultiZone(t *testing.T) {
pvInfo := fakelisters.PersistentVolumeInfo{
pvLister := fakelisters.PersistentVolumeLister{
{
ObjectMeta: metav1.ObjectMeta{Name: "Vol_1", Labels: map[string]string{v1.LabelZoneFailureDomain: "us-west1-a"}},
},
@@ -4443,7 +4443,7 @@ func TestVolumeZonePredicateMultiZone(t *testing.T) {
},
}
pvcInfo := fakelisters.PersistentVolumeClaimInfo{
pvcLister := fakelisters.PersistentVolumeClaimLister{
{
ObjectMeta: metav1.ObjectMeta{Name: "PVC_1", Namespace: "default"},
Spec: v1.PersistentVolumeClaimSpec{VolumeName: "Vol_1"},
@@ -4506,7 +4506,7 @@ func TestVolumeZonePredicateMultiZone(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
fit := NewVolumeZonePredicate(pvInfo, pvcInfo, nil)
fit := NewVolumeZonePredicate(pvLister, pvcLister, nil)
node := &schedulernodeinfo.NodeInfo{}
node.SetNode(test.Node)
@@ -4533,7 +4533,7 @@ func TestVolumeZonePredicateWithVolumeBinding(t *testing.T) {
classImmediate = "Class_Immediate"
)
classInfo := fakelisters.StorageClassInfo{
scLister := fakelisters.StorageClassLister{
{
ObjectMeta: metav1.ObjectMeta{Name: classImmediate},
},
@@ -4543,13 +4543,13 @@ func TestVolumeZonePredicateWithVolumeBinding(t *testing.T) {
},
}
pvInfo := fakelisters.PersistentVolumeInfo{
pvLister := fakelisters.PersistentVolumeLister{
{
ObjectMeta: metav1.ObjectMeta{Name: "Vol_1", Labels: map[string]string{v1.LabelZoneFailureDomain: "us-west1-a"}},
},
}
pvcInfo := fakelisters.PersistentVolumeClaimInfo{
pvcLister := fakelisters.PersistentVolumeClaimLister{
{
ObjectMeta: metav1.ObjectMeta{Name: "PVC_1", Namespace: "default"},
Spec: v1.PersistentVolumeClaimSpec{VolumeName: "Vol_1"},
@@ -4622,7 +4622,7 @@ func TestVolumeZonePredicateWithVolumeBinding(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
fit := NewVolumeZonePredicate(pvInfo, pvcInfo, classInfo)
fit := NewVolumeZonePredicate(pvLister, pvcLister, scLister)
node := &schedulernodeinfo.NodeInfo{}
node.SetNode(test.Node)