add networkPorts

[plstackapi.git] / planetstack / core / xoslib / methods / sliceplus.py

diff --git a/planetstack/core/xoslib/methods/sliceplus.py b/planetstack/core/xoslib/methods/sliceplus.py
index 79aae3b..0e0a940 100644 (file)
--- a/planetstack/core/xoslib/methods/sliceplus.py
+++ b/planetstack/core/xoslib/methods/sliceplus.py
@@ -6,26 +6,49 @@ from rest_framework import generics
 from core.models import *\r
 from django.forms import widgets
 from core.xoslib.objects.sliceplus import SlicePlus
+from plus import PlusSerializerMixin
 
-class SlicePlusIdSerializer(serializers.ModelSerializer):
-        id = serializers.Field()\r
+if hasattr(serializers, "ReadOnlyField"):
+    # rest_framework 3.x
+    IdField = serializers.ReadOnlyField
+else:
+    # rest_framework 2.x
+    IdField = serializers.Field
+
+class NetworkPortsField(serializers.WritableField):   # note: maybe just Field in rest_framework 3.x instead of WritableField
+    def to_representation(self, obj):
+        return obj
+
+    def to_internal_value(self, data):
+        return data
+
+class SlicePlusIdSerializer(serializers.ModelSerializer, PlusSerializerMixin):
+        id = IdField()
 \r
         sliceInfo = serializers.SerializerMethodField("getSliceInfo")\r
+        humanReadableName = serializers.SerializerMethodField("getHumanReadableName")\r
+        networkPorts = NetworkPortsField()\r
 \r
         def getSliceInfo(self, slice):\r
-            return slice.getSliceInfo()\r
+            return slice.getSliceInfo(user=self.context['request'].user)\r
 \r
-        networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')\r
-        availableNetworks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')\r
+        def getHumanReadableName(self, obj):\r
+            return str(obj)\r
+\r
+        networks = serializers.PrimaryKeyRelatedField(many=True, read_only=True)\r
+#        availableNetworks = serializers.PrimaryKeyRelatedField(many=True, read_only=True, view_name='network-detail')\r
 \r
         class Meta:\r
             model = SlicePlus\r
-            fields = ('id','created','updated','enacted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','imagePreference','service','network','mountDataSets','serviceClass','creator','networks','availableNetworks','sliceInfo')
+            fields = ('humanReadableName', 'id','created','updated','enacted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','image_preference','service','network','mount_data_sets','serviceClass','creator','networks','sliceInfo','networkPorts','backendIcon','backendHtml')
 
 class SlicePlusList(generics.ListCreateAPIView):
     queryset = SlicePlus.objects.select_related().all()
     serializer_class = SlicePlusIdSerializer
 
+    method_kind = "list"
+    method_name = "slicesplus"
+
     def get_queryset(self):
         return SlicePlus.select_by_user(self.request.user)
 
@@ -41,6 +64,9 @@ class SlicePlusDetail(generics.RetrieveUpdateDestroyAPIView):
     queryset = SlicePlus.objects.select_related().all()
     serializer_class = SlicePlusIdSerializer
 
+    method_kind = "detail"
+    method_name = "slicesplus"
+
     def get_queryset(self):
         return SlicePlus.select_by_user(self.request.user)