* Updated to get NFs list when requesting a specific subscription (DCAEGEN2-2992)
* AAI Event handler changes with new subscription format (DCAEGEN2-2912)
* Read NFS associated with MG by using MGName and subName(DCAEGEN2-2993)
+* Lazy loading error for nfs in read API (DCAEGEN2-3029)
## [1.3.2]
### Changed
# ============LICENSE_START===================================================
-# Copyright (C) 2021 Nordix Foundation.
+# Copyright (C) 2021-2022 Nordix Foundation.
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Args:
sub_name (string): The name of subscription inorder to perform filtering
Returns:
- list[NetworkFunction]: a list of filtered NetworkFunction Objects.
+ list[NetworkFunction]: a list of filtered NetworkFunction Objects
+ or an empty list if no network function is filtered.
"""
logger.info(f'Getting filtered nfs for subscription: {sub_name}')
nf_filter = NetworkFunctionFilter.get_network_function_filter(sub_name)
# ============LICENSE_START===================================================
-# Copyright (C) 2021 Nordix Foundation.
+# Copyright (C) 2021-2022 Nordix Foundation.
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
logger.info('Attempting to fetch all the subscriptions')
subscriptions = db.session.query(SubscriptionModel) \
.options(joinedload(SubscriptionModel.network_filter),
- joinedload(SubscriptionModel.measurement_groups)) \
+ joinedload(SubscriptionModel.measurement_groups),
+ joinedload(SubscriptionModel.nfs)) \
.all()
db.session.remove()
return subscriptions
# ============LICENSE_START===================================================
-# Copyright (C) 2020-2021 Nordix Foundation.
+# Copyright (C) 2020-2022 Nordix Foundation.
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
subscriptions = []
for subscription_name in subscription_names:
subscriptions.append(create_subscription_data(subscription_name))
+ subscriptions[1].nfs = []
return subscriptions
# ============LICENSE_START===================================================
-# Copyright (C) 2019-2021 Nordix Foundation.
+# Copyright (C) 2019-2022 Nordix Foundation.
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
self.assertEqual(subs[1]['subscription']['measurementGroups'][0]['measurementGroup']
['measurementGroupName'], 'MG1')
self.assertEqual(len(subs[1]['subscription']['measurementGroups']), 2)
+ self.assertEqual(subs[0]['subscription']['nfs'][0], 'pnf_101')
+ self.assertEqual(subs[0]['subscription']['nfs'][1], 'pnf_102')
+ self.assertEqual(subs[1]['subscription']['nfs'], [])
self.assertEqual(len(subs), 2)
@patch('mod.api.services.subscription_service.query_all_subscriptions',