summaryrefslogtreecommitdiffstats
path: root/components/pm-subscription-handler/pmsh_service
diff options
context:
space:
mode:
authoregernug <gerard.nugent@est.tech>2022-03-17 12:40:34 +0000
committeregernug <gerard.nugent@est.tech>2022-03-17 12:51:42 +0000
commit934454b4eb2da070d69c810f310c49fd4895f11c (patch)
treee06eb68af9abf5097dd010d342b0d8b042490bf4 /components/pm-subscription-handler/pmsh_service
parenteeacfc71aafb2ae92ac464f3484efc1d181c75ca (diff)
[PMSH] Bug fix for Create MG2.2.2-pmsh
Object parse error in save_measurement_group DB Commit missing Issue-ID: DCAEGEN2-3118 Signed-off-by: egernug <gerard.nugent@est.tech> Change-Id: I47362d5233cca3fef01e2e069f5ea68781e9ac7d
Diffstat (limited to 'components/pm-subscription-handler/pmsh_service')
-rw-r--r--components/pm-subscription-handler/pmsh_service/mod/api/services/measurement_group_service.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/components/pm-subscription-handler/pmsh_service/mod/api/services/measurement_group_service.py b/components/pm-subscription-handler/pmsh_service/mod/api/services/measurement_group_service.py
index 29c4a27a..9045ac66 100644
--- a/components/pm-subscription-handler/pmsh_service/mod/api/services/measurement_group_service.py
+++ b/components/pm-subscription-handler/pmsh_service/mod/api/services/measurement_group_service.py
@@ -73,12 +73,13 @@ def create_measurement_group(subscription, measurement_group_name, body):
logger.info(f'Initiating create measurement group for: {measurement_group_name}')
check_duplication(subscription.subscription_name, measurement_group_name)
check_measurement_group_names_comply(measurement_group_name, body)
- new_mg = [save_measurement_group(body, subscription.subscription_name)]
- if body["administrativeState"] == AdministrativeState.UNLOCKED.value:
+ new_mg = [save_measurement_group(body["measurementGroup"], subscription.subscription_name)]
+ if body["measurementGroup"]["administrativeState"] == AdministrativeState.UNLOCKED.value:
filtered_nfs = nf_service.capture_filtered_nfs(subscription.subscription_name)
subscription_service.add_new_filtered_nfs(filtered_nfs, new_mg, subscription)
else:
logger.info(f'Measurement Group {measurement_group_name} is not in an unlocked state')
+ db.session.commit()
def check_measurement_group_names_comply(measurement_group_name, measurement_group):
@@ -90,9 +91,10 @@ def check_measurement_group_names_comply(measurement_group_name, measurement_gro
measurement_group (dict): Measurement Group
"""
- if measurement_group_name != measurement_group["measurementGroupName"]:
+ logger.info("Checking names match")
+ if measurement_group_name != measurement_group["measurementGroup"]["measurementGroupName"]:
logger.info(f'Changing measurement_group_name in body to {measurement_group_name}')
- measurement_group["measurementGroupName"] = measurement_group_name
+ measurement_group["measurementGroup"]["measurementGroupName"] = measurement_group_name
def check_duplication(subscription_name, measurement_group_name):