diff options
author | fujinhua <fu.jinhua@zte.com.cn> | 2019-04-05 09:32:44 +0800 |
---|---|---|
committer | fujinhua <fu.jinhua@zte.com.cn> | 2019-04-05 09:57:51 +0800 |
commit | 694fcbfedf69712638f7fc384c3671c8c3e5dc69 (patch) | |
tree | 92738acb16579934e7026c3c24bc13417e137797 | |
parent | d9af6627ca1fc644690f907adf68054c81ee1835 (diff) |
Update serializer for catalog
Change-Id: I830758cea02c04c2ff2e85b29ca070cfd27282be
Issue-ID: VFC-1306
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
-rw-r--r-- | catalog/packages/serializers/checksum.py | 6 | ||||
-rw-r--r-- | catalog/packages/serializers/create_nsd_info_request.py | 10 | ||||
-rw-r--r-- | catalog/packages/serializers/create_pnfd_info_request.py | 10 | ||||
-rw-r--r-- | catalog/packages/serializers/create_vnf_pkg_info_req.py | 8 | ||||
-rw-r--r-- | catalog/packages/serializers/nsd_info.py | 93 |
5 files changed, 81 insertions, 46 deletions
diff --git a/catalog/packages/serializers/checksum.py b/catalog/packages/serializers/checksum.py index 5460fdbe..12966262 100644 --- a/catalog/packages/serializers/checksum.py +++ b/catalog/packages/serializers/checksum.py @@ -20,9 +20,11 @@ class ChecksumSerializer(serializers.Serializer): help_text="Name of the algorithm used to generate the checksum.", required=True, allow_null=False, - allow_blank=False) + allow_blank=False + ) hash = serializers.CharField( help_text="The hexadecimal value of the checksum.", required=True, allow_null=True, - allow_blank=False) + allow_blank=False + ) diff --git a/catalog/packages/serializers/create_nsd_info_request.py b/catalog/packages/serializers/create_nsd_info_request.py index 737f95e0..24fe3b78 100644 --- a/catalog/packages/serializers/create_nsd_info_request.py +++ b/catalog/packages/serializers/create_nsd_info_request.py @@ -17,9 +17,13 @@ from rest_framework import serializers class CreateNsdInfoRequestSerializer(serializers.Serializer): userDefinedData = serializers.DictField( - help_text='User-defined data for the NS descriptor resource to be created. \ - It shall be present when the user defined data is set for the individual NS descriptor resource to be created.', - child=serializers.CharField(help_text='Key Value Pairs', allow_blank=True), + help_text="User-defined data for the NS descriptor resource to be created." + "It shall be present when the user defined data is set for the individual NS " + "descriptor resource to be created.", + child=serializers.CharField( + help_text='Key Value Pairs', + allow_blank=True + ), required=False, allow_null=True ) diff --git a/catalog/packages/serializers/create_pnfd_info_request.py b/catalog/packages/serializers/create_pnfd_info_request.py index 0569f967..01d8229e 100644 --- a/catalog/packages/serializers/create_pnfd_info_request.py +++ b/catalog/packages/serializers/create_pnfd_info_request.py @@ -17,9 +17,13 @@ from rest_framework import serializers class CreatePnfdInfoRequestSerializer(serializers.Serializer): userDefinedData = serializers.DictField( - help_text='User-defined data for the PNF descriptor resource to be created. \ - It shall be present when the user defined data is set for the individual PNF descriptor resource to be created.', - child=serializers.CharField(help_text='Key Value Pairs', allow_blank=True), + help_text="User-defined data for the PNF descriptor resource to be created." + "It shall be present when the user defined data is set for the individual " + "PNF descriptor resource to be created.", + child=serializers.CharField( + help_text='Key Value Pairs', + allow_blank=True + ), required=False, allow_null=True ) diff --git a/catalog/packages/serializers/create_vnf_pkg_info_req.py b/catalog/packages/serializers/create_vnf_pkg_info_req.py index 5a4328ee..6da281d9 100644 --- a/catalog/packages/serializers/create_vnf_pkg_info_req.py +++ b/catalog/packages/serializers/create_vnf_pkg_info_req.py @@ -18,6 +18,10 @@ from rest_framework import serializers class CreateVnfPkgInfoRequestSerializer(serializers.Serializer): userDefinedData = serializers.DictField( help_text="User defined data for the VNF package.", - child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True), + child=serializers.CharField( + help_text="KeyValue Pairs", + allow_blank=True + ), required=False, - allow_null=True) + allow_null=True + ) diff --git a/catalog/packages/serializers/nsd_info.py b/catalog/packages/serializers/nsd_info.py index 59df1b65..2206f467 100644 --- a/catalog/packages/serializers/nsd_info.py +++ b/catalog/packages/serializers/nsd_info.py @@ -19,122 +19,143 @@ from link import LinkSerializer class _LinkSerializer(serializers.Serializer): self = LinkSerializer( - help_text='URI of this resource.', + help_text="URI of this resource.", required=True, allow_null=False ) nsd_content = LinkSerializer( - help_text='Link to the NSD content resource.', + help_text="Link to the NSD content resource.", required=True, allow_null=False ) class Meta: - ref_name = 'NSD_LinkSerializer' + ref_name = "NSD_LinkSerializer" class NsdInfoSerializer(serializers.Serializer): id = serializers.CharField( - help_text='Identifier of the onboarded individual NS descriptor resource. \ - This identifier is allocated by the NFVO.', + help_text="Identifier of the onboarded individual NS descriptor resource." + "This identifier is allocated by the NFVO.", required=True, allow_null=False, allow_blank=False ) nsdId = serializers.CharField( - help_text='This identifier, which is allocated by the NSD designer, \ - identifies the NSD in a globally unique way. \ - It is copied from the NSD content and shall be present after the NSD content is on-boarded.', + help_text="This identifier, which is allocated by the NSD designer," + "identifies the NSD in a globally unique way." + "It is copied from the NSD content and shall be present after the " + "NSD content is on-boarded.", required=False, allow_null=True, allow_blank=True ) nsdName = serializers.CharField( - help_text='Name of the onboarded NSD. \ - This information is copied from the NSD content and shall be present after the NSD content is on-boarded.', + help_text="Name of the onboarded NSD." + "This information is copied from the NSD content and shall be present " + "after the NSD content is on-boarded.", required=False, allow_null=True, allow_blank=True ) nsdVersion = serializers.CharField( # TODO: data type is version - help_text='Version of the on-boarded NSD. \ - This information is copied from the NSD content and shall be present after the NSD content is on-boarded.', + help_text="Version of the on-boarded NSD." + "This information is copied from the NSD content and shall be " + "present after the NSD content is on-boarded.", required=False, allow_null=True, allow_blank=True ) nsdDesigner = serializers.CharField( - help_text='Designer of the on-boarded NSD. \ - This information is copied from the NSD content and shall be present after the NSD content is on-boarded.', + help_text="Designer of the on-boarded NSD." + "This information is copied from the NSD content and shall be " + "present after the NSD content is on-boarded.", required=False, allow_null=True, allow_blank=True ) nsdInvariantId = serializers.CharField( - help_text='This identifier, which is allocated by the NSD designer, \ - identifies an NSD in a version independent manner. \ - This information is copied from the NSD content and shall be present after the NSD content is on-boarded.', + help_text="This identifier, which is allocated by the NSD designer," + "identifies an NSD in a version independent manner." + "This information is copied from the NSD content and shall be " + "present after the NSD content is on-boarded.", required=False, allow_null=True, allow_blank=True ) vnfPkgIds = serializers.ListSerializer( - help_text='Identifies the VNF package for the VNFD referenced by the on-boarded NS descriptor resource.', - child=serializers.CharField(help_text="Identifier of the VNF package", allow_blank=True), + help_text="Identifies the VNF package for the VNFD referenced " + "by the on-boarded NS descriptor resource.", + child=serializers.CharField( + help_text="Identifier of the VNF package", + allow_blank=True + ), required=False, allow_null=True, allow_empty=True ) pnfdInfoIds = serializers.ListSerializer( - help_text='Identifies the PnfdInfo element for the PNFD referenced by the on-boarded NS descriptor resource.', - child=serializers.CharField(help_text="Identifier of the PnfdInfo element", allow_blank=True), + help_text="Identifies the PnfdInfo element for the PNFD referenced " + "by the on-boarded NS descriptor resource.", + child=serializers.CharField( + help_text="Identifier of the PnfdInfo element", + allow_blank=True + ), required=False, allow_null=True, allow_empty=True ) nestedNsdInfoIds = serializers.ListSerializer( - help_text='Identifies the NsdInfo element for the nested NSD referenced by the on-boarded NS descriptor resource.', - child=serializers.CharField(help_text="Identifier of the NsdInfo element", allow_blank=True), + help_text="Identifies the NsdInfo element for the nested NSD referenced " + "by the on-boarded NS descriptor resource.", + child=serializers.CharField( + help_text="Identifier of the NsdInfo element", + allow_blank=True + ), required=False, allow_null=True, allow_empty=True ) nsdOnboardingState = serializers.ChoiceField( - help_text='Onboarding state of the individual NS descriptor resource.', - choices=['CREATED', 'UPLOADING', 'PROCESSING', 'ONBOARDED'], + help_text="Onboarding state of the individual NS descriptor resource.", + choices=["CREATED", "UPLOADING", "PROCESSING", "ONBOARDED"], required=True, allow_null=False, allow_blank=False ) onboardingFailureDetails = ProblemDetailsSerializer( - help_text='Failure details of current onboarding procedure. \ - It shall be present when the "nsdOnboardingState" attribute is CREATED and the uploading or processing fails in NFVO.', + help_text="Failure details of current onboarding procedure." + "It shall be present when the nsdOnboardingState attribute is CREATED " + "and the uploading or processing fails in NFVO.", required=False, allow_null=True, ) nsdOperationalState = serializers.ChoiceField( - help_text='Operational state of the individual NS descriptor resource. \ - This attribute can be modified with the PATCH method.', - choices=['ENABLED', 'DISABLED'], + help_text="Operational state of the individual NS descriptor resource." + "This attribute can be modified with the PATCH method.", + choices=["ENABLED", "DISABLED"], required=True, allow_null=False, allow_blank=False ) nsdUsageState = serializers.ChoiceField( - help_text='Usage state of the individual NS descriptor resource.', - choices=['IN_USE', 'NOT_IN_USE'], + help_text="Usage state of the individual NS descriptor resource.", + choices=["IN_USE", "NOT_IN_USE"], required=True, allow_null=False, ) userDefinedData = serializers.DictField( - help_text='User defined data for the individual NS descriptor resource. \ - This attribute can be modified with the PATCH method.', - child=serializers.CharField(help_text='Key Value Pairs', allow_blank=True), + help_text="User defined data for the individual NS descriptor resource." + "This attribute can be modified with the PATCH method.", + child=serializers.CharField( + help_text="Key Value Pairs", + allow_blank=True + ), required=False, allow_null=True ) _links = _LinkSerializer( - help_text='Links to resources related to this resource.', + help_text="Links to resources related to this resource.", required=True, allow_null=True # TODO: supposed to be False ) |