diff options
| author |   fujinhua <fu.jinhua@zte.com.cn> | 2019-04-20 11:14:59 +0800 |
|---|---|---|
| committer | fujinhua <fu.jinhua@zte.com.cn> | 2019-04-20 11:59:46 +0800 |
| commit | 9f82fb824b2d539892b8b50643e5881eda006cdc (patch) | |
| tree | a2207ec65ee83e46ebabc5e9a1454ab4481a0114 | |
| parent | 4d3c50b33ac03e8d9c319d6654d92048cdb6a3ed (diff) | |
Fix query subscription bugs
Change-Id: I35564a4eb5683d8b5654051d93cc17a690f52027
Issue-ID: VFC-1306
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
| -rw-r--r-- | lcm/ns/biz/query_subscription.py | 3 | ||||
| -rw-r--r-- | lcm/ns/tests/test_query_subscriptions.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lcm/ns/biz/query_subscription.py b/lcm/ns/biz/query_subscription.py index 4b36aa78..237c87a9 100644 --- a/lcm/ns/biz/query_subscription.py +++ b/lcm/ns/biz/query_subscription.py @@ -17,7 +17,6 @@ import json import logging from lcm.pub.database.models import SubscriptionModel -from lcm.pub.exceptions import NSLCMException logger = logging.getLogger(__name__) ROOT_FILTERS = { @@ -55,8 +54,6 @@ class QuerySubscription: subscriptions = SubscriptionModel.objects.filter(**query_data) else: subscriptions = SubscriptionModel.objects.all() - if not subscriptions.exists(): - raise NSLCMException('Subscriptions do not exist') return [self.fill_resp_data(subscription) for subscription in subscriptions] def fill_resp_data(self, subscription): diff --git a/lcm/ns/tests/test_query_subscriptions.py b/lcm/ns/tests/test_query_subscriptions.py index 87e98b8f..ec70bda7 100644 --- a/lcm/ns/tests/test_query_subscriptions.py +++ b/lcm/ns/tests/test_query_subscriptions.py @@ -125,7 +125,8 @@ class TestQuerySubscriptions(TestCase): links=json.dumps(links), ns_instance_filter=json.dumps(ns_instance_filter)).save() response = self.client.get("/api/nslcm/v1/subscriptions?nsInstanceId=dummy", format='json') - self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR) + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual([], response.data) def test_get_subscriptions_with_invalid_filter(self): ns_instance_filter = { |