X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Ftests%2Ftest_query_subscriptions.py;h=f67ac2724f10595813d633a98b4345df13ebd0e3;hb=f37e69e59d05edf620b81945a6c9a564ec4dffba;hp=fd949af91ef90acbd5fc787f4528771e2e82cb72;hpb=e6ae5437e43d4d6e4948d59c269ddba4ce555073;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/tests/test_query_subscriptions.py b/lcm/lcm/nf/tests/test_query_subscriptions.py index fd949af9..f67ac272 100644 --- a/lcm/lcm/nf/tests/test_query_subscriptions.py +++ b/lcm/lcm/nf/tests/test_query_subscriptions.py @@ -53,67 +53,67 @@ class TestQuerySubscriptions(TestCase): def tearDown(self): pass - # def test_get_subscriptions(self): - # vnf_instance_filter = { - # "vnfdIds": [], - # "vnfInstanceIds": [self.vnf_instance_id], - # "vnfInstanceNames": [], - # "vnfProductsFromProviders": { - # "vnfProvider": "vendor" - # } - # } - # links = { - # "self": { - # "href": "/api/v1/subscriptions/99442b18-a5c7-11e8-998c-bf1755941f16" - # } - # } - # SubscriptionModel(subscription_id=self.subscription_id, callback_uri="http://aurl.com", - # auth_info="{}", notification_types="['VnfLcmOperationOccurrenceNotification']", - # operation_types="['INSTANTIATE']", - # operation_states="['STARTING']", - # links=json.dumps(links), - # vnf_instance_filter=json.dumps(vnf_instance_filter)).save() - # response = self.client.get("/api/vnflcm/v1/subscriptions", format='json') - # self.assertEqual(response.status_code, status.HTTP_200_OK) - # self.assertEqual([self.test_single_subscription], response.data) + def test_get_subscriptions(self): + vnf_instance_filter = { + "vnfdIds": [], + "vnfInstanceIds": [self.vnf_instance_id], + "vnfInstanceNames": [], + "vnfProductsFromProviders": { + "vnfProvider": "vendor" + } + } + links = { + "self": { + "href": "/api/v1/subscriptions/99442b18-a5c7-11e8-998c-bf1755941f16" + } + } + SubscriptionModel(subscription_id=self.subscription_id, callback_uri="http://aurl.com", + auth_info="{}", notification_types="['VnfLcmOperationOccurrenceNotification']", + operation_types="['INSTANTIATE']", + operation_states="['STARTING']", + links=json.dumps(links), + vnf_instance_filter=json.dumps(vnf_instance_filter)).save() + response = self.client.get("/api/vnflcm/v1/subscriptions", format='json') + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual([self.test_single_subscription], response.data) + + def test_get_subscriptions_with_vnf_instance_id(self): + vnf_instance_filter = { + "vnfdIds": [], + "vnfInstanceIds": [self.vnf_instance_id], + "vnfInstanceNames": [], + "vnfProductsFromProviders": { + "vnfProvider": "vendor" + } + } + links = { + "self": { + "href": "/api/v1/subscriptions/99442b18-a5c7-11e8-998c-bf1755941f16" + } + } + SubscriptionModel(subscription_id=self.subscription_id, callback_uri="http://aurl.com", + auth_info="{}", notification_types="['VnfLcmOperationOccurrenceNotification']", + operation_types="['INSTANTIATE']", + operation_states="['STARTING']", + links=json.dumps(links), + vnf_instance_filter=json.dumps(vnf_instance_filter)).save() + dummy_vnf_id = "584b35e2-b2a2-11e8-8e11-645106374fd3" + dummy_subscription_id = "947dcd2c-b2a2-11e8-b365-645106374fd4" + vnf_instance_filter["vnfInstanceIds"].append(dummy_vnf_id) + SubscriptionModel(subscription_id=dummy_subscription_id, callback_uri="http://aurl.com", + auth_info="{}", notification_types="['VnfLcmOperationOccurrenceNotification']", + operation_types="['INSTANTIATE']", + operation_states="['STARTING']", + links=json.dumps(links), + vnf_instance_filter=json.dumps(vnf_instance_filter)).save() - # def test_get_subscriptions_with_vnf_instance_id(self): - # vnf_instance_filter = { - # "vnfdIds": [], - # "vnfInstanceIds": [self.vnf_instance_id], - # "vnfInstanceNames": [], - # "vnfProductsFromProviders": { - # "vnfProvider": "vendor" - # } - # } - # links = { - # "self": { - # "href": "/api/v1/subscriptions/99442b18-a5c7-11e8-998c-bf1755941f16" - # } - # } - # SubscriptionModel(subscription_id=self.subscription_id, callback_uri="http://aurl.com", - # auth_info="{}", notification_types="['VnfLcmOperationOccurrenceNotification']", - # operation_types="['INSTANTIATE']", - # operation_states="['STARTING']", - # links=json.dumps(links), - # vnf_instance_filter=json.dumps(vnf_instance_filter)).save() - # dummy_vnf_id = "584b35e2-b2a2-11e8-8e11-645106374fd3" - # dummy_subscription_id = "947dcd2c-b2a2-11e8-b365-645106374fd4" - # vnf_instance_filter["vnfInstanceIds"].append(dummy_vnf_id) - # SubscriptionModel(subscription_id=dummy_subscription_id, callback_uri="http://aurl.com", - # auth_info="{}", notification_types="['VnfLcmOperationOccurrenceNotification']", - # operation_types="['INSTANTIATE']", - # operation_states="['STARTING']", - # links=json.dumps(links), - # vnf_instance_filter=json.dumps(vnf_instance_filter)).save() - # - # response = self.client.get("/api/vnflcm/v1/subscriptions?vnfInstanceId=" + dummy_vnf_id, format='json') - # expected_response = self.test_single_subscription.copy() - # expected_response["id"] = dummy_subscription_id - # expected_response["filter"]["vnfInstanceSubscriptionFilter"]["vnfInstanceIds"] = \ - # vnf_instance_filter["vnfInstanceIds"] - # self.assertEqual(response.status_code, status.HTTP_200_OK) - # self.assertEqual([expected_response], response.data) + response = self.client.get("/api/vnflcm/v1/subscriptions?vnfInstanceId=" + dummy_vnf_id, format='json') + expected_response = self.test_single_subscription.copy() + expected_response["id"] = dummy_subscription_id + expected_response["filter"]["vnfInstanceSubscriptionFilter"]["vnfInstanceIds"] = \ + vnf_instance_filter["vnfInstanceIds"] + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual([expected_response], response.data) def test_get_subscriptions_with_unknown_vnf_instance_id(self): vnf_instance_filter = { @@ -138,64 +138,64 @@ class TestQuerySubscriptions(TestCase): response = self.client.get("/api/vnflcm/v1/subscriptions?vnfInstanceId=dummy", format='json') self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR) - # def test_get_subscriptions_with_invalid_filter(self): - # vnf_instance_filter = { - # "vnfdIds": [], - # "vnfInstanceIds": [self.vnf_instance_id], - # "vnfInstanceNames": [], - # "vnfProductsFromProviders": { - # "vnfProvider": "vendor" - # } - # } - # links = { - # "self": { - # "href": "/api/v1/subscriptions/99442b18-a5c7-11e8-998c-bf1755941f16" - # } - # } - # SubscriptionModel(subscription_id=self.subscription_id, callback_uri="http://aurl.com", - # auth_info="{}", notification_types="['VnfLcmOperationOccurrenceNotification']", - # operation_types="['INSTANTIATE']", - # operation_states="['STARTING']", - # links=json.dumps(links), - # vnf_instance_filter=json.dumps(vnf_instance_filter)).save() - # response = self.client.get("/api/vnflcm/v1/subscriptions?dummy=dummy", format='json') - # self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + def test_get_subscriptions_with_invalid_filter(self): + vnf_instance_filter = { + "vnfdIds": [], + "vnfInstanceIds": [self.vnf_instance_id], + "vnfInstanceNames": [], + "vnfProductsFromProviders": { + "vnfProvider": "vendor" + } + } + links = { + "self": { + "href": "/api/v1/subscriptions/99442b18-a5c7-11e8-998c-bf1755941f16" + } + } + SubscriptionModel(subscription_id=self.subscription_id, callback_uri="http://aurl.com", + auth_info="{}", notification_types="['VnfLcmOperationOccurrenceNotification']", + operation_types="['INSTANTIATE']", + operation_states="['STARTING']", + links=json.dumps(links), + vnf_instance_filter=json.dumps(vnf_instance_filter)).save() + response = self.client.get("/api/vnflcm/v1/subscriptions?dummy=dummy", format='json') + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + + def test_get_subscriptions_with_operation_type_filter(self): + vnf_instance_filter = { + "vnfdIds": [], + "vnfInstanceIds": [self.vnf_instance_id], + "vnfInstanceNames": [], + "vnfProductsFromProviders": { + "vnfProvider": "vendor" + } + } + links = { + "self": { + "href": "/api/v1/subscriptions/99442b18-a5c7-11e8-998c-bf1755941f16" + } + } + SubscriptionModel(subscription_id=self.subscription_id, callback_uri="http://aurl.com", + auth_info="{}", notification_types="['VnfLcmOperationOccurrenceNotification']", + operation_types="['INSTANTIATE']", + operation_states="['STARTING']", + links=json.dumps(links), + vnf_instance_filter=json.dumps(vnf_instance_filter)).save() + dummy_vnf_id = "584b35e2-b2a2-11e8-8e11-645106374fd3" + dummy_subscription_id = "947dcd2c-b2a2-11e8-b365-645106374fd4" + vnf_instance_filter["vnfInstanceIds"].append(dummy_vnf_id) + SubscriptionModel(subscription_id=dummy_subscription_id, callback_uri="http://aurl.com", + auth_info="{}", notification_types="['VnfLcmOperationOccurrenceNotification']", + operation_types="['SCALE']", + operation_states="['STARTING']", + links=json.dumps(links), + vnf_instance_filter=json.dumps(vnf_instance_filter)).save() - # def test_get_subscriptions_with_operation_type_filter(self): - # vnf_instance_filter = { - # "vnfdIds": [], - # "vnfInstanceIds": [self.vnf_instance_id], - # "vnfInstanceNames": [], - # "vnfProductsFromProviders": { - # "vnfProvider": "vendor" - # } - # } - # links = { - # "self": { - # "href": "/api/v1/subscriptions/99442b18-a5c7-11e8-998c-bf1755941f16" - # } - # } - # SubscriptionModel(subscription_id=self.subscription_id, callback_uri="http://aurl.com", - # auth_info="{}", notification_types="['VnfLcmOperationOccurrenceNotification']", - # operation_types="['INSTANTIATE']", - # operation_states="['STARTING']", - # links=json.dumps(links), - # vnf_instance_filter=json.dumps(vnf_instance_filter)).save() - # dummy_vnf_id = "584b35e2-b2a2-11e8-8e11-645106374fd3" - # dummy_subscription_id = "947dcd2c-b2a2-11e8-b365-645106374fd4" - # vnf_instance_filter["vnfInstanceIds"].append(dummy_vnf_id) - # SubscriptionModel(subscription_id=dummy_subscription_id, callback_uri="http://aurl.com", - # auth_info="{}", notification_types="['VnfLcmOperationOccurrenceNotification']", - # operation_types="['SCALE']", - # operation_states="['STARTING']", - # links=json.dumps(links), - # vnf_instance_filter=json.dumps(vnf_instance_filter)).save() - # - # response = self.client.get("/api/vnflcm/v1/subscriptions?operationTypes=SCALE", format='json') - # expected_response = self.test_single_subscription.copy() - # expected_response["id"] = dummy_subscription_id - # expected_response["filter"]["vnfInstanceSubscriptionFilter"]["vnfInstanceIds"] = \ - # vnf_instance_filter["vnfInstanceIds"] - # expected_response["filter"]["operationTypes"] = ["SCALE"] - # self.assertEqual(response.status_code, status.HTTP_200_OK) - # self.assertEqual([expected_response], response.data) + response = self.client.get("/api/vnflcm/v1/subscriptions?operationTypes=SCALE", format='json') + expected_response = self.test_single_subscription.copy() + expected_response["id"] = dummy_subscription_id + expected_response["filter"]["vnfInstanceSubscriptionFilter"]["vnfInstanceIds"] = \ + vnf_instance_filter["vnfInstanceIds"] + expected_response["filter"]["operationTypes"] = ["SCALE"] + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual([expected_response], response.data)