You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2016/11/28 05:24:40 UTC
[01/10] libcloud git commit: update v1.4.0
Repository: libcloud
Updated Branches:
refs/heads/trunk 8dc66ccb1 -> 216a24fbe
update v1.4.0
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/30bced9f
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/30bced9f
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/30bced9f
Branch: refs/heads/trunk
Commit: 30bced9f000170f0e267469d95e50c1a5c54c209
Parents: 8dc66cc
Author: Anthony Shaw <an...@apache.org>
Authored: Sun Nov 27 11:01:04 2016 +1100
Committer: Anthony Shaw <an...@apache.org>
Committed: Sun Nov 27 11:01:04 2016 +1100
----------------------------------------------------------------------
doap_libcloud.rdf | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/30bced9f/doap_libcloud.rdf
----------------------------------------------------------------------
diff --git a/doap_libcloud.rdf b/doap_libcloud.rdf
index 78fd195..9f10a44 100644
--- a/doap_libcloud.rdf
+++ b/doap_libcloud.rdf
@@ -329,6 +329,13 @@
<revision>v1.3.0</revision>
</Version>
</release>
+ <release>
+ <Version>
+ <name>1.4.0</name>
+ <created>2016-11-27</created>
+ <revision>v1.4.0</revision>
+ </Version>
+ </release>
<repository>
<SVNRepository>
<location rdf:resource="https://svn.apache.org/repos/asf/libcloud/trunk/"/>
[10/10] libcloud git commit: Replace Distutils.version LooseVersion
with a customised version. Temp workaround until Travis CI support
Distutils.version with pylint Closes #940
Posted by an...@apache.org.
Replace Distutils.version LooseVersion with a customised version. Temp workaround until Travis CI support Distutils.version with pylint
Closes #940
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/216a24fb
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/216a24fb
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/216a24fb
Branch: refs/heads/trunk
Commit: 216a24fbe7d74a99ee9f2595850c04d1bdd7b034
Parents: 71a42ca
Author: Samuel Chong <sa...@gmail.com>
Authored: Thu Nov 24 12:28:04 2016 +1100
Committer: Anthony Shaw <an...@apache.org>
Committed: Mon Nov 28 16:24:16 2016 +1100
----------------------------------------------------------------------
libcloud/common/dimensiondata.py | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/216a24fb/libcloud/common/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/common/dimensiondata.py b/libcloud/common/dimensiondata.py
index 0cb726f..a8f5917 100644
--- a/libcloud/common/dimensiondata.py
+++ b/libcloud/common/dimensiondata.py
@@ -17,18 +17,15 @@ Dimension Data Common Components
"""
from base64 import b64encode
from time import sleep
-
-try:
- from distutils.version import LooseVersion # pylint: disable=import-error
-except ImportError:
- pass
-
+# TODO: use disutils.version when Travis CI fixed the pylint issue with version
+# from distutils.version import LooseVersion
from libcloud.utils.py3 import httplib
from libcloud.utils.py3 import b
from libcloud.common.base import ConnectionUserAndKey, XmlResponse, RawResponse
from libcloud.compute.base import Node
from libcloud.utils.py3 import basestring
from libcloud.utils.xml import findtext
+from libcloud.compute.types import LibcloudError, InvalidCredsError
# Roadmap / TODO:
#
@@ -318,6 +315,12 @@ def dd_object_to_id(obj, obj_type, id_value='id'):
)
+# TODO: use disutils.version when Travis CI fixed the pylint issue with version
+# This is a temporary workaround.
+def LooseVersion(version):
+ return float(version)
+
+
class NetworkDomainServicePlan(object):
ESSENTIALS = "ESSENTIALS"
ADVANCED = "ADVANCED"
[02/10] libcloud git commit: Attempt workaround 2 for pylint bug on
travis CI
Posted by an...@apache.org.
Attempt workaround 2 for pylint bug on travis CI
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/83f92914
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/83f92914
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/83f92914
Branch: refs/heads/trunk
Commit: 83f92914771f76ea67475b63ce2a45eeb9735e46
Parents: 20014e6
Author: Samuel Chong <sa...@gmail.com>
Authored: Tue Nov 22 11:19:50 2016 +1100
Committer: Anthony Shaw <an...@apache.org>
Committed: Mon Nov 28 16:24:10 2016 +1100
----------------------------------------------------------------------
libcloud/common/dimensiondata.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/83f92914/libcloud/common/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/common/dimensiondata.py b/libcloud/common/dimensiondata.py
index 22f1da8..a665eed 100644
--- a/libcloud/common/dimensiondata.py
+++ b/libcloud/common/dimensiondata.py
@@ -18,7 +18,7 @@ Dimension Data Common Components
from base64 import b64encode
from time import sleep
-from distutils.version import LooseVersion # pylint: disable=import-error
+from distutils.version import LooseVersion # pylint: disable-msg=E0611
from libcloud.utils.py3 import httplib
from libcloud.utils.py3 import b
from libcloud.common.base import ConnectionUserAndKey, XmlResponse, RawResponse
[07/10] libcloud git commit: Attempt to workaround pylint issue on
import disutils.version on travis CI
Posted by an...@apache.org.
Attempt to workaround pylint issue on import disutils.version on travis CI
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/71a42ca9
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/71a42ca9
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/71a42ca9
Branch: refs/heads/trunk
Commit: 71a42ca9566f90ca1196f156a21f58048816460b
Parents: 83f9291
Author: Samuel Chong <sa...@gmail.com>
Authored: Wed Nov 23 15:53:19 2016 +1100
Committer: Anthony Shaw <an...@apache.org>
Committed: Mon Nov 28 16:24:10 2016 +1100
----------------------------------------------------------------------
libcloud/common/dimensiondata.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/71a42ca9/libcloud/common/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/common/dimensiondata.py b/libcloud/common/dimensiondata.py
index a665eed..0cb726f 100644
--- a/libcloud/common/dimensiondata.py
+++ b/libcloud/common/dimensiondata.py
@@ -18,11 +18,14 @@ Dimension Data Common Components
from base64 import b64encode
from time import sleep
-from distutils.version import LooseVersion # pylint: disable-msg=E0611
+try:
+ from distutils.version import LooseVersion # pylint: disable=import-error
+except ImportError:
+ pass
+
from libcloud.utils.py3 import httplib
from libcloud.utils.py3 import b
from libcloud.common.base import ConnectionUserAndKey, XmlResponse, RawResponse
-from libcloud.common.types import LibcloudError, InvalidCredsError
from libcloud.compute.base import Node
from libcloud.utils.py3 import basestring
from libcloud.utils.xml import findtext
[08/10] libcloud git commit: update comment
Posted by an...@apache.org.
update comment
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/432a6865
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/432a6865
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/432a6865
Branch: refs/heads/trunk
Commit: 432a686526e5d806c4a7a7ae6f152dcf3a0a4d97
Parents: 141c177
Author: Samuel Chong <sa...@gmail.com>
Authored: Thu Nov 3 15:01:57 2016 +1100
Committer: Anthony Shaw <an...@apache.org>
Committed: Mon Nov 28 16:24:10 2016 +1100
----------------------------------------------------------------------
libcloud/compute/drivers/dimensiondata.py | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/432a6865/libcloud/compute/drivers/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py
index 9e477b6..13914e3 100644
--- a/libcloud/compute/drivers/dimensiondata.py
+++ b/libcloud/compute/drivers/dimensiondata.py
@@ -369,7 +369,6 @@ class DimensionDataNodeDriver(NodeDriver):
>>> # ex_primary_nic_network_adapter='E1000',
>>> # ex_is_started=False)
>>>
- >>> pprint(node)
:keyword name: (required) String with a name for this new node
:type name: ``str``
[05/10] libcloud git commit: Enable specifying api version
Posted by an...@apache.org.
Enable specifying api version
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/141c1770
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/141c1770
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/141c1770
Branch: refs/heads/trunk
Commit: 141c177076f6ed7700344d0d65088fc2650e2c1a
Parents: 30bced9
Author: Samuel Chong <sa...@gmail.com>
Authored: Thu Nov 3 11:10:07 2016 +1100
Committer: Anthony Shaw <an...@apache.org>
Committed: Mon Nov 28 16:24:10 2016 +1100
----------------------------------------------------------------------
libcloud/common/dimensiondata.py | 7 ++++++-
libcloud/compute/drivers/dimensiondata.py | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/141c1770/libcloud/common/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/common/dimensiondata.py b/libcloud/common/dimensiondata.py
index bdcde5a..0a868b8 100644
--- a/libcloud/common/dimensiondata.py
+++ b/libcloud/common/dimensiondata.py
@@ -382,7 +382,8 @@ class DimensionDataConnection(ConnectionUserAndKey):
allow_insecure = False
def __init__(self, user_id, key, secure=True, host=None, port=None,
- url=None, timeout=None, proxy_url=None, **conn_kwargs):
+ url=None, timeout=None, proxy_url=None,
+ api_version=None, **conn_kwargs):
super(DimensionDataConnection, self).__init__(
user_id=user_id,
key=key,
@@ -394,6 +395,10 @@ class DimensionDataConnection(ConnectionUserAndKey):
if conn_kwargs['region']:
self.host = conn_kwargs['region']['host']
+ if api_version:
+ if api_version.startswith('2'):
+ self.api_version_2 = api_version
+
def add_default_headers(self, headers):
headers['Authorization'] = \
('Basic %s' % b64encode(b('%s:%s' % (self.user_id,
http://git-wip-us.apache.org/repos/asf/libcloud/blob/141c1770/libcloud/compute/drivers/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py
index 76dfb55..9e477b6 100644
--- a/libcloud/compute/drivers/dimensiondata.py
+++ b/libcloud/compute/drivers/dimensiondata.py
@@ -114,6 +114,9 @@ class DimensionDataNodeDriver(NodeDriver):
if region is not None:
self.selected_region = API_ENDPOINTS[region]
+ if api_version is not None:
+ self.api_version = api_version
+
super(DimensionDataNodeDriver, self).__init__(key=key, secret=secret,
secure=secure, host=host,
port=port,
@@ -129,6 +132,7 @@ class DimensionDataNodeDriver(NodeDriver):
kwargs = super(DimensionDataNodeDriver,
self)._ex_connection_class_kwargs()
kwargs['region'] = self.selected_region
+ kwargs['api_version'] = self.api_version
return kwargs
def _create_node_mcp1(self, name, image, auth, ex_description,
[09/10] libcloud git commit: Attempt workaround for pylint bug on
travis CI
Posted by an...@apache.org.
Attempt workaround for pylint bug on travis CI
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/20014e6f
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/20014e6f
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/20014e6f
Branch: refs/heads/trunk
Commit: 20014e6f640d023660af3d14b38c159b6494bfb3
Parents: fdcd762
Author: Samuel Chong <sa...@gmail.com>
Authored: Tue Nov 22 09:14:56 2016 +1100
Committer: Anthony Shaw <an...@apache.org>
Committed: Mon Nov 28 16:24:10 2016 +1100
----------------------------------------------------------------------
libcloud/common/dimensiondata.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/20014e6f/libcloud/common/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/common/dimensiondata.py b/libcloud/common/dimensiondata.py
index fdc3230..22f1da8 100644
--- a/libcloud/common/dimensiondata.py
+++ b/libcloud/common/dimensiondata.py
@@ -17,7 +17,8 @@ Dimension Data Common Components
"""
from base64 import b64encode
from time import sleep
-from distutils.version import LooseVersion
+
+from distutils.version import LooseVersion # pylint: disable=import-error
from libcloud.utils.py3 import httplib
from libcloud.utils.py3 import b
from libcloud.common.base import ConnectionUserAndKey, XmlResponse, RawResponse
[03/10] libcloud git commit: update variable names
Posted by an...@apache.org.
update variable names
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/97d2f7d3
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/97d2f7d3
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/97d2f7d3
Branch: refs/heads/trunk
Commit: 97d2f7d31f88811d0714cb7089a2a30368f8786d
Parents: 432a686
Author: Samuel Chong <sa...@gmail.com>
Authored: Tue Nov 8 15:16:38 2016 +1100
Committer: Anthony Shaw <an...@apache.org>
Committed: Mon Nov 28 16:24:10 2016 +1100
----------------------------------------------------------------------
libcloud/common/dimensiondata.py | 39 +++++++++++++++++++++++++++++------
1 file changed, 33 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/97d2f7d3/libcloud/common/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/common/dimensiondata.py b/libcloud/common/dimensiondata.py
index 0a868b8..c58d5dd 100644
--- a/libcloud/common/dimensiondata.py
+++ b/libcloud/common/dimensiondata.py
@@ -372,8 +372,16 @@ class DimensionDataConnection(ConnectionUserAndKey):
api_path_version_1 = '/oec'
api_path_version_2 = '/caas'
- api_version_1 = '0.9'
- api_version_2 = '2.3'
+ api_version_1 = 0.9
+
+ # Earliest version supported
+ oldest_api_version = 2.2
+
+ # Latest version supported
+ latest_api_version = 2.3
+
+ # Default api version
+ active_api_version = 2.3
_orgId = None
responseCls = DimensionDataResponse
@@ -396,8 +404,27 @@ class DimensionDataConnection(ConnectionUserAndKey):
self.host = conn_kwargs['region']['host']
if api_version:
- if api_version.startswith('2'):
- self.api_version_2 = api_version
+ if float(api_version) < self.oldest_api_version:
+ msg = 'API Version specified is too old. No longer ' \
+ 'supported. Please upgrade to the latest version {}' \
+ .format(self.active_api_version)
+
+ raise DimensionDataAPIException(code=None,
+ msg=msg,
+ driver=self.driver)
+ elif float(api_version) > self.latest_api_version:
+ msg = 'Unsupported API Version. The version specified is ' \
+ 'not release yet. Please use the latest supported ' \
+ 'version {}' \
+ .format(self.active_api_version)
+
+ raise DimensionDataAPIException(code=None,
+ msg=msg,
+ driver=self.driver)
+
+ else:
+ # Overwrite default version using the version user specified
+ self.active_api_version = api_version
def add_default_headers(self, headers):
headers['Authorization'] = \
@@ -419,7 +446,7 @@ class DimensionDataConnection(ConnectionUserAndKey):
def request_api_2(self, path, action, params=None, data='',
headers=None, method='GET'):
action = "%s/%s/%s/%s" % (self.api_path_version_2,
- self.api_version_2, path, action)
+ self.active_api_version, path, action)
return super(DimensionDataConnection, self).request(
action=action,
@@ -520,7 +547,7 @@ class DimensionDataConnection(ConnectionUserAndKey):
resources that require a full path instead of just an ID, such as
networks, and customer snapshots.
"""
- return ("%s/%s/%s" % (self.api_path_version_2, self.api_version_2,
+ return ("%s/%s/%s" % (self.api_path_version_2, self.active_api_version,
self._get_orgId()))
def wait_for_state(self, state, func, poll_interval=2, timeout=60, *args,
[06/10] libcloud git commit: Compare version using disutils package
LooseVersion
Posted by an...@apache.org.
Compare version using disutils package LooseVersion
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/1a03eaf6
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/1a03eaf6
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/1a03eaf6
Branch: refs/heads/trunk
Commit: 1a03eaf6fe127199582ef041585fe4be28bdc480
Parents: 97d2f7d
Author: Samuel Chong <sa...@gmail.com>
Authored: Tue Nov 15 11:33:47 2016 +1100
Committer: Anthony Shaw <an...@apache.org>
Committed: Mon Nov 28 16:24:10 2016 +1100
----------------------------------------------------------------------
libcloud/common/dimensiondata.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/1a03eaf6/libcloud/common/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/common/dimensiondata.py b/libcloud/common/dimensiondata.py
index c58d5dd..3cb9f66 100644
--- a/libcloud/common/dimensiondata.py
+++ b/libcloud/common/dimensiondata.py
@@ -17,6 +17,7 @@ Dimension Data Common Components
"""
from base64 import b64encode
from time import sleep
+from distutils.version import LooseVersion, StrictVersion
from libcloud.utils.py3 import httplib
from libcloud.utils.py3 import b
from libcloud.common.base import ConnectionUserAndKey, XmlResponse, RawResponse
@@ -375,13 +376,13 @@ class DimensionDataConnection(ConnectionUserAndKey):
api_version_1 = 0.9
# Earliest version supported
- oldest_api_version = 2.2
+ oldest_api_version = '2.2'
# Latest version supported
- latest_api_version = 2.3
+ latest_api_version = '2.3'
# Default api version
- active_api_version = 2.3
+ active_api_version = '2.3'
_orgId = None
responseCls = DimensionDataResponse
@@ -404,7 +405,8 @@ class DimensionDataConnection(ConnectionUserAndKey):
self.host = conn_kwargs['region']['host']
if api_version:
- if float(api_version) < self.oldest_api_version:
+ if LooseVersion(api_version) < LooseVersion(
+ self.oldest_api_version):
msg = 'API Version specified is too old. No longer ' \
'supported. Please upgrade to the latest version {}' \
.format(self.active_api_version)
@@ -412,7 +414,8 @@ class DimensionDataConnection(ConnectionUserAndKey):
raise DimensionDataAPIException(code=None,
msg=msg,
driver=self.driver)
- elif float(api_version) > self.latest_api_version:
+ elif LooseVersion(api_version) > LooseVersion(
+ self.latest_api_version):
msg = 'Unsupported API Version. The version specified is ' \
'not release yet. Please use the latest supported ' \
'version {}' \
[04/10] libcloud git commit: remove strictversion imported but unused
Posted by an...@apache.org.
remove strictversion imported but unused
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/fdcd762a
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/fdcd762a
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/fdcd762a
Branch: refs/heads/trunk
Commit: fdcd762a92110d811493f1f0ba3ed2fb5d8ad90a
Parents: 1a03eaf
Author: Samuel Chong <sa...@gmail.com>
Authored: Mon Nov 21 14:12:25 2016 +1100
Committer: Anthony Shaw <an...@apache.org>
Committed: Mon Nov 28 16:24:10 2016 +1100
----------------------------------------------------------------------
libcloud/common/dimensiondata.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/fdcd762a/libcloud/common/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/common/dimensiondata.py b/libcloud/common/dimensiondata.py
index 3cb9f66..fdc3230 100644
--- a/libcloud/common/dimensiondata.py
+++ b/libcloud/common/dimensiondata.py
@@ -17,7 +17,7 @@ Dimension Data Common Components
"""
from base64 import b64encode
from time import sleep
-from distutils.version import LooseVersion, StrictVersion
+from distutils.version import LooseVersion
from libcloud.utils.py3 import httplib
from libcloud.utils.py3 import b
from libcloud.common.base import ConnectionUserAndKey, XmlResponse, RawResponse