some updates to repair API drift with opensrf/evergreen

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/constrictor/trunk@53 6d9bc8c9-1ec2-4278-b937-99fde70a366f

diff --git a/contrib/evergreen/eg_fetch_user_groups.py b/contrib/evergreen/eg_fetch_user_groups.py
index ad31efa..d7cd893 100644 (file)
--- a/contrib/evergreen/eg_fetch_user_groups.py
+++ b/contrib/evergreen/eg_fetch_user_groups.py
@@ -1,7 +1,6 @@
 from constrictor.task import Task
 from constrictor.script import Script, ScriptManager
 from constrictor.log import *
-from osrf.gateway import XMLGatewayRequest
 import eg_utils
 
 SERVICE = 'open-ils.actor'
@@ -14,7 +13,7 @@ class FetchUserGroupsTask(Task):
         Task.__init__(self, self.__class__.__name__)
 
     def run(self, **kwargs):
-        request = XMLGatewayRequest(SERVICE, METHOD)
+        request = eg_utils.request(SERVICE, METHOD)
         return request.send()
 
 

diff --git a/contrib/evergreen/eg_tasks.py b/contrib/evergreen/eg_tasks.py
index 7a79910..925efc0 100644 (file)
--- a/contrib/evergreen/eg_tasks.py
+++ b/contrib/evergreen/eg_tasks.py
@@ -1,6 +1,5 @@
 from constrictor.task import Task
 from constrictor.log import *
-from osrf.gateway import XMLGatewayRequest
 import eg_utils
 from oils.const import *
 from osrf.net_obj import *

diff --git a/contrib/evergreen/eg_utils.py b/contrib/evergreen/eg_utils.py
index 7995a1e..bad645c 100644 (file)
--- a/contrib/evergreen/eg_utils.py
+++ b/contrib/evergreen/eg_utils.py
@@ -4,7 +4,8 @@ from osrf.net_obj import NetworkObject
 import osrf.json
 from osrf.gateway import GatewayRequest, XMLGatewayRequest, JSONGatewayRequest
 from oils.utils.idl import IDLParser
-from oils.utils.utils import eventText, eventCode, md5sum
+from oils.utils.utils import md5sum
+from oils.event import Event
 from oils.const import *
 import os, errno
 
@@ -56,7 +57,7 @@ def initThread():
 
 def fetchSessionUser():
     user = request('open-ils.auth', 'open-ils.auth.session.retrieve', authtoken()).send()
-    if eventCode(user):
+    if Event.parse_event(user):
         raise ILSEventException(osrf.json.to_json(user))
     logInfo("fetched user %s" % user.usrname())
     return user
@@ -90,8 +91,8 @@ def loadIDL():
         file.close()
 
     logInfo("parsing Evergreen IDL file...")
-    parser.setIDL(filePath)
-    parser.parseIDL()
+    parser.set_IDL(filePath)
+    parser.parse_IDL()
 
 
 class AtomicReqWrapper(object):
@@ -151,8 +152,9 @@ def login(username, password, workstation=None):
             'type' : 'staff' 
         }).send()
 
-    if eventText(result) != OILS_EVENT_SUCCESS:
-       raise AuthException(eventText(result)) 
+    evt = Event.parse_event(result)
+    if evt and not evt.success:
+       raise AuthException(evt.textcode)
 
     __authtoken = result['payload']['authtoken']
     return __authtoken