Skip to content
This repository has been archived by the owner on Aug 21, 2020. It is now read-only.

Commit

Permalink
Check for ipv6 hosts when creating the url
Browse files Browse the repository at this point in the history
  • Loading branch information
lihiwish authored and dims committed Sep 19, 2017
1 parent f4a7f59 commit 3504ef1
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 1 deletion.
4 changes: 3 additions & 1 deletion etcd3gw/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ def get_url(self, path):
:param path:
:return: url
"""
base_url = self.protocol + '://' + self.host + ':' + str(self.port)
host = ('[' + self.host + ']' if (self.host.find(':') != -1)
else self.host)
base_url = self.protocol + '://' + host + ':' + str(self.port)
return base_url + '/v3alpha/' + path.lstrip("/")

def post(self, *args, **kwargs):
Expand Down
32 changes: 32 additions & 0 deletions etcd3gw/tests/test_client.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

from etcd3gw.client import Etcd3Client
from etcd3gw.tests import base


class TestEtcd3Gateway(base.TestCase):

def test_client_default(self):
client = Etcd3Client()
self.assertEqual("http://localhost:2379/v3alpha/lease/grant",
client.get_url("/lease/grant"))

def test_client_ipv4(self):
client = Etcd3Client(host="127.0.0.1")
self.assertEqual("http://127.0.0.1:2379/v3alpha/lease/grant",
client.get_url("/lease/grant"))

def test_client_ipv6(self):
client = Etcd3Client(host="::1")
self.assertEqual("http://[::1]:2379/v3alpha/lease/grant",
client.get_url("/lease/grant"))

0 comments on commit 3504ef1

Please sign in to comment.