Browse Source

list/get for user/account/association

pull/9/head
zhouqunjie 3 years ago
parent
commit
2d79caefac
3 changed files with 18 additions and 16 deletions
  1. +11
    -11
      adaptor/pcm_slurm/service/slurmdb_account.go
  2. +1
    -1
      adaptor/pcm_slurm/service/slurmdb_association.go
  3. +6
    -4
      adaptor/pcm_slurm/service/slurmdb_user.go

+ 11
- 11
adaptor/pcm_slurm/service/slurmdb_account.go View File

@@ -84,14 +84,15 @@ func GetAcctInfo() AcctInfoMsg {

func (slurmStruct SlurmStruct) ListAccounts(ctx context.Context, req *pbslurm.ListAccountsReq) (*pbslurm.ListAccountsResp, error) {

AcctList := GetAcctInfo()
acctList := GetAcctInfo()

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
@@ -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) {

AcctList := GetAcctInfo()
acctList := GetAcctInfo()

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


+ 1
- 1
adaptor/pcm_slurm/service/slurmdb_association.go View File

@@ -193,7 +193,7 @@ func (slurmStruct SlurmStruct) GetAssociation(ctx context.Context, req *pbslurm.
resp := pbslurm.GetAssociationResp{}
for _, assoc := range assocList.AssocInfoList {
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 {
resp.AssocInfos = append(resp.AssocInfos, &assocResult)
}


+ 6
- 4
adaptor/pcm_slurm/service/slurmdb_user.go View File

@@ -92,8 +92,8 @@ func (slurmStruct SlurmStruct) ListUsers(ctx context.Context, req *pbslurm.ListU

resp := pbslurm.ListUsersResp{}
for _, user := range userList.UserInfoList {
userInfoResult := pbslurm.UserInfo{}
userInfoResult.Name = user.Name
userInfoResult := user
//userInfoResult.Name = user.Name

resp.UserInfos = append(resp.UserInfos, &userInfoResult)
}
@@ -107,8 +107,10 @@ func (slurmStruct SlurmStruct) GetUser(ctx context.Context, req *pbslurm.GetUser

resp := pbslurm.GetUserResp{}
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)
}


Loading…
Cancel
Save