From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 9 Apr 2013 03:18:04 +0000 (-0400)
Subject: enable sites
X-Git-Tag: 1.0~205
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e87bffaef3ebfd44dec13af1ae2827bb4b60529b;p=plstackapi.git

enable sites
---

diff --git a/plstackapi/planetstack/api/roles.py b/plstackapi/planetstack/api/roles.py
index 2f2a019..5155767 100644
--- a/plstackapi/planetstack/api/roles.py
+++ b/plstackapi/planetstack/api/roles.py
@@ -1,7 +1,7 @@
 from plstackapi.openstack.client import OpenStackClient
 from plstackapi.openstack.driver import OpenStackDriver
 from plstackapi.planetstack.api.auth import auth_check
-from plstackapi.planetstack.models import *
+from plstackapi.planetstack.models import Role
  
 
 def add_role(auth, name):
diff --git a/plstackapi/planetstack/serializers.py b/plstackapi/planetstack/serializers.py
index ab79886..d4cba48 100644
--- a/plstackapi/planetstack/serializers.py
+++ b/plstackapi/planetstack/serializers.py
@@ -46,6 +46,7 @@ class SiteSerializer(serializers.HyperlinkedModelSerializer):
                   'longitude',
                   'latitude',
                   'login_base',
+                  'tenant_id',
                   'is_public',
                   'abbreviated_name',
                   'updated',
diff --git a/plstackapi/planetstack/urls.py b/plstackapi/planetstack/urls.py
index 63c2505..5316440 100644
--- a/plstackapi/planetstack/urls.py
+++ b/plstackapi/planetstack/urls.py
@@ -3,6 +3,7 @@ from django.conf.urls import patterns, include, url
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
 from plstackapi.planetstack.views.roles import RoleListCreate, RoleRetrieveUpdateDestroy
+from plstackapi.planetstack.views.roles import SiteListCreate, SiteRetrieveUpdateDestroy
 from plstackapi.planetstack.views.api_root import api_root
 from plstackapi.planetstack.models import Site
 from rest_framework import generics
@@ -25,8 +26,8 @@ urlpatterns = patterns('',
     url(r'^plstackapi/roles/$', RoleListCreate.as_view(), name='role-list'),
     url(r'^plstackapi/roles/(?P<pk>[a-zA-Z0-9]+)/$', RoleRetrieveUpdateDestroy.as_view(), name='role-detail'),
 
-    #url(r'^plstackapi/sites/$', views.SiteList.as_view(), name='site-list'),
-    #url(r'^plstackapi/sites/(?P<pk>[0-9]+)/$', views.SiteDetail.as_view(), name='site-detail'),
+    url(r'^plstackapi/sites/$', SiteListCreate.as_view(), name='site-list'),
+    url(r'^plstackapi/sites/(?P<pk>[0-9]+)/$', SiteRetrieveUpdateDestroy.as_view(), name='site-detail'),
 
     #url(r'^plstackapi/slices/$', views.SliceList.as_view(), name='slice-list'),
     #url(r'^plstackapi/slices/(?P<pk>[0-9]+)/$', views.SliceDetail.as_view(), name='slice-detail'),
diff --git a/plstackapi/planetstack/views/api_root.py b/plstackapi/planetstack/views/api_root.py
index 78ef658..ca81f5a 100644
--- a/plstackapi/planetstack/views/api_root.py
+++ b/plstackapi/planetstack/views/api_root.py
@@ -7,7 +7,7 @@ def api_root(request, format=None):
     return Response({
         'roles': reverse('role-list', request=request, format=format),
         #'nodes': reverse('node-list', request=request, format=format),
-        #'sites': reverse('site-list', request=request, format=format),
+        'sites': reverse('site-list', request=request, format=format),
         #'deploymentNetworks': reverse('deploymentnetwork-list', request=request, format=format),
         #'slices': reverse('slice-list', request=request, format=format)
     })