s/openstack/openstack_xos/ module renaming
diff --git a/xos/openstack_xos/driver.py b/xos/openstack_xos/driver.py
index 15668b9..5b1040e 100644
--- a/xos/openstack_xos/driver.py
+++ b/xos/openstack_xos/driver.py
@@ -4,7 +4,7 @@
from core.models import Controller
try:
- from openstack.client import OpenStackClient
+ from openstack_xos.client import OpenStackClient
has_openstack = True
except:
has_openstack = False
diff --git a/xos/openstack_xos/instanceagent.py b/xos/openstack_xos/instanceagent.py
index 8e50cf3..e3fd58d 100644
--- a/xos/openstack_xos/instanceagent.py
+++ b/xos/openstack_xos/instanceagent.py
@@ -3,7 +3,7 @@
#os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xos.settings")
import time
from core.models.instance import Instance
-from openstack.manager import OpenStackManager
+from openstack_xos.manager import OpenStackManager
class InstanceAgent:
diff --git a/xos/openstack_xos/manager.py b/xos/openstack_xos/manager.py
index 45d49b4..ae288bd 100644
--- a/xos/openstack_xos/manager.py
+++ b/xos/openstack_xos/manager.py
@@ -11,8 +11,8 @@
from core.models import *
from xos.config import Config
try:
- from openstack.client import OpenStackClient
- from openstack.driver import OpenStackDriver
+ from openstack_xos.client import OpenStackClient
+ from openstack_xos.driver import OpenStackDriver
has_openstack = True
except:
has_openstack = False
diff --git a/xos/synchronizers/base/event_loop.py b/xos/synchronizers/base/event_loop.py
index 4f7d436..ef79781 100644
--- a/xos/synchronizers/base/event_loop.py
+++ b/xos/synchronizers/base/event_loop.py
@@ -17,8 +17,8 @@
from django.db.models import F, Q
from django.db import connection
from django.db import reset_queries
-#from openstack.manager import OpenStackManager
-from openstack.driver import OpenStackDriver
+#from openstack_xos.manager import OpenStackManager
+from openstack_xos.driver import OpenStackDriver
from xos.logger import Logger, logging, logger
#from timeout import timeout
from xos.config import Config, XOS_DIR
diff --git a/xos/synchronizers/base/steps/sync_controller_networks.py b/xos/synchronizers/base/steps/sync_controller_networks.py
index 990cb87..f209f01 100644
--- a/xos/synchronizers/base/steps/sync_controller_networks.py
+++ b/xos/synchronizers/base/steps/sync_controller_networks.py
@@ -11,7 +11,7 @@
from core.models.instance import Instance
from xos.logger import observer_logger as logger
from synchronizers.base.ansible import *
-from openstack.driver import OpenStackDriver
+from openstack_xos.driver import OpenStackDriver
from xos.config import Config
import json
diff --git a/xos/synchronizers/base/steps/sync_controller_slices.py b/xos/synchronizers/base/steps/sync_controller_slices.py
index 97d8c29..2f36441 100644
--- a/xos/synchronizers/base/steps/sync_controller_slices.py
+++ b/xos/synchronizers/base/steps/sync_controller_slices.py
@@ -8,7 +8,7 @@
from synchronizers.base.syncstep import *
from core.models import *
from synchronizers.base.ansible import *
-from openstack.driver import OpenStackDriver
+from openstack_xos.driver import OpenStackDriver
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizers/base/steps/sync_object.py b/xos/synchronizers/base/steps/sync_object.py
index a6a939f..aaf2f25 100644
--- a/xos/synchronizers/base/steps/sync_object.py
+++ b/xos/synchronizers/base/steps/sync_object.py
@@ -7,7 +7,7 @@
from synchronizers.base.syncstep import *
from core.models import *
from synchronizers.base.ansible import *
-from openstack.driver import OpenStackDriver
+from openstack_xos.driver import OpenStackDriver
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizers/base/steps/sync_ports.py b/xos/synchronizers/base/steps/sync_ports.py
index 21376e5..4c6681f 100644
--- a/xos/synchronizers/base/steps/sync_ports.py
+++ b/xos/synchronizers/base/steps/sync_ports.py
@@ -171,8 +171,8 @@
# A bunch of stuff to compensate for OpenStackDriver.client_driveR()
# not being in working condition.
- from openstack.client import OpenStackClient
- from openstack.driver import OpenStackDriver
+ from openstack_xos.client import OpenStackClient
+ from openstack_xos.driver import OpenStackDriver
caller = port.network.owner.creator
auth = {'username': caller.email,
'password': caller.remote_password,
diff --git a/xos/synchronizers/openstack/steps/sync_controller_networks.py b/xos/synchronizers/openstack/steps/sync_controller_networks.py
index 5375a8d..211ce13 100644
--- a/xos/synchronizers/openstack/steps/sync_controller_networks.py
+++ b/xos/synchronizers/openstack/steps/sync_controller_networks.py
@@ -13,7 +13,7 @@
from core.models.instance import Instance
from xos.logger import observer_logger as logger
from synchronizers.base.ansible import *
-from openstack.driver import OpenStackDriver
+from openstack_xos.driver import OpenStackDriver
from xos.config import Config
import json
diff --git a/xos/synchronizers/openstack/steps/sync_controller_slices.py b/xos/synchronizers/openstack/steps/sync_controller_slices.py
index 97d8c29..2f36441 100644
--- a/xos/synchronizers/openstack/steps/sync_controller_slices.py
+++ b/xos/synchronizers/openstack/steps/sync_controller_slices.py
@@ -8,7 +8,7 @@
from synchronizers.base.syncstep import *
from core.models import *
from synchronizers.base.ansible import *
-from openstack.driver import OpenStackDriver
+from openstack_xos.driver import OpenStackDriver
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizers/openstack/steps/sync_object.py b/xos/synchronizers/openstack/steps/sync_object.py
index a6a939f..aaf2f25 100644
--- a/xos/synchronizers/openstack/steps/sync_object.py
+++ b/xos/synchronizers/openstack/steps/sync_object.py
@@ -7,7 +7,7 @@
from synchronizers.base.syncstep import *
from core.models import *
from synchronizers.base.ansible import *
-from openstack.driver import OpenStackDriver
+from openstack_xos.driver import OpenStackDriver
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizers/openstack/steps/sync_ports.py b/xos/synchronizers/openstack/steps/sync_ports.py
index 4f6ce14..1aeaef3 100644
--- a/xos/synchronizers/openstack/steps/sync_ports.py
+++ b/xos/synchronizers/openstack/steps/sync_ports.py
@@ -30,8 +30,8 @@
# A bunch of stuff to compensate for OpenStackDriver.client_driveR()
# not being in working condition.
- from openstack.client import OpenStackClient
- from openstack.driver import OpenStackDriver
+ from openstack_xos.client import OpenStackClient
+ from openstack_xos.driver import OpenStackDriver
controller = port.instance.node.site_deployment.controller
slice = port.instance.slice
caller = port.network.owner.creator