move cord to services/
diff --git a/xos/core/xoslib/methods/cordsubscriber.py b/xos/core/xoslib/methods/cordsubscriber.py
index 3892014..b22d70e 100644
--- a/xos/core/xoslib/methods/cordsubscriber.py
+++ b/xos/core/xoslib/methods/cordsubscriber.py
@@ -9,7 +9,7 @@
from core.models import *
from django.forms import widgets
from django.conf.urls import patterns, url
-from cord.models import VOLTTenant, VBNGTenant, CordSubscriberRoot
+from services.cord.models import VOLTTenant, VBNGTenant, CordSubscriberRoot
from core.xoslib.objects.cordsubscriber import CordSubscriber
from plus import PlusSerializerMixin, XOSViewSet
from django.shortcuts import get_object_or_404
diff --git a/xos/core/xoslib/methods/volttenant.py b/xos/core/xoslib/methods/volttenant.py
index bf48290..3adb995 100644
--- a/xos/core/xoslib/methods/volttenant.py
+++ b/xos/core/xoslib/methods/volttenant.py
@@ -6,7 +6,7 @@
from rest_framework import status
from core.models import *
from django.forms import widgets
-from cord.models import VOLTTenant, VOLTService
+from services.cord.models import VOLTTenant, VOLTService
from plus import PlusSerializerMixin
from xos.apibase import XOSListCreateAPIView, XOSRetrieveUpdateDestroyAPIView, XOSPermissionDenied
diff --git a/xos/core/xoslib/objects/cordsubscriber.py b/xos/core/xoslib/objects/cordsubscriber.py
index 0b2763b..d859cd2 100644
--- a/xos/core/xoslib/objects/cordsubscriber.py
+++ b/xos/core/xoslib/objects/cordsubscriber.py
@@ -1,5 +1,5 @@
from core.models import Slice, SlicePrivilege, SliceRole, Instance, Site, Node, User
-from cord.models import VOLTTenant, CordSubscriberRoot
+from services.cord.models import VOLTTenant, CordSubscriberRoot
from plus import PlusObjectMixin
from operator import itemgetter, attrgetter
from rest_framework.exceptions import APIException
@@ -10,9 +10,9 @@
sys.path.append("/opt/xos")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xos.settings")
import django
-from core.models import *
-from services.hpc.models import *
-from cord.models import *
+from core.models import *
+from services.hpc.models import *
+from services.cord.models import *
django.setup()
from core.xoslib.objects.cordsubscriber import CordSubscriber
c=CordSubscriber.get_tenant_objects().select_related().all()[0]
diff --git a/xos/observers/vbng/steps/sync_vbngtenant.py b/xos/observers/vbng/steps/sync_vbngtenant.py
index 1347e2f..432a7c6 100644
--- a/xos/observers/vbng/steps/sync_vbngtenant.py
+++ b/xos/observers/vbng/steps/sync_vbngtenant.py
@@ -8,7 +8,7 @@
from observer.syncstep import SyncStep
from observer.ansible import run_template_ssh
from core.models import Service
-from cord.models import VCPEService, VCPETenant, VBNGTenant, VBNGService
+from services.cord.models import VCPEService, VCPETenant, VBNGTenant, VBNGService
from hpc.models import HpcService, CDNPrefix
from util.logger import Logger, logging
diff --git a/xos/observers/vcpe/steps/sync_vcpetenant.py b/xos/observers/vcpe/steps/sync_vcpetenant.py
index 0985d22..5bb8b74 100644
--- a/xos/observers/vcpe/steps/sync_vcpetenant.py
+++ b/xos/observers/vcpe/steps/sync_vcpetenant.py
@@ -10,7 +10,7 @@
from observer.ansible import run_template_ssh
from observers.base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
from core.models import Service, Slice
-from cord.models import VCPEService, VCPETenant, VOLTTenant
+from services.cord.models import VCPEService, VCPETenant, VOLTTenant
from hpc.models import HpcService, CDNPrefix
from util.logger import Logger, logging
diff --git a/xos/observers/vtn/steps/sync_tenant.py b/xos/observers/vtn/steps/sync_tenant.py
index 5e8d0a2..7610177 100644
--- a/xos/observers/vtn/steps/sync_tenant.py
+++ b/xos/observers/vtn/steps/sync_tenant.py
@@ -8,7 +8,7 @@
from observer.syncstep import SyncStep
from core.models import Service
from core.models.service import COARSE_KIND
-from cord.models import Tenant
+from services.cord.models import Tenant
from util.logger import Logger, logging
# hpclibrary will be in steps/..
diff --git a/xos/cord/__init__.py b/xos/services/cord/__init__.py
similarity index 100%
rename from xos/cord/__init__.py
rename to xos/services/cord/__init__.py
diff --git a/xos/cord/admin.py b/xos/services/cord/admin.py
similarity index 99%
rename from xos/cord/admin.py
rename to xos/services/cord/admin.py
index 686d8ae..ced79af 100644
--- a/xos/cord/admin.py
+++ b/xos/services/cord/admin.py
@@ -1,6 +1,6 @@
from django.contrib import admin
-from cord.models import *
+from services.cord.models import *
from django import forms
from django.utils.safestring import mark_safe
from django.contrib.auth.admin import UserAdmin
diff --git a/xos/cord/models.py b/xos/services/cord/models.py
similarity index 99%
rename from xos/cord/models.py
rename to xos/services/cord/models.py
index e6959e5..4b794b4 100644
--- a/xos/cord/models.py
+++ b/xos/services/cord/models.py
@@ -17,7 +17,7 @@
import django
from core.models import *
from services.hpc.models import *
-from cord.models import *
+from services.cord.models import *
django.setup()
t = VOLTTenant()
diff --git a/xos/cord/rest_examples/add_volt_tenant.sh b/xos/services/cord/rest_examples/add_volt_tenant.sh
similarity index 100%
rename from xos/cord/rest_examples/add_volt_tenant.sh
rename to xos/services/cord/rest_examples/add_volt_tenant.sh
diff --git a/xos/cord/rest_examples/config.sh b/xos/services/cord/rest_examples/config.sh
similarity index 100%
rename from xos/cord/rest_examples/config.sh
rename to xos/services/cord/rest_examples/config.sh
diff --git a/xos/cord/rest_examples/delete_volt_tenant.sh b/xos/services/cord/rest_examples/delete_volt_tenant.sh
similarity index 100%
rename from xos/cord/rest_examples/delete_volt_tenant.sh
rename to xos/services/cord/rest_examples/delete_volt_tenant.sh
diff --git a/xos/cord/rest_examples/list_cord_subscribers.sh b/xos/services/cord/rest_examples/list_cord_subscribers.sh
similarity index 100%
rename from xos/cord/rest_examples/list_cord_subscribers.sh
rename to xos/services/cord/rest_examples/list_cord_subscribers.sh
diff --git a/xos/cord/rest_examples/list_volt_tenants.sh b/xos/services/cord/rest_examples/list_volt_tenants.sh
similarity index 100%
rename from xos/cord/rest_examples/list_volt_tenants.sh
rename to xos/services/cord/rest_examples/list_volt_tenants.sh
diff --git a/xos/cord/templates/vbngadmin.html b/xos/services/cord/templates/vbngadmin.html
similarity index 100%
rename from xos/cord/templates/vbngadmin.html
rename to xos/services/cord/templates/vbngadmin.html
diff --git a/xos/cord/templates/vcpeadmin.html b/xos/services/cord/templates/vcpeadmin.html
similarity index 100%
rename from xos/cord/templates/vcpeadmin.html
rename to xos/services/cord/templates/vcpeadmin.html
diff --git a/xos/cord/templates/voltadmin.html b/xos/services/cord/templates/voltadmin.html
similarity index 100%
rename from xos/cord/templates/voltadmin.html
rename to xos/services/cord/templates/voltadmin.html
diff --git a/xos/tools/cleanup_unique.py b/xos/tools/cleanup_unique.py
index 629e17f..4df82f4 100644
--- a/xos/tools/cleanup_unique.py
+++ b/xos/tools/cleanup_unique.py
@@ -5,7 +5,7 @@
import django
from core.models import *
from services.hpc.models import *
-from cord.models import *
+from services.cord.models import *
django.setup()
for obj in ControllerNetwork.deleted_objects.all():
diff --git a/xos/tools/purge.py b/xos/tools/purge.py
index a0e8351..023c2fe 100644
--- a/xos/tools/purge.py
+++ b/xos/tools/purge.py
@@ -5,7 +5,7 @@
import django
from core.models import *
from services.hpc.models import *
-from cord.models import *
+from services.cord.models import *
django.setup()
def purge(cls):
diff --git a/xos/tosca/resources/CORDSubscriber.py b/xos/tosca/resources/CORDSubscriber.py
index 45f5ee3..4097ca9 100644
--- a/xos/tosca/resources/CORDSubscriber.py
+++ b/xos/tosca/resources/CORDSubscriber.py
@@ -7,7 +7,7 @@
import pdb
from core.models import User
-from cord.models import CordSubscriberRoot
+from services.cord.models import CordSubscriberRoot
from xosresource import XOSResource
diff --git a/xos/tosca/resources/CORDUser.py b/xos/tosca/resources/CORDUser.py
index 78883f2..566e205 100644
--- a/xos/tosca/resources/CORDUser.py
+++ b/xos/tosca/resources/CORDUser.py
@@ -7,7 +7,7 @@
import pdb
from core.models import User
-from cord.models import CordSubscriberRoot
+from services.cord.models import CordSubscriberRoot
from xosresource import XOSResource
diff --git a/xos/tosca/resources/VOLTTenant.py b/xos/tosca/resources/VOLTTenant.py
index 20c4dfb..ae1692d 100644
--- a/xos/tosca/resources/VOLTTenant.py
+++ b/xos/tosca/resources/VOLTTenant.py
@@ -7,7 +7,7 @@
import pdb
from core.models import User
-from cord.models import VOLTTenant, VOLTService, CordSubscriberRoot, VOLT_KIND
+from services.cord.models import VOLTTenant, VOLTService, CordSubscriberRoot, VOLT_KIND
from xosresource import XOSResource
diff --git a/xos/tosca/resources/vbngservice.py b/xos/tosca/resources/vbngservice.py
index 1fc8d25..28d4a1d 100644
--- a/xos/tosca/resources/vbngservice.py
+++ b/xos/tosca/resources/vbngservice.py
@@ -5,7 +5,7 @@
sys.path.append("/opt/tosca")
from translator.toscalib.tosca_template import ToscaTemplate
-from cord.models import VBNGService
+from services.cord.models import VBNGService
from service import XOSService
diff --git a/xos/tosca/resources/vcpeservice.py b/xos/tosca/resources/vcpeservice.py
index 8df7231..abcdea9 100644
--- a/xos/tosca/resources/vcpeservice.py
+++ b/xos/tosca/resources/vcpeservice.py
@@ -5,7 +5,7 @@
sys.path.append("/opt/tosca")
from translator.toscalib.tosca_template import ToscaTemplate
-from cord.models import VCPEService
+from services.cord.models import VCPEService
from service import XOSService
diff --git a/xos/xos/settings.py b/xos/xos/settings.py
index 1f1e167..f141ccb 100644
--- a/xos/xos/settings.py
+++ b/xos/xos/settings.py
@@ -174,7 +174,7 @@
'django_extensions',
'core',
'services.hpc',
- 'cord',
+ 'services.cord',
'services.helloworldservice_complete',
'services.onos',
'ceilometer',