passing slice hrn to slice control methods

[sfa.git] / geni / util / slices.py

diff --git a/geni/util/slices.py b/geni/util/slices.py
index 1ba2f95..8486057 100644 (file)
--- a/geni/util/slices.py
+++ b/geni/util/slices.py
@@ -251,9 +251,9 @@ class Slices(SimpleStorage):
 
     def start_slice(self, hrn):
         if self.api.interface in ['aggregate']:
-            self.start_slice_aggregate()
+            self.start_slice_aggregate(hrn)
         elif self.api.interface in ['slicemgr']:
-            self.start_slice_smgr()
+            self.start_slice_smgr(hrn)
 
     def start_slice_aggregate(self, hrn):
         slicename = hrn_to_pl_slicename(hrn)
@@ -268,24 +268,24 @@ class Slices(SimpleStorage):
 
     def start_slice_smgr(self, hrn):
         credential = self.api.getCredential()
-        aggregates = Aggregates()
+        aggregates = Aggregates(self.api)
         for aggregate in aggregates:
-            aggreegates[aggregate].start_slice(credential, hrn)
+            aggregates[aggregate].start_slice(credential, hrn)
         return 1
 
 
     def stop_slice(self, hrn):
         if self.api.interface in ['aggregate']:
-            self.stop_slice_aggregate()
+            self.stop_slice_aggregate(hrn)
         elif self.api.interface in ['slicemgr']:
-            self.stop_slice_smgr()
+            self.stop_slice_smgr(hrn)
 
     def stop_slice_aggregate(self, hrn):
         slicename = hrn_to_pl_slicename(hrn)
         slices = self.api.plshell.GetSlices(self.api.plauth, {'name': slicename}, ['slice_id'])
         if not slices:
             raise RecordNotFound(hrn)
-        slice_id = slices[0]
+        slice_id = slices[0]['slice_id']
         attributes = self.api.plshell.GetSliceAttributes(self.api.plauth, {'slice_id': slice_id, 'name': 'enabled'}, ['slice_attribute_id'])
         attribute_id = attributes[0]['slice_attribute_id']
         self.api.plshell.UpdateSliceAttribute(self.api.plauth, attribute_id, "0")
@@ -293,7 +293,7 @@ class Slices(SimpleStorage):
 
     def stop_slice_smgr(self, hrn):
         credential = self.api.getCredential()
-        aggregates = Aggregates()
+        aggregates = Aggregates(self.api)
         for aggregate in aggregates:
-            aggregate[aggregate].stop_slice(credential, hrn)  
+            aggregates[aggregate].stop_slice(credential, hrn)