| @@ -84,14 +84,15 @@ func GetAcctInfo() AcctInfoMsg { | |||||
| func (slurmStruct SlurmStruct) ListAccounts(ctx context.Context, req *pbslurm.ListAccountsReq) (*pbslurm.ListAccountsResp, error) { | func (slurmStruct SlurmStruct) ListAccounts(ctx context.Context, req *pbslurm.ListAccountsReq) (*pbslurm.ListAccountsResp, error) { | ||||
| AcctList := GetAcctInfo() | |||||
| acctList := GetAcctInfo() | |||||
| resp := pbslurm.ListAccountsResp{} | resp := pbslurm.ListAccountsResp{} | ||||
| for _, Acct := range AcctList.AcctInfoList { | |||||
| AcctInfoResult := pbslurm.AccountInfo{} | |||||
| AcctInfoResult.Name = Acct.Name | |||||
| for _, acct := range acctList.AcctInfoList { | |||||
| //AcctInfoResult := pbslurm.AccountInfo{} | |||||
| //AcctInfoResult.Name = Acct.Name | |||||
| acctInfoResult := acct | |||||
| resp.AccountInfos = append(resp.AccountInfos, &AcctInfoResult) | |||||
| resp.AccountInfos = append(resp.AccountInfos, &acctInfoResult) | |||||
| } | } | ||||
| return &resp, nil | return &resp, nil | ||||
| @@ -99,14 +100,13 @@ func (slurmStruct SlurmStruct) ListAccounts(ctx context.Context, req *pbslurm.Li | |||||
| func (slurmStruct SlurmStruct) GetAccount(ctx context.Context, req *pbslurm.GetAccountReq) (*pbslurm.GetAccountResp, error) { | func (slurmStruct SlurmStruct) GetAccount(ctx context.Context, req *pbslurm.GetAccountReq) (*pbslurm.GetAccountResp, error) { | ||||
| AcctList := GetAcctInfo() | |||||
| acctList := GetAcctInfo() | |||||
| resp := pbslurm.GetAccountResp{} | resp := pbslurm.GetAccountResp{} | ||||
| for _, Acct := range AcctList.AcctInfoList { | |||||
| AcctInfoResult := pbslurm.AccountInfo{} | |||||
| AcctInfoResult.Name = Acct.Name | |||||
| resp.AccountInfos = append(resp.AccountInfos, &AcctInfoResult) | |||||
| for _, acct := range acctList.AcctInfoList { | |||||
| acctInfoResult := acct | |||||
| //todo add filter logic | |||||
| resp.AccountInfos = append(resp.AccountInfos, &acctInfoResult) | |||||
| } | } | ||||
| return &resp, nil | return &resp, nil | ||||
| @@ -193,7 +193,7 @@ func (slurmStruct SlurmStruct) GetAssociation(ctx context.Context, req *pbslurm. | |||||
| resp := pbslurm.GetAssociationResp{} | resp := pbslurm.GetAssociationResp{} | ||||
| for _, assoc := range assocList.AssocInfoList { | for _, assoc := range assocList.AssocInfoList { | ||||
| assocResult := assoc | assocResult := assoc | ||||
| //todo logic rewrite | |||||
| //todo add filter logic | |||||
| if assocResult.Cluster == req.Cluster && assocResult.User == req.User && assocResult.Acct == assocResult.Acct && assocResult.Partition == req.Partition { | if assocResult.Cluster == req.Cluster && assocResult.User == req.User && assocResult.Acct == assocResult.Acct && assocResult.Partition == req.Partition { | ||||
| resp.AssocInfos = append(resp.AssocInfos, &assocResult) | resp.AssocInfos = append(resp.AssocInfos, &assocResult) | ||||
| } | } | ||||
| @@ -92,8 +92,8 @@ func (slurmStruct SlurmStruct) ListUsers(ctx context.Context, req *pbslurm.ListU | |||||
| resp := pbslurm.ListUsersResp{} | resp := pbslurm.ListUsersResp{} | ||||
| for _, user := range userList.UserInfoList { | for _, user := range userList.UserInfoList { | ||||
| userInfoResult := pbslurm.UserInfo{} | |||||
| userInfoResult.Name = user.Name | |||||
| userInfoResult := user | |||||
| //userInfoResult.Name = user.Name | |||||
| resp.UserInfos = append(resp.UserInfos, &userInfoResult) | resp.UserInfos = append(resp.UserInfos, &userInfoResult) | ||||
| } | } | ||||
| @@ -107,8 +107,10 @@ func (slurmStruct SlurmStruct) GetUser(ctx context.Context, req *pbslurm.GetUser | |||||
| resp := pbslurm.GetUserResp{} | resp := pbslurm.GetUserResp{} | ||||
| for _, user := range userList.UserInfoList { | for _, user := range userList.UserInfoList { | ||||
| userInfoResult := pbslurm.UserInfo{} | |||||
| userInfoResult.Name = user.Name | |||||
| //userInfoResult := pbslurm.UserInfo{} | |||||
| //todo add filter logic | |||||
| userInfoResult := user | |||||
| //userInfoResult.Name = user.Name | |||||
| resp.UserInfo = append(resp.UserInfo, &userInfoResult) | resp.UserInfo = append(resp.UserInfo, &userInfoResult) | ||||
| } | } | ||||