Skip to content
This repository was archived by the owner on Aug 20, 2022. It is now read-only.

Updates DC list and allows unknown DC designators #38

Merged
briancline merged 1 commit into from
Mar 19, 2015
+36 −26
Merged

Updates DC list and allows unknown DC designators #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions object_storage/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,3 @@ def get_twisted_client(username, password,

d = conn.authenticate().addCallback(lambda r: client)
return d

__all__ = ['get_client',
'get_httplib2_client',
'get_requests_client',
'get_twisted_client']
41 changes: 25 additions & 16 deletions object_storage/consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,34 @@
See COPYING for license information
"""

__version__ = "0.5.2"

__version__ = "0.5.3"

USER_AGENT = "sl-object-storage-python/%s" % __version__

DATACENTERS = [
'dal05', # US - Texas - Dallas
'ams01', # NL - North Holland - Amsterdam
'sng01', # SG - Singapore
'sjc01', # US - California - San Jose
'hkg02', # HK - Hong Kong
'lon02', # GB - London
'tor01', # CA - Ontario - Toronto
'mel01', # AU - Victoria - Melbourne
'par01', # FR - Paris
'mex01', # MX - Mexico City
'tok02', # JP - Tokyo
'fra02', # DE - Hesse - Frankfurt
'syd01', # AU - New South Wales - Sydney
'mon01', # CA - Quebec - Montreal
]

PUBLIC_SUFFIX = 'objectstorage.softlayer.net'
PRIVATE_SUFFIX = 'objectstorage.service.networklayer.com'


def _dc_endpoints(dc):
def dc_endpoints(dc):
dc = dc.lower()
return {
'public': {
'http': 'http://%s.%s/auth/v1.0' % (dc, PUBLIC_SUFFIX),
Expand All @@ -21,19 +43,6 @@ def _dc_endpoints(dc):
}
}

DATACENTERS = ['dal05', # US - Texas - Dallas
'ams01', # NL - North Holland - Amsterdam
'sng01', # SG - Singapore
'sjc01', # US - California - San Jose
'hkg02', # HK - Hong Kong
'lon02', # GB - London
'tor01', # CA - Ontario - Toronto
'mel01', # AU - Victoria - Melbourne
'par01'] # FR - Paris

PUBLIC_SUFFIX = 'objectstorage.softlayer.net'
PRIVATE_SUFFIX = 'objectstorage.service.networklayer.com'

# Normally this could be a dict comprehension, but we're maintaining
# compatibility with Python 2.6, so the slower dict() is necessary.
ENDPOINTS = dict((dc, _dc_endpoints(dc)) for dc in DATACENTERS)
ENDPOINTS = dict((dc, dc_endpoints(dc)) for dc in DATACENTERS)
16 changes: 11 additions & 5 deletions object_storage/transport/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
import httplib
from socket import timeout
from urlparse import urlparse
from object_storage.errors import ResponseError, NotFound
from object_storage import consts

import urllib2
import re

from object_storage.errors import ResponseError, NotFound
from object_storage import consts


class Response(object):
def __init__(self):
Expand Down Expand Up @@ -85,9 +86,14 @@ def __init__(self, auth_url=None,
self.use_default_storage_url = True
if not auth_url:
self.use_default_storage_url = False
self.auth_url = consts.ENDPOINTS.get(self.datacenter) \
.get(self.network) \
.get(self.protocol)
dc_endpoints = consts.ENDPOINTS.get(self.datacenter)

if not dc_endpoints:
dc_endpoints = consts.dc_endpoints(self.datacenter)

self.auth_url = dc_endpoints.get(self.network) \
.get(self.protocol)

self.storage_url = None
self.auth_token = None
self.authenticated = False
Expand Down