[PMSH] Operational policy and control loop updates

[dcaegen2/services.git] / components / pm-subscription-handler / pmsh_service / mod / api / services / nf_service.py

diff --git a/components/pm-subscription-handler/pmsh_service/mod/api/services/nf_service.py b/components/pm-subscription-handler/pmsh_service/mod/api/services/nf_service.py
index 1fca766..6d43147 100644 (file)
--- a/components/pm-subscription-handler/pmsh_service/mod/api/services/nf_service.py
+++ b/components/pm-subscription-handler/pmsh_service/mod/api/services/nf_service.py
@@ -37,25 +37,25 @@ def capture_filtered_nfs(sub_name):
     return aai_client.get_pmsh_nfs_from_aai(AppConfig.get_instance(), nf_filter)
 
 
-def create_nf_event_body(nf, change_type):
+def create_nf_event_body(nf, change_type, sub_model):
     """
     Creates a network function event body to publish on MR
 
     Args:
         nf (NetworkFunction): the Network function to include in the event.
         change_type (string): define the change type to be applied on node
+        sub_model(SubscriptionModel): Subscription model object
     Returns:
         dict: network function event body to publish on MR.
     """
-    app_conf = AppConfig.get_instance()
     return {'nfName': nf.nf_name,
             'ipAddress': nf.ipv4_address if nf.ipv6_address in (None, '')
             else nf.ipv6_address,
             'blueprintName': nf.sdnc_model_name,
             'blueprintVersion': nf.sdnc_model_version,
-            'policyName': app_conf.operational_policy_name,
+            'operationalPolicyName': sub_model.operational_policy_name,
             'changeType': change_type,
-            'closedLoopControlName': app_conf.control_loop_name}
+            'controlLoopName': sub_model.control_loop_name}
 
 
 def save_nf(nf):