move syndicate_storage to services/
diff --git a/xos/core/dashboard/views/view_common.py b/xos/core/dashboard/views/view_common.py
index 4b054fe..ba78ffd 100644
--- a/xos/core/dashboard/views/view_common.py
+++ b/xos/core/dashboard/views/view_common.py
@@ -4,7 +4,7 @@
import datetime
from pprint import pprint
import json
-from syndicate_storage.models import *
+from services.syndicate_storage.models import *
from core.models import *
from services.hpc.models import ContentProvider
from operator import attrgetter
diff --git a/xos/core/xoslib/methods/tenantview.py b/xos/core/xoslib/methods/tenantview.py
index 6922c17..e505b1c 100644
--- a/xos/core/xoslib/methods/tenantview.py
+++ b/xos/core/xoslib/methods/tenantview.py
@@ -6,7 +6,7 @@
from rest_framework.views import APIView
from core.models import *
from django.forms import widgets
-from syndicate_storage.models import Volume
+from services.syndicate_storage.models import Volume
from django.core.exceptions import PermissionDenied
# This REST API endpoint contains a bunch of misc information that the
diff --git a/xos/services/syndicate_storage/admin.py b/xos/services/syndicate_storage/admin.py
index 66e07dd..779f83b 100644
--- a/xos/services/syndicate_storage/admin.py
+++ b/xos/services/syndicate_storage/admin.py
@@ -1,6 +1,6 @@
from django.contrib import admin
-from syndicate_storage.models import *
+from services.syndicate_storage.models import *
from django import forms
from django.utils.safestring import mark_safe
from django.contrib.auth.admin import UserAdmin
diff --git a/xos/services/syndicate_storage/migrations/0001_initial.py b/xos/services/syndicate_storage/migrations/0001_initial.py
index 51c8f94..f0065ce 100644
--- a/xos/services/syndicate_storage/migrations/0001_initial.py
+++ b/xos/services/syndicate_storage/migrations/0001_initial.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
from django.db import models, migrations
-import syndicate_storage.models
+import services.syndicate_storage.models
import django.utils.timezone
from django.conf import settings
@@ -19,7 +19,7 @@
name='SliceSecret',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('secret', syndicate_storage.models.ObserverSecretValue(help_text=b"Shared secret between OpenCloud and this slice's Syndicate daemons.", blank=True)),
+ ('secret', services.syndicate_storage.models.ObserverSecretValue(help_text=b"Shared secret between OpenCloud and this slice's Syndicate daemons.", blank=True)),
('slice_id', models.ForeignKey(to='core.Slice')),
],
options={
diff --git a/xos/syndicate_observer/steps/sync_volume.py b/xos/syndicate_observer/steps/sync_volume.py
index 726908c..c973e8a 100644
--- a/xos/syndicate_observer/steps/sync_volume.py
+++ b/xos/syndicate_observer/steps/sync_volume.py
@@ -19,7 +19,7 @@
from xos.config import Config
from observer.syncstep import SyncStep
from core.models import Service
-from syndicate_storage.models import Volume
+from services.syndicate_storage.models import Volume
import logging
from logging import Logger
diff --git a/xos/syndicate_observer/steps/sync_volumeaccessright.py b/xos/syndicate_observer/steps/sync_volumeaccessright.py
index e68b6af..c135237 100644
--- a/xos/syndicate_observer/steps/sync_volumeaccessright.py
+++ b/xos/syndicate_observer/steps/sync_volumeaccessright.py
@@ -32,7 +32,7 @@
else:
logger.warning("No OPENCLOUD_PYTHONPATH set; assuming your PYTHONPATH works")
-from syndicate_storage.models import VolumeAccessRight
+from services.syndicate_storage.models import VolumeAccessRight
# syndicatelib will be in stes/..
parentdir = os.path.join(os.path.dirname(__file__),"..")
diff --git a/xos/syndicate_observer/steps/sync_volumeslice.py b/xos/syndicate_observer/steps/sync_volumeslice.py
index 3217d7a..e88d4c1 100644
--- a/xos/syndicate_observer/steps/sync_volumeslice.py
+++ b/xos/syndicate_observer/steps/sync_volumeslice.py
@@ -32,7 +32,7 @@
else:
logger.warning("No OPENCLOUD_PYTHONPATH set; assuming your PYTHONPATH works")
-from syndicate_storage.models import VolumeSlice,VolumeAccessRight,Volume
+from services.syndicate_storage.models import VolumeSlice,VolumeAccessRight,Volume
# syndicatelib will be in stes/..
parentdir = os.path.join(os.path.dirname(__file__),"..")
diff --git a/xos/syndicate_observer/syndicatelib.py b/xos/syndicate_observer/syndicatelib.py
index 9044a48..56bd120 100644
--- a/xos/syndicate_observer/syndicatelib.py
+++ b/xos/syndicate_observer/syndicatelib.py
@@ -58,7 +58,7 @@
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xos.settings")
# get our models
- import syndicate_storage.models as models
+ import services.syndicate_storage.models as models
# get OpenCloud models
from core.models import Slice,Instance
diff --git a/xos/xos/settings.py b/xos/xos/settings.py
index f141ccb..b09cd86 100644
--- a/xos/xos/settings.py
+++ b/xos/xos/settings.py
@@ -179,9 +179,7 @@
'services.onos',
'ceilometer',
'services.requestrouter',
-# 'urlfilter',
-# 'servcomp',
- 'syndicate_storage',
+ 'services.syndicate_storage',
'geoposition',
'rest_framework_swagger',
)