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 2012/03/03 01:06:30 UTC
svn commit: r1296520 - in /libcloud/trunk: CHANGES
libcloud/compute/drivers/openstack.py
test/compute/fixtures/openstack/300_multiple_choices.json
test/compute/fixtures/openstack_v1.1/_images_detail.json
test/compute/test_openstack.py
Author: tomaz
Date: Sat Mar 3 00:06:30 2012
New Revision: 1296520
URL: http://svn.apache.org/viewvc?rev=1296520&view=rev
Log:
Add serverId attribute to the NodeImage object extra dictionary in the
OpenStack driver. This patch has been contributed by Mark Everett and is part of
GITHUB-61.
Added:
libcloud/trunk/test/compute/fixtures/openstack/300_multiple_choices.json
Modified:
libcloud/trunk/CHANGES
libcloud/trunk/libcloud/compute/drivers/openstack.py
libcloud/trunk/test/compute/fixtures/openstack_v1.1/_images_detail.json
libcloud/trunk/test/compute/test_openstack.py
Modified: libcloud/trunk/CHANGES
URL: http://svn.apache.org/viewvc/libcloud/trunk/CHANGES?rev=1296520&r1=1296519&r2=1296520&view=diff
==============================================================================
--- libcloud/trunk/CHANGES (original)
+++ libcloud/trunk/CHANGES Sat Mar 3 00:06:30 2012
@@ -42,6 +42,10 @@ Changes with Apache Libcloud in developm
(Toronto) locations. ; GITHUB-53
[Jaime Irurzun]
+ - Add serverId attribute to the NodeImage object extra dictionary in the
+ OpenStack driver.
+ [Mark Everett]
+
*) Storage:
- Don't lowercase special header names in the Amazon S3 storage driver. ;
Modified: libcloud/trunk/libcloud/compute/drivers/openstack.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/openstack.py?rev=1296520&r1=1296519&r2=1296520&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/openstack.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/openstack.py Sat Mar 3 00:06:30 2012
@@ -843,6 +843,7 @@ class OpenStack_1_1_NodeDriver(OpenStack
return images
def _to_image(self, api_image):
+ server = api_image.get('server', {})
return NodeImage(
id=api_image['id'],
name=api_image['name'],
@@ -853,6 +854,7 @@ class OpenStack_1_1_NodeDriver(OpenStack
status=api_image['status'],
progress=api_image.get('progress'),
metadata=api_image.get('metadata'),
+ serverId=server.get('id'),
)
)
Added: libcloud/trunk/test/compute/fixtures/openstack/300_multiple_choices.json
URL: http://svn.apache.org/viewvc/libcloud/trunk/test/compute/fixtures/openstack/300_multiple_choices.json?rev=1296520&view=auto
==============================================================================
--- libcloud/trunk/test/compute/fixtures/openstack/300_multiple_choices.json (added)
+++ libcloud/trunk/test/compute/fixtures/openstack/300_multiple_choices.json Sat Mar 3 00:06:30 2012
@@ -0,0 +1,7 @@
+{"choices": [{"status": "CURRENT", "media-types": [{"base":
+"application/xml", "type":
+"application/vnd.openstack.compute+xml;version=2"}, {"base":
+"application/json", "type":
+"application/vnd.openstack.compute+json;version=2"}], "id": "v2.0",
+"links": [{"href": "http://50.56.213.226:8774/v2/v2.0/images/detail",
+"rel": "self"}]}]}
Modified: libcloud/trunk/test/compute/fixtures/openstack_v1.1/_images_detail.json
URL: http://svn.apache.org/viewvc/libcloud/trunk/test/compute/fixtures/openstack_v1.1/_images_detail.json?rev=1296520&r1=1296519&r2=1296520&view=diff
==============================================================================
--- libcloud/trunk/test/compute/fixtures/openstack_v1.1/_images_detail.json (original)
+++ libcloud/trunk/test/compute/fixtures/openstack_v1.1/_images_detail.json Sat Mar 3 00:06:30 2012
@@ -1 +1,366 @@
-{"images": [{"status": "ACTIVE", "updated": "2011-08-06T18:14:02Z", "name": "Windows 2008 SP2 x86 (B24)", "links": [{"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/13", "rel": "self"}, {"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/13", "rel": "bookmark"}, {"href": "http://10.13.136.170:9292/rs-reach-project/images/13", "type": "application/vnd.openstack.image", "rel": "alternate"}], "created": "2011-08-06T18:13:11Z", "minDisk": 0, "progress": 100, "minRam": 0, "id": "13", "metadata": {"os_type": "windows"}}, {"status": "ACTIVE", "updated": "2011-08-06T18:13:11Z", "name": "Windows 2003 R2 x86 (B24)", "links": [{"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/12", "rel": "self"}, {"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/12", "rel": "bookmark"}, {"href": "http://10.13.136.170:9292/rs-reach-project/images/12
", "type": "application/vnd.openstack.image", "rel": "alternate"}], "created": "2011-08-06T18:12:33Z", "minDisk": 0, "progress": 100, "minRam": 0, "id": "12", "metadata": {"os_type": "windows"}}, {"status": "ACTIVE", "updated": "2011-08-06T16:27:56Z", "name": "Windows 2008 SP2 x64 (B24)", "links": [{"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/11", "rel": "self"}, {"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/11", "rel": "bookmark"}, {"href": "http://10.13.136.170:9292/rs-reach-project/images/11", "type": "application/vnd.openstack.image", "rel": "alternate"}], "created": "2011-08-06T16:26:15Z", "minDisk": 0, "progress": 100, "minRam": 0, "id": "11", "metadata": {"os_type": "windows"}}, {"status": "ACTIVE", "updated": "2011-08-06T16:26:14Z", "name": "Windows 2008 R2 x64 (B24)", "links": [{"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/10", "rel":
"self"}, {"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/10", "rel": "bookmark"}, {"href": "http://10.13.136.170:9292/rs-reach-project/images/10", "type": "application/vnd.openstack.image", "rel": "alternate"}], "created": "2011-08-06T16:24:51Z", "minDisk": 0, "progress": 100, "minRam": 0, "id": "10", "metadata": {"os_type": "windows"}}, {"status": "ACTIVE", "updated": "2011-08-06T16:24:51Z", "name": "Windows 2003 R2 x64 (B24)", "links": [{"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/9", "rel": "self"}, {"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/9", "rel": "bookmark"}, {"href": "http://10.13.136.170:9292/rs-reach-project/images/9", "type": "application/vnd.openstack.image", "rel": "alternate"}], "created": "2011-08-06T16:23:52Z", "minDisk": 0, "progress": 100, "minRam": 0, "id": "9", "metadata": {"os_type": "windows"}}, {"status": "ACTIVE", "updat
ed": "2011-08-05T22:58:29Z", "name": "Ubuntu Natty (11.04)", "links": [{"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/8", "rel": "self"}, {"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/8", "rel": "bookmark"}, {"href": "http://10.13.136.170:9292/rs-reach-project/images/8", "type": "application/vnd.openstack.image", "rel": "alternate"}], "created": "2011-08-05T22:58:20Z", "minDisk": 0, "progress": 100, "minRam": 0, "id": "8", "metadata": {}}, {"status": "ACTIVE", "updated": "2011-08-05T22:58:19Z", "name": "Ubuntu Lucid (10.04)", "links": [{"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/7", "rel": "self"}, {"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/7", "rel": "bookmark"}, {"href": "http://10.13.136.170:9292/rs-reach-project/images/7", "type": "application/vnd.openstack.image", "rel": "alternate"}], "created"
: "2011-08-05T22:58:14Z", "minDisk": 0, "progress": 100, "minRam": 0, "id": "7", "metadata": {}}, {"status": "ACTIVE", "updated": "2011-08-05T22:58:14Z", "name": "Fedora 15", "links": [{"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/6", "rel": "self"}, {"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/6", "rel": "bookmark"}, {"href": "http://10.13.136.170:9292/rs-reach-project/images/6", "type": "application/vnd.openstack.image", "rel": "alternate"}], "created": "2011-08-05T22:58:01Z", "minDisk": 0, "progress": 100, "minRam": 0, "id": "6", "metadata": {}}, {"status": "ACTIVE", "updated": "2011-08-05T22:58:00Z", "name": "Fedora 14", "links": [{"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/5", "rel": "self"}, {"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/5", "rel": "bookmark"}, {"href": "http://10.13.136.170:9292
/rs-reach-project/images/5", "type": "application/vnd.openstack.image", "rel": "alternate"}], "created": "2011-08-05T22:57:47Z", "minDisk": 0, "progress": 100, "minRam": 0, "id": "5", "metadata": {}}, {"status": "ACTIVE", "updated": "2011-08-05T22:57:47Z", "name": "Debian Squeeze (6.0)", "links": [{"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/4", "rel": "self"}, {"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/4", "rel": "bookmark"}, {"href": "http://10.13.136.170:9292/rs-reach-project/images/4", "type": "application/vnd.openstack.image", "rel": "alternate"}], "created": "2011-08-05T22:57:41Z", "minDisk": 0, "progress": 100, "minRam": 0, "id": "4", "metadata": {}}, {"status": "ACTIVE", "updated": "2011-08-05T22:57:40Z", "name": "Debian Lenny (5.0)", "links": [{"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/3", "rel": "self"}, {"href": "http://alpha.
ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/3", "rel": "bookmark"}, {"href": "http://10.13.136.170:9292/rs-reach-project/images/3", "type": "application/vnd.openstack.image", "rel": "alternate"}], "created": "2011-08-05T22:57:30Z", "minDisk": 0, "progress": 100, "minRam": 0, "id": "3", "metadata": {}}, {"status": "ACTIVE", "updated": "2011-08-05T22:57:30Z", "name": "CentOS 6.0", "links": [{"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/2", "rel": "self"}, {"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/2", "rel": "bookmark"}, {"href": "http://10.13.136.170:9292/rs-reach-project/images/2", "type": "application/vnd.openstack.image", "rel": "alternate"}], "created": "2011-08-05T22:57:20Z", "minDisk": 0, "progress": 100, "minRam": 0, "id": "2", "metadata": {}}, {"status": "ACTIVE", "updated": "2011-08-05T22:56:20Z", "name": "CentOS 5.6", "links": [{"href": "http://alpha.ord.ser
vers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/1", "rel": "self"}, {"href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/1", "rel": "bookmark"}, {"href": "http://10.13.136.170:9292/rs-reach-project/images/1", "type": "application/vnd.openstack.image", "rel": "alternate"}], "created": "2011-08-05T22:56:03Z", "minDisk": 0, "progress": 100, "minRam": 0, "id": "1", "metadata": {}}]}
\ No newline at end of file
+{
+ "images": [
+ {
+ "status": "ACTIVE",
+ "updated": "2011-08-06T18:14:02Z",
+ "name": "Windows 2008 SP2 x86 (B24)",
+ "server" : {
+ "id": "52415800-8b69-11e0-9b19-734f335aa7b3",
+ "name": "test-server",
+ "links": [
+ {
+ "rel": "self",
+ "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"
+ },
+ {
+ "rel": "bookmark",
+ "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"
+ }
+ ]
+ },
+ "links": [
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/13",
+ "rel": "self"
+ },
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/13",
+ "rel": "bookmark"
+ },
+ {
+ "href": "http://10.13.136.170:9292/rs-reach-project/images/13",
+ "type": "application/vnd.openstack.image",
+ "rel": "alternate"
+ }
+ ],
+ "created": "2011-08-06T18:13:11Z",
+ "minDisk": 0,
+ "progress": 100,
+ "minRam": 0,
+ "id": "13",
+ "metadata": {
+ "os_type": "windows"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2011-08-06T18:13:11Z",
+ "name": "Windows 2003 R2 x86 (B24)",
+ "links": [
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/12",
+ "rel": "self"
+ },
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/12",
+ "rel": "bookmark"
+ },
+ {
+ "href": "http://10.13.136.170:9292/rs-reach-project/images/12",
+ "type": "application/vnd.openstack.image",
+ "rel": "alternate"
+ }
+ ],
+ "created": "2011-08-06T18:12:33Z",
+ "minDisk": 0,
+ "progress": 100,
+ "minRam": 0,
+ "id": "12",
+ "metadata": {
+ "os_type": "windows"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2011-08-06T16:27:56Z",
+ "name": "Windows 2008 SP2 x64 (B24)",
+ "links": [
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/11",
+ "rel": "self"
+ },
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/11",
+ "rel": "bookmark"
+ },
+ {
+ "href": "http://10.13.136.170:9292/rs-reach-project/images/11",
+ "type": "application/vnd.openstack.image",
+ "rel": "alternate"
+ }
+ ],
+ "created": "2011-08-06T16:26:15Z",
+ "minDisk": 0,
+ "progress": 100,
+ "minRam": 0,
+ "id": "11",
+ "metadata": {
+ "os_type": "windows"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2011-08-06T16:26:14Z",
+ "name": "Windows 2008 R2 x64 (B24)",
+ "links": [
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/10",
+ "rel": "self"
+ },
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/10",
+ "rel": "bookmark"
+ },
+ {
+ "href": "http://10.13.136.170:9292/rs-reach-project/images/10",
+ "type": "application/vnd.openstack.image",
+ "rel": "alternate"
+ }
+ ],
+ "created": "2011-08-06T16:24:51Z",
+ "minDisk": 0,
+ "progress": 100,
+ "minRam": 0,
+ "id": "10",
+ "metadata": {
+ "os_type": "windows"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2011-08-06T16:24:51Z",
+ "name": "Windows 2003 R2 x64 (B24)",
+ "links": [
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/9",
+ "rel": "self"
+ },
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/9",
+ "rel": "bookmark"
+ },
+ {
+ "href": "http://10.13.136.170:9292/rs-reach-project/images/9",
+ "type": "application/vnd.openstack.image",
+ "rel": "alternate"
+ }
+ ],
+ "created": "2011-08-06T16:23:52Z",
+ "minDisk": 0,
+ "progress": 100,
+ "minRam": 0,
+ "id": "9",
+ "metadata": {
+ "os_type": "windows"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2011-08-05T22:58:29Z",
+ "name": "Ubuntu Natty (11.04)",
+ "links": [
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/8",
+ "rel": "self"
+ },
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/8",
+ "rel": "bookmark"
+ },
+ {
+ "href": "http://10.13.136.170:9292/rs-reach-project/images/8",
+ "type": "application/vnd.openstack.image",
+ "rel": "alternate"
+ }
+ ],
+ "created": "2011-08-05T22:58:20Z",
+ "minDisk": 0,
+ "progress": 100,
+ "minRam": 0,
+ "id": "8",
+ "metadata": {}
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2011-08-05T22:58:19Z",
+ "name": "Ubuntu Lucid (10.04)",
+ "links": [
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/7",
+ "rel": "self"
+ },
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/7",
+ "rel": "bookmark"
+ },
+ {
+ "href": "http://10.13.136.170:9292/rs-reach-project/images/7",
+ "type": "application/vnd.openstack.image",
+ "rel": "alternate"
+ }
+ ],
+ "created": "2011-08-05T22:58:14Z",
+ "minDisk": 0,
+ "progress": 100,
+ "minRam": 0,
+ "id": "7",
+ "metadata": {}
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2011-08-05T22:58:14Z",
+ "name": "Fedora 15",
+ "links": [
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/6",
+ "rel": "self"
+ },
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/6",
+ "rel": "bookmark"
+ },
+ {
+ "href": "http://10.13.136.170:9292/rs-reach-project/images/6",
+ "type": "application/vnd.openstack.image",
+ "rel": "alternate"
+ }
+ ],
+ "created": "2011-08-05T22:58:01Z",
+ "minDisk": 0,
+ "progress": 100,
+ "minRam": 0,
+ "id": "6",
+ "metadata": {}
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2011-08-05T22:58:00Z",
+ "name": "Fedora 14",
+ "links": [
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/5",
+ "rel": "self"
+ },
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/5",
+ "rel": "bookmark"
+ },
+ {
+ "href": "http://10.13.136.170:9292/rs-reach-project/images/5",
+ "type": "application/vnd.openstack.image",
+ "rel": "alternate"
+ }
+ ],
+ "created": "2011-08-05T22:57:47Z",
+ "minDisk": 0,
+ "progress": 100,
+ "minRam": 0,
+ "id": "5",
+ "metadata": {}
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2011-08-05T22:57:47Z",
+ "name": "Debian Squeeze (6.0)",
+ "links": [
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/4",
+ "rel": "self"
+ },
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/4",
+ "rel": "bookmark"
+ },
+ {
+ "href": "http://10.13.136.170:9292/rs-reach-project/images/4",
+ "type": "application/vnd.openstack.image",
+ "rel": "alternate"
+ }
+ ],
+ "created": "2011-08-05T22:57:41Z",
+ "minDisk": 0,
+ "progress": 100,
+ "minRam": 0,
+ "id": "4",
+ "metadata": {}
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2011-08-05T22:57:40Z",
+ "name": "Debian Lenny (5.0)",
+ "links": [
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/3",
+ "rel": "self"
+ },
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/3",
+ "rel": "bookmark"
+ },
+ {
+ "href": "http://10.13.136.170:9292/rs-reach-project/images/3",
+ "type": "application/vnd.openstack.image",
+ "rel": "alternate"
+ }
+ ],
+ "created": "2011-08-05T22:57:30Z",
+ "minDisk": 0,
+ "progress": 100,
+ "minRam": 0,
+ "id": "3",
+ "metadata": {}
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2011-08-05T22:57:30Z",
+ "name": "CentOS 6.0",
+ "links": [
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/2",
+ "rel": "self"
+ },
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/2",
+ "rel": "bookmark"
+ },
+ {
+ "href": "http://10.13.136.170:9292/rs-reach-project/images/2",
+ "type": "application/vnd.openstack.image",
+ "rel": "alternate"
+ }
+ ],
+ "created": "2011-08-05T22:57:20Z",
+ "minDisk": 0,
+ "progress": 100,
+ "minRam": 0,
+ "id": "2",
+ "metadata": {}
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2011-08-05T22:56:20Z",
+ "name": "CentOS 5.6",
+ "links": [
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/v1.1/rs-reach-project/images/1",
+ "rel": "self"
+ },
+ {
+ "href": "http://alpha.ord.servers.api.rackspacecloud.com:8774/rs-reach-project/images/1",
+ "rel": "bookmark"
+ },
+ {
+ "href": "http://10.13.136.170:9292/rs-reach-project/images/1",
+ "type": "application/vnd.openstack.image",
+ "rel": "alternate"
+ }
+ ],
+ "created": "2011-08-05T22:56:03Z",
+ "minDisk": 0,
+ "progress": 100,
+ "minRam": 0,
+ "id": "1",
+ "metadata": {}
+ }
+ ]
+}
Modified: libcloud/trunk/test/compute/test_openstack.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_openstack.py?rev=1296520&r1=1296519&r2=1296520&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_openstack.py (original)
+++ libcloud/trunk/test/compute/test_openstack.py Sat Mar 3 00:06:30 2012
@@ -601,6 +601,7 @@ class OpenStack_1_1_Tests(unittest.TestC
self.assertEqual(image.extra['created'], '2011-08-06T18:13:11Z')
self.assertEqual(image.extra['status'], 'ACTIVE')
self.assertEqual(image.extra['metadata']['os_type'], 'windows')
+ self.assertEqual(image.extra['serverId'], '52415800-8b69-11e0-9b19-734f335aa7b3')
def test_create_node(self):
image = NodeImage(id=11, name='Ubuntu 8.10 (intrepid)', driver=self.driver)
@@ -716,6 +717,7 @@ class OpenStack_1_1_Tests(unittest.TestC
image = self.driver.ex_get_image(image_id)
self.assertEqual(image.id, image_id)
self.assertEqual(image.name, 'Windows 2008 SP2 x86 (B24)')
+ self.assertEqual(image.extra['serverId'], None)
def test_ex_delete_image(self):
image = NodeImage(id='26365521-8c62-11f9-2c33-283d153ecc3a', name='My Backup', driver=self.driver)