From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Wed, 2 Apr 2008 21:14:48 +0000 (+0000)
Subject: Latest tag.
X-Git-Tag: NodeManager-1.7-4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=852dacfc9d8570e2dbbadc35b7099d2b2de3a2e7;p=nodemanager.git

Latest tag.
+* Wed Apr 02 2008 Faiyaz Ahmed <faiyaza@cs.prineton.edu - NodeManager-1.7.4
+- Codemux supports multiple hosts mapping to single slice
+- Fixed bug in delegation support where tickets delivered weren't
+  being passed to sm.deliver_ticket()
---

diff --git a/NodeManager.spec b/NodeManager.spec
index 6a62873..1089b38 100644
--- a/NodeManager.spec
+++ b/NodeManager.spec
@@ -98,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/logrotate.d/nm
 
 %changelog
+* Wed Apr 02 2008 Faiyaz Ahmed <faiyaza@cs.prineton.edu - NodeManager-1.7.4
+- Codemux supports multiple hosts mapping to single slice
+- Fixed bug in delegation support where tickets delivered weren't
+  being passed to sm.deliver_ticket().
 * Fri Mar 28 2008 Faiyaz Ahmed <faiyaza@cs.prineton.edu - NodeManager-1.7.3
 - Codemux now configured via slice attribute (host,port)
 - Support for multiple vserver reference images (including different archs)
diff --git a/api.py b/api.py
index fe97ae2..b099fb8 100644
--- a/api.py
+++ b/api.py
@@ -24,15 +24,11 @@ import logger
 import sliver_vs
 import ticket
 import tools
-
+from api_calls import *
 
 API_SERVER_PORT = 812
 UNIX_ADDR = '/tmp/sliver_mgr.api'
 
-deliver_ticket = None  # set in sm.py:start()
-
-from api_calls import *
-
 class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
     # overriding _dispatch to achieve this effect is officially deprecated,
     # but I can't figure out how to get access to .request without
diff --git a/api_calls.py b/api_calls.py
index 19035ae..e99a559 100644
--- a/api_calls.py
+++ b/api_calls.py
@@ -39,6 +39,7 @@ except: import logger as sliver_vs
 import ticket as ticket_module
 import tools
 
+deliver_ticket = None  # set in sm.py:start()
 
 api_method_dict = {}
 nargs_dict = {}
diff --git a/sm.py b/sm.py
index abbcaec..a050ded 100644
--- a/sm.py
+++ b/sm.py
@@ -13,6 +13,7 @@ try: from bwlimit import bwmin, bwmax
 except ImportError: bwmin, bwmax = 8, 1000*1000*1000
 import accounts
 import api
+import api_calls
 import database
 import delegate
 import logger
@@ -142,5 +143,5 @@ def start(options, config):
     accounts.register_class(delegate.Delegate)
     accounts.Startingup = options.startup
     database.start()
-    api.deliver_ticket = deliver_ticket
+    api_calls.deliver_ticket = deliver_ticket
     api.start()