From 327556ed536e64d06bdef900686a949cb5663c67 Mon Sep 17 00:00:00 2001 From: Sergey Lebedev Date: Fri, 23 Sep 2016 09:48:55 +0300 Subject: [PATCH] Make k8s.cluster.K8sCluster be used both in py2 and py3 Additional changes in k8smanager.py - file() is not supported by Python3 Change-Id: I4bd9d2965597bd9b1372127a83f7742aee84092d --- fuel_ccp_tests/managers/k8s/cluster.py | 3 ++- fuel_ccp_tests/managers/k8smanager.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fuel_ccp_tests/managers/k8s/cluster.py b/fuel_ccp_tests/managers/k8s/cluster.py index 2f55fa2..d827107 100644 --- a/fuel_ccp_tests/managers/k8s/cluster.py +++ b/fuel_ccp_tests/managers/k8s/cluster.py @@ -54,7 +54,8 @@ class K8sCluster(object): def __init__(self, schema="https", user=None, password=None, host='localhost', port='443', default_namespace='default'): if user and password: - auth = base64.encodestring('%s:%s' % (user, password))[:-1] + auth_string = '%s:%s' % (user, password) + auth = base64.encodestring(auth_string.encode()).decode()[:-1] auth = "Basic {}".format(auth) self._client = api_client.ApiClient( '{schema}://{host}:{port}/'.format( diff --git a/fuel_ccp_tests/managers/k8smanager.py b/fuel_ccp_tests/managers/k8smanager.py index c49e0db..3f38a03 100644 --- a/fuel_ccp_tests/managers/k8smanager.py +++ b/fuel_ccp_tests/managers/k8smanager.py @@ -177,10 +177,10 @@ class K8SManager(object): 'registry_templates/' \ 'service-registry.yaml' - with file(registry_pod) as f: - registry = yaml.load(f) - with file(service_registry) as f: - service = yaml.load(f) + with open(registry_pod) as f: + registry = yaml.load(f.read()) + with open(service_registry) as f: + service = yaml.load(f.read()) registry_pod = self.api.pods.create(body=registry, namespace='default') self.api.services.create(body=service, namespace='default')