You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/10/29 20:16:56 UTC
[1/3] git commit: tox: run "lint" step by default.
Updated Branches:
refs/heads/trunk 8f8beec1e -> a54b7df55
tox: run "lint" step by default.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/067e53ff
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/067e53ff
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/067e53ff
Branch: refs/heads/trunk
Commit: 067e53ff5f10e60a88562319dcfeeaf016e6587e
Parents: 8f8beec
Author: Tomaz Muraus <to...@apache.org>
Authored: Tue Oct 29 20:07:52 2013 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Tue Oct 29 20:07:52 2013 +0100
----------------------------------------------------------------------
tox.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/067e53ff/tox.ini
----------------------------------------------------------------------
diff --git a/tox.ini b/tox.ini
index 70fa6af..d2931fc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py25,py26,py27,pypy,py32,py33
+envlist = py25,py26,py27,pypy,py32,py33,lint
setenv =
PIP_USE_MIRRORS=1
[3/3] git commit: lint.
Posted by to...@apache.org.
lint.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/a54b7df5
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/a54b7df5
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/a54b7df5
Branch: refs/heads/trunk
Commit: a54b7df550bf9fea99dbe82b1f346fb5123974ee
Parents: 9c2a266
Author: Tomaz Muraus <to...@apache.org>
Authored: Tue Oct 29 20:15:49 2013 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Tue Oct 29 20:15:49 2013 +0100
----------------------------------------------------------------------
libcloud/test/dns/test_linode.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/a54b7df5/libcloud/test/dns/test_linode.py
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/test_linode.py b/libcloud/test/dns/test_linode.py
index b0995a7..7933a51 100644
--- a/libcloud/test/dns/test_linode.py
+++ b/libcloud/test/dns/test_linode.py
@@ -67,7 +67,7 @@ class LinodeTests(unittest.TestCase):
self.assertEqual(arecord.type, RecordType.A)
self.assertEqual(arecord.data, '127.0.0.1')
self.assertHasKeys(arecord.extra, ['protocol', 'ttl_sec', 'port',
- 'weight'])
+ 'weight'])
def test_list_records_zone_does_not_exist(self):
zone = self.driver.list_zones()[0]
[2/3] git commit: Issue LIBCLOUD-425: update api responses
Posted by to...@apache.org.
Issue LIBCLOUD-425: update api responses
update create.domain error api response
update create.resource api response
update domain.list api response
update resource.list api response
update resource.list api error response
update get_zone.json
update get_zone_does_not_exist.json
update get_record.json
update get_record_does_not_exist.json
update domain.update api response
update domain.resource.delete api response
update domain.resource.delete api error response
update domain.resource.update api response
awaiting some api error response bugfixes
update _avail_datacenters.json
update _avail_distributions.json
update _avail_linodeplans.json
update _batch.json
update _linode_ip_list.json
update _linode_list.json
jsonlint
update test values
update linode planids
fix keyerror
set_context for get_zone and get_record
flak8
Signed-off-by: Tomaz Muraus <to...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/9c2a2666
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/9c2a2666
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/9c2a2666
Branch: refs/heads/trunk
Commit: 9c2a26664fab52ee85d831b5f795ba62fbf344b1
Parents: 067e53f
Author: Jon Chen <bs...@voltaire.sh>
Authored: Sun Oct 27 12:45:09 2013 -0400
Committer: Tomaz Muraus <to...@apache.org>
Committed: Tue Oct 29 20:08:15 2013 +0100
----------------------------------------------------------------------
libcloud/common/linode.py | 18 +-
libcloud/dns/drivers/linode.py | 4 +
.../fixtures/linode/_avail_datacenters.json | 37 ++-
.../fixtures/linode/_avail_distributions.json | 247 +++++++++++++++-
.../compute/fixtures/linode/_avail_kernels.json | 290 +++++++++----------
.../fixtures/linode/_avail_linodeplans.json | 135 ++++++++-
.../test/compute/fixtures/linode/_batch.json | 23 +-
.../fixtures/linode/_linode_ip_list.json | 21 +-
.../compute/fixtures/linode/_linode_list.json | 34 ++-
libcloud/test/compute/test_linode.py | 6 +-
.../test/dns/fixtures/linode/create_domain.json | 12 +-
.../linode/create_domain_validation_error.json | 11 +-
.../dns/fixtures/linode/create_resource.json | 12 +-
.../test/dns/fixtures/linode/delete_domain.json | 12 +-
.../linode/delete_domain_does_not_exist.json | 11 +-
.../dns/fixtures/linode/delete_resource.json | 12 +-
.../linode/delete_resource_does_not_exist.json | 11 +-
.../test/dns/fixtures/linode/domain_list.json | 66 +++--
.../test/dns/fixtures/linode/get_record.json | 34 +--
.../linode/get_record_does_not_exist.json | 13 +-
libcloud/test/dns/fixtures/linode/get_zone.json | 38 +--
.../linode/get_zone_does_not_exist.json | 13 +-
.../test/dns/fixtures/linode/resource_list.json | 58 ++--
.../linode/resource_list_does_not_exist.json | 11 +-
.../test/dns/fixtures/linode/update_domain.json | 12 +-
.../dns/fixtures/linode/update_resource.json | 12 +-
libcloud/test/dns/test_linode.py | 28 +-
27 files changed, 860 insertions(+), 321 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/common/linode.py
----------------------------------------------------------------------
diff --git a/libcloud/common/linode.py b/libcloud/common/linode.py
index c999fcc..6947d0a 100644
--- a/libcloud/common/linode.py
+++ b/libcloud/common/linode.py
@@ -32,16 +32,14 @@ API_HOST = 'api.linode.com'
API_ROOT = '/'
# Constants that map a RAM figure to a PlanID (updated 6/28/10)
-LINODE_PLAN_IDS = {512: '1',
- 768: '2',
- 1024: '3',
- 1536: '4',
- 2048: '5',
- 4096: '6',
- 8192: '7',
- 12288: '8',
- 16384: '9',
- 20480: '10'}
+LINODE_PLAN_IDS = {1024: '1',
+ 2048: '3',
+ 4096: '5',
+ 8192: '6',
+ 16384: '7',
+ 24576: '8',
+ 32768: '9',
+ 40960: '10'}
class LinodeException(Exception):
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/dns/drivers/linode.py
----------------------------------------------------------------------
diff --git a/libcloud/dns/drivers/linode.py b/libcloud/dns/drivers/linode.py
index 0b29fe9..f0fdbdc 100644
--- a/libcloud/dns/drivers/linode.py
+++ b/libcloud/dns/drivers/linode.py
@@ -87,6 +87,8 @@ class LinodeDNSDriver(DNSDriver):
def get_zone(self, zone_id):
params = {'api_action': 'domain.list', 'DomainID': zone_id}
+ self.connection.set_context(context={'resource': 'zone',
+ 'id': zone_id})
data = self.connection.request(API_ROOT, params=params).objects[0]
zones = self._to_zones(data)
@@ -99,6 +101,8 @@ class LinodeDNSDriver(DNSDriver):
zone = self.get_zone(zone_id=zone_id)
params = {'api_action': 'domain.resource.list', 'DomainID': zone_id,
'ResourceID': record_id}
+ self.connection.set_context(context={'resource': 'record',
+ 'id': record_id})
data = self.connection.request(API_ROOT, params=params).objects[0]
records = self._to_records(items=data, zone=zone)
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/compute/fixtures/linode/_avail_datacenters.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/linode/_avail_datacenters.json b/libcloud/test/compute/fixtures/linode/_avail_datacenters.json
index 2f8a36c..eb16962 100644
--- a/libcloud/test/compute/fixtures/linode/_avail_datacenters.json
+++ b/libcloud/test/compute/fixtures/linode/_avail_datacenters.json
@@ -1 +1,36 @@
-{"ERRORARRAY":[],"ACTION":"avail.datacenters","DATA":[{"DATACENTERID":2,"LOCATION":"Dallas, TX, USA"},{"DATACENTERID":3,"LOCATION":"Fremont, CA, USA"},{"DATACENTERID":4,"LOCATION":"Atlanta, GA, USA"},{"DATACENTERID":6,"LOCATION":"Newark, NJ, USA"}]}
+{
+ "ERRORARRAY": [],
+ "DATA": [
+ {
+ "LOCATION": "Dallas, TX, USA",
+ "DATACENTERID": 2,
+ "ABBR": "dallas"
+ },
+ {
+ "LOCATION": "Fremont, CA, USA",
+ "DATACENTERID": 3,
+ "ABBR": "fremont"
+ },
+ {
+ "LOCATION": "Atlanta, GA, USA",
+ "DATACENTERID": 4,
+ "ABBR": "atlanta"
+ },
+ {
+ "LOCATION": "Newark, NJ, USA",
+ "DATACENTERID": 6,
+ "ABBR": "newark"
+ },
+ {
+ "LOCATION": "London, England, UK",
+ "DATACENTERID": 7,
+ "ABBR": "london"
+ },
+ {
+ "LOCATION": "Tokyo, JP",
+ "DATACENTERID": 8,
+ "ABBR": "tokyo"
+ }
+ ],
+ "ACTION": "avail.datacenters"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/compute/fixtures/linode/_avail_distributions.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/linode/_avail_distributions.json b/libcloud/test/compute/fixtures/linode/_avail_distributions.json
index e2dbd0c..f1bdee6 100644
--- a/libcloud/test/compute/fixtures/linode/_avail_distributions.json
+++ b/libcloud/test/compute/fixtures/linode/_avail_distributions.json
@@ -1 +1,246 @@
-{"ERRORARRAY":[],"ACTION":"avail.distributions","DATA":[{"REQUIRESPVOPSKERNEL":0,"IS64BIT":0,"LABEL":"Arch Linux 2007.08","MINIMAGESIZE":436,"DISTRIBUTIONID":38,"CREATE_DT":"2007-10-24 00:00:00.0"},{"REQUIRESPVOPSKERNEL":0,"IS64BIT":0,"LABEL":"Centos 5.0","MINIMAGESIZE":594,"DISTRIBUTIONID":32,"CREATE_DT":"2007-04-27 00:00:00.0"},{"REQUIRESPVOPSKERNEL":0,"IS64BIT":0,"LABEL":"Centos 5.2","MINIMAGESIZE":950,"DISTRIBUTIONID":46,"CREATE_DT":"2008-11-30 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"IS64BIT":1,"LABEL":"Centos 5.2 64bit","MINIMAGESIZE":980,"DISTRIBUTIONID":47,"CREATE_DT":"2008-11-30 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"IS64BIT":0,"LABEL":"Debian 4.0","MINIMAGESIZE":200,"DISTRIBUTIONID":28,"CREATE_DT":"2007-04-18 00:00:00.0"},{"REQUIRESPVOPSKERNEL":0,"IS64BIT":1,"LABEL":"Debian 4.0 64bit","MINIMAGESIZE":220,"DISTRIBUTIONID":48,"CREATE_DT":"2008-12-02 00:00:00.0"},{"REQUIRESPVOPSKERNEL":0,"IS64BIT":0,"LABEL":"Debian 5.0","MINIMAGESIZE":200,"DISTRIBUTIONID":50,"CREATE_DT":"2009-02
-19 00:00:00.0"},{"REQUIRESPVOPSKERNEL":0,"IS64BIT":1,"LABEL":"Debian 5.0 64bit","MINIMAGESIZE":300,"DISTRIBUTIONID":51,"CREATE_DT":"2009-02-19 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"IS64BIT":0,"LABEL":"Fedora 8","MINIMAGESIZE":740,"DISTRIBUTIONID":40,"CREATE_DT":"2007-11-09 00:00:00.0"},{"REQUIRESPVOPSKERNEL":0,"IS64BIT":0,"LABEL":"Fedora 9","MINIMAGESIZE":1175,"DISTRIBUTIONID":43,"CREATE_DT":"2008-06-09 15:15:21.0"},{"REQUIRESPVOPSKERNEL":1,"IS64BIT":0,"LABEL":"Gentoo 2007.0","MINIMAGESIZE":1800,"DISTRIBUTIONID":35,"CREATE_DT":"2007-08-29 00:00:00.0"},{"REQUIRESPVOPSKERNEL":0,"IS64BIT":0,"LABEL":"Gentoo 2008.0","MINIMAGESIZE":1500,"DISTRIBUTIONID":52,"CREATE_DT":"2009-03-20 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"IS64BIT":1,"LABEL":"Gentoo 2008.0 64bit","MINIMAGESIZE":2500,"DISTRIBUTIONID":53,"CREATE_DT":"2009-04-04 00:00:00.0"},{"REQUIRESPVOPSKERNEL":0,"IS64BIT":0,"LABEL":"OpenSUSE 11.0","MINIMAGESIZE":850,"DISTRIBUTIONID":44,"CREATE_DT":"2008-08-21 08:32:16.0"},{"REQUIRESPVOPSKER
NEL":0,"IS64BIT":0,"LABEL":"Slackware 12.0","MINIMAGESIZE":315,"DISTRIBUTIONID":34,"CREATE_DT":"2007-07-16 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"IS64BIT":0,"LABEL":"Slackware 12.2","MINIMAGESIZE":500,"DISTRIBUTIONID":54,"CREATE_DT":"2009-04-04 00:00:00.0"},{"REQUIRESPVOPSKERNEL":0,"IS64BIT":0,"LABEL":"Ubuntu 8.04 LTS","MINIMAGESIZE":400,"DISTRIBUTIONID":41,"CREATE_DT":"2008-04-23 15:11:29.0"},{"REQUIRESPVOPSKERNEL":0,"IS64BIT":1,"LABEL":"Ubuntu 8.04 LTS 64bit","MINIMAGESIZE":350,"DISTRIBUTIONID":42,"CREATE_DT":"2008-06-03 12:51:11.0"},{"REQUIRESPVOPSKERNEL":0,"IS64BIT":0,"LABEL":"Ubuntu 8.10","MINIMAGESIZE":220,"DISTRIBUTIONID":45,"CREATE_DT":"2008-10-30 23:23:03.0"},{"REQUIRESPVOPSKERNEL":1,"IS64BIT":1,"LABEL":"Ubuntu 8.10 64bit","MINIMAGESIZE":230,"DISTRIBUTIONID":49,"CREATE_DT":"2008-12-02 00:00:00.0"},{"REQUIRESPVOPSKERNEL":0,"IS64BIT":0,"LABEL":"Ubuntu 9.04","MINIMAGESIZE":350,"DISTRIBUTIONID":55,"CREATE_DT":"2009-04-23 00:00:00.0"},{"REQUIRESPVOPSKERNEL":0,"IS64BIT":1,"LABEL"
:"Ubuntu 9.04 64bit","MINIMAGESIZE":350,"DISTRIBUTIONID":56,"CREATE_DT":"2009-04-23 00:00:00.0"}]}
+{
+ "ERRORARRAY": [],
+ "DATA": [
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 112,
+ "IS64BIT": 1,
+ "LABEL": "Arch Linux 2013.06",
+ "MINIMAGESIZE": 500,
+ "CREATE_DT": "2013-06-06 02:45:11.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 89,
+ "IS64BIT": 1,
+ "LABEL": "CentOS 6.2",
+ "MINIMAGESIZE": 800,
+ "CREATE_DT": "2011-07-19 11:38:20.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 78,
+ "IS64BIT": 1,
+ "LABEL": "Debian 6",
+ "MINIMAGESIZE": 550,
+ "CREATE_DT": "2011-02-08 16:54:31.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 109,
+ "IS64BIT": 1,
+ "LABEL": "Debian 7",
+ "MINIMAGESIZE": 660,
+ "CREATE_DT": "2013-05-08 11:31:32.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 114,
+ "IS64BIT": 1,
+ "LABEL": "Fedora 19",
+ "MINIMAGESIZE": 750,
+ "CREATE_DT": "2013-08-26 15:29:21.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 53,
+ "IS64BIT": 1,
+ "LABEL": "Gentoo",
+ "MINIMAGESIZE": 1000,
+ "CREATE_DT": "2009-04-04 00:00:00.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 115,
+ "IS64BIT": 1,
+ "LABEL": "openSUSE 12.3",
+ "MINIMAGESIZE": 1024,
+ "CREATE_DT": "2013-09-19 10:49:09.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 87,
+ "IS64BIT": 1,
+ "LABEL": "Slackware 13.37",
+ "MINIMAGESIZE": 600,
+ "CREATE_DT": "2011-06-05 15:11:59.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 65,
+ "IS64BIT": 1,
+ "LABEL": "Ubuntu 10.04 LTS",
+ "MINIMAGESIZE": 450,
+ "CREATE_DT": "2010-04-29 00:00:00.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 99,
+ "IS64BIT": 1,
+ "LABEL": "Ubuntu 12.04 LTS",
+ "MINIMAGESIZE": 600,
+ "CREATE_DT": "2012-04-26 17:25:16.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 111,
+ "IS64BIT": 1,
+ "LABEL": "Ubuntu 13.04",
+ "MINIMAGESIZE": 770,
+ "CREATE_DT": "2013-05-08 11:31:32.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 113,
+ "IS64BIT": 0,
+ "LABEL": "Arch Linux 2013.06 32bit",
+ "MINIMAGESIZE": 500,
+ "CREATE_DT": "2013-06-06 02:45:11.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 88,
+ "IS64BIT": 0,
+ "LABEL": "CentOS 6.2 32bit",
+ "MINIMAGESIZE": 800,
+ "CREATE_DT": "2011-07-19 11:38:20.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 77,
+ "IS64BIT": 0,
+ "LABEL": "Debian 6 32bit",
+ "MINIMAGESIZE": 550,
+ "CREATE_DT": "2011-02-08 16:54:31.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 108,
+ "IS64BIT": 0,
+ "LABEL": "Debian 7 32bit",
+ "MINIMAGESIZE": 660,
+ "CREATE_DT": "2013-05-08 11:31:32.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 72,
+ "IS64BIT": 0,
+ "LABEL": "Gentoo 32bit",
+ "MINIMAGESIZE": 1000,
+ "CREATE_DT": "2010-09-13 00:00:00.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 86,
+ "IS64BIT": 0,
+ "LABEL": "Slackware 13.37 32bit",
+ "MINIMAGESIZE": 600,
+ "CREATE_DT": "2011-06-05 15:11:59.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 64,
+ "IS64BIT": 0,
+ "LABEL": "Ubuntu 10.04 LTS 32bit",
+ "MINIMAGESIZE": 450,
+ "CREATE_DT": "2010-04-29 00:00:00.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 98,
+ "IS64BIT": 0,
+ "LABEL": "Ubuntu 12.04 LTS 32bit",
+ "MINIMAGESIZE": 600,
+ "CREATE_DT": "2012-04-26 17:25:16.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 110,
+ "IS64BIT": 0,
+ "LABEL": "Ubuntu 13.04 32bit",
+ "MINIMAGESIZE": 770,
+ "CREATE_DT": "2013-05-08 11:31:32.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 105,
+ "IS64BIT": 1,
+ "LABEL": "Arch Linux 2012.10",
+ "MINIMAGESIZE": 500,
+ "CREATE_DT": "2012-10-22 15:00:49.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 60,
+ "IS64BIT": 1,
+ "LABEL": "CentOS 5.6 64bit",
+ "MINIMAGESIZE": 950,
+ "CREATE_DT": "2009-08-17 00:00:00.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 100,
+ "IS64BIT": 1,
+ "LABEL": "Fedora 17",
+ "MINIMAGESIZE": 800,
+ "CREATE_DT": "2012-05-31 16:03:49.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 97,
+ "IS64BIT": 1,
+ "LABEL": "openSUSE 12.1",
+ "MINIMAGESIZE": 1000,
+ "CREATE_DT": "2012-04-13 11:43:30.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 107,
+ "IS64BIT": 1,
+ "LABEL": "Ubuntu 12.10",
+ "MINIMAGESIZE": 660,
+ "CREATE_DT": "2012-11-06 11:51:25.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 104,
+ "IS64BIT": 0,
+ "LABEL": "Arch Linux 2012.10 32bit",
+ "MINIMAGESIZE": 500,
+ "CREATE_DT": "2012-10-22 15:00:49.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 59,
+ "IS64BIT": 0,
+ "LABEL": "CentOS 5.6 32bit",
+ "MINIMAGESIZE": 950,
+ "CREATE_DT": "2009-08-17 00:00:00.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 101,
+ "IS64BIT": 0,
+ "LABEL": "Fedora 17 32bit",
+ "MINIMAGESIZE": 800,
+ "CREATE_DT": "2012-05-31 16:03:49.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 96,
+ "IS64BIT": 0,
+ "LABEL": "openSUSE 12.1 32bit",
+ "MINIMAGESIZE": 1000,
+ "CREATE_DT": "2012-04-13 11:43:30.0"
+ },
+ {
+ "REQUIRESPVOPSKERNEL": 1,
+ "DISTRIBUTIONID": 106,
+ "IS64BIT": 0,
+ "LABEL": "Ubuntu 12.10 32bit",
+ "MINIMAGESIZE": 660,
+ "CREATE_DT": "2012-11-06 11:51:25.0"
+ }
+ ],
+ "ACTION": "avail.distributions"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/compute/fixtures/linode/_avail_kernels.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/linode/_avail_kernels.json b/libcloud/test/compute/fixtures/linode/_avail_kernels.json
index 9d0ad8d..9552c46 100644
--- a/libcloud/test/compute/fixtures/linode/_avail_kernels.json
+++ b/libcloud/test/compute/fixtures/linode/_avail_kernels.json
@@ -1,146 +1,146 @@
{
- "ERRORARRAY": [],
- "ACTION": "avail.kernels",
- "DATA": [
- {
- "LABEL": "Latest 2.6 Stable (2.6.18.8-linode19)",
- "ISXEN": 1,
- "KERNELID": 60
- },
- {
- "LABEL": "2.6.18.8-linode19",
- "ISXEN": 1,
- "KERNELID": 103
- },
- {
- "LABEL": "2.6.30.5-linode20",
- "ISXEN": 1,
- "KERNELID": 105
- },
- {
- "LABEL": "Latest 2.6 Stable (2.6.18.8-x86_64-linode7)",
- "ISXEN": 1,
- "KERNELID": 107
- },
- {
- "LABEL": "2.6.18.8-x86_64-linode7",
- "ISXEN": 1,
- "KERNELID": 104
- },
- {
- "LABEL": "2.6.30.5-x86_64-linode8",
- "ISXEN": 1,
- "KERNELID": 106
- },
- {
- "LABEL": "pv-grub-x86_32",
- "ISXEN": 1,
- "KERNELID": 92
- },
- {
- "LABEL": "pv-grub-x86_64",
- "ISXEN": 1,
- "KERNELID": 95
- },
- {
- "LABEL": "Recovery - Finnix (kernel)",
- "ISXEN": 1,
- "KERNELID": 61
- },
- {
- "LABEL": "2.6.18.8-domU-linode7",
- "ISXEN": 1,
- "KERNELID": 81
- },
- {
- "LABEL": "2.6.18.8-linode10",
- "ISXEN": 1,
- "KERNELID": 89
- },
- {
- "LABEL": "2.6.18.8-linode16",
- "ISXEN": 1,
- "KERNELID": 98
- },
- {
- "LABEL": "2.6.24.4-linode8",
- "ISXEN": 1,
- "KERNELID": 84
- },
- {
- "LABEL": "2.6.25-linode9",
- "ISXEN": 1,
- "KERNELID": 88
- },
- {
- "LABEL": "2.6.25.10-linode12",
- "ISXEN": 1,
- "KERNELID": 90
- },
- {
- "LABEL": "2.6.26-linode13",
- "ISXEN": 1,
- "KERNELID": 91
- },
- {
- "LABEL": "2.6.27.4-linode14",
- "ISXEN": 1,
- "KERNELID": 93
- },
- {
- "LABEL": "2.6.28-linode15",
- "ISXEN": 1,
- "KERNELID": 96
- },
- {
- "LABEL": "2.6.28.3-linode17",
- "ISXEN": 1,
- "KERNELID": 99
- },
- {
- "LABEL": "2.6.29-linode18",
- "ISXEN": 1,
- "KERNELID": 101
- },
- {
- "LABEL": "2.6.16.38-x86_64-linode2",
- "ISXEN": 1,
- "KERNELID": 85
- },
- {
- "LABEL": "2.6.18.8-x86_64-linode1",
- "ISXEN": 1,
- "KERNELID": 86
- },
- {
- "LABEL": "2.6.27.4-x86_64-linode3",
- "ISXEN": 1,
- "KERNELID": 94
- },
- {
- "LABEL": "2.6.28-x86_64-linode4",
- "ISXEN": 1,
- "KERNELID": 97
- },
- {
- "LABEL": "2.6.28.3-x86_64-linode5",
- "ISXEN": 1,
- "KERNELID": 100
- },
- {
- "LABEL": "2.6.29-x86_64-linode6",
- "ISXEN": 1,
- "KERNELID": 102
- },
- {
- "LABEL": "3.9.3-x86-linode52",
- "ISXEN": 1,
- "KERNELID": 137
- },
- {
- "LABEL": "3.9.3-x86_64-linode33",
- "ISXEN": 1,
- "KERNELID": 138
- }
- ]
-}
+ "ERRORARRAY": [],
+ "ACTION": "avail.kernels",
+ "DATA": [
+ {
+ "LABEL": "Latest 2.6 Stable (2.6.18.8-linode19)",
+ "ISXEN": 1,
+ "KERNELID": 60
+ },
+ {
+ "LABEL": "2.6.18.8-linode19",
+ "ISXEN": 1,
+ "KERNELID": 103
+ },
+ {
+ "LABEL": "2.6.30.5-linode20",
+ "ISXEN": 1,
+ "KERNELID": 105
+ },
+ {
+ "LABEL": "Latest 2.6 Stable (2.6.18.8-x86_64-linode7)",
+ "ISXEN": 1,
+ "KERNELID": 107
+ },
+ {
+ "LABEL": "2.6.18.8-x86_64-linode7",
+ "ISXEN": 1,
+ "KERNELID": 104
+ },
+ {
+ "LABEL": "2.6.30.5-x86_64-linode8",
+ "ISXEN": 1,
+ "KERNELID": 106
+ },
+ {
+ "LABEL": "pv-grub-x86_32",
+ "ISXEN": 1,
+ "KERNELID": 92
+ },
+ {
+ "LABEL": "pv-grub-x86_64",
+ "ISXEN": 1,
+ "KERNELID": 95
+ },
+ {
+ "LABEL": "Recovery - Finnix (kernel)",
+ "ISXEN": 1,
+ "KERNELID": 61
+ },
+ {
+ "LABEL": "2.6.18.8-domU-linode7",
+ "ISXEN": 1,
+ "KERNELID": 81
+ },
+ {
+ "LABEL": "2.6.18.8-linode10",
+ "ISXEN": 1,
+ "KERNELID": 89
+ },
+ {
+ "LABEL": "2.6.18.8-linode16",
+ "ISXEN": 1,
+ "KERNELID": 98
+ },
+ {
+ "LABEL": "2.6.24.4-linode8",
+ "ISXEN": 1,
+ "KERNELID": 84
+ },
+ {
+ "LABEL": "2.6.25-linode9",
+ "ISXEN": 1,
+ "KERNELID": 88
+ },
+ {
+ "LABEL": "2.6.25.10-linode12",
+ "ISXEN": 1,
+ "KERNELID": 90
+ },
+ {
+ "LABEL": "2.6.26-linode13",
+ "ISXEN": 1,
+ "KERNELID": 91
+ },
+ {
+ "LABEL": "2.6.27.4-linode14",
+ "ISXEN": 1,
+ "KERNELID": 93
+ },
+ {
+ "LABEL": "2.6.28-linode15",
+ "ISXEN": 1,
+ "KERNELID": 96
+ },
+ {
+ "LABEL": "2.6.28.3-linode17",
+ "ISXEN": 1,
+ "KERNELID": 99
+ },
+ {
+ "LABEL": "2.6.29-linode18",
+ "ISXEN": 1,
+ "KERNELID": 101
+ },
+ {
+ "LABEL": "2.6.16.38-x86_64-linode2",
+ "ISXEN": 1,
+ "KERNELID": 85
+ },
+ {
+ "LABEL": "2.6.18.8-x86_64-linode1",
+ "ISXEN": 1,
+ "KERNELID": 86
+ },
+ {
+ "LABEL": "2.6.27.4-x86_64-linode3",
+ "ISXEN": 1,
+ "KERNELID": 94
+ },
+ {
+ "LABEL": "2.6.28-x86_64-linode4",
+ "ISXEN": 1,
+ "KERNELID": 97
+ },
+ {
+ "LABEL": "2.6.28.3-x86_64-linode5",
+ "ISXEN": 1,
+ "KERNELID": 100
+ },
+ {
+ "LABEL": "2.6.29-x86_64-linode6",
+ "ISXEN": 1,
+ "KERNELID": 102
+ },
+ {
+ "LABEL": "3.9.3-x86-linode52",
+ "ISXEN": 1,
+ "KERNELID": 137
+ },
+ {
+ "LABEL": "3.9.3-x86_64-linode33",
+ "ISXEN": 1,
+ "KERNELID": 138
+ }
+ ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/compute/fixtures/linode/_avail_linodeplans.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/linode/_avail_linodeplans.json b/libcloud/test/compute/fixtures/linode/_avail_linodeplans.json
index 37036d6..4248425 100644
--- a/libcloud/test/compute/fixtures/linode/_avail_linodeplans.json
+++ b/libcloud/test/compute/fixtures/linode/_avail_linodeplans.json
@@ -1 +1,134 @@
-{"ERRORARRAY":[],"ACTION":"avail.linodeplans","DATA":[{"AVAIL":{"2":27,"3":0,"4":0,"6":0},"DISK":16,"PRICE":19.95,"PLANID":1,"LABEL":"Linode 360","RAM":360,"XFER":200},{"AVAIL":{"2":0,"3":0,"4":0,"6":0},"DISK":24,"PRICE":29.95,"PLANID":2,"LABEL":"Linode 512","RAM":512,"XFER":300},{"AVAIL":{"2":0,"3":0,"4":0,"6":0},"DISK":32,"PRICE":39.95,"PLANID":3,"LABEL":"Linode 720","RAM":720,"XFER":400},{"AVAIL":{"2":0,"3":0,"4":0,"6":0},"DISK":48,"PRICE":59.95,"PLANID":4,"LABEL":"Linode 1080","RAM":1080,"XFER":600},{"AVAIL":{"2":0,"3":0,"4":0,"6":0},"DISK":64,"PRICE":79.95,"PLANID":5,"LABEL":"Linode 1440","RAM":1440,"XFER":800},{"AVAIL":{"2":0,"3":0,"4":0,"6":0},"DISK":128,"PRICE":159.95,"PLANID":6,"LABEL":"Linode 2880","RAM":2880,"XFER":1600},{"AVAIL":{"2":0,"3":0,"4":0,"6":0},"DISK":256,"PRICE":319.95,"PLANID":7,"LABEL":"Linode 5760","RAM":5760,"XFER":2000},{"AVAIL":{"2":0,"3":0,"4":0,"6":0},"DISK":384,"PRICE":479.95,"PLANID":8,"LABEL":"Linode 8640","RAM":8640,"XFER":2000},{"AVAIL":{"2":0,"3"
:0,"4":0,"6":0},"DISK":512,"PRICE":639.95,"PLANID":9,"LABEL":"Linode 11520","RAM":11520,"XFER":2000},{"AVAIL":{"2":0,"3":0,"4":0,"6":0},"DISK":640,"PRICE":799.95,"PLANID":10,"LABEL":"Linode 14400","RAM":14400,"XFER":2000}]}
+{
+ "ERRORARRAY": [],
+ "DATA": [
+ {
+ "PRICE": 20,
+ "RAM": 1024,
+ "XFER": 2000,
+ "PLANID": 1,
+ "LABEL": "Linode 1024",
+ "AVAIL": {
+ "2": 500,
+ "3": 500,
+ "4": 500,
+ "6": 500,
+ "7": 500,
+ "8": 500
+ },
+ "DISK": 48
+ },
+ {
+ "PRICE": 40,
+ "RAM": 2048,
+ "XFER": 4000,
+ "PLANID": 3,
+ "LABEL": "Linode 2048",
+ "AVAIL": {
+ "2": 500,
+ "3": 500,
+ "4": 500,
+ "6": 500,
+ "7": 500,
+ "8": 500
+ },
+ "DISK": 96
+ },
+ {
+ "PRICE": 80,
+ "RAM": 4096,
+ "XFER": 8000,
+ "PLANID": 5,
+ "LABEL": "Linode 4096",
+ "AVAIL": {
+ "2": 500,
+ "3": 500,
+ "4": 500,
+ "6": 500,
+ "7": 500,
+ "8": 500
+ },
+ "DISK": 192
+ },
+ {
+ "PRICE": 160,
+ "RAM": 8192,
+ "XFER": 16000,
+ "PLANID": 6,
+ "LABEL": "Linode 8192",
+ "AVAIL": {
+ "2": 500,
+ "3": 500,
+ "4": 500,
+ "6": 500,
+ "7": 500,
+ "8": 500
+ },
+ "DISK": 384
+ },
+ {
+ "PRICE": 320,
+ "RAM": 16384,
+ "XFER": 20000,
+ "PLANID": 7,
+ "LABEL": "Linode 16384",
+ "AVAIL": {
+ "2": 500,
+ "3": 500,
+ "4": 500,
+ "6": 500,
+ "7": 500,
+ "8": 500
+ },
+ "DISK": 768
+ },
+ {
+ "PRICE": 480,
+ "RAM": 24576,
+ "XFER": 20000,
+ "PLANID": 8,
+ "LABEL": "Linode 24576",
+ "AVAIL": {
+ "2": 500,
+ "3": 500,
+ "4": 500,
+ "6": 500,
+ "7": 500,
+ "8": 500
+ },
+ "DISK": 1152
+ },
+ {
+ "PRICE": 640,
+ "RAM": 32768,
+ "XFER": 20000,
+ "PLANID": 9,
+ "LABEL": "Linode 32768",
+ "AVAIL": {
+ "2": 500,
+ "3": 500,
+ "4": 500,
+ "6": 500,
+ "7": 500,
+ "8": 500
+ },
+ "DISK": 1536
+ },
+ {
+ "PRICE": 800,
+ "RAM": 40960,
+ "XFER": 20000,
+ "PLANID": 10,
+ "LABEL": "Linode 40960",
+ "AVAIL": {
+ "2": 500,
+ "3": 500,
+ "4": 500,
+ "6": 500,
+ "7": 500,
+ "8": 500
+ },
+ "DISK": 1920
+ }
+ ],
+ "ACTION": "avail.linodeplans"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/compute/fixtures/linode/_batch.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/linode/_batch.json b/libcloud/test/compute/fixtures/linode/_batch.json
index 3567259..36e28f9 100644
--- a/libcloud/test/compute/fixtures/linode/_batch.json
+++ b/libcloud/test/compute/fixtures/linode/_batch.json
@@ -1 +1,22 @@
-[{"ACTION": "linode.ip.list", "DATA": [{"RDNS_NAME": "li22-54.members.linode.com", "ISPUBLIC": 1, "IPADDRESS": "75.127.96.54", "IPADDRESSID": 5384, "LINODEID": 8098}, {"RDNS_NAME": "li22-245.members.linode.com", "ISPUBLIC": 1, "IPADDRESS": "75.127.96.245", "IPADDRESSID": 5575, "LINODEID": 8098}], "ERRORARRAY": []}]
+[
+ {
+ "ERRORARRAY": [],
+ "DATA": [
+ {
+ "IPADDRESSID": 5384,
+ "RDNS_NAME": "li22-54.members.linode.com",
+ "LINODEID": 8098,
+ "ISPUBLIC": 1,
+ "IPADDRESS": "66.228.43.47"
+ },
+ {
+ "IPADDRESSID": 5575,
+ "RDNS_NAME": "li22-245.members.linode.com",
+ "LINODEID": 8098,
+ "ISPUBLIC": 1,
+ "IPADDRESS": "75.127.96.245"
+ }
+ ],
+ "ACTION": "linode.ip.list"
+ }
+]
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/compute/fixtures/linode/_linode_ip_list.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/linode/_linode_ip_list.json b/libcloud/test/compute/fixtures/linode/_linode_ip_list.json
index 53b8e91..33a969c 100644
--- a/libcloud/test/compute/fixtures/linode/_linode_ip_list.json
+++ b/libcloud/test/compute/fixtures/linode/_linode_ip_list.json
@@ -1 +1,20 @@
-{"ACTION": "linode.ip.list", "DATA": [{"RDNS_NAME": "li22-54.members.linode.com", "ISPUBLIC": 1, "IPADDRESS": "75.127.96.54", "IPADDRESSID": 5384, "LINODEID": 8098}, {"RDNS_NAME": "li22-245.members.linode.com", "ISPUBLIC": 1, "IPADDRESS": "75.127.96.245", "IPADDRESSID": 5575, "LINODEID": 8098}], "ERRORARRAY": []}
+{
+ "ACTION": "linode.ip.list",
+ "DATA": [
+ {
+ "IPADDRESS": "66.228.43.47",
+ "IPADDRESSID": 5384,
+ "ISPUBLIC": 1,
+ "LINODEID": 8098,
+ "RDNS_NAME": "li22-54.members.linode.com"
+ },
+ {
+ "IPADDRESS": "75.127.96.245",
+ "IPADDRESSID": 5575,
+ "ISPUBLIC": 1,
+ "LINODEID": 8098,
+ "RDNS_NAME": "li22-245.members.linode.com"
+ }
+ ],
+ "ERRORARRAY": []
+}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/compute/fixtures/linode/_linode_list.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/linode/_linode_list.json b/libcloud/test/compute/fixtures/linode/_linode_list.json
index 93311e5..4f21714 100644
--- a/libcloud/test/compute/fixtures/linode/_linode_list.json
+++ b/libcloud/test/compute/fixtures/linode/_linode_list.json
@@ -1 +1,33 @@
-{"ACTION": "linode.list", "DATA": [{"ALERT_DISKIO_ENABLED": 1, "BACKUPWEEKLYDAY": 0, "LABEL": "api-node3", "DATACENTERID": 5, "ALERT_BWOUT_ENABLED": 1, "ALERT_CPU_THRESHOLD": 10, "TOTALHD": 100, "ALERT_BWQUOTA_THRESHOLD": 81, "ALERT_BWQUOTA_ENABLED": 1, "TOTALXFER": 200, "STATUS": 2, "ALERT_BWIN_ENABLED": 1, "ALERT_BWIN_THRESHOLD": 5, "ALERT_DISKIO_THRESHOLD": 200, "WATCHDOG": 1, "LINODEID": 8098, "BACKUPWINDOW": 1, "TOTALRAM": 512, "LPM_DISPLAYGROUP": "", "ALERT_BWOUT_THRESHOLD": 5, "BACKUPSENABLED": 1, "ALERT_CPU_ENABLED": 1}], "ERRORARRAY": []}
+{
+ "ERRORARRAY": [],
+ "DATA": [
+ {
+ "ALERT_CPU_ENABLED": 1,
+ "ALERT_BWIN_ENABLED": 1,
+ "ALERT_BWQUOTA_ENABLED": 1,
+ "BACKUPWINDOW": 0,
+ "ALERT_DISKIO_THRESHOLD": 1000,
+ "DISTRIBUTIONVENDOR": "Debian",
+ "WATCHDOG": 1,
+ "DATACENTERID": 6,
+ "STATUS": 1,
+ "ALERT_DISKIO_ENABLED": 1,
+ "CREATE_DT": "2012-05-04 19:31:30.0",
+ "TOTALHD": 98304,
+ "ALERT_BWQUOTA_THRESHOLD": 80,
+ "TOTALRAM": 2048,
+ "ALERT_BWIN_THRESHOLD": 5,
+ "LINODEID": 8098,
+ "ALERT_BWOUT_THRESHOLD": 5,
+ "ALERT_BWOUT_ENABLED": 1,
+ "BACKUPSENABLED": 1,
+ "ALERT_CPU_THRESHOLD": 90,
+ "PLANID": "3",
+ "BACKUPWEEKLYDAY": 0,
+ "LABEL": "api-node3",
+ "LPM_DISPLAYGROUP": "test",
+ "TOTALXFER": 4000
+ }
+ ],
+ "ACTION": "linode.list"
+}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/compute/test_linode.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_linode.py b/libcloud/test/compute/test_linode.py
index 39cf814..b332878 100644
--- a/libcloud/test/compute/test_linode.py
+++ b/libcloud/test/compute/test_linode.py
@@ -43,7 +43,7 @@ class LinodeTest(unittest.TestCase, TestCaseMixin):
node = nodes[0]
self.assertEqual(node.id, "8098")
self.assertEqual(node.name, 'api-node3')
- self.assertEqual(node.extra['PLANID'], '1')
+ self.assertEqual(node.extra['PLANID'], '3')
self.assertTrue('75.127.96.245' in node.public_ips)
self.assertEqual(node.private_ips, [])
@@ -77,13 +77,13 @@ class LinodeTest(unittest.TestCase, TestCaseMixin):
def test_list_sizes(self):
sizes = self.driver.list_sizes()
- self.assertEqual(len(sizes), 10)
+ self.assertEqual(len(sizes), 8)
for size in sizes:
self.assertEqual(size.ram, int(size.name.split(" ")[1]))
def test_list_images(self):
images = self.driver.list_images()
- self.assertEqual(len(images), 22)
+ self.assertEqual(len(images), 30)
def test_create_node_response(self):
# should return a node object
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/create_domain.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/create_domain.json b/libcloud/test/dns/fixtures/linode/create_domain.json
index 566cfa2..a9eef97 100644
--- a/libcloud/test/dns/fixtures/linode/create_domain.json
+++ b/libcloud/test/dns/fixtures/linode/create_domain.json
@@ -1,7 +1,7 @@
{
- "ERRORARRAY":[],
- "ACTION":"domain.create",
- "DATA":{
- "DomainID":5123
- }
-}
+ "ERRORARRAY": [],
+ "ACTION": "domain.create",
+ "DATA": {
+ "DomainID": 5094
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/create_domain_validation_error.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/create_domain_validation_error.json b/libcloud/test/dns/fixtures/linode/create_domain_validation_error.json
index 5a9be30..3c70597 100644
--- a/libcloud/test/dns/fixtures/linode/create_domain_validation_error.json
+++ b/libcloud/test/dns/fixtures/linode/create_domain_validation_error.json
@@ -1 +1,10 @@
-{"ERRORARRAY":[{"ERRORCODE":2,"ERRORMESSAGE":"The domain 'test.foo3455.net' already exists in our database. Please open a ticket if you think this is in error."},{"ERRORCODE":2,"ERRORMESSAGE":"Invalid domain type."}],"DATA":{},"ACTION":"domain.create"}
+{
+ "ERRORARRAY": [
+ {
+ "ERRORCODE": 8,
+ "ERRORMESSAGE": "The domain 'linode.com' already exists in our database. Please open a ticket if you think this is in error."
+ }
+ ],
+ "DATA": {},
+ "ACTION": "domain.create"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/create_resource.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/create_resource.json b/libcloud/test/dns/fixtures/linode/create_resource.json
index 78f3e69..0fa3738 100644
--- a/libcloud/test/dns/fixtures/linode/create_resource.json
+++ b/libcloud/test/dns/fixtures/linode/create_resource.json
@@ -1,7 +1,7 @@
{
- "ERRORARRAY":[],
- "ACTION":"domain.resource.create",
- "DATA":{
- "ResourceID":28537
- }
-}
+ "ERRORARRAY": [],
+ "DATA": {
+ "ResourceID": 3585100
+ },
+ "ACTION": "domain.resource.create"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/delete_domain.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/delete_domain.json b/libcloud/test/dns/fixtures/linode/delete_domain.json
index 4c580d5..ff39a38 100644
--- a/libcloud/test/dns/fixtures/linode/delete_domain.json
+++ b/libcloud/test/dns/fixtures/linode/delete_domain.json
@@ -1,7 +1,7 @@
{
- "ERRORARRAY":[],
- "ACTION":"domain.delete",
- "DATA":{
- "DomainID":5123
- }
-}
+ "ERRORARRAY": [],
+ "ACTION": "domain.delete",
+ "DATA": {
+ "DomainID": 5123
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/delete_domain_does_not_exist.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/delete_domain_does_not_exist.json b/libcloud/test/dns/fixtures/linode/delete_domain_does_not_exist.json
index 5c1d402..8965baa 100644
--- a/libcloud/test/dns/fixtures/linode/delete_domain_does_not_exist.json
+++ b/libcloud/test/dns/fixtures/linode/delete_domain_does_not_exist.json
@@ -1 +1,10 @@
-{"ERRORARRAY":[{"ERRORCODE":5,"ERRORMESSAGE":"Object not found"}],"DATA":{},"ACTION":"domain.delete"}
+{
+ "ERRORARRAY": [
+ {
+ "ERRORCODE": 5,
+ "ERRORMESSAGE": "Object not found"
+ }
+ ],
+ "DATA": {},
+ "ACTION": "domain.delete"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/delete_resource.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/delete_resource.json b/libcloud/test/dns/fixtures/linode/delete_resource.json
index 0f73816..7f7af2a 100644
--- a/libcloud/test/dns/fixtures/linode/delete_resource.json
+++ b/libcloud/test/dns/fixtures/linode/delete_resource.json
@@ -1,7 +1,7 @@
{
- "ERRORARRAY":[],
- "ACTION":"domain.delete",
- "DATA":{
- "ResourceID":5123
- }
-}
+ "ERRORARRAY": [],
+ "DATA": {
+ "ResourceID": 3585141
+ },
+ "ACTION": "domain.resource.delete"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/delete_resource_does_not_exist.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/delete_resource_does_not_exist.json b/libcloud/test/dns/fixtures/linode/delete_resource_does_not_exist.json
index 3b90911..b6969aa 100644
--- a/libcloud/test/dns/fixtures/linode/delete_resource_does_not_exist.json
+++ b/libcloud/test/dns/fixtures/linode/delete_resource_does_not_exist.json
@@ -1 +1,10 @@
-{"ERRORARRAY":[{"ERRORCODE":5,"ERRORMESSAGE":"Object not found"}],"DATA":{},"ACTION":"domain.resource.delete"}
+{
+ "ERRORARRAY": [
+ {
+ "ERRORCODE": 5,
+ "ERRORMESSAGE": "Object not found"
+ }
+ ],
+ "DATA": {},
+ "ACTION": "domain.resource.delete"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/domain_list.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/domain_list.json b/libcloud/test/dns/fixtures/linode/domain_list.json
index 437d32b..ac88b9b 100644
--- a/libcloud/test/dns/fixtures/linode/domain_list.json
+++ b/libcloud/test/dns/fixtures/linode/domain_list.json
@@ -1,32 +1,36 @@
{
- "ERRORARRAY":[],
- "ACTION":"domain.list",
- "DATA":[
- {
- "DOMAINID":5093,
- "DESCRIPTION":"",
- "TYPE":"master",
- "STATUS":1,
- "SOA_EMAIL":"dns@example.com",
- "DOMAIN":"linode.com",
- "RETRY_SEC":0,
- "MASTER_IPS":"",
- "EXPIRE_SEC":0,
- "REFRESH_SEC":0,
- "TTL_SEC":0
- },
- {
- "DOMAINID":5125,
- "DESCRIPTION":"",
- "TYPE":"slave",
- "STATUS":1,
- "SOA_EMAIL":"",
- "DOMAIN":"nodefs.com",
- "RETRY_SEC":0,
- "MASTER_IPS":"1.3.5.7;2.4.6.8;",
- "EXPIRE_SEC":0,
- "REFRESH_SEC":0,
- "TTL_SEC":0
- }
- ]
-}
+ "ERRORARRAY": [],
+ "ACTION": "domain.list",
+ "DATA": [
+ {
+ "DOMAINID": 5093,
+ "DESCRIPTION": "",
+ "EXPIRE_SEC": 0,
+ "RETRY_SEC": 0,
+ "STATUS": 1,
+ "LPM_DISPLAYGROUP": "thing",
+ "MASTER_IPS": "",
+ "REFRESH_SEC": 0,
+ "SOA_EMAIL": "dns@example.com",
+ "TTL_SEC": 0,
+ "DOMAIN": "linode.com",
+ "AXFR_IPS": "none",
+ "TYPE": "master"
+ },
+ {
+ "DOMAINID": 5094,
+ "DESCRIPTION": "",
+ "EXPIRE_SEC": 0,
+ "RETRY_SEC": 0,
+ "STATUS": 1,
+ "LPM_DISPLAYGROUP": "",
+ "MASTER_IPS": "2600:3c03::f03c:91ff:feae:e071;66.228.43.47;",
+ "REFRESH_SEC": 0,
+ "SOA_EMAIL": "",
+ "TTL_SEC": 0,
+ "DOMAIN": "0.c.d.7.0.6.0.f.1.0.7.4.0.1.0.0.2.ip6.arpa",
+ "AXFR_IPS": "2600:3c03::f03c:91ff:feae:e071;66.228.43.47;",
+ "TYPE": "slave"
+ }
+ ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/get_record.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/get_record.json b/libcloud/test/dns/fixtures/linode/get_record.json
index ce050e3..4d5b0eb 100644
--- a/libcloud/test/dns/fixtures/linode/get_record.json
+++ b/libcloud/test/dns/fixtures/linode/get_record.json
@@ -1,18 +1,18 @@
{
- "ERRORARRAY":[],
- "ACTION":"domain.resource.list",
- "DATA":[
- {
- "PROTOCOL":"",
- "TTL_SEC":0,
- "PRIORITY":0,
- "TYPE":"A",
- "TARGET":"75.127.96.245",
- "WEIGHT":0,
- "RESOURCEID":28536,
- "PORT":0,
- "DOMAINID":5093,
- "NAME":"www"
- }
- ]
-}
+ "ERRORARRAY": [],
+ "DATA": [
+ {
+ "DOMAINID": 5093,
+ "PORT": 80,
+ "RESOURCEID": 3585100,
+ "NAME": "www",
+ "WEIGHT": 5,
+ "TTL_SEC": 0,
+ "TARGET": "127.0.0.1",
+ "PRIORITY": 10,
+ "PROTOCOL": "",
+ "TYPE": "a"
+ }
+ ],
+ "ACTION": "domain.resource.list"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/get_record_does_not_exist.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/get_record_does_not_exist.json b/libcloud/test/dns/fixtures/linode/get_record_does_not_exist.json
index 33438c3..c2c1fb4 100644
--- a/libcloud/test/dns/fixtures/linode/get_record_does_not_exist.json
+++ b/libcloud/test/dns/fixtures/linode/get_record_does_not_exist.json
@@ -1,5 +1,10 @@
{
- "ERRORARRAY":[],
- "ACTION":"domain.resource.list",
- "DATA":[]
-}
+ "ERRORARRAY": [
+ {
+ "ERRORCODE": 5,
+ "ERRORMESSAGE": "Object not found"
+ }
+ ],
+ "DATA": {},
+ "ACTION": "domain.resource.list"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/get_zone.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/get_zone.json b/libcloud/test/dns/fixtures/linode/get_zone.json
index 61215ff..e938712 100644
--- a/libcloud/test/dns/fixtures/linode/get_zone.json
+++ b/libcloud/test/dns/fixtures/linode/get_zone.json
@@ -1,19 +1,21 @@
{
- "ERRORARRAY":[],
- "ACTION":"domain.list",
- "DATA":[
- {
- "DOMAINID":5093,
- "DESCRIPTION":"",
- "TYPE":"master",
- "STATUS":1,
- "SOA_EMAIL":"dns@example.com",
- "DOMAIN":"linode.com",
- "RETRY_SEC":0,
- "MASTER_IPS":"",
- "EXPIRE_SEC":0,
- "REFRESH_SEC":0,
- "TTL_SEC":0
- }
- ]
-}
+ "ERRORARRAY": [],
+ "DATA": [
+ {
+ "DOMAINID": 5093,
+ "DESCRIPTION": "",
+ "EXPIRE_SEC": 0,
+ "RETRY_SEC": 0,
+ "STATUS": 1,
+ "LPM_DISPLAYGROUP": "thing",
+ "MASTER_IPS": "",
+ "REFRESH_SEC": 0,
+ "SOA_EMAIL": "dns@example.com",
+ "TTL_SEC": 0,
+ "DOMAIN": "linode.com",
+ "AXFR_IPS": "none",
+ "TYPE": "master"
+ }
+ ],
+ "ACTION": "domain.list"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/get_zone_does_not_exist.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/get_zone_does_not_exist.json b/libcloud/test/dns/fixtures/linode/get_zone_does_not_exist.json
index d6424b5..ea18547 100644
--- a/libcloud/test/dns/fixtures/linode/get_zone_does_not_exist.json
+++ b/libcloud/test/dns/fixtures/linode/get_zone_does_not_exist.json
@@ -1,5 +1,10 @@
{
- "ERRORARRAY":[],
- "ACTION":"domain.list",
- "DATA":[]
-}
+ "ERRORARRAY": [
+ {
+ "ERRORCODE": 5,
+ "ERRORMESSAGE": "Object not found"
+ }
+ ],
+ "DATA": {},
+ "ACTION": "domain.list"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/resource_list.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/resource_list.json b/libcloud/test/dns/fixtures/linode/resource_list.json
index a6bf13b..2ed18cd 100644
--- a/libcloud/test/dns/fixtures/linode/resource_list.json
+++ b/libcloud/test/dns/fixtures/linode/resource_list.json
@@ -1,30 +1,30 @@
{
- "ERRORARRAY":[],
- "ACTION":"domain.resource.list",
- "DATA":[
- {
- "PROTOCOL":"",
- "TTL_SEC":0,
- "PRIORITY":0,
- "TYPE":"A",
- "TARGET":"75.127.96.245",
- "WEIGHT":0,
- "RESOURCEID":28536,
- "PORT":0,
- "DOMAINID":5093,
- "NAME":"www"
- },
- {
- "PROTOCOL":"",
- "TTL_SEC":0,
- "PRIORITY":0,
- "TYPE":"A",
- "TARGET":"75.127.96.245",
- "WEIGHT":0,
- "RESOURCEID":28537,
- "PORT":0,
- "DOMAINID":5093,
- "NAME":"mail"
- }
- ]
-}
+ "ERRORARRAY": [],
+ "DATA": [
+ {
+ "DOMAINID": 5093,
+ "PORT": 80,
+ "RESOURCEID": 3585100,
+ "NAME": "mc",
+ "WEIGHT": 5,
+ "TTL_SEC": 0,
+ "TARGET": "127.0.0.1",
+ "PRIORITY": 10,
+ "PROTOCOL": "",
+ "TYPE": "a"
+ },
+ {
+ "DOMAINID": 5093,
+ "PORT": 25565,
+ "RESOURCEID": 3585141,
+ "NAME": "_minecraft._udp",
+ "WEIGHT": 5,
+ "TTL_SEC": 0,
+ "TARGET": "mc.linode.com",
+ "PRIORITY": 10,
+ "PROTOCOL": "udp",
+ "TYPE": "srv"
+ }
+ ],
+ "ACTION": "domain.resource.list"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/resource_list_does_not_exist.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/resource_list_does_not_exist.json b/libcloud/test/dns/fixtures/linode/resource_list_does_not_exist.json
index fe11275..c2c1fb4 100644
--- a/libcloud/test/dns/fixtures/linode/resource_list_does_not_exist.json
+++ b/libcloud/test/dns/fixtures/linode/resource_list_does_not_exist.json
@@ -1 +1,10 @@
-{"ERRORARRAY":[{"ERRORCODE":5,"ERRORMESSAGE":"Object not found"}],"DATA":{},"ACTION":"domain.resource.list"}
+{
+ "ERRORARRAY": [
+ {
+ "ERRORCODE": 5,
+ "ERRORMESSAGE": "Object not found"
+ }
+ ],
+ "DATA": {},
+ "ACTION": "domain.resource.list"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/update_domain.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/update_domain.json b/libcloud/test/dns/fixtures/linode/update_domain.json
index a66b227..f695f4c 100644
--- a/libcloud/test/dns/fixtures/linode/update_domain.json
+++ b/libcloud/test/dns/fixtures/linode/update_domain.json
@@ -1,7 +1,7 @@
{
- "ERRORARRAY":[],
- "ACTION":"domain.update",
- "DATA":{
- "DomainID":5093
- }
-}
+ "ERRORARRAY": [],
+ "DATA": {
+ "DomainID": 5093
+ },
+ "ACTION": "domain.update"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/fixtures/linode/update_resource.json
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/fixtures/linode/update_resource.json b/libcloud/test/dns/fixtures/linode/update_resource.json
index bcf0a85..7f88aab 100644
--- a/libcloud/test/dns/fixtures/linode/update_resource.json
+++ b/libcloud/test/dns/fixtures/linode/update_resource.json
@@ -1,7 +1,7 @@
{
- "ERRORARRAY":[],
- "ACTION":"domain.resource.update",
- "DATA":{
- "ResourceID":28537
- }
-}
+ "ERRORARRAY": [],
+ "DATA": {
+ "ResourceID": 3585100
+ },
+ "ACTION": "domain.resource.update"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9c2a2666/libcloud/test/dns/test_linode.py
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/test_linode.py b/libcloud/test/dns/test_linode.py
index b688130..b0995a7 100644
--- a/libcloud/test/dns/test_linode.py
+++ b/libcloud/test/dns/test_linode.py
@@ -61,12 +61,12 @@ class LinodeTests(unittest.TestCase):
records = self.driver.list_records(zone=zone)
self.assertEqual(len(records), 2)
- record = records[0]
- self.assertEqual(record.id, '28536')
- self.assertEqual(record.name, 'www')
- self.assertEqual(record.type, RecordType.A)
- self.assertEqual(record.data, '75.127.96.245')
- self.assertHasKeys(record.extra, ['protocol', 'ttl_sec', 'port',
+ arecord = records[0]
+ self.assertEqual(arecord.id, '3585100')
+ self.assertEqual(arecord.name, 'mc')
+ self.assertEqual(arecord.type, RecordType.A)
+ self.assertEqual(arecord.data, '127.0.0.1')
+ self.assertHasKeys(arecord.extra, ['protocol', 'ttl_sec', 'port',
'weight'])
def test_list_records_zone_does_not_exist(self):
@@ -104,11 +104,11 @@ class LinodeTests(unittest.TestCase):
def test_get_record_success(self):
LinodeMockHttp.type = 'GET_RECORD'
- record = self.driver.get_record(zone_id='1234', record_id='28536')
- self.assertEqual(record.id, '28536')
+ record = self.driver.get_record(zone_id='1234', record_id='3585100')
+ self.assertEqual(record.id, '3585100')
self.assertEqual(record.name, 'www')
self.assertEqual(record.type, RecordType.A)
- self.assertEqual(record.data, '75.127.96.245')
+ self.assertEqual(record.data, '127.0.0.1')
self.assertHasKeys(record.extra, ['protocol', 'ttl_sec', 'port',
'weight'])
@@ -116,7 +116,7 @@ class LinodeTests(unittest.TestCase):
LinodeMockHttp.type = 'GET_RECORD_ZONE_DOES_NOT_EXIST'
try:
- self.driver.get_record(zone_id='444', record_id='28536')
+ self.driver.get_record(zone_id='444', record_id='3585100')
except ZoneDoesNotExistError:
pass
else:
@@ -126,7 +126,7 @@ class LinodeTests(unittest.TestCase):
LinodeMockHttp.type = 'GET_RECORD_RECORD_DOES_NOT_EXIST'
try:
- self.driver.get_record(zone_id='4441', record_id='28536')
+ self.driver.get_record(zone_id='4441', record_id='3585100')
except RecordDoesNotExistError:
pass
else:
@@ -135,7 +135,7 @@ class LinodeTests(unittest.TestCase):
def test_create_zone_success(self):
zone = self.driver.create_zone(domain='foo.bar.com', type='master',
ttl=None, extra=None)
- self.assertEqual(zone.id, '5123')
+ self.assertEqual(zone.id, '5094')
self.assertEqual(zone.domain, 'foo.bar.com')
def test_create_zone_validaton_error(self):
@@ -173,7 +173,7 @@ class LinodeTests(unittest.TestCase):
record = self.driver.create_record(name='www', zone=zone,
type=RecordType.A, data='127.0.0.1')
- self.assertEqual(record.id, '28537')
+ self.assertEqual(record.id, '3585100')
self.assertEqual(record.name, 'www')
self.assertEqual(record.zone, zone)
self.assertEqual(record.type, RecordType.A)
@@ -186,7 +186,7 @@ class LinodeTests(unittest.TestCase):
type=RecordType.AAAA,
data='::1')
- self.assertEqual(record.data, '75.127.96.245')
+ self.assertEqual(record.data, '127.0.0.1')
self.assertEqual(updated_record.id, record.id)
self.assertEqual(updated_record.name, 'www')