git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b62cb06
)
latest auto-generated genapi.py
author
Scott Baker
<smbaker@gmail.com>
Mon, 22 Dec 2014 23:59:33 +0000
(15:59 -0800)
committer
Scott Baker
<smbaker@gmail.com>
Mon, 22 Dec 2014 23:59:33 +0000
(15:59 -0800)
planetstack/genapi.py
patch
|
blob
|
history
diff --git
a/planetstack/genapi.py
b/planetstack/genapi.py
index
3e6f7b0
..
4accc07
100644
(file)
--- a/
planetstack/genapi.py
+++ b/
planetstack/genapi.py
@@
-428,6
+428,10
@@
class ControllerImagesIdSerializer(XOSModelSerializer):
class ImageSerializer(serializers.HyperlinkedModelSerializer):
id = serializers.Field()
class ImageSerializer(serializers.HyperlinkedModelSerializer):
id = serializers.Field()
+
+ deployments = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='deployment-detail')
+
+
humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
validators = serializers.SerializerMethodField("getValidators")
def getHumanReadableName(self, obj):
\r
humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
validators = serializers.SerializerMethodField("getValidators")
def getHumanReadableName(self, obj):
\r
@@
-439,11
+443,15
@@
class ImageSerializer(serializers.HyperlinkedModelSerializer):
return None
class Meta:
model = Image
return None
class Meta:
model = Image
- fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path',)
+ fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path',
'deployments',
)
class ImageIdSerializer(XOSModelSerializer):
id = serializers.Field()
class ImageIdSerializer(XOSModelSerializer):
id = serializers.Field()
+
+ deployments = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='deployment-detail')
+
+
humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
validators = serializers.SerializerMethodField("getValidators")
def getHumanReadableName(self, obj):
\r
humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
validators = serializers.SerializerMethodField("getValidators")
def getHumanReadableName(self, obj):
\r
@@
-455,7
+463,7
@@
class ImageIdSerializer(XOSModelSerializer):
return None
\r
class Meta:
\r
model = Image
return None
\r
class Meta:
\r
model = Image
- fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path',)
+ fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path',
'deployments',
)
@@
-1711,6
+1719,10
@@
class DeploymentSerializer(serializers.HyperlinkedModelSerializer):
+ images = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='image-detail')
+
+
+
sites = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='site-detail')
sites = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='site-detail')
@@
-1725,7
+1737,7
@@
class DeploymentSerializer(serializers.HyperlinkedModelSerializer):
return None
class Meta:
model = Deployment
return None
class Meta:
model = Deployment
- fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','accessControl','flavors','sites',)
+ fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','accessControl','flavors','
images','
sites',)
class DeploymentIdSerializer(XOSModelSerializer):
id = serializers.Field()
class DeploymentIdSerializer(XOSModelSerializer):
id = serializers.Field()
@@
-1735,6
+1747,10
@@
class DeploymentIdSerializer(XOSModelSerializer):
+ images = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='image-detail')
+
+
+
sites = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='site-detail')
sites = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='site-detail')
@@
-1749,7
+1765,7
@@
class DeploymentIdSerializer(XOSModelSerializer):
return None
\r
class Meta:
\r
model = Deployment
return None
\r
class Meta:
\r
model = Deployment
- fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','accessControl','flavors','sites',)
+ fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','accessControl','flavors','
images','
sites',)
@@
-2714,7
+2730,7
@@
class ImageList(generics.ListCreateAPIView):
serializer_class = ImageSerializer
id_serializer_class = ImageIdSerializer
filter_backends = (filters.DjangoFilterBackend,)
serializer_class = ImageSerializer
id_serializer_class = ImageIdSerializer
filter_backends = (filters.DjangoFilterBackend,)
- filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path',)
+ filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path',
'deployments',
)
def get_serializer_class(self):
no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
def get_serializer_class(self):
no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@
-4720,7
+4736,7
@@
class DeploymentList(generics.ListCreateAPIView):
serializer_class = DeploymentSerializer
id_serializer_class = DeploymentIdSerializer
filter_backends = (filters.DjangoFilterBackend,)
serializer_class = DeploymentSerializer
id_serializer_class = DeploymentIdSerializer
filter_backends = (filters.DjangoFilterBackend,)
- filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','accessControl','flavors','sites',)
+ filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','accessControl','flavors','
images','
sites',)
def get_serializer_class(self):
no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
def get_serializer_class(self):
no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)