updated import paths
diff --git a/plstackapi/importer/plclassic/site_importer.py b/plstackapi/importer/plclassic/site_importer.py
index ca89bf5..9311890 100644
--- a/plstackapi/importer/plclassic/site_importer.py
+++ b/plstackapi/importer/plclassic/site_importer.py
@@ -1,4 +1,4 @@
-from plstackapi.core.models import Site
+from plstackapi.planetstack.models import Site
class SiteImporter:
diff --git a/plstackapi/importer/plclassic/slice_importer.py b/plstackapi/importer/plclassic/slice_importer.py
index 2b8703f..a3b6382 100644
--- a/plstackapi/importer/plclassic/slice_importer.py
+++ b/plstackapi/importer/plclassic/slice_importer.py
@@ -1,4 +1,4 @@
-from plstackapi.core.models import Slice
+from plstackapi.planetstack.models import Slice
class SliceImporter:
diff --git a/plstackapi/openstack/manager.py b/plstackapi/openstack/manager.py
index 7ba9106..50a36e2 100644
--- a/plstackapi/openstack/manager.py
+++ b/plstackapi/openstack/manager.py
@@ -12,7 +12,7 @@
def refresh_nodes(self):
# collect local nodes
- from plstackapi.core.models import Node
+ from plstackapi.planetstack.models import Node
nodes = Node.objects.all()
nodes_dict = {}
for node in nodes:
@@ -36,7 +36,7 @@
def refresh_flavors(self):
# collect local flavors
- from plstackapi.core.models import Flavor
+ from plstackapi.planetstack.models import Flavor
flavors = Flavor.objects.all()
flavors_dict = {}
for flavor in flavors:
@@ -65,7 +65,7 @@
def refresh_images(self):
# collect local images
- from plstackapi.core.models import Image
+ from plstackapi.planetstack.models import Image
images = Image.objects.all()
images_dict = {}
for image in images:
diff --git a/plstackapi/planetstack/admin.py b/plstackapi/planetstack/admin.py
index 18c1e86..9f47e55 100644
--- a/plstackapi/planetstack/admin.py
+++ b/plstackapi/planetstack/admin.py
@@ -1,4 +1,4 @@
-from plstackapi.core.models import *
+from plstackapi.planetstack.models import *
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin
diff --git a/plstackapi/planetstack/fixtures/initial_data.json b/plstackapi/planetstack/fixtures/initial_data.json
index 5188d63..62d943b 100644
--- a/plstackapi/planetstack/fixtures/initial_data.json
+++ b/plstackapi/planetstack/fixtures/initial_data.json
@@ -1 +1 @@
-[{"pk": 1, "model": "core.deploymentnetwork", "fields": {"updated": "2013-03-20T01:18:31.247Z", "name": "VICCI", "created": "2013-03-20T01:18:31.247Z"}}, {"pk": 2, "model": "core.deploymentnetwork", "fields": {"updated": "2013-03-20T01:19:00.063Z", "name": "VINI", "created": "2013-03-20T01:19:00.063Z"}}, {"pk": 3, "model": "core.deploymentnetwork", "fields": {"updated": "2013-03-20T01:19:15.143Z", "name": "GENI", "created": "2013-03-20T01:19:15.143Z"}}, {"pk": 4, "model": "core.deploymentnetwork", "fields": {"updated": "2013-03-20T01:19:40.098Z", "name": "PlanetLab Classic", "created": "2013-03-20T01:19:25.672Z"}}]
\ No newline at end of file
+[{"pk": 1, "model": "plstackapi.planetstack.deploymentnetwork", "fields": {"updated": "2013-03-20T01:18:31.247Z", "name": "VICCI", "created": "2013-03-20T01:18:31.247Z"}}, {"pk": 2, "model": "plstackapi.planetstack.deploymentnetwork", "fields": {"updated": "2013-03-20T01:19:00.063Z", "name": "VINI", "created": "2013-03-20T01:19:00.063Z"}}, {"pk": 3, "model": "plstackapi.planetstack.deploymentnetwork", "fields": {"updated": "2013-03-20T01:19:15.143Z", "name": "GENI", "created": "2013-03-20T01:19:15.143Z"}}, {"pk": 4, "model": "plstackapi.planetstack.deploymentnetwork", "fields": {"updated": "2013-03-20T01:19:40.098Z", "name": "PlanetLab Classic", "created": "2013-03-20T01:19:25.672Z"}}]
diff --git a/plstackapi/planetstack/serializers.py b/plstackapi/planetstack/serializers.py
index 2973ab4..b779a4a 100644
--- a/plstackapi/planetstack/serializers.py
+++ b/plstackapi/planetstack/serializers.py
@@ -1,6 +1,6 @@
from django.forms import widgets
from rest_framework import serializers
-from plstackapi.core.models import *
+from plstackapi.planetstack.models import *
class SliceSerializer(serializers.HyperlinkedModelSerializer):
diff --git a/plstackapi/planetstack/settings.py b/plstackapi/planetstack/settings.py
index 9af30d9..7e223a1 100644
--- a/plstackapi/planetstack/settings.py
+++ b/plstackapi/planetstack/settings.py
@@ -128,7 +128,7 @@
'django.contrib.admindocs',
'rest_framework',
'django_extensions',
- 'plstackapi.core',
+ 'plstackapi.planetstack',
'django_evolution',
)
diff --git a/plstackapi/planetstack/urls.py b/plstackapi/planetstack/urls.py
index f04a87f..456892e 100644
--- a/plstackapi/planetstack/urls.py
+++ b/plstackapi/planetstack/urls.py
@@ -2,9 +2,9 @@
# Uncomment the next two lines to enable the admin:
from django.contrib import admin
-from plstackapi.core import views
-from plstackapi.core.views import api_root
-from plstackapi.core.models import Site
+from plstackapi.planetstack import views
+from plstackapi.planetstack.views import api_root
+from plstackapi.planetstack.models import Site
from rest_framework import generics
admin.autodiscover()
diff --git a/plstackapi/planetstack/views.py b/plstackapi/planetstack/views.py
index a5efd36..21b0301 100644
--- a/plstackapi/planetstack/views.py
+++ b/plstackapi/planetstack/views.py
@@ -1,6 +1,6 @@
# Create your views here.
-from plstackapi.core.models import Site
+from plstackapi.planetstack.models import Site
from serializers import *
from rest_framework import generics
from rest_framework.decorators import api_view