Merge branch 'master' of github.com:open-cloud/xos
diff --git a/xos/cord/models.py b/xos/cord/models.py
index 346fcc9..72234fa 100644
--- a/xos/cord/models.py
+++ b/xos/cord/models.py
@@ -203,6 +203,7 @@
"firewall_rules": "accept all anywhere anywhere",
"url_filter_enable": False,
"url_filter_rules": "allow all",
+ "url_filter_level": "PG",
"cdn_enable": False,
"sliver_id": None}
@@ -316,6 +317,14 @@
self.set_attribute("url_filter_enable", value)
@property
+ def url_filter_level(self):
+ return self.get_attribute("url_filter_level", self.default_attributes["url_filter_level"])
+
+ @url_filter_level.setter
+ def url_filter_level(self, value):
+ self.set_attribute("url_filter_level", value)
+
+ @property
def url_filter_rules(self):
return self.get_attribute("url_filter_rules", self.default_attributes["url_filter_rules"])
@@ -331,6 +340,27 @@
def cdn_enable(self, value):
self.set_attribute("cdn_enable", value)
+ @property
+ def users(self):
+ return [ {"name": "mom", "id": 1, "role": "admin"},
+ {"name": "dad", "id": 2, "role": "admin"},
+ {"name": "kid1", "id": 3, "role": "user"},
+ {"name": "kid2", "id": 4, "role": "user"} ]
+
+ @users.setter
+ def users(self, value):
+ pass
+
+ @property
+ def services(self):
+ return [ {"cdn": self.cdn_enable,
+ "url_filter": self.url_filter_enable,
+ "firewall": self.firewall_enable} ]
+
+ @services.setter
+ def services(self, value):
+ pass
+
def pick_node(self):
nodes = list(Node.objects.all())
# TODO: logic to filter nodes by which nodes are up, and which
diff --git a/xos/core/xoslib/methods/__init__.py b/xos/core/xoslib/methods/__init__.py
index 0b891eb..c777668 100644
--- a/xos/core/xoslib/methods/__init__.py
+++ b/xos/core/xoslib/methods/__init__.py
@@ -1,5 +1,6 @@
from django.views.generic import View
from django.conf.urls import patterns, url
+from rest_framework.routers import DefaultRouter
import os, sys
import inspect
import importlib
@@ -40,6 +41,19 @@
urlpatterns.append(url(r'^' + view_url[1] + '/$', view_url[3].as_view(), name=view_url[1]+'list'))
elif view_url[0] == "detail":
urlpatterns.append(url(r'^' + view_url[1] + '/(?P<pk>[a-zA-Z0-9\-]+)/$', view_url[3].as_view(), name=view_url[1]+'detail'))
+ elif view_url[0] == "viewset":
+ viewset = view_url[3]
+
+ urlpatterns.extend(viewset.get_urlpatterns())
+
+ #urlpatterns.append(url(r'^' + view_url[1] + '/$', viewset.as_view({'get': 'list'}), name=view_url[1]+'list'))
+ #urlpatterns.append(url(r'^' + view_url[1] + '/(?P<pk>[a-zA-Z0-9\-]+)/$', viewset.as_view({'get': 'retrieve', 'put': 'update', 'post': 'create', 'delete': 'destroy', 'patch': 'partial_update'}), name=view_url[1]+'detail'))
+ #urlpatterns.extend(
+
+ #router = DefaultRouter()
+ #router.register(r'^' + view_url[1], view_url[3], base_name="foo")
+ #urlpatterns.extend(router.urls)
+ #urlpatterns.append(url(r'^' + view_url[1], view_url[3]))
finally:
sys.path = sys_path_save
diff --git a/xos/core/xoslib/methods/cordsubscriber.py b/xos/core/xoslib/methods/cordsubscriber.py
index 08aa9d9..1f65dfc 100644
--- a/xos/core/xoslib/methods/cordsubscriber.py
+++ b/xos/core/xoslib/methods/cordsubscriber.py
@@ -3,12 +3,17 @@
from rest_framework.reverse import reverse
from rest_framework import serializers
from rest_framework import generics
+from rest_framework import viewsets
+from rest_framework.decorators import detail_route, list_route
from core.models import *
from django.forms import widgets
+from django.conf.urls import patterns, url
from cord.models import VOLTTenant
from core.xoslib.objects.cordsubscriber import CordSubscriber
from plus import PlusSerializerMixin
+from django.shortcuts import get_object_or_404
from xos.apibase import XOSListCreateAPIView, XOSRetrieveUpdateDestroyAPIView, XOSPermissionDenied
+import json
if hasattr(serializers, "ReadOnlyField"):
# rest_framework 3.x
@@ -29,6 +34,7 @@
firewall_rules = serializers.CharField()
url_filter_enable = serializers.BooleanField()
url_filter_rules = serializers.CharField()
+ url_filter_level = serializers.CharField()
cdn_enable = serializers.BooleanField()
sliver_name = ReadOnlyField()
image_name = ReadOnlyField()
@@ -40,7 +46,7 @@
model = CordSubscriber
fields = ('humanReadableName', 'id',
'service_specific_id', 'vlan_id',
- 'vcpe_id', 'sliver', 'sliver_name', 'image', 'image_name', 'firewall_enable', 'firewall_rules', 'url_filter_enable', 'url_filter_rules', 'cdn_enable', 'vbng_id', 'routeable_subnet',)
+ 'vcpe_id', 'sliver', 'sliver_name', 'image', 'image_name', 'firewall_enable', 'firewall_rules', 'url_filter_enable', 'url_filter_rules', 'url_filter_level', 'cdn_enable', 'vbng_id', 'routeable_subnet',)
def getHumanReadableName(self, obj):
@@ -60,4 +66,56 @@
method_kind = "detail"
method_name = "cordsubscriber"
+class XOSViewSet(viewsets.ModelViewSet):
+ @classmethod
+ def detail_url(self, pattern, viewdict, name):
+ return url(r'^' + self.method_name + r'/(?P<pk>[a-zA-Z0-9\-]+)/' + pattern,
+ self.as_view(viewdict),
+ name=self.base_name+"_"+name)
+
+ @classmethod
+ def get_urlpatterns(self):
+ patterns = []
+
+ patterns.append(url(r'^' + self.method_name + '/$', self.as_view({'get': 'list'}), name=self.base_name+'_list'))
+ patterns.append(url(r'^' + self.method_name + '/(?P<pk>[a-zA-Z0-9\-]+)/$', self.as_view({'get': 'retrieve', 'put': 'update', 'post': 'update', 'delete': 'destroy', 'patch': 'partial_update'}), name=self.base_name+'_detail'))
+
+ return patterns
+
+class CordSubscriberViewSet(XOSViewSet):
+ base_name = "subscriber"
+ method_name = "rs/subscriber"
+ method_kind = "viewset"
+ queryset = CordSubscriber.get_tenant_objects().select_related().all()
+ serializer_class = CordSubscriberIdSerializer
+
+ @classmethod
+ def get_urlpatterns(self):
+ patterns = super(CordSubscriberViewSet, self).get_urlpatterns()
+ patterns.append( self.detail_url("url_filtering/$", {"get": "get_url_filtering"}, "url_filtering") )
+ patterns.append( self.detail_url("url_filtering/(?P<level>[a-zA-Z0-9\-]+)/$", {"get": "set_url_filtering"}, "url_filtering") )
+ patterns.append( self.detail_url("users/$", {"get": "get_users"}, "users") )
+ patterns.append( self.detail_url("services/$", {"get": "get_services"}, "services") )
+ return patterns
+
+ def get_url_filtering(self, request, pk=None):
+ subscriber = self.get_object()
+ return Response(subscriber.url_filter_level)
+
+ def set_url_filtering(self, request, pk=None, level=None):
+ subscriber = self.get_object()
+ subscriber.url_filter_level = level
+ subscriber.save()
+ return Response(subscriber.url_filter_level)
+
+ def get_users(self, request, pk=None):
+ subscriber = self.get_object()
+ return Response(subscriber.users)
+
+ def get_services(self, request, pk=None):
+ subscriber = self.get_object()
+ return Response(subscriber.services)
+
+
+
diff --git a/xos/core/xoslib/objects/cordsubscriber.py b/xos/core/xoslib/objects/cordsubscriber.py
index f4cd8e6..72a9984 100644
--- a/xos/core/xoslib/objects/cordsubscriber.py
+++ b/xos/core/xoslib/objects/cordsubscriber.py
@@ -29,6 +29,9 @@
("firewall_rules", "vcpe.firewall_rules"),
("url_filter_enable", "vcpe.url_filter_enable"),
("url_filter_rules", "vcpe.url_filter_rules"),
+ ("url_filter_level", "vcpe.url_filter_level"),
+ ("users", "vcpe.users"),
+ ("services", "vcpe.services"),
("cdn_enable", "vcpe.cdn_enable"),
("image", "vcpe.image.id"),
("image_name", "vcpe.image.name"),