remove Slice.instantiation field

[plstackapi.git] / plstackapi / importer / plclassic / slice_importer.py

diff --git a/plstackapi/importer/plclassic/slice_importer.py b/plstackapi/importer/plclassic/slice_importer.py
index 0db9136..4717b3d 100644 (file)
--- a/plstackapi/importer/plclassic/slice_importer.py
+++ b/plstackapi/importer/plclassic/slice_importer.py
@@ -9,12 +9,13 @@ class SliceImporter:
 
     def run(self, remote_sites={}, local_sites={}):
         if not remote_sites:
-            sites = self.api.GetSites()
+            sites = self.api.GetSites({'peer_id': None})
             for site in sites:
                 remote_sites[site['site_id']] = site
+        
 
         if not local_sites:
-            from models import Site
+            from plstackapi.core.models import Site
             sites = Site.objects.all()
             for site in sites:
                 local_sites[site.login_base] = site            
@@ -22,15 +23,16 @@ class SliceImporter:
         db_slices = Slice.objects.all()
         for db_slice in db_slices:
             self.local_slices[db_slice.name] = db_slice
+        print "%s local slices" % len(db_slices)
 
-        slices = api.GetSlices()
+        slices = self.api.GetSlices({'peer_id': None})
+        print "%s remote slices" % len(slices)
         count = 0 
         for slice in slices:
-            self.remote_slice[slice['slice_id']] = slice
+            self.remote_slices[slice['slice_id']] = slice
             if slice['name'] not in self.local_slices:
                 site = local_sites[remote_sites[slice['site_id']]['login_base']]
-                new_slices = Slice(name=slice['name'],
-                                   instantiation=slice['instantiation'],
+                new_slice = Slice(name=slice['name'],
                                    omf_friendly = False,
                                    description = slice['description'],
                                    slice_url = slice['url'],