Fixed service pools info

server/src/uds/core/consts/__init__.py

@@ -90,6 +90,9 @@
 TRUE_STR: typing.Final[str] = 'true'
 FALSE_STR: typing.Final[str] = 'false'
 
+# Constant to mark an "UNLIMITED" value
+UNLIMITED: typing.Final[int] = -1
+
 # Default length for Gui Text Fields
 DEFAULT_TEXT_LENGTH: typing.Final[int] = 64
 

server/src/uds/core/exceptions/__init__.py

@@ -30,9 +30,10 @@
 """
 Author: Adolfo Gómez, dkmaster at dkmon dot com
 """
+from . import actor
 from . import auth
-from . import validation
 from . import service
+from . import validation
 
 # Common exceptions inserted here
 from .common import UDSException, BlockAccess

server/src/uds/core/managers/user_service.py

@@ -109,7 +109,7 @@ def maximumUserServicesDeployed(self, service: 'models.Service') -> bool:
         """
         serviceInstance = service.getInstance()
         # Early return, so no database count is needed
-        if serviceInstance.maxUserServices == services.Service.UNLIMITED:
+        if serviceInstance.maxUserServices == consts.UNLIMITED:
             return False
 
         if self.getExistingUserServices(service) >= (serviceInstance.maxUserServices or 1):
@@ -604,7 +604,7 @@ def reset(self, userService: UserService) -> None:
     def notifyPreconnect(self, userService: UserService, info: types.connections.ConnectionData) -> None:
         try:
             comms.notifyPreconnect(userService, info)
-        except exceptions.NoActorComms:  # If no comms url for userService, try with service
+        except exceptions.actor.NoActorComms:  # If no comms url for userService, try with service
             userService.deployed_service.service.notifyPreconnect(userService, info)
 
     def checkUuid(self, userService: UserService) -> bool:
@@ -918,7 +918,7 @@ def getMeta(
         if meta.policy == types.pools.LoadBalancingPolicy.PRIORITY:
             sortPools = [(p.priority, p.pool) for p in poolMembers]
         elif meta.policy == types.pools.LoadBalancingPolicy.GREATER_PERCENT_FREE:
-            sortPools = [(p.pool.usage(), p.pool) for p in poolMembers]
+            sortPools = [(p.pool.usage()[0], p.pool) for p in poolMembers]
         else:
             sortPools = [
                 (

server/src/uds/core/services/service.py

@@ -40,7 +40,7 @@
 from uds.core.util.state import State
 from uds.core.util import log
 
-from uds.core import types
+from uds.core import types, consts
 
 
 if typing.TYPE_CHECKING:
@@ -93,9 +93,6 @@ class Service(Module):
 
     """
 
-    # : Constant for indicating that max elements this service can deploy is unlimited.
-    UNLIMITED: int = -1
-
     # : Name of type, used at administration interface to identify this
     # : service (i.e. Xen server, oVirt Server, ...)
     # : This string will be translated when provided to admin interface
@@ -125,7 +122,7 @@ class Service(Module):
     # : Normally set to UNLIMITED. This attribute indicates if the service has some "limitation"
     # : for providing deployed services to users. This attribute can be set here or
     # : modified at instance level, core will access always to it using an instance object.
-    maxUserServices: int = UNLIMITED  # : If the service provides more than 1 "provided service" (-1 = no limit, 0 = ???? (do not use it!!!), N = max number to deploy
+    maxUserServices: int = consts.UNLIMITED  # : If the service provides more than 1 "provided service" (-1 = no limit, 0 = ???? (do not use it!!!), N = max number to deploy
 
     # : If this item "has constains", on deployed service edition, defined keys will overwrite defined ones
     # : That is, this Dicionary will OVERWRITE fields ON ServicePool (normally cache related ones) dictionary from a REST api save invocation!!
@@ -271,10 +268,10 @@ def unmarshal(self, data: bytes) -> None:
             try:
                 self.maxUserServices = getattr(self, 'maxServices').num()
             except Exception:
-                self.maxUserServices = Service.UNLIMITED
+                self.maxUserServices = consts.UNLIMITED
 
             if self.maxUserServices < 1:
-                self.maxUserServices = Service.UNLIMITED
+                self.maxUserServices = consts.UNLIMITED
 
         # Keep untouched if maxServices is not present
 

server/src/uds/models/meta_pool.py

@@ -38,7 +38,7 @@
 from django.db.models import QuerySet, signals
 from django.utils.translation import gettext_noop as _
 
-from uds.core import types
+from uds.core import consts, types
 from uds.core.util import log, states
 from uds.core.util.calendar import CalendarChecker
 
@@ -178,6 +178,7 @@ def usage(self, cachedValue=-1) -> typing.Tuple[int, int, int]:
             )
             .prefetch_related(
                 'service',
+                'service__provider',
             )
         )
 
@@ -186,13 +187,14 @@ def usage(self, cachedValue=-1) -> typing.Tuple[int, int, int]:
         for pool in query:
             p, u, m = pool.usage(pool.usage_count)  # type:ignore  # Anotated field
             usage_count += u
-            if max_count <= 0  or m <= 0:
-                max_count = -1
+            # If any of the pools has no max, then max is -1
+            if max_count == consts.UNLIMITED  or m == consts.UNLIMITED:
+                max_count = consts.UNLIMITED
             else:
                 max_count += m
 
-        if max_count <= 0:
-            return (0, usage_count, max_count)
+        if max_count == 0 or max_count == consts.UNLIMITED:
+            return (0, usage_count, consts.UNLIMITED)
 
         return (usage_count * 100 // max_count, usage_count, max_count)
 

server/src/uds/models/service_pool.py

@@ -55,6 +55,7 @@
 
 from ..core.consts import NEVER
 from ..core.util.model import getSqlDatetime
+from uds.core import consts
 
 
 # Not imported at runtime, just for type checking
@@ -643,8 +644,8 @@ def usage(self, cachedValue=-1) -> typing.Tuple[int, int, int]:
         if cachedValue == -1:
             cachedValue = self.assignedUserServices().filter(state__in=states.userService.VALID_STATES).count()
 
-        if maxs <= 0:
-            return 0, cachedValue, maxs
+        if maxs == 0 or max == consts.UNLIMITED:
+            return 0, cachedValue, consts.UNLIMITED
 
         return 100 * cachedValue // maxs, cachedValue, maxs