Add parsing the endpoint URL

Add parsing the endpoint URL and check the path string only
in order to decide the API version.

Change-Id: Ib0a035f3bed31e2162a1231a5f5dcc3907d37243
Closes-Bug: #1489727
This commit is contained in:
Takashi NATSUME
2015-08-28 16:16:06 +09:00
parent 1e2274aef0
commit 19480df10a
2 changed files with 27 additions and 4 deletions
+7 -4
View File
@@ -20,6 +20,7 @@ import hashlib
import json
import os
import re
import six.moves.urllib.parse as urlparse
import sys
import threading
import uuid
@@ -396,11 +397,13 @@ def strip_version(endpoint):
version = None
# Get rid of trailing '/' if present
endpoint = endpoint.rstrip('/')
url_bits = endpoint.split('/')
url_parts = urlparse.urlparse(endpoint)
(scheme, netloc, path, __, __, __) = url_parts
path = path.lstrip('/')
# regex to match 'v1' or 'v2.0' etc
if re.match('v\d+\.?\d*', url_bits[-1]):
version = float(url_bits[-1].lstrip('v'))
endpoint = '/'.join(url_bits[:-1])
if re.match('v\d+\.?\d*', path):
version = float(path.lstrip('v'))
endpoint = scheme + '://' + netloc
return endpoint, version