From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 2 Apr 2013 13:42:10 +0000 (-0400)
Subject: import django settings module in importer
X-Git-Tag: 1.0~291
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=59c762a5982f8c22a90a8404ba4c4b9711a23736;p=plstackapi.git

import django settings module in importer
---

diff --git a/plstackapi/core/models.py b/plstackapi/core/models.py
index a0e332c..79edaca 100644
--- a/plstackapi/core/models.py
+++ b/plstackapi/core/models.py
@@ -2,7 +2,6 @@ import os
 from django.db import models
 from plstackapi.openstack.driver import OpenStackDriver
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "plstackapi.planetstack.settings")
 # Create your models here.
 
 class PlCoreBase(models.Model):
diff --git a/plstackapi/importer/plclassic/importer.py b/plstackapi/importer/plclassic/importer.py
index 8831afd..599e548 100644
--- a/plstackapi/importer/plclassic/importer.py
+++ b/plstackapi/importer/plclassic/importer.py
@@ -1,4 +1,5 @@
 import os
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "plstackapi.planetstack.settings")
 import xmlrpclib
 from plstackapi.importer.plclassic.site_importer import SiteImporter
 from plstackapi.importer.plclassic.user_importer import UserImporter
@@ -16,19 +17,19 @@ class Call:
         return self.callable(*a)
 
 class API():
-    def __init__(self):
+    def __init__(self, username, password, url):
         self.auth = {'AuthMethod': 'password',
-                     'Username': None,
-                     'AuthString': None}
-        self.server = xmlrpclib.ServerProxy("URL", allow_none=True)
+                     'Username': username,
+                     'AuthString': password}
+        self.server = xmlrpclib.ServerProxy(url, allow_none=True)
 
     def __getattr__(self, name):         
         return Call(getattr(self.server, name), self.auth) 
 
 class Importer: 
 
-    def __init__(self):
-        api = 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.users = UserImporter(api)