brandboat commented on code in PR #772:
URL: https://github.com/apache/yunikorn-core/pull/772#discussion_r1447247165
##########
pkg/webservice/handlers_test.go:
##########
@@ -1046,43 +1029,111 @@ func TestGetPartitionQueuesHandler(t *testing.T) {
NewWebApp(schedulerContext, nil)
+ tMaxResource, err :=
resources.NewResourceFromConf(map[string]string{"memory": "600000"})
+ assert.NilError(t, err)
+ tGuaranteedResource, err :=
resources.NewResourceFromConf(map[string]string{"memory": "400000"})
+ assert.NilError(t, err)
+
+ templateInfo := dao.TemplateInfo{
+ MaxApplications: 10,
+ MaxResource: tMaxResource.DAOMap(),
+ GuaranteedResource: tGuaranteedResource.DAOMap(),
+ Properties: map[string]string{
+ configs.ApplicationSortPolicy:
policies.StateAwarePolicy.String(),
+ },
+ }
+
+ maxResource, err :=
resources.NewResourceFromConf(map[string]string{"memory": "800000", "vcore":
"80000"})
+ assert.NilError(t, err)
+ guaranteedResource, err :=
resources.NewResourceFromConf(map[string]string{"memory": "500000", "vcore":
"50000"})
+ assert.NilError(t, err)
+
var req *http.Request
- req, err := http.NewRequest("GET", "/ws/v1/partition/default/queues",
strings.NewReader(""))
+ req, err = http.NewRequest("GET", "/ws/v1/partition/default/queues",
strings.NewReader(""))
req = req.WithContext(context.WithValue(req.Context(),
httprouter.ParamsKey, httprouter.Params{httprouter.Param{Key: "partition",
Value: partitionNameWithoutClusterID}}))
assert.NilError(t, err, "Get Queues for PartitionQueues Handler request
failed")
resp := &MockResponseWriter{}
var partitionQueuesDao dao.PartitionQueueDAOInfo
getPartitionQueues(resp, req)
err = json.Unmarshal(resp.outputBytes, &partitionQueuesDao)
assert.NilError(t, err, unmarshalError)
- assert.Equal(t, partitionQueuesDao.Children[0].Parent, "root")
- assert.Equal(t, partitionQueuesDao.Children[1].Parent, "root")
- assert.Equal(t, partitionQueuesDao.Children[2].Parent, "root")
+ // assert root fields
+ assert.Equal(t, partitionQueuesDao.QueueName, configs.RootQueue)
+ assert.Equal(t, partitionQueuesDao.Status, objects.Active.String())
+ assert.Equal(t, partitionQueuesDao.Partition, configs.DefaultPartition)
+ assert.Equal(t, partitionQueuesDao.PendingResource == nil, true)
+ assert.Equal(t, partitionQueuesDao.MaxResource == nil, true)
+ assert.Equal(t, partitionQueuesDao.GuaranteedResource == nil, true)
+ assert.Equal(t, partitionQueuesDao.AllocatedResource == nil, true)
+ assert.Equal(t, partitionQueuesDao.PreemptingResource == nil, true)
+ assert.Equal(t, partitionQueuesDao.HeadRoom == nil, true)
+ assert.Equal(t, partitionQueuesDao.IsLeaf, false)
+ assert.Equal(t, partitionQueuesDao.IsManaged, true)
+ assert.Equal(t, partitionQueuesDao.Parent, "")
+ assert.Equal(t, partitionQueuesDao.AbsUsedCapacity == nil, true)
+ assert.Equal(t, partitionQueuesDao.MaxRunningApps, uint64(0))
+ assert.Equal(t, partitionQueuesDao.RunningApps, uint64(0))
+ assert.Equal(t, partitionQueuesDao.CurrentPriority, configs.MinPriority)
+ assert.Equal(t, partitionQueuesDao.AllocatingAcceptedApps == nil, true)
assert.Equal(t, len(partitionQueuesDao.Properties), 1)
- assert.Equal(t,
partitionQueuesDao.Properties["application.sort.policy"], "stateaware")
- assert.Equal(t, partitionQueuesDao.TemplateInfo.MaxApplications,
uint64(10))
- assert.Equal(t, len(partitionQueuesDao.TemplateInfo.Properties), 1)
- assert.Equal(t,
partitionQueuesDao.TemplateInfo.Properties["application.sort.policy"],
"stateaware")
-
- maxResourcesConf := make(map[string]string)
- maxResourcesConf["memory"] = "600000"
- maxResource, err := resources.NewResourceFromConf(maxResourcesConf)
- assert.NilError(t, err)
- assert.DeepEqual(t, partitionQueuesDao.TemplateInfo.MaxResource,
maxResource.DAOMap())
-
- guaranteedResourcesConf := make(map[string]string)
- guaranteedResourcesConf["memory"] = "400000"
- guaranteedResources, err :=
resources.NewResourceFromConf(guaranteedResourcesConf)
- assert.NilError(t, err)
- assert.DeepEqual(t, partitionQueuesDao.TemplateInfo.GuaranteedResource,
guaranteedResources.DAOMap())
+ assert.Equal(t,
partitionQueuesDao.Properties[configs.ApplicationSortPolicy],
policies.StateAwarePolicy.String())
+ assert.DeepEqual(t, partitionQueuesDao.TemplateInfo, &templateInfo)
+
+ // assert child root.a fields
+ assert.Equal(t, len(partitionQueuesDao.Children), 1)
+ child := &partitionQueuesDao.Children[0]
+ assert.Equal(t, child.QueueName, "root.a")
+ assert.Equal(t, child.Status, objects.Active.String())
+ assert.Equal(t, child.Partition, "")
+ assert.Equal(t, child.PendingResource == nil, true)
+ assert.DeepEqual(t, child.MaxResource, maxResource.DAOMap())
+ assert.DeepEqual(t, child.GuaranteedResource,
guaranteedResource.DAOMap())
+ assert.Equal(t, child.AllocatedResource == nil, true)
+ assert.Equal(t, child.PreemptingResource == nil, true)
+ assert.DeepEqual(t, child.HeadRoom, maxResource.DAOMap())
+ assert.Equal(t, child.IsLeaf, false)
+ assert.Equal(t, child.IsManaged, true)
+ assert.Equal(t, child.Parent, configs.RootQueue)
+ assert.Equal(t, child.AbsUsedCapacity == nil, true)
+ assert.Equal(t, child.MaxRunningApps, uint64(0))
+ assert.Equal(t, child.RunningApps, uint64(0))
+ assert.Equal(t, child.CurrentPriority, configs.MinPriority)
+ assert.Equal(t, child.AllocatingAcceptedApps == nil, true)
+ assert.Equal(t, len(child.Properties), 1)
+ assert.Equal(t, child.Properties[configs.ApplicationSortPolicy],
policies.StateAwarePolicy.String())
+ assert.DeepEqual(t, child.TemplateInfo, &templateInfo)
+
+ // assert child root.a.a1 fields
+ assert.Equal(t, len(partitionQueuesDao.Children[0].Children), 1)
+ child = &partitionQueuesDao.Children[0].Children[0]
+ assert.Equal(t, child.QueueName, "root.a.a1")
+ assert.Equal(t, child.Status, objects.Active.String())
+ assert.Equal(t, child.Partition, "")
+ assert.Equal(t, child.PendingResource == nil, true)
+ assert.DeepEqual(t, child.MaxResource, maxResource.DAOMap())
+ assert.DeepEqual(t, child.GuaranteedResource,
guaranteedResource.DAOMap())
+ assert.Equal(t, child.AllocatedResource == nil, true)
+ assert.Equal(t, child.PreemptingResource == nil, true)
+ assert.DeepEqual(t, child.HeadRoom, maxResource.DAOMap())
+ assert.Equal(t, child.IsLeaf, true)
+ assert.Equal(t, child.IsManaged, true)
+ assert.Equal(t, child.Parent, "root.a")
+ assert.Equal(t, child.AbsUsedCapacity == nil, true)
+ assert.Equal(t, child.MaxRunningApps, uint64(0))
+ assert.Equal(t, child.RunningApps, uint64(0))
+ assert.Equal(t, child.CurrentPriority, configs.MinPriority)
+ assert.Equal(t, child.AllocatingAcceptedApps == nil, true)
+ assert.Equal(t, len(child.Properties), 1)
+ assert.Equal(t, child.Properties[configs.ApplicationSortPolicy],
policies.StateAwarePolicy.String())
Review Comment:
Already address comments in
[563a5ce](https://github.com/apache/yunikorn-core/pull/772/commits/563a5ce666c9d63121033ff2b513ccc3e4241d24),
many thanks !
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]