diff options
| author |   Arthur Martella <arthur.martella.1@att.com> | 2020-01-09 14:14:23 -0500 |
|---|---|---|
| committer | Arthur Martella <arthur.martella.1@att.com> | 2020-01-09 14:14:23 -0500 |
| commit | ac3396ce0380244ded8895a6bd0abd6cb32e8d7a (patch) | |
| tree | e5acdbf93c8c0355a6214d25d875f269338ebe6a | |
| parent | 069415e671f851718796e89708fc4ebf212febb2 (diff) | |
Valet Python 3 conversion
Issue-ID: OPTFRA-646
Signed-off-by: Martella, Arthur <arthur.martella.1@att.com>
Change-Id: I2999f5bbdb401a84f2c24de5934da8958c7bf190
4 files changed, 6 insertions, 4 deletions
diff --git a/engine/src/docker/Dockerfile b/engine/src/docker/Dockerfile index 8eccb13..42d5ad9 100644 --- a/engine/src/docker/Dockerfile +++ b/engine/src/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7.15-alpine +FROM python:3.8.0-alpine COPY src/ /opt/engine WORKDIR /opt/engine diff --git a/engine/src/valet/engine/resource_manager/naming.py b/engine/src/valet/engine/resource_manager/naming.py index bdf5211..69a404d 100644 --- a/engine/src/valet/engine/resource_manager/naming.py +++ b/engine/src/valet/engine/resource_manager/naming.py @@ -22,7 +22,6 @@ import copy import re -from sre_parse import isdigit from valet.engine.resource_manager.resources.host_group import HostGroup @@ -35,6 +34,9 @@ class Naming(object): self.rack_code_list = _config.get("rack_codes") self.host_code_list = _config.get("host_codes") + def isdigit(char): + return "0" <= char <= "9" + def get_topology(self, _datacenter, _host_groups, _hosts, _rhosts): """Set datacenter resource structure (racks, hosts).""" diff --git a/engine/src/valet/engine/search/filters/aggregate_instance_filter.py b/engine/src/valet/engine/search/filters/aggregate_instance_filter.py index 316388e..753d16f 100644 --- a/engine/src/valet/engine/search/filters/aggregate_instance_filter.py +++ b/engine/src/valet/engine/search/filters/aggregate_instance_filter.py @@ -16,7 +16,7 @@ # # ------------------------------------------------------------------------- # -import filter_utils +from . import filter_utils import six diff --git a/engine/src/valet/engine/search/filters/az_filter.py b/engine/src/valet/engine/search/filters/az_filter.py index 8902893..81a04e8 100644 --- a/engine/src/valet/engine/search/filters/az_filter.py +++ b/engine/src/valet/engine/search/filters/az_filter.py @@ -16,7 +16,7 @@ # # ------------------------------------------------------------------------- # -import filter_utils +from . import filter_utils from valet.engine.app_manager.group import Group from valet.engine.app_manager.server import Server |