From: Sandrine Avakian Date: Fri, 15 Nov 2013 14:00:46 +0000 (+0100) Subject: Testing cortexlab objects - few fixes. X-Git-Tag: geni-v2-broken-and-discontinued~6 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=a1ae66cabca988634059e1324c3a582b9aba9551 Testing cortexlab objects - few fixes. --- diff --git a/sfa/cortexlab/cortexlabshell.py b/sfa/cortexlab/cortexlabshell.py index d0f58346..54c637a5 100644 --- a/sfa/cortexlab/cortexlabshell.py +++ b/sfa/cortexlab/cortexlabshell.py @@ -21,7 +21,8 @@ from sfa.trust.certificate import Keypair, convert_public_key from sfa.trust.gid import create_uuid from sfa.trust.hierarchy import Hierarchy -from sfa.cortexlab.iotlabaggregate import iotlab_xrn_object +from sfa.iotlab.iotlabaggregate import iotlab_xrn_object +from sfa.cortexlab.cortexlabnodes import CortexlabQueryNodes class CortexlabShell(): """ Class enabled to use LDAP and OAR api calls. """ diff --git a/sfa/cortexlab/cortexlabslices.py b/sfa/cortexlab/cortexlabslices.py index f7ba032e..2e58ea56 100644 --- a/sfa/cortexlab/cortexlabslices.py +++ b/sfa/cortexlab/cortexlabslices.py @@ -8,7 +8,7 @@ from sfa.util.sfalogging import logger MAXINT = 2L**31-1 -class IotlabSlices: +class CortexlabSlices: """ This class is responsible for checking the slice when creating a lease or a sliver. Those checks include verifying that the user is valid,