X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2FsfaImport.py;h=4de6e1bd6d4ee41c925e38f2ed544ccc581b2b28;hb=57b6a99255d4a88be9c0f910f8524677e34ff4bc;hp=cadefd71cdfa9a60ae172d9506f5d466a1424761;hpb=81c87aab9fc402bf72e6c75193ccf24385fd67c7;p=sfa.git

diff --git a/sfa/plc/sfaImport.py b/sfa/plc/sfaImport.py
index cadefd71..4de6e1bd 100644
--- a/sfa/plc/sfaImport.py
+++ b/sfa/plc/sfaImport.py
@@ -8,20 +8,16 @@
 # RSA keys at this time, not DSA keys.
 ##
 
-import getopt
-import sys
-import tempfile
-
 from sfa.util.sfalogging import _SfaLogger
 
-from sfa.util.record import *
+from sfa.util.record import SfaRecord
 from sfa.util.table import SfaTable
 from sfa.util.xrn import get_authority, hrn_to_urn
 from sfa.util.plxrn import email_to_hrn
 from sfa.util.config import Config
 from sfa.trust.certificate import convert_public_key, Keypair
 from sfa.trust.trustedroots import TrustedRoots
-from sfa.trust.hierarchy import *
+from sfa.trust.hierarchy import Hierarchy
 from sfa.trust.gid import create_uuid
 
 
@@ -96,6 +92,24 @@ class sfaImport:
             self.logger.info("Import: inserting authority record for %s"%hrn)
             table.insert(auth_record)
 
+    def create_sm_client_record(self):
+        """
+        Create a user record for the Slicemanager service.
+        """
+        hrn = self.config.SFA_INTERFACE_HRN + '.slicemanager'
+        urn = hrn_to_urn(hrn, 'user')
+        if not self.AuthHierarchy.auth_exists(urn):
+            self.logger.info("Import: creating Slice Manager user")
+            self.AuthHierarchy.create_auth(urn)
+
+        auth_info = self.AuthHierarchy.get_auth_info(hrn)
+        table = SfaTable()
+        sm_user_record = table.find({'type': 'user', 'hrn': hrn})
+        if not sm_user_record:
+            record = SfaRecord(hrn=hrn, gid=auth_info.get_gid_object(), type="user", pointer=-1)
+            record['authority'] = get_authority(record['hrn'])
+            table.insert(record)    
+
     def create_interface_records(self):
         """
         Create a record for each SFA interface
@@ -116,7 +130,9 @@ class sfaImport:
                 record = SfaRecord(hrn=interface_hrn, gid=gid, type=interface, pointer=-1)  
                 record['authority'] = get_authority(interface_hrn)
                 table.insert(record) 
+                                
 
+    
     def import_person(self, parent_hrn, person):
         """
         Register a user record 
@@ -214,8 +230,6 @@ class sfaImport:
 
     
     def import_site(self, hrn, site):
-        shell = self.shell
-        plc_auth = self.plc_auth
         urn = hrn_to_urn(hrn, 'authority')
         self.logger.info("Import: site %s"%hrn)