Updates for Python 3.10 and Ubuntu 22.04

[osm/POL.git] / osm_policy_module / autoscaling / service.py

diff --git a/osm_policy_module/autoscaling/service.py b/osm_policy_module/autoscaling/service.py
index a8c36e0..fd96da3 100644 (file)
--- a/osm_policy_module/autoscaling/service.py
+++ b/osm_policy_module/autoscaling/service.py
@@ -22,10 +22,11 @@
 # For those usages not covered by the Apache License, Version 2.0 please
 # contact: bdiaz@whitestack.com or glavado@whitestack.com
 ##
-import asyncio
 import datetime
 import json
 import logging
+import operator
+import functools
 
 from osm_policy_module.common.common_db_client import CommonDbClient
 from osm_policy_module.common.lcm_client import LcmClient
@@ -48,16 +49,13 @@ log = logging.getLogger(__name__)
 
 
 class AutoscalingService:
-    def __init__(self, config: Config, loop=None):
+    def __init__(self, config: Config):
         self.conf = config
-        if not loop:
-            loop = asyncio.get_event_loop()
-        self.loop = loop
         self.db_client = CommonDbClient(config)
-        self.mon_client = MonClient(config, loop=self.loop)
-        self.lcm_client = LcmClient(config, loop=self.loop)
+        self.mon_client = MonClient(config)
+        self.lcm_client = LcmClient(config)
 
-    async def configure_scaling_groups(self, nsr_id: str):
+    async def configure_scaling_groups(self, nsr_id: str, vnf_member_index=None):
         """
         Configures scaling groups for a network service. Creates records in DB. Creates alarms in MON.
         :param nsr_id: Network service record id
@@ -71,7 +69,13 @@ class AutoscalingService:
         try:
             with database.db.atomic() as tx:
                 try:
-                    vnfrs = self.db_client.get_vnfrs(nsr_id)
+                    if vnf_member_index is None:
+                        vnfrs = self.db_client.get_vnfrs(nsr_id)
+                    else:
+                        vnfrs = []
+                        vnfr = self.db_client.get_vnfr(nsr_id, vnf_member_index)
+                        vnfrs.append(vnfr)
+                    # vnfrs = self.db_client.get_vnfrs(nsr_id)
                     for vnfr in vnfrs:
                         log.debug("Processing vnfr: %s", vnfr)
                         vnfd = self.db_client.get_vnfd(vnfr["vnfd-id"])
@@ -190,7 +194,7 @@ class AutoscalingService:
                                                     operation=scaling_criteria[
                                                         "scale-in-relational-operation"
                                                     ],
-                                                    action="scale_in"
+                                                    action="scale_in",
                                                 )
                                             )
                                             alarm = ScalingAlarmRepository.create(
@@ -245,15 +249,21 @@ class AutoscalingService:
         finally:
             database.db.close()
 
-    async def delete_scaling_groups(self, nsr_id: str):
+    async def delete_scaling_groups(self, nsr_id: str, vnf_member_index=None):
         log.debug("Deleting scaling groups for network service %s", nsr_id)
         database.db.connect()
         try:
             with database.db.atomic() as tx:
                 try:
-                    for scaling_group in ScalingGroupRepository.list(
-                        ScalingGroup.nsr_id == nsr_id
-                    ):
+                    if vnf_member_index is None:
+                        scale_conditions = ScalingGroup.nsr_id == nsr_id
+                    else:
+                        query_list = [
+                            ScalingGroup.nsr_id == nsr_id,
+                            ScalingGroup.vnf_member_index == vnf_member_index,
+                        ]
+                        scale_conditions = functools.reduce(operator.and_, query_list)
+                    for scaling_group in ScalingGroupRepository.list(scale_conditions):
                         for scaling_policy in scaling_group.scaling_policies:
                             for scaling_criteria in scaling_policy.scaling_criterias:
                                 for alarm in scaling_criteria.scaling_alarms: