Cleanup dir structure.

diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py
index 19a6687..9d89c4f 100644 (file)
--- a/sfa/methods/create_slice.py
+++ b/sfa/methods/create_slice.py
@@ -6,7 +6,7 @@ from sfa.util.misc import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
-from sfa.util.slices import Slices
+from sfa.plc.slices import Slices
 
 class create_slice(Method):
     """

diff --git a/sfa/methods/delete_slice.py b/sfa/methods/delete_slice.py
index 6bded1b..a1ca96d 100644 (file)
--- a/sfa/methods/delete_slice.py
+++ b/sfa/methods/delete_slice.py
@@ -7,7 +7,7 @@ from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
 
-from sfa.util.slices import Slices
+from sfa.plc.slices import Slices
 
 class delete_slice(Method):
     """

diff --git a/sfa/methods/get_resources.py b/sfa/methods/get_resources.py
index 19e0bda..a9b9cdc 100644 (file)
--- a/sfa/methods/get_resources.py
+++ b/sfa/methods/get_resources.py
@@ -5,7 +5,8 @@ from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
-from sfa.util.nodes import Nodes
+
+from sfa.plc.nodes import Nodes
 
 class get_resources(Method):
     """

diff --git a/sfa/methods/get_slices.py b/sfa/methods/get_slices.py
index d3976e8..603f643 100644 (file)
--- a/sfa/methods/get_slices.py
+++ b/sfa/methods/get_slices.py
@@ -6,7 +6,7 @@ from sfa.util.misc import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
-from sfa.util.slices import Slices
+from sfa.plc.slices import Slices
 
 class get_slices(Method):
     """

diff --git a/sfa/methods/reset_slices.py b/sfa/methods/reset_slices.py
index 540848e..9b40d83 100644 (file)
--- a/sfa/methods/reset_slices.py
+++ b/sfa/methods/reset_slices.py
@@ -6,7 +6,7 @@ from sfa.util.misc import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
-from sfa.util.slices import Slices
+from sfa.plc.slices import Slices
 
 class reset_slices(Method):
     """

diff --git a/sfa/methods/start_slice.py b/sfa/methods/start_slice.py
index 8e7311d..4356de2 100644 (file)
--- a/sfa/methods/start_slice.py
+++ b/sfa/methods/start_slice.py
@@ -6,7 +6,7 @@ from sfa.util.misc import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
-from sfa.util.slices import Slices
+from sfa.plc.slices import Slices
 
 class start_slice(Method):
     """

diff --git a/sfa/methods/stop_slice.py b/sfa/methods/stop_slice.py
index b58f235..959b18f 100644 (file)
--- a/sfa/methods/stop_slice.py
+++ b/sfa/methods/stop_slice.py
@@ -6,7 +6,7 @@ from sfa.util.misc import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
-from sfa.util.slices import Slices
+from sfa.plc.slices import Slices
 
 class stop_slice(Method):
     """

diff --git a/sfa/util/api.py b/sfa/plc/api.py
similarity index 100%
rename from sfa/util/api.py
rename to sfa/plc/api.py

diff --git a/sfa/util/nodes.py b/sfa/plc/nodes.py
similarity index 100%
rename from sfa/util/nodes.py
rename to sfa/plc/nodes.py

diff --git a/sfa/util/remoteshell.py b/sfa/plc/remoteshell.py
similarity index 100%
rename from sfa/util/remoteshell.py
rename to sfa/plc/remoteshell.py

diff --git a/sfa/plc/sfa-import-plc.py b/sfa/plc/sfa-import-plc.py
index 8f4c959..e1f2bb5 100755 (executable)
--- a/sfa/plc/sfa-import-plc.py
+++ b/sfa/plc/sfa-import-plc.py
@@ -41,7 +41,7 @@ def connect_shell():
 
     # connect to planetlab
     if "Url" in pl_auth:
-        from sfa.util import remoteshell
+        import remoteshell
         shell = remoteshell.RemoteShell()
     else:
         import PLC.Shell

diff --git a/sfa/util/slices.py b/sfa/plc/slices.py
similarity index 100%
rename from sfa/util/slices.py
rename to sfa/plc/slices.py

diff --git a/sfa/util/geniserver.py b/sfa/util/geniserver.py
index 1a7307d..7159df5 100644 (file)
--- a/sfa/util/geniserver.py
+++ b/sfa/util/geniserver.py
@@ -25,7 +25,7 @@ from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.credential import *
 
 from sfa.util.faults import *
-from sfa.util.api import GeniAPI 
+from sfa.plc.api import GeniAPI 
 from sfa.util.debug import log
 
 ##

diff --git a/sfa/util/record.py b/sfa/util/record.py
index 8575f01..039652c 100644 (file)
--- a/sfa/util/record.py
+++ b/sfa/util/record.py
@@ -35,7 +35,7 @@ class GeniRecord(dict):
     of different types.
     """
 
