diff options
Diffstat (limited to 'catalog/packages')
5 files changed, 18 insertions, 18 deletions
diff --git a/catalog/packages/serializers/nsdm_filter_data.py b/catalog/packages/serializers/nsdm_filter_data.py index 47d7680..59e1a08 100644 --- a/catalog/packages/serializers/nsdm_filter_data.py +++ b/catalog/packages/serializers/nsdm_filter_data.py @@ -28,13 +28,13 @@ class NsdmNotificationsFilter(serializers.Serializer): required=False ) nsdInfoId = serializers.ListField( - child=serializers.UUIDField(), + child=serializers.CharField(), help_text="Match NS packages with particular nsdInfoIds", allow_null=False, required=False ) nsdId = serializers.ListField( - child=serializers.UUIDField(), + child=serializers.CharField(), help_text="Match NS Packages with particular nsdIds", allow_null=False, required=False @@ -58,19 +58,19 @@ class NsdmNotificationsFilter(serializers.Serializer): allow_null=False ) nsdInvariantId = serializers.ListField( - child=serializers.UUIDField(), + child=serializers.CharField(), help_text="Match NS Packages with particular nsdInvariantIds", allow_null=False, required=False ) vnfPkgIds = serializers.ListField( - child=serializers.UUIDField(), + child=serializers.CharField(), help_text="Match NS Packages that has VNF PackageIds", allow_null=False, required=False ) nestedNsdInfoIds = serializers.ListField( - child=serializers.UUIDField(), + child=serializers.CharField(), help_text="Match NS Packages with particular nsdInvariantIds", allow_null=False, required=False @@ -108,13 +108,13 @@ class NsdmNotificationsFilter(serializers.Serializer): required=False ) pnfdInfoIds = serializers.ListField( - child=serializers.UUIDField(), + child=serializers.CharField(), help_text="Match PF packages with particular pnfdInfoIds", allow_null=False, required=False ) pnfdId = serializers.ListField( - child=serializers.UUIDField(), + child=serializers.CharField(), help_text="Match PF packages with particular pnfdInfoIds", allow_null=False, required=False @@ -147,7 +147,7 @@ class NsdmNotificationsFilter(serializers.Serializer): required=False ) pnfdInvariantId = serializers.ListField( - child=serializers.UUIDField(), + child=serializers.CharField(), help_text="Match PF Packages with particular pnfdInvariantIds", allow_null=False, required=False diff --git a/catalog/packages/serializers/nsdm_subscription.py b/catalog/packages/serializers/nsdm_subscription.py index 140e549..826fc14 100644 --- a/catalog/packages/serializers/nsdm_subscription.py +++ b/catalog/packages/serializers/nsdm_subscription.py @@ -58,7 +58,7 @@ class NsdmSubscriptionsSerializer(serializers.ListSerializer): class NsdmSubscriptionIdSerializer(serializers.Serializer): - subscription_id = serializers.UUIDField( + subscription_id = serializers.CharField( help_text="Identifier of this subscription resource.", required=True, allow_null=False diff --git a/catalog/packages/serializers/vnf_pkg_notifications.py b/catalog/packages/serializers/vnf_pkg_notifications.py index 72ae6fe..c1dab6a 100644 --- a/catalog/packages/serializers/vnf_pkg_notifications.py +++ b/catalog/packages/serializers/vnf_pkg_notifications.py @@ -87,14 +87,14 @@ class PkgmNotificationsFilter(serializers.Serializer): required=False ) vnfdId = serializers.ListField( - child=serializers.UUIDField(), + child=serializers.CharField(), help_text="Match VNF packages with a VNFD identifier" "listed in the attribute", required=False, allow_null=False ) vnfPkgId = serializers.ListField( - child=serializers.UUIDField(), + child=serializers.CharField(), help_text="Match VNF packages with a VNFD identifier" "listed in the attribute", required=False, @@ -168,12 +168,12 @@ class PkgChangeNotificationSerializer(serializers.Serializer): required=True, allow_null=False ) - vnfPkgId = serializers.UUIDField( + vnfPkgId = serializers.CharField( help_text="Identifier of the VNF package.", required=True, allow_null=False ) - vnfdId = serializers.UUIDField( + vnfdId = serializers.CharField( help_text="This identifier, which is managed by the VNF provider, " "identifies the VNF package and the VNFD in a globally unique way.", required=True, @@ -227,12 +227,12 @@ class PkgOnboardingNotificationSerializer(serializers.Serializer): required=True, allow_null=False ) - vnfPkgId = serializers.UUIDField( + vnfPkgId = serializers.CharField( help_text="Identifier of the VNF package.", required=True, allow_null=False ) - vnfdId = serializers.UUIDField( + vnfdId = serializers.CharField( help_text="This identifier, which is managed by the VNF provider, " "identifies the VNF package and the VNFD in a globally unique way.", required=True, diff --git a/catalog/packages/serializers/vnf_pkg_subscription.py b/catalog/packages/serializers/vnf_pkg_subscription.py index edcd6fe..8b98ca8 100644 --- a/catalog/packages/serializers/vnf_pkg_subscription.py +++ b/catalog/packages/serializers/vnf_pkg_subscription.py @@ -62,7 +62,7 @@ class PkgmSubscriptionRequestSerializer(serializers.Serializer): class PkgmSubscriptionSerializer(serializers.Serializer): - id = serializers.UUIDField( + id = serializers.CharField( help_text="Identifier of this subscription resource.", required=True, allow_null=False diff --git a/catalog/packages/tests/test_nsdm_subscription.py b/catalog/packages/tests/test_nsdm_subscription.py index d1e8770..862054b 100644 --- a/catalog/packages/tests/test_nsdm_subscription.py +++ b/catalog/packages/tests/test_nsdm_subscription.py @@ -476,7 +476,7 @@ class TestNsdmSubscription(TestCase): def test_nsdm_get_subscription_failure_bad_request(self): response = self.client.get("/api/nsd/v1/subscriptions/123", format='json') - self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) @mock.patch.object(NsdmSubscription, 'query_single_subscription') def test_nsdmsubscription_getsingle_when_catch_exception( @@ -518,7 +518,7 @@ class TestNsdmSubscription(TestCase): def test_nsdm_delete_subscription_failure_bad_request(self): response = self.client.delete("/api/nsd/v1/subscriptions/123", format='json') - self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) @mock.patch.object(NsdmSubscription, 'delete_single_subscription') def test_nsdmsubscription_delete_when_catch_exception(self, mock_create): |