From a8d0081fd1b8a8d4081d919dc472e0fc2ca3b545 Mon Sep 17 00:00:00 2001 From: Alexey Shabalin Date: Wed, 29 Apr 2020 17:30:17 +0300 Subject: [PATCH] ovirt -> proxmox in Proxmox service --- server/src/uds/services/Proxmox/deployment.py | 4 ++-- server/src/uds/services/Proxmox/jobs.py | 2 +- server/src/uds/services/Proxmox/provider.py | 2 +- server/src/uds/services/Proxmox/service.py | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/src/uds/services/Proxmox/deployment.py b/server/src/uds/services/Proxmox/deployment.py index f7bcccdf..0069ca2a 100644 --- a/server/src/uds/services/Proxmox/deployment.py +++ b/server/src/uds/services/Proxmox/deployment.py @@ -64,7 +64,7 @@ class ProxmoxDeployment(services.UserDeployment): create consumable services for users using UserDeployment class as provider of this elements. - The logic for managing ovirt deployments (user machines in this case) is here. + The logic for managing Proxmox deployments (user machines in this case) is here. """ # : Recheck every this seconds by default (for task methods) @@ -164,7 +164,7 @@ class ProxmoxDeployment(services.UserDeployment): def reset(self) -> None: """ - o oVirt, reset operation just shutdowns it until v3 support is removed + o Proxmox, reset operation just shutdowns it until v3 support is removed """ if self._vmid != '': self.service().stopMachine(int(self._vmid)) diff --git a/server/src/uds/services/Proxmox/jobs.py b/server/src/uds/services/Proxmox/jobs.py index 77e921df..e8f18b37 100644 --- a/server/src/uds/services/Proxmox/jobs.py +++ b/server/src/uds/services/Proxmox/jobs.py @@ -44,7 +44,7 @@ logger = logging.getLogger(__name__) class ProxmoxDeferredRemoval(jobs.Job): frecuency = 60 * 5 # Once every NN minutes - friendly_name = 'Ovirt removal' + friendly_name = 'Proxmox removal' counter = 0 @staticmethod diff --git a/server/src/uds/services/Proxmox/provider.py b/server/src/uds/services/Proxmox/provider.py index 7c5dbbde..92d5dc81 100644 --- a/server/src/uds/services/Proxmox/provider.py +++ b/server/src/uds/services/Proxmox/provider.py @@ -169,7 +169,7 @@ class ProxmoxProvider(services.ServiceProvider): # pylint: disable=too-many-pub @staticmethod def test(env: 'Environment', data: 'Module.ValuesType') -> typing.List[typing.Any]: """ - Test ovirt Connectivity + Test Proxmox Connectivity Args: env: environment passed for testing (temporal environment passed) diff --git a/server/src/uds/services/Proxmox/service.py b/server/src/uds/services/Proxmox/service.py index 3d1b7195..ec94cb89 100644 --- a/server/src/uds/services/Proxmox/service.py +++ b/server/src/uds/services/Proxmox/service.py @@ -55,16 +55,16 @@ logger = logging.getLogger(__name__) class ProxmoxLinkedService(Service): # pylint: disable=too-many-public-methods """ - oVirt Linked clones service. This is based on creating a template from selected vm, and then use it to + Proxmox Linked clones service. This is based on creating a template from selected vm, and then use it to """ # : Name to show the administrator. This string will be translated BEFORE # : sending it to administration interface, so don't forget to # : mark it as _ (using ugettext_noop) - typeName = _('oVirt/RHEV Linked Clone') + typeName = _('Proxmox Linked Clone') # : Type used internally to identify this provider - typeType = 'oVirtLinkedService' + typeType = 'ProxmoxLinkedService' # : Description shown at administration interface for this provider - typeDescription = _('oVirt Services based on templates and COW (experimental)') + typeDescription = _('Proxmox Services based on templates and COW (experimental)') # : Icon file used as icon for this provider. This string will be translated # : BEFORE sending it to administration interface, so don't forget to # : mark it as _ (using ugettext_noop) @@ -209,7 +209,7 @@ class ProxmoxLinkedService(Service): # pylint: disable=too-many-public-methods def sanitizeVmName(self, name: str) -> str: """ - Ovirt only allows machine names with [a-zA-Z0-9_-] + Proxmox only allows machine names with [a-zA-Z0-9_-] """ return re.sub("[^a-zA-Z0-9_-]", "-", name)