diff --git a/LSF-Script/node/node b/LSF-Script/node/node index a24f900720c83686f286a6998128658cf56b74b7..bbf28dc434d147d88a7a5aebe2a2ecd3b43fac93 100644 --- a/LSF-Script/node/node +++ b/LSF-Script/node/node @@ -107,8 +107,8 @@ for index in range(1, len(bhoststr) - 1): bhosts.append(temp) #基于第三方调度器向DONAU调度器状态映射Map -statusMap = {'ok': 'OKAY', 'closed': 'CLOSED', 'closed_Adm': 'CLOSED','closed_Busy': 'CLOSED','closed_EGO': 'CLOSED','closed_Excl': 'CLOSED','closed_LIM': 'CLOSED', -'closed_Lock': 'CLOSED','closed_Wind': 'CLOSED','closed_RC': 'CLOSED','closed_CU_excl': 'CLOSED','unavail': 'UNAVAILABLE', 'unreach': 'UNAVAILABLE', 'closed_Full': 'CLOSED'} +statusMap = {'ok': 'OK', 'closed': 'CLOSE', 'closed_Adm': 'CLOSE','closed_Busy': 'CLOSE','closed_EGO': 'CLOSE','closed_Excl': 'CLOSE','closed_LIM': 'CLOSE', +'closed_Lock': 'CLOSE','closed_Wind': 'CLOSE','closed_RC': 'CLOSE','closed_CU_excl': 'CLOSE','unavail': 'UNAVAILABLE', 'unreach': 'UNAVAILABLE', 'closed_Full': 'CLOSE'} for hostinfo in nodeArrayList: for bhost in bhosts: @@ -121,7 +121,7 @@ for hostinfo in nodeArrayList: hostinfo['nativeResources']['mCpu'] = host['ncpus'] hostinfo['nativeResources']['mem'] = transferMem(host['maxmem']) hostinfo['numaInfo']['architecture'] = host['type'] - if (hostinfo['status'] == 'CLOSED' and hostinfo['nativeResources']['loadResources']['cpuFree'] == 0): + if (hostinfo['status'] == 'CLOSE' and hostinfo['nativeResources']['loadResources']['cpuFree'] == 0): hostinfo['nativeResources']['loadResources']['cpuFree'] = host['ncpus'] outputStr = json.dumps(nodeArrayList) print(outputStr) \ No newline at end of file