-    fields = {
+    public = {
         'hrn': Parameter(str, "Human readable name of object"),
         'gid': Parameter(str, "GID of the object"),
         'type': Parameter(str, "Record type"),
@@ -43,10 +43,6 @@ class GeniRecord(dict):
         #'date_created': Parameter(int, 'Date and time this record was created'),
     }
 
-    internal_fields = {
-        'pointer': Parameter(int, "Internal ID")
-    }
-
     ##
     # Create a Geni Record
     #
@@ -224,13 +220,13 @@ class GeniRecord(dict):
             return str(val)
 
     ##
-    # Given a list of field names, return a list of values for those fields.
+    # Given a list of field names, return a list of values for those public.
     #
     # @param fieldnames is a list of field names
 
     def get_field_value_strings(self, fieldnames):
         """
-        Given a list of field names, return a list of values for those fields.
+        Given a list of field names, return a list of values for those public.
         """
         strs = []
         for fieldname in fieldnames:
@@ -249,7 +245,7 @@ class GeniRecord(dict):
     ##
     # Load the record from a dictionary
     #
-    # @param dict dictionary to load record fields from
+    # @param dict dictionary to load record public from
 
     def load_from_dict(self, dict):
         """
@@ -277,8 +273,11 @@ class GeniRecord(dict):
         the record.
         """
         dict = self.as_dict()
+        filteredDict = {}
+        for key in self.public.keys():
+            filteredDict[key] = dict[key]
         record = RecordSpec()
-        record.parseDict(dict)
+        record.parseDict(filteredDict)
         str = record.toxml()
         #str = xmlrpclib.dumps((dict,), allow_none=True)
         return str
@@ -319,12 +318,12 @@ class GeniRecord(dict):
         #    self.get_gid_object().dump(8, dump_parents)
         #print "    pointer:", self.pointer
        
-        order = GeniRecord.fields.keys() 
+        order = GeniRecord.public.keys() 
         for key in self.keys():
             if key not in order:
                 order.append(key)
         for key in order:
-            if key in (self and self.fields):
+            if key in (self and self.public):
                 if key in 'gid' and self[key]:
                     gid = GID(string=self[key])
                     print "     %s:" % key
@@ -338,72 +337,40 @@ class GeniRecord(dict):
 
 class UserRecord(GeniRecord):
 
-    fields = {
+    public = {
         'email': Parameter(str, 'email'),
         'first_name': Parameter(str, 'First name'),
         'last_name': Parameter(str, 'Last name'),
         'phone': Parameter(str, 'Phone Number'),
         'key': Parameter(str, 'Public key'),
-        'slice': Parameter([str], 'List of slices this user belongs to'),
-        }
-    fields.update(GeniRecord.fields)
- 
-    internal_fields = {
-        'roles': Parameter([str], 'List of roles'),
-        'title': Parameter(str, 'Title'),
-        'sites': Parameter([str], 'List of sites this user belongs to'),
-        'enabled': Parameter(bool, 'Is this person enabled'),
+        'slices': Parameter([str], 'List of slices this user belongs to'),
         }
-    internal_fields.update(GeniRecord.internal_fields)
+    public.update(GeniRecord.public)
     
 class SliceRecord(GeniRecord):
-    fields = {
+    public = {
         'name': Parameter(str, 'Slice name'),
         'url': Parameter(str, 'Slice url'),
         'expires': Parameter(int, 'Date and time this slice exipres'),
         'researcher': Parameter([str], 'List of users for this slice'),
         'description': Parameter([str], 'Description of this slice'), 
         }
-    fields.update(GeniRecord.fields)
+    public.update(GeniRecord.public)
 
-    internal_fields = {
-        'site': Parameter(str, 'Site this slice belongs to'),
-        'instantiation': Parameter(str, 'Slice instantiation'),
-        'nodes': Parameter([str], 'List of nodes this slice is instantiated on'),
-        'max_nodes': Parameter(int, 'Maximum number of nodes this slice is allowed on')
-        }
-    internal_fields.update(GeniRecord.internal_fields)
  
 class NodeRecord(GeniRecord):
-    fields = {
+    public = {
         'hostname': Parameter(str, 'This nodes dns name'),
         'node_type': Parameter(str, 'Type of node this is'),
         'node_type': Parameter(str, 'Type of node this is'),
         'latitude': Parameter(str, 'latitude'),
         'longitude': Parameter(str, 'longitude'),
         }
-    fields.update(GeniRecord.fields)
-
-    internal_fields = {
-        'slice_ids_whitelist': Parameter([str], 'List of allowed slices on this node'),
-        'site': Parameter(str, 'Site this node belongs to'),
-        'slices': Parameter([str], 'List of instantiated slices on this node'),
-        'boot_state': Parameter(str, 'This nodes boot state'),
-        'session': Parameter(str, 'This nodes session key'),
-        'ssh_rsa_key': Parameter(str, 'Last known ssh host key'),
-        'verified': Parameter(str, 'Whether the node configuration is verified correct'),
-        'last_contact': Parameter(int, 'Date and time this node last phoned home'),
-        'run_level': Parameter(str, 'Run level'),
-        'version': Parameter(str, 'Node software version'),
-        'key': Parameter(str, 'Node key'),
-        'boot_noonce': Parameter(str, 'Random value generate at nodes last boot'),
-        'model': Parameter(str, 'Model of node'),
-        'ports': Parameter([int], 'List of pcu ports this node is connected to') 
-        }
-    internal_fields.update(GeniRecord.internal_fields)
+    public.update(GeniRecord.public)
+
 
 class AuthorityRecord(GeniRecord):
-    fields =  {
+    public =  {
         'name': Parameter(str, 'Name'),
         'login_base': Parameter(str, 'login base'),
         'enabled': Parameter(bool, 'Is this site enabled'),
@@ -413,17 +380,6 @@ class AuthorityRecord(GeniRecord):
         'researcher': Parameter([str], 'List of researchers'),
         'PI': Parameter([str], 'List of Principal Investigators'),
         }
-    fields.update(GeniRecord.fields)
+    public.update(GeniRecord.public)
     
-    internal_fields = {
-        'nodes': Parameter([str], 'List of nodes at this site'),  
-        'slices': Parameter([str], 'List of slices instantiated by this site'),
-        'abbreviated_name': Parameter(str, 'Abbreviated name'),
-        'owners': Parameter([str], 'List of owners'),
-        'max_slices': Parameter(int, 'Maximum number of slices this site can instantiate'),
-        'max_slivers': Parameter(int, 'Maximum number of slivers this site can instantiate'),
-        'pi': Parameter([str], 'List of pis'),
-        'is_public': Parameter(bool, 'Is this site public'),
-        
-        }
-    internal_fields.update(GeniRecord.internal_fields) 
+