[YUNIKORN-1867] refactor priority_scheduling_test

Signed-off-by: Frank Yang <yangpoan@gmail.com>

test/e2e/priority_scheduling/priority_scheduling_test.go

@@ -33,12 +33,18 @@ import (
 	"github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/common"
 	"github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/k8s"
 	"github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/yunikorn"
+	siCommon "github.com/apache/yunikorn-scheduler-interface/lib/go/common"
+)
+
+const (
+	requestCPU = "100m"
+	requestMem = "100M"
 )
 
 var rr = &v1.ResourceRequirements{
 	Requests: v1.ResourceList{
-		"cpu":    resource.MustParse("100m"),
-		"memory": resource.MustParse("100M"),
+		v1.ResourceCPU:    resource.MustParse(requestCPU),
+		v1.ResourceMemory: resource.MustParse(requestMem),
 	},
 }
 
@@ -63,8 +69,8 @@ var _ = ginkgo.Describe("Static_Queue_Priority", func() {
 			if err = common.AddQueue(sc, "default", "root", configs.QueueConfig{
 				Name:       "fence",
 				Parent:     true,
-				Resources:  configs.Resources{Max: map[string]string{"vcore": "100m", "memory": "100M"}},
-				Properties: map[string]string{"priority.policy": "fence"},
+				Resources:  configs.Resources{Max: map[string]string{siCommon.CPU: requestCPU, siCommon.Memory: requestMem}},
+				Properties: map[string]string{configs.PriorityPolicy: "fence"},
 			}); err != nil {
 				return err
 			}
@@ -83,13 +89,6 @@ var _ = ginkgo.Describe("Static_Queue_Priority", func() {
 		Ω(err).ShouldNot(HaveOccurred())
 		Ω(namespace.Status.Phase).Should(Equal(v1.NamespaceActive))
 
-		rr = &v1.ResourceRequirements{
-			Requests: v1.ResourceList{
-				"cpu":    resource.MustParse("100m"),
-				"memory": resource.MustParse("100M"),
-			},
-		}
-
 		sleepPodConf = k8s.TestPodConfig{
 			Name: "test-sleep-" + common.RandSeq(5),
 			Labels: map[string]string{
@@ -130,7 +129,7 @@ var _ = ginkgo.Describe("Static_Queue_Priority", func() {
 		}
 	})
 
-	ginkgo.It("Verify_Dynamic_Queue_Scheduling_Order", func() {
+	ginkgo.It("Verify_Static_Queue_App_Scheduling_Order", func() {
 		validatePodSchedulingOrder(ns, sleepPodConf, lowPodConf, normalPodConf, highPodConf)
 	})
 
@@ -167,17 +166,11 @@ var _ = ginkgo.Describe("Dynamic_Queue_Priority", func() {
 
 		By(fmt.Sprintf("Creating test namespace %s", ns))
 		namespace, err = kubeClient.CreateNamespace(ns, map[string]string{
-			constants.NamespaceQuota: "{\"cpu\": \"100m\", \"memory\": \"100M\"}"})
+			constants.NamespaceQuota: fmt.Sprintf("{\"%s\": \"%s\", \"%s\": \"%s\"}", v1.ResourceCPU, requestCPU, v1.ResourceMemory, requestMem),
+		})
 		Ω(err).ShouldNot(HaveOccurred())
 		Ω(namespace.Status.Phase).Should(Equal(v1.NamespaceActive))
 
-		rr = &v1.ResourceRequirements{
-			Requests: v1.ResourceList{
-				"cpu":    resource.MustParse("100m"),
-				"memory": resource.MustParse("100M"),
-			},
-		}
-
 		sleepPodConf = k8s.TestPodConfig{
 			Name:      "test-sleep-" + common.RandSeq(5),
 			Labels:    map[string]string{constants.LabelApplicationID: "app-sleep-" + common.RandSeq(5)},