burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

refactoring and updating models for python 3.7 -- ServicesPool

Browse Source
This commit is contained in:
Adolfo Gómez García 2019-08-14 09:11:15 +02:00
parent c9c4a8f578
commit ffc3d14daf
8 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/uds/REST/methods/meta_service_pools.py
View File

@ -35,7 +35,7 @@ import logging
from django.utils.translation import ugettext as _
from uds.models.meta_pool import MetaPool, MetaPoolMember
from uds.models.ServicesPool import ServicePool
from uds.models.service_pool import ServicePool
from uds.models.user_service import UserService
from uds.models.user import User

3
server/src/uds/models/ServicesPoolPublication.py
View File

@ -40,7 +40,7 @@ from uds.core.util.State import State
from uds.core.environment import Environment
from uds.core.util import log
from uds.models.ServicesPool import DeployedService
from uds.models.service_pool import DeployedService
from uds.models.util import getSqlDatetime
from uds.models.uuid_model import UUIDModel
@ -202,4 +202,3 @@ class DeployedServicePublication(UUIDModel):
signals.pre_delete.connect(DeployedServicePublication.beforeDelete, sender=DeployedServicePublication)
ServicePoolPublication = DeployedServicePublication

4
server/src/uds/models/__init__.py
View File

@ -58,8 +58,8 @@ from .user_preference import UserPreference
from .group import Group
# Provisioned services
from .ServicesPool import DeployedService # Old name, will continue here for a while already
from .ServicesPool import ServicePool # New name
from .service_pool import DeployedService # Old name, will continue here for a while already
from .service_pool import ServicePool # New name
from .meta_pool import MetaPool
from .ServicesPoolGroup import ServicesPoolGroup
from .ServicesPoolPublication import DeployedServicePublication

2
server/src/uds/models/calendar_access.py
View File

@ -39,7 +39,7 @@ from uds.core.util import states
from .uuid_model import UUIDModel
from .calendar import Calendar
from .ServicesPool import ServicePool
from .service_pool import ServicePool
from .meta_pool import MetaPool

2
server/src/uds/models/calendar_action.py
View File

@ -45,7 +45,7 @@ from uds.core.util import (calendar, log)
from .calendar import Calendar
from .uuid_model import UUIDModel
from .util import getSqlDatetime
from .ServicesPool import ServicePool
from .service_pool import ServicePool
from .transport import Transport
from .authenticator import Authenticator
# from django.utils.translation import ugettext_lazy as _, ugettext

2
server/src/uds/models/meta_pool.py
View File

@ -46,7 +46,7 @@ from uds.core.util.calendar import CalendarChecker
from uds.models.image import Image
from uds.models.ServicesPoolGroup import ServicesPoolGroup
from uds.models.ServicesPool import ServicePool
from uds.models.service_pool import ServicePool
from uds.models.group import Group
from uds.models.calendar import Calendar

0
server/src/uds/models/ServicesPool.py → server/src/uds/models/service_pool.py
View File

2
server/src/uds/models/user_service.py
View File

@ -42,7 +42,7 @@ from uds.core.util import unique
from uds.core.util.State import State
from uds.models.uuid_model import UUIDModel
from uds.models.ServicesPool import DeployedService
from uds.models.service_pool import DeployedService
from uds.models.ServicesPoolPublication import DeployedServicePublication
from uds.models.user import User