self.auth = auth
def __call__(self, *args, **kwds):
- a = [auth] + args
+ a = [self.auth] + list(args)
return self.callable(*a)
class API():
def __init__(self, username, password, url):
api = API(username, password, url)
self.sites = SiteImporter(api)
- self.slices = SliceImporter(api, remote_sites=self.sites.remote_sites, local_sites=self.sites.local_sites)
+ self.slices = SliceImporter(api)
self.users = UserImporter(api)
self.slivers = SliverImporter(api)
def run(self):
- self.roles.run()
self.sites.run()
self.users.run()
- self.slices.run()
+ self.slices.run(remote_sites=self.sites.remote_sites,
+ local_sites=self.sites.local_sites)
self.slivers.run()
print
sys.exit(0)
-
Importer(config.username, password, config.url).run()
db_sites = Site.objects.all()
for db_site in db_sites:
self.local_sites[db_site.login_base] = db_site
+ print "%s local sites" % len(db_sites)
sites = self.api.GetSites()
+ print "%s remote sites" %s len(sites))
count = 0
for site in sites:
self.remote_sites[site['site_id']] = site
sites = self.api.GetSites()
for site in sites:
remote_sites[site['site_id']] = site
+
if not local_sites:
from models import Site
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()
+ print "%s remote sites" %s len(slices)
count = 0
for slice in slices:
self.remote_slice[slice['slice_id']] = slice