From: Tony Mack <tmack@cs.princeton.edu>
Date: Thu, 26 Mar 2009 17:43:35 +0000 (+0000)
Subject: fix more bugs
X-Git-Tag: sfa-0.9-0@14641~537
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4eb8b240542587ffe7264f014fa7d00f23f93a37;p=sfa.git

fix more bugs
---

diff --git a/geni/aggregate.py b/geni/aggregate.py
index d0dd58f1..cf538a1a 100644
--- a/geni/aggregate.py
+++ b/geni/aggregate.py
@@ -373,7 +373,7 @@ class Aggregate(GeniServer):
             sites = self.shell.GetSites(self.auth, [login_base]) 
             if not sites:
                 authority = get_authority(slice_hrn)
-                site_record = self.registry.reolve(self.cred, authority)
+                site_record = self.registry.resolve(self.credential, authority)
                 site_info = site_record.as_dict()
                 site = site_info['pl_info'] 
                 
diff --git a/geni/slicemgr.py b/geni/slicemgr.py
index 73b6345d..7448b58f 100644
--- a/geni/slicemgr.py
+++ b/geni/slicemgr.py
@@ -310,34 +310,37 @@ class SliceMgr(GeniServer):
         # save slice state locally
         # we can assume that spec object has been validated so its safer to
         # save this instead of the unvalidated rspec the user gave us
-        rspec = Rspec()
+        spec = Rspec()
         tempspec = Rspec()
-        rspec.parseString(rspec)
+        spec.parseString(rspec)
 
-        self.slices[slice_hrn] = rspec.toxml()
+        self.slices[slice_hrn] = spec.toxml()
         self.slices.write()
 
         # extract network list from the rspec and create a separate
         # rspec for each network
-        slicename = self.hrn_to_plcslicename(slice_hrn)
-        specDict = rspec.toDict()
-        start_time = specDict['start_time']
-        end_time = specDict['end_time']
-
+        slicename = hrn_to_pl_slicename(slice_hrn)
+        specDict = spec.toDict()
+        if specDict.has_key('Rspec'): specDict = specDict['Rspec']
+        if specDict.has_key('start_time'): start_time = specDict['start_time']
+        else: start_time = 0
+        if specDict.has_key('end_time'): end_time = specDict['end_time']
+        else: end_time = 0
+   
         rspecs = {}
         # only attempt to extract information about the aggregates we know about
         for hrn in self.aggregates.keys():
             netspec = spec.getDictByTagNameValue('NetSpec', hrn)
             if netspec:
                 # creat a plc dict 
-                resources = {'start_time': star_time, 'end_time': end_time, 'networks': netspec}
+                resources = {'start_time': start_time, 'end_time': end_time, 'networks': netspec}
                 resourceDict = {'Rspec': resources}
                 tempspec.parseDict(resourceDict)
                 rspecs[hrn] = tempspec.toxml()
 
         # notify the aggregates
-        for hrn in self.rspecs.keys():
-            self.aggregates[hrn].createSlice(self.credential, rspecs[hrn])
+        for hrn in rspecs.keys():
+            self.aggregates[hrn].create_slice(self.credential, slice_hrn, rspecs[hrn])
             
         return 1