[PMSH] Improve CBS data handling

  # AppConfog object fetch priodically
  # AAI client to only fetch AAI data

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I78315f141c3bb7e8b0d9efa818d294415fa79918
Issue-ID: DCAEGEN2-2146

1 files changed, 2 insertions, 3 deletions

diff --git a/components/pm-subscription-handler/pmsh_service/mod/subscription.py b/components/pm-subscription-handler/pmsh_service/mod/subscription.py
index be217b11..d6b17cd9 100755
--- a/components/pm-subscription-handler/pmsh_service/mod/subscription.py
+++ b/components/pm-subscription-handler/pmsh_service/mod/subscription.py
@@ -125,7 +125,7 @@ class Subscription:
             logger.debug(f'Failed to add nf {nf.nf_name} to subscription '
                          f'{current_sub.subscription_name}: {e}')
             logger.debug(f'Subscription {current_sub.subscription_name} now contains these XNFs:'
-                         f'{Subscription.get_nfs_per_subscription(current_sub.subscription_name)}')
+                         f'{Subscription.get_nf_names_per_sub(current_sub.subscription_name)}')
 
     @staticmethod
     def get(subscription_name):
@@ -206,9 +206,9 @@ class Subscription:
         self.update_subscription_status()
 
         if self.administrativeState == AdministrativeState.UNLOCKED.value:
-            logger.info(f'{action} subscription initiated for {self.subscriptionName}.')
             action = 'Activate'
             sub_nf_state = SubNfState.PENDING_CREATE.value
+            logger.info(f'{action} subscription initiated for {self.subscriptionName}.')
 
         try:
             for nf in nfs:
@@ -228,7 +228,6 @@ class Subscription:
             list: NetworkFunctions per Subscription list else empty
         """
         nf_per_subscriptions = NfSubRelationalModel.query.all()
-
         return nf_per_subscriptions
 
     @staticmethod