Skip to content

Commit

Permalink
remove aux.json
Browse files Browse the repository at this point in the history
  • Loading branch information
ticoann committed Jul 5, 2013
1 parent 611497f commit 7d6a00d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
12 changes: 9 additions & 3 deletions src/python/WMCore/ReqMgr/Service/Request.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def get(self, **kwargs):
if status and team:
request_info.append(self.get_reqmgr_view("byteamandstatus", option, team, "list"))
if name:
request_info.append(self._getReuestsByNames(name))
request_info.append(self._get_request_by_name(name))
if prep_id:
request_info.append(self.get_reqmgr_view("byprepid", option, prep_id, "list"))
if inputdataset:
Expand Down Expand Up @@ -151,11 +151,11 @@ def get_wmstats_view(self, view, options, keys, format):
return self._get_couch_view(self.wmstatsCouch, "WMStats", view, options, keys, format)


def _get_request_by_names(self, names, stale="update_after"):
def _get_request_by_name(self, name, stale="update_after"):
"""
TODO: names can be regular expression or list of names
"""
request_doc = self.reqmgr_db.document(self.db_name, names)
request_doc = self.reqmgr_db.document(name)
return rows([request_doc])

def _combine_request(self, request_info, requestAgentUrl, cache):
Expand All @@ -173,6 +173,12 @@ def _combine_request(self, request_info, requestAgentUrl, cache):

return requestAgentUrlList;

def put(self, name, **kwargs):

return self.reqmgr_db.updateDocument(name, "ReqMgr", "updaterequest",
fields=kwargs)


@restcall
def delete(self, request_name):
cherrypy.log("INFO: Deleting request document '%s' ..." % request_name)
Expand Down
2 changes: 0 additions & 2 deletions test/data/ReqMgr/aux.json

This file was deleted.

6 changes: 4 additions & 2 deletions test/python/WMCore_t/ReqMgr_t/Service_t/ReqMgr_t.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ def setUp(self):
RESTBaseUnitTestWithDBBackend.setUp(self)

#Warning: this assumes the same structure in jenkins wmcore_root/test
requestPath = os.path.join(getWMBASE(), "test", "data", "ReqMgr", "requests")
#requestPath = os.path.join("..", "..", "..", "..", "data", "ReqMgr", "requests")
#requestPath = os.path.join(getWMBASE(), "test", "data", "ReqMgr", "requests")
requestPath = os.path.join("..", "..", "..", "..", "data", "ReqMgr", "requests")
mcFile = open(os.path.join(requestPath, "MonteCarlo.json"), 'r')
self.mcArgs = JsonWrapper.load(mcFile)["createRequest"]

Expand All @@ -65,6 +65,8 @@ def testRequest(self):
print result
self.jsonSender.get('data/request?prep_id=%s&_nostale=true' % self.mcArgs["PrepID"])[0]['result']
print result
self.jsonSender.get('data/request?campaign=%s&_nostale=true' % self.mcArgs["PrepID"])[0]['result']
print result

if __name__ == '__main__':

Expand Down

0 comments on commit 7d6a00d

Please sign in to comment.