shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-25 23:21:41 +03:00
Code Issues Releases Wiki Activity

manually imported changes to v3.0 on spool names variables

Browse Source
This commit is contained in:
Adolfo Gómez García 2021-01-28 14:06:03 +01:00
parent 600f50f203
commit ae6d36b86a
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/uds/models/service_pool.py
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# Copyright (c) 2012-2020 Virtual Cable S.L.U.
# Copyright (c) 2012-2021 Virtual Cable S.L.U.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification,
@ -12,7 +12,7 @@
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# * Neither the name of Virtual Cable S.L. nor the names of its contributors
# * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
@ -557,6 +557,7 @@ class ServicePool(UUIDModel, TaggingMixin): # type: ignore
pubs_active=models.Count(
'publications',
filter=models.Q(publications__state=states.publication.USABLE),
distinct=True,
)
)
.annotate(
@ -566,6 +567,7 @@ class ServicePool(UUIDModel, TaggingMixin): # type: ignore
userServices__state__in=states.userService.VALID_STATES,
userServices__cache_level=0,
),
distinct=True,
)
)
.prefetch_related(

22
server/src/uds/web/util/services.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright (c) 2012-2020 Virtual Cable S.L.U.
# Copyright (c) 2012-2021 Virtual Cable S.L.U.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification,
@ -11,7 +11,7 @@
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# * Neither the name of Virtual Cable S.L. nor the names of its contributors
# * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
@ -46,8 +46,6 @@ from uds.models import (
from uds.core.util.config import GlobalConfig
from uds.core.util import html
from uds.core.managers import userServiceManager
# Not imported at runtime, just for type checking
if typing.TYPE_CHECKING:
from uds.core.util.request import ExtendedHttpRequestWithUser
@ -178,7 +176,9 @@ def getServicesData(
if sPool.owned_by_meta:
continue
use = str(sPool.usage(typing.cast(typing.Any, sPool).usage_count)) + '%'
use_percent = str(sPool.usage(sPool.usage_count)) + '%'
use_count = str(sPool.usage_count)
left_count = str(sPool.max_srvs - sPool.usage_count)
trans = []
for t in sorted(
@ -243,17 +243,21 @@ def getServicesData(
maxDeployed = str(sPool.max_srvs)
# if sPool.service.getType().usesCache is False:
# maxDeployed = sPool.service.getInstance().maxDeployed
def datator(x) -> str:
return x.replace('{use}', use).replace('{total}', maxDeployed)
def datator(x) -> str:
return (
x.replace('{use}', use_percent)
.replace('{total}', str(sPool.max_srvs))
.replace('{usec}', use_count)
.replace('{left}', left_count)
)
services.append(
{
'id': 'F' + sPool.uuid,
'name': datator(sPool.name),
'visual_name': datator(
sPool.visual_name.replace('{use}', use).replace(
sPool.visual_name.replace('{use}', use_percent).replace(
'{total}', maxDeployed
)
),