DAOS-18201 control: Allow bracketed strings in CreateRankSet (#17124)

Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

Author: tanabarr

src/control/lib/ranklist/ranklist.go

@@ -25,11 +25,7 @@ func init() {
 	}
 }
 
-func fixBrackets(stringRanks string, remove bool) string {
-	if remove {
-		return strings.Trim(stringRanks, "[]")
-	}
-
+func addBrackets(stringRanks string) string {
 	if !strings.HasPrefix(stringRanks, "[") {
 		stringRanks = "[" + stringRanks
 	}
@@ -40,6 +36,10 @@ func fixBrackets(stringRanks string, remove bool) string {
 	return stringRanks
 }
 
+func removeBrackets(stringRanks string) string {
+	return strings.Trim(stringRanks, "[]")
+}
+
 // RankList provides convenience methods for working with Rank slices.
 type RankList []Rank
 
@@ -65,7 +65,7 @@ func (rs *RankSet) String() string {
 	if rs == nil || rs.ns == nil {
 		return ""
 	}
-	return fixBrackets(rs.ns.String(), true)
+	return removeBrackets(rs.ns.String())
 }
 
 // RangedString returns a ranged string representation of the RankSet.
@@ -201,14 +201,11 @@ func MustCreateRankSet(stringRanks string) *RankSet {
 func CreateRankSet(stringRanks string) (*RankSet, error) {
 	rs := NewRankSet()
 
-	if len(stringRanks) < 1 {
+	if len(removeBrackets(stringRanks)) < 1 {
 		return rs, nil
 	}
 
-	stringRanks = fixBrackets(stringRanks, false)
-
-	// add enclosing brackets to input so CreateSet works without hostnames
-	ns, err := hostlist.CreateNumericSet(stringRanks)
+	ns, err := hostlist.CreateNumericSet(addBrackets(stringRanks))
 	if err != nil {
 		return nil, err
 	}

src/control/lib/ranklist/ranklist_test.go

@@ -31,10 +31,22 @@ func TestRanklist_RankSet(t *testing.T) {
 			expCount: 0,
 			expRanks: []Rank{},
 		},
+		"empty bracketed start list": {
+			ranks:    "[]",
+			expOut:   "",
+			expCount: 0,
+			expRanks: []Rank{},
+		},
 		"invalid with hostnames": {
 			ranks:  "node2-1,node1-2.suffix1,node1-[45,47].suffix2,node3,node1-3",
 			expErr: errors.New("unexpected alphabetic character(s)"),
 		},
+		"simple bracketed ranged rank list": {
+			ranks:    "[0-10]",
+			expOut:   "0-10",
+			expCount: 11,
+			expRanks: []Rank{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
+		},
 		"simple ranged rank list": {
 			ranks:    "0-10",
 			expOut:   "0-10",

src/control/server/mgmt_system_test.go

@@ -595,6 +595,46 @@ func TestServer_MgmtSvc_getPoolRanks(t *testing.T) {
 			},
 			expDrpcCount: 2,
 		},
+		"two pools; bracketed zero disabled ranks": {
+			pools:      []string{test.MockUUID(1), test.MockUUID(2)},
+			inRanks:    ranklist.MustCreateRankSet("1,8"),
+			getEnabled: false,
+			drpcResps: []*mockDrpcResponse{
+				&mockDrpcResponse{
+					Message: &mgmtpb.PoolQueryResp{
+						EnabledRanks:  "0-4",
+						DisabledRanks: "[]",
+					},
+				},
+				&mockDrpcResponse{
+					Message: &mgmtpb.PoolQueryResp{
+						EnabledRanks:  "1-7",
+						DisabledRanks: "[]",
+					},
+				},
+			},
+			expDrpcCount: 2,
+		},
+		"two pools; bracketed zero enabled ranks": {
+			pools:      []string{test.MockUUID(1), test.MockUUID(2)},
+			inRanks:    ranklist.MustCreateRankSet("1,8"),
+			getEnabled: true,
+			drpcResps: []*mockDrpcResponse{
+				&mockDrpcResponse{
+					Message: &mgmtpb.PoolQueryResp{
+						EnabledRanks:  "[]",
+						DisabledRanks: "0-4",
+					},
+				},
+				&mockDrpcResponse{
+					Message: &mgmtpb.PoolQueryResp{
+						EnabledRanks:  "[]",
+						DisabledRanks: "1-7",
+					},
+				},
+			},
+			expDrpcCount: 2,
+		},
 		"match zero ranks; two pools": {
 			pools:      []string{test.MockUUID(1), test.MockUUID(2)},
 			inRanks:    ranklist.MustCreateRankSet("8-10"),