Skip to content
This repository was archived by the owner on Sep 12, 2024. It is now read-only.

Commit 30f7a1c

Browse files
committed
proper check on reqmgr
1 parent a9aa106 commit 30f7a1c

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

utils.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,13 +1082,8 @@ def check_cmsr(self):
10821082
all_info = session.query(Workflow).filter(Workflow.name.contains('1')).all()
10831083

10841084
def check_reqmgr(self):
1085-
if 'testbed' in reqmgr_url:
1086-
wfi = getWorkLoad(reqmgr_url,'sryu_B2G-Summer12DR53X-00743_v4_v2_150126_223017_1156')
1087-
else:
1088-
wfi = getWorkLoad(reqmgr_url,'pdmvserv_task_B2G-RunIIWinter15wmLHE-00067__v1_T_150505_082426_497')
1089-
name = wfi['RequestName']
1090-
tests = getWorkflows(reqmgr_url, 'assignment-approved')
1091-
1085+
data = getReqmgrInfo(reqmgr_url)
1086+
10921087
def check_mcm(self):
10931088
from McMClient import McMClient
10941089
mcmC = McMClient(dev=False)
@@ -5189,7 +5184,13 @@ def getWorkLoad(url, wf ):
51895184
except:
51905185
print "failed twice to _getWorkLoad(url, wf )"
51915186
return None
5192-
5187+
def getReqmgrInfo(url):
5188+
conn = make_x509_conn(url)
5189+
r1= conn.request("GET",'/reqmgr2/data/info', headers={"Accept":"*/*"})
5190+
r2=conn.getresponse()
5191+
data = json.loads(r2.read())
5192+
return data['result']
5193+
51935194
def _getWorkLoad(url, wf ):
51945195
conn = make_x509_conn(url)
51955196
r1= conn.request("GET",'/reqmgr2/data/request/'+wf, headers={"Accept":"*/*"})

0 commit comments

Comments
 (0)