ogle 0.2.2 → 0.2.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. data/README.md +2 -0
  2. data/lib/ogle/image.rb +3 -3
  3. data/lib/ogle/version.rb +1 -1
  4. data/ogle.gemspec +2 -2
  5. data/test/cassettes/{image_delete.yml → image_destroy.yml} +7 -7
  6. data/test/cassettes/image_find.yml +36 -36
  7. data/test/cassettes/images_all.yml +4 -31
  8. data/test/cassettes/images_all_with_details.yml +4 -31
  9. data/test/cassettes/images_find.yml +14 -81
  10. data/test/cassettes/images_runable.yml +4 -4
  11. data/test/cassettes/images_runable_with_details.yml +4 -4
  12. data/test/lib/ogle/image_test.rb +10 -10
  13. metadata +6 -4
data/README.md CHANGED
@@ -24,6 +24,8 @@ ruby 1.9.2
24
24
 
25
25
  ## Testing
26
26
 
27
+ Add gluster.trunk to your hosts file.
28
+
27
29
  $ bundle exec rake
28
30
 
29
31
  ## TODOs
data/lib/ogle/image.rb CHANGED
@@ -42,7 +42,7 @@ module Ogle
42
42
  # information.
43
43
 
44
44
  def all details = false
45
- path = details ? "/images/detail" : "/images"
45
+ path = details ? "/v1/images/detail" : "/v1/images"
46
46
 
47
47
  response = @connection.get path
48
48
 
@@ -57,7 +57,7 @@ module Ogle
57
57
  # +image_id+: A String representing an image_id.
58
58
 
59
59
  def find image_id
60
- response = @connection.head "/images/#{image_id}"
60
+ response = @connection.head "/v1/images/#{image_id}"
61
61
 
62
62
  ImageData.new(
63
63
  Hash.new.tap do |h|
@@ -91,7 +91,7 @@ module Ogle
91
91
  #
92
92
  # +image_id+: A String representing an image_id.
93
93
 
94
- def delete image_id
94
+ def destroy image_id
95
95
  response = @connection.delete "/images/#{image_id}"
96
96
  end
97
97
 
data/lib/ogle/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Ogle
2
- VERSION = "0.2.2"
2
+ VERSION = "0.2.3"
3
3
  end
data/ogle.gemspec CHANGED
@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
6
6
  s.name = "ogle"
7
7
  s.version = Ogle::VERSION
8
8
  s.platform = Gem::Platform::RUBY
9
- s.authors = ["Kevin Bringard"]
10
- s.email = ["kbringard@attinteractive.com"]
9
+ s.authors = ["Kevin Bringard", "John Dewey"]
10
+ s.email = ["kbringard@attinteractive.com", "john@dewey.ws"]
11
11
  s.homepage = %q{http://github.com/kevinbringard/ogle}
12
12
  s.summary = %q{Ruby interface for OpenStack Glance}
13
13
  s.description = %q{Exposes the API for OpenStack Glance. Go ahead and ogle, it's so much more than a glance.}
data/test/cassettes/{image_delete.yml → image_destroy.yml} RENAMED
@@ -2,7 +2,7 @@
2
2
  - !ruby/struct:VCR::HTTPInteraction
3
3
  request: !ruby/struct:VCR::Request
4
4
  method: :delete
5
- uri: http://10.3.170.32:9292/images/15
5
+ uri: http://gluster.trunk:9292/images/41
6
6
  body:
7
7
  headers:
8
8
  accept:
@@ -13,16 +13,16 @@
13
13
  - 30
14
14
  response: !ruby/struct:VCR::Response
15
15
  status: !ruby/struct:VCR::ResponseStatus
16
- code: 200
17
- message: OK
16
+ code: 300
17
+ message: Multiple Choices
18
18
  headers:
19
19
  content-type:
20
- - text/html; charset=UTF-8
20
+ - application/json
21
21
  content-length:
22
- - "0"
22
+ - "114"
23
23
  date:
24
- - Mon, 18 Apr 2011 13:48:38 GMT
24
+ - Sat, 28 May 2011 04:11:37 GMT
25
25
  connection:
26
26
  - keep-alive
27
- body:
27
+ body: "{\"versions\": [{\"status\": \"CURRENT\", \"id\": \"v1.0\", \"links\": [{\"href\": \"http://0.0.0.0:9292/v1/\", \"rel\": \"self\"}]}]}"
28
28
  http_version: "1.1"
data/test/cassettes/image_find.yml CHANGED
@@ -2,7 +2,7 @@
2
2
  - !ruby/struct:VCR::HTTPInteraction
3
3
  request: !ruby/struct:VCR::Request
4
4
  method: :head
5
- uri: http://10.3.170.32:9292/images/6
5
+ uri: http://gluster.trunk:9292/v1/images/4
6
6
  body:
7
7
  headers:
8
8
  accept:
@@ -21,47 +21,51 @@
21
21
  content-length:
22
22
  - "0"
23
23
  x-image-meta-property-distro:
24
- - CentOS
24
+ - Ubuntu
25
25
  x-image-meta-id:
26
- - "6"
26
+ - "4"
27
27
  x-image-meta-property-arch:
28
- - x86_64
28
+ - amd64
29
29
  x-image-meta-deleted:
30
30
  - "False"
31
31
  x-image-meta-container-format:
32
32
  - ami
33
+ x-image-meta-property-uploader:
34
+ - root@enc1b11
33
35
  x-image-meta-location:
34
- - file:///var/lib/glance/images/6
36
+ - file:///var/lib/glance/images/4
35
37
  x-image-meta-deleted-at:
36
38
  - ""
37
39
  x-image-meta-created-at:
38
- - 2011-04-11T21:04:51
40
+ - 2011-05-11T15:48:02
39
41
  x-image-meta-size:
40
- - "816906240"
42
+ - "1476395008"
41
43
  x-image-meta-status:
42
44
  - active
43
45
  x-image-meta-property-type:
44
46
  - machine
45
- x-image-meta-property-uploader:
46
- - root@cc-01
47
+ x-image-meta-property-kernel-name:
48
+ - natty-server-uec-amd64-vmlinuz-virtual
47
49
  x-image-meta-is-public:
48
50
  - "True"
51
+ x-image-meta-property-kernel-id:
52
+ - "3"
49
53
  x-image-meta-updated-at:
50
- - 2011-04-11T21:04:56
54
+ - 2011-05-11T15:48:08
51
55
  x-image-meta-checksum:
52
- - 6277381feb8708c393c64499a0ce7e1e
56
+ - b6149317c554d2c335365e7bd43e9bf0
53
57
  x-image-meta-property-version:
54
- - "5.5"
58
+ - "11.04"
55
59
  x-image-meta-disk-format:
56
60
  - ami
57
61
  x-image-meta-name:
58
- - CentOS5-5.5-Base_VM-032311-212432
62
+ - natty-server-uec-amd64.img
59
63
  location:
60
- - http://10.3.170.32:9292/images/6
64
+ - http://gluster.trunk:9292/v1/images/4
61
65
  etag:
62
- - 6277381feb8708c393c64499a0ce7e1e
66
+ - b6149317c554d2c335365e7bd43e9bf0
63
67
  date:
64
- - Thu, 21 Apr 2011 00:17:37 GMT
68
+ - Sat, 28 May 2011 02:32:55 GMT
65
69
  connection:
66
70
  - keep-alive
67
71
  body:
@@ -69,7 +73,7 @@
69
73
  - !ruby/struct:VCR::HTTPInteraction
70
74
  request: !ruby/struct:VCR::Request
71
75
  method: :head
72
- uri: http://10.3.170.32:9292/images/17
76
+ uri: http://gluster.trunk:9292/v1/images/36
73
77
  body:
74
78
  headers:
75
79
  accept:
@@ -88,51 +92,47 @@
88
92
  content-length:
89
93
  - "0"
90
94
  x-image-meta-property-distro:
91
- - Ubuntu
95
+ - CentOS
92
96
  x-image-meta-id:
93
- - "17"
97
+ - "36"
94
98
  x-image-meta-property-arch:
95
- - amd64
99
+ - x86_64
96
100
  x-image-meta-deleted:
97
101
  - "False"
98
102
  x-image-meta-container-format:
99
103
  - ami
100
- x-image-meta-property-uploader:
101
- - root@e21ab3
102
104
  x-image-meta-location:
103
- - file:///var/lib/glance/images/17
105
+ - file:///var/lib/glance/images/36
104
106
  x-image-meta-deleted-at:
105
107
  - ""
106
108
  x-image-meta-created-at:
107
- - 2011-04-18T17:08:02
109
+ - 2011-05-26T15:13:11
108
110
  x-image-meta-size:
109
- - "2610561024"
111
+ - "1430192128"
110
112
  x-image-meta-status:
111
113
  - active
112
114
  x-image-meta-property-type:
113
115
  - machine
114
- x-image-meta-property-kernel-name:
115
- - maverick-server-uec-amd64-vmlinuz-virtual
116
+ x-image-meta-property-uploader:
117
+ - root@enc1b11
116
118
  x-image-meta-is-public:
117
119
  - "True"
118
- x-image-meta-property-kernel-id:
119
- - "1"
120
120
  x-image-meta-updated-at:
121
- - 2011-04-18T17:08:32
121
+ - 2011-05-26T15:13:16
122
122
  x-image-meta-checksum:
123
- - c283810a95e1c8028cb22ca39f0fc40d
123
+ - 8731b6dcb85e7554cc69aeb8acc6ad09
124
124
  x-image-meta-property-version:
125
- - "10.10"
125
+ - "5.4"
126
126
  x-image-meta-disk-format:
127
127
  - ami
128
128
  x-image-meta-name:
129
- - maverick-server-uec-amd64-CloudFoundry
129
+ - CentOS-5.4-cloudinit
130
130
  location:
131
- - http://10.3.170.32:9292/images/17
131
+ - http://gluster.trunk:9292/v1/images/36
132
132
  etag:
133
- - c283810a95e1c8028cb22ca39f0fc40d
133
+ - 8731b6dcb85e7554cc69aeb8acc6ad09
134
134
  date:
135
- - Thu, 21 Apr 2011 00:17:37 GMT
135
+ - Sat, 28 May 2011 02:32:56 GMT
136
136
  connection:
137
137
  - keep-alive
138
138
  body:
data/test/cassettes/images_all.yml CHANGED
@@ -2,7 +2,7 @@
2
2
  - !ruby/struct:VCR::HTTPInteraction
3
3
  request: !ruby/struct:VCR::Request
4
4
  method: :get
5
- uri: http://10.1.170.33:9292/images
5
+ uri: http://gluster.trunk:9292/v1/images
6
6
  body:
7
7
  headers:
8
8
  accept:
@@ -19,37 +19,10 @@
19
19
  content-type:
20
20
  - text/html; charset=UTF-8
21
21
  content-length:
22
- - "1067"
22
+ - "1662"
23
23
  date:
24
- - Fri, 08 Apr 2011 17:56:53 GMT
24
+ - Sat, 28 May 2011 02:32:56 GMT
25
25
  connection:
26
26
  - keep-alive
27
- body: "{\"images\": [{\"name\": \"ttylinux-uec-amd64-12.1_2.6.35-22_1-initrd\", \"container_format\": \"ari\", \"disk_format\": \"ari\", \"checksum\": \"2d222d406f3ed30e03ed44123c33cba6\", \"id\": 1, \"size\": 5882349}, {\"name\": \"ttylinux-uec-amd64-12.1_2.6.35-22_1-vmlinuz\", \"container_format\": \"aki\", \"disk_format\": \"aki\", \"checksum\": \"3ed2965d3f8d877a3ee3e061fd648e9a\", \"id\": 2, \"size\": 4404752}, {\"name\": \"ttylinux-uec-amd64-12.1_2.6.35-22_1.img\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"10047a119149e08fb206eea89832eee0\", \"id\": 3, \"size\": 25165824}, {\"name\": \"CentOS5-5.5-Base_VM-032311-212432\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"6277381feb8708c393c64499a0ce7e1e\", \"id\": 4, \"size\": 816906240}, {\"name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"container_format\": \"aki\", \"disk_format\": \"aki\", \"checksum\": \"73152adae523a52d481f5150deb30356\", \"id\": 5, \"size\": 4408912}, {\"name\": \"maverick-server-uec-amd64.img\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"d511da81009517c53f36ff4e8602ff62\", \"id\": 6, \"size\": 1476395008}]}"
28
- http_version: "1.1"
29
- - !ruby/struct:VCR::HTTPInteraction
30
- request: !ruby/struct:VCR::Request
31
- method: :get
32
- uri: http://10.3.170.32:9292/images
33
- body:
34
- headers:
35
- accept:
36
- - application/json
37
- connection:
38
- - keep-alive
39
- keep-alive:
40
- - 30
41
- response: !ruby/struct:VCR::Response
42
- status: !ruby/struct:VCR::ResponseStatus
43
- code: 200
44
- message: OK
45
- headers:
46
- content-type:
47
- - text/html; charset=UTF-8
48
- content-length:
49
- - "1019"
50
- date:
51
- - Wed, 13 Apr 2011 22:32:26 GMT
52
- connection:
53
- - keep-alive
54
- body: "{\"images\": [{\"name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"container_format\": \"aki\", \"disk_format\": \"aki\", \"checksum\": \"73152adae523a52d481f5150deb30356\", \"id\": 1, \"size\": 4408912}, {\"name\": \"maverick-server-uec-amd64.img\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"d2d3b3049f897dff2f86295d5a9e879e\", \"id\": 2, \"size\": 1476395008}, {\"name\": \"CentOS5-5.5-Base_VM-032311-212432\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"6277381feb8708c393c64499a0ce7e1e\", \"id\": 6, \"size\": 816906240}, {\"name\": \"initrd.img-2.6.28-11-generic\", \"container_format\": \"ari\", \"disk_format\": \"ari\", \"checksum\": \"4ee1b2aa5c15472b41dafe39f4854aac\", \"id\": 7, \"size\": 8679404}, {\"name\": \"vmlinuz-2.6.28-11-generic\", \"container_format\": \"aki\", \"disk_format\": \"aki\", \"checksum\": \"d15243d1203d0aecf187ff969d6764ea\", \"id\": 8, \"size\": 3522336}, {\"name\": \"centos.5-3.x86-64.img\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"79523e49084752f61b49398b19831b23\", \"id\": 9, \"size\": 1049624576}]}"
27
+ body: "{\"images\": [{\"name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"container_format\": \"aki\", \"disk_format\": \"aki\", \"checksum\": \"83d999516352e8311f5ee9a314679b6c\", \"id\": 1, \"size\": 4408496}, {\"name\": \"maverick-server-uec-amd64.img\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"04845edf42118420a9d13a53186a5f59\", \"id\": 2, \"size\": 1476395008}, {\"name\": \"natty-server-uec-amd64-vmlinuz-virtual\", \"container_format\": \"aki\", \"disk_format\": \"aki\", \"checksum\": \"55c855957ae2ca4b476dabc26dbb1685\", \"id\": 3, \"size\": 4592768}, {\"name\": \"natty-server-uec-amd64.img\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"b6149317c554d2c335365e7bd43e9bf0\", \"id\": 4, \"size\": 1476395008}, {\"name\": \"Gateway-copy.img\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"86c2df3d9d60fe41577aca870ee89b41\", \"id\": 16, \"size\": 21474836480}, {\"name\": \"CentOS-5.4-cloudinit\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"8731b6dcb85e7554cc69aeb8acc6ad09\", \"id\": 36, \"size\": 1430192128}, {\"name\": \"OpenVPN_Cloudpipe-base-v1\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"396c52780d4624d574704cf578e7e7dd\", \"id\": 37, \"size\": 637403136}, {\"name\": \"OpenVPN_Cloudpipe-base-v1.1\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"50b799cc99724691129a95b44256c6e1\", \"id\": 38, \"size\": 637534208}, {\"name\": \"kvm1.img\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"0d36e66650833b38bba46da56a35820f\", \"id\": 41, \"size\": 20971520000}, {\"name\": \"CentOS-5.6-cloudinit\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"654fb40e9c3c2917a10b7475ce895e57\", \"id\": 48, \"size\": 2362245120}]}"
55
28
  http_version: "1.1"
data/test/cassettes/images_all_with_details.yml CHANGED
@@ -2,7 +2,7 @@
2
2
  - !ruby/struct:VCR::HTTPInteraction
3
3
  request: !ruby/struct:VCR::Request
4
4
  method: :get
5
- uri: http://10.1.170.33:9292/images/detail
5
+ uri: http://gluster.trunk:9292/v1/images/detail
6
6
  body:
7
7
  headers:
8
8
  accept:
@@ -19,37 +19,10 @@
19
19
  content-type:
20
20
  - text/html; charset=UTF-8
21
21
  content-length:
22
- - "3294"
22
+ - "5149"
23
23
  date:
24
- - Fri, 08 Apr 2011 17:56:53 GMT
24
+ - Sat, 28 May 2011 02:32:56 GMT
25
25
  connection:
26
26
  - keep-alive
27
- body: "{\"images\": [{\"status\": \"active\", \"name\": \"ttylinux-uec-amd64-12.1_2.6.35-22_1-initrd\", \"deleted\": false, \"container_format\": \"ari\", \"created_at\": \"2011-04-06T20:03:11.914270\", \"disk_format\": \"ari\", \"updated_at\": \"2011-04-06T20:03:12.206204\", \"id\": 1, \"location\": \"file:///var/lib/glance/images/1\", \"checksum\": \"2d222d406f3ed30e03ed44123c33cba6\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"amd64\", \"type\": \"ramdisk\", \"uploader\": \"root@e3ab3\", \"distro\": \"ttylinux\"}, \"size\": 5882349}, {\"status\": \"active\", \"name\": \"ttylinux-uec-amd64-12.1_2.6.35-22_1-vmlinuz\", \"deleted\": false, \"container_format\": \"aki\", \"created_at\": \"2011-04-06T20:03:12.585510\", \"disk_format\": \"aki\", \"updated_at\": \"2011-04-06T20:03:12.846637\", \"id\": 2, \"location\": \"file:///var/lib/glance/images/2\", \"checksum\": \"3ed2965d3f8d877a3ee3e061fd648e9a\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"amd64\", \"version\": \"2.5.35-22_1\", \"type\": \"kernel\", \"uploader\": \"root@e3ab3\", \"distro\": \"ttylinux\"}, \"size\": 4404752}, {\"status\": \"active\", \"name\": \"ttylinux-uec-amd64-12.1_2.6.35-22_1.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-04-06T20:03:13.227286\", \"disk_format\": \"ami\", \"updated_at\": \"2011-04-06T20:03:13.602220\", \"id\": 3, \"location\": \"file:///var/lib/glance/images/3\", \"checksum\": \"10047a119149e08fb206eea89832eee0\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"2\", \"arch\": \"amd64\", \"ramdisk_id\": \"1\", \"version\": \"1.0\", \"kernel_name\": \"ttylinux-uec-amd64-12.1_2.6.35-22_1-vmlinuz\", \"ramdisk_name\": \"ttylinux-uec-amd64-12.1_2.6.35-22_1-initrd\", \"uploader\": \"root@e3ab3\", \"type\": \"machine\", \"distro\": \"ttylinux\"}, \"size\": 25165824}, {\"status\": \"active\", \"name\": \"CentOS5-5.5-Base_VM-032311-212432\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-04-06T20:03:59.759260\", \"disk_format\": \"ami\", \"updated_at\": \"2011-04-06T20:04:04.498592\", \"id\": 4, \"location\": \"file:///var/lib/glance/images/4\", \"checksum\": \"6277381feb8708c393c64499a0ce7e1e\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"builder\": \"kevin\", \"version\": \"5.5\", \"uploader\": \"root@e3ab3\", \"type\": \"machine\", \"distro\": \"CentOS\"}, \"size\": 816906240}, {\"status\": \"active\", \"name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"deleted\": false, \"container_format\": \"aki\", \"created_at\": \"2011-04-06T20:04:47.984648\", \"disk_format\": \"aki\", \"updated_at\": \"2011-04-06T20:04:48.281538\", \"id\": 5, \"location\": \"file:///var/lib/glance/images/5\", \"checksum\": \"73152adae523a52d481f5150deb30356\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"amd64\", \"version\": \"2.6.32\", \"type\": \"kernel\", \"uploader\": \"root@e3ab3\", \"distro\": \"Ubuntu\"}, \"size\": 4408912}, {\"status\": \"active\", \"name\": \"maverick-server-uec-amd64.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-04-06T20:04:48.664176\", \"disk_format\": \"ami\", \"updated_at\": \"2011-04-06T20:04:57.042658\", \"id\": 6, \"location\": \"file:///var/lib/glance/images/6\", \"checksum\": \"d511da81009517c53f36ff4e8602ff62\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"5\", \"type\": \"machine\", \"version\": \"10.10\", \"kernel_name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"uploader\": \"root@e3ab3\", \"arch\": \"amd64\", \"distro\": \"Ubuntu\"}, \"size\": 1476395008}]}"
28
- http_version: "1.1"
29
- - !ruby/struct:VCR::HTTPInteraction
30
- request: !ruby/struct:VCR::Request
31
- method: :get
32
- uri: http://10.3.170.32:9292/images/detail
33
- body:
34
- headers:
35
- accept:
36
- - application/json
37
- connection:
38
- - keep-alive
39
- keep-alive:
40
- - 30
41
- response: !ruby/struct:VCR::Response
42
- status: !ruby/struct:VCR::ResponseStatus
43
- code: 200
44
- message: OK
45
- headers:
46
- content-type:
47
- - text/html; charset=UTF-8
48
- content-length:
49
- - "3113"
50
- date:
51
- - Wed, 13 Apr 2011 22:32:27 GMT
52
- connection:
53
- - keep-alive
54
- body: "{\"images\": [{\"status\": \"active\", \"name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"deleted\": false, \"container_format\": \"aki\", \"created_at\": \"2011-04-11T17:18:44\", \"disk_format\": \"aki\", \"updated_at\": \"2011-04-11T17:18:44\", \"id\": 1, \"location\": \"file:///var/lib/glance/images/1\", \"checksum\": \"73152adae523a52d481f5150deb30356\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"amd64\", \"version\": \"2.6.35\", \"type\": \"kernel\", \"uploader\": \"root@cc-01\", \"distro\": \"Ubuntu\"}, \"size\": 4408912}, {\"status\": \"active\", \"name\": \"maverick-server-uec-amd64.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-04-11T17:18:45\", \"disk_format\": \"ami\", \"updated_at\": \"2011-04-11T17:18:51\", \"id\": 2, \"location\": \"file:///var/lib/glance/images/2\", \"checksum\": \"d2d3b3049f897dff2f86295d5a9e879e\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"1\", \"type\": \"machine\", \"version\": \"10.10\", \"kernel_name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"uploader\": \"root@cc-01\", \"arch\": \"amd64\", \"distro\": \"Ubuntu\"}, \"size\": 1476395008}, {\"status\": \"active\", \"name\": \"CentOS5-5.5-Base_VM-032311-212432\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-04-11T21:04:51\", \"disk_format\": \"ami\", \"updated_at\": \"2011-04-11T21:04:56\", \"id\": 6, \"location\": \"file:///var/lib/glance/images/6\", \"checksum\": \"6277381feb8708c393c64499a0ce7e1e\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"version\": \"5.5\", \"type\": \"machine\", \"uploader\": \"root@cc-01\", \"distro\": \"CentOS\"}, \"size\": 816906240}, {\"status\": \"active\", \"name\": \"initrd.img-2.6.28-11-generic\", \"deleted\": false, \"container_format\": \"ari\", \"created_at\": \"2011-04-11T21:18:33\", \"disk_format\": \"ari\", \"updated_at\": \"2011-04-11T21:18:33\", \"id\": 7, \"location\": \"file:///var/lib/glance/images/7\", \"checksum\": \"4ee1b2aa5c15472b41dafe39f4854aac\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"type\": \"ramdisk\", \"uploader\": \"root@cc-01\", \"distro\": \"CentOS\"}, \"size\": 8679404}, {\"status\": \"active\", \"name\": \"vmlinuz-2.6.28-11-generic\", \"deleted\": false, \"container_format\": \"aki\", \"created_at\": \"2011-04-11T21:18:34\", \"disk_format\": \"aki\", \"updated_at\": \"2011-04-11T21:18:34\", \"id\": 8, \"location\": \"file:///var/lib/glance/images/8\", \"checksum\": \"d15243d1203d0aecf187ff969d6764ea\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"version\": \"2.6.28-11-generic\", \"type\": \"kernel\", \"uploader\": \"root@cc-01\", \"distro\": \"CentOS\"}, \"size\": 3522336}, {\"status\": \"active\", \"name\": \"centos.5-3.x86-64.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-04-11T21:18:34\", \"disk_format\": \"ami\", \"updated_at\": \"2011-04-11T21:18:39\", \"id\": 9, \"location\": \"file:///var/lib/glance/images/9\", \"checksum\": \"79523e49084752f61b49398b19831b23\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"8\", \"arch\": \"x86_64\", \"ramdisk_id\": \"7\", \"version\": \"5.3\", \"kernel_name\": \"vmlinuz-2.6.28-11-generic\", \"ramdisk_name\": \"initrd.img-2.6.28-11-generic\", \"uploader\": \"root@cc-01\", \"type\": \"machine\", \"distro\": \"CentOS\"}, \"size\": 1049624576}]}"
27
+ body: "{\"images\": [{\"status\": \"active\", \"name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"deleted\": false, \"container_format\": \"aki\", \"created_at\": \"2011-05-10T21:53:36\", \"disk_format\": \"aki\", \"updated_at\": \"2011-05-10T21:53:36\", \"id\": 1, \"location\": \"file:///var/lib/glance/images/1\", \"checksum\": \"83d999516352e8311f5ee9a314679b6c\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"amd64\", \"version\": \"2.5.35\", \"type\": \"kernel\", \"uploader\": \"root@enc1b11\", \"distro\": \"ubuntu\"}, \"size\": 4408496}, {\"status\": \"active\", \"name\": \"maverick-server-uec-amd64.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-10T21:53:37\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-10T21:53:44\", \"id\": 2, \"location\": \"file:///var/lib/glance/images/2\", \"checksum\": \"04845edf42118420a9d13a53186a5f59\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"1\", \"type\": \"machine\", \"version\": \"10.10\", \"kernel_name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"uploader\": \"root@enc1b11\", \"arch\": \"amd64\", \"distro\": \"Ubuntu\"}, \"size\": 1476395008}, {\"status\": \"active\", \"name\": \"natty-server-uec-amd64-vmlinuz-virtual\", \"deleted\": false, \"container_format\": \"aki\", \"created_at\": \"2011-05-11T15:48:02\", \"disk_format\": \"aki\", \"updated_at\": \"2011-05-11T15:48:02\", \"id\": 3, \"location\": \"file:///var/lib/glance/images/3\", \"checksum\": \"55c855957ae2ca4b476dabc26dbb1685\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"amd64\", \"version\": \"2.6.35\", \"type\": \"kernel\", \"uploader\": \"root@enc1b11\", \"distro\": \"ubuntu\"}, \"size\": 4592768}, {\"status\": \"active\", \"name\": \"natty-server-uec-amd64.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-11T15:48:02\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-11T15:48:08\", \"id\": 4, \"location\": \"file:///var/lib/glance/images/4\", \"checksum\": \"b6149317c554d2c335365e7bd43e9bf0\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"3\", \"type\": \"machine\", \"version\": \"11.04\", \"kernel_name\": \"natty-server-uec-amd64-vmlinuz-virtual\", \"uploader\": \"root@enc1b11\", \"arch\": \"amd64\", \"distro\": \"Ubuntu\"}, \"size\": 1476395008}, {\"status\": \"active\", \"name\": \"Gateway-copy.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-21T00:03:01\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-21T00:04:45\", \"id\": 16, \"location\": \"file:///var/lib/glance/images/16\", \"checksum\": \"86c2df3d9d60fe41577aca870ee89b41\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"version\": \"3.8\", \"type\": \"machine\", \"uploader\": \"root@enc1b11\", \"distro\": \"CentOS\"}, \"size\": 21474836480}, {\"status\": \"active\", \"name\": \"CentOS-5.4-cloudinit\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-26T15:13:11\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-26T15:13:16\", \"id\": 36, \"location\": \"file:///var/lib/glance/images/36\", \"checksum\": \"8731b6dcb85e7554cc69aeb8acc6ad09\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"version\": \"5.4\", \"type\": \"machine\", \"uploader\": \"root@enc1b11\", \"distro\": \"CentOS\"}, \"size\": 1430192128}, {\"status\": \"active\", \"name\": \"OpenVPN_Cloudpipe-base-v1\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-26T17:17:32\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-26T17:17:35\", \"id\": 37, \"location\": \"file:///var/lib/glance/images/37\", \"checksum\": \"396c52780d4624d574704cf578e7e7dd\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"3\", \"type\": \"machine\", \"version\": \"11.04\", \"kernel_name\": \"natty-server-uec-amd64-vmlinuz-virtual\", \"uploader\": \"root@enc1b11\", \"arch\": \"x86_64\", \"distro\": \"Ubuntu\"}, \"size\": 637403136}, {\"status\": \"active\", \"name\": \"OpenVPN_Cloudpipe-base-v1.1\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-26T19:05:44\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-26T19:05:47\", \"id\": 38, \"location\": \"file:///var/lib/glance/images/38\", \"checksum\": \"50b799cc99724691129a95b44256c6e1\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"3\", \"type\": \"machine\", \"version\": \"11.04\", \"kernel_name\": \"natty-server-uec-amd64-vmlinuz-virtual\", \"uploader\": \"root@enc1b11\", \"arch\": \"x86_64\", \"distro\": \"Ubuntu\"}, \"size\": 637534208}, {\"status\": \"active\", \"name\": \"kvm1.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-26T21:57:57\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-26T22:00:30\", \"id\": 41, \"location\": \"file:///var/lib/glance/images/41\", \"checksum\": \"0d36e66650833b38bba46da56a35820f\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"version\": \"3.8\", \"type\": \"machine\", \"uploader\": \"root@enc1b11\", \"distro\": \"CentOS\"}, \"size\": 20971520000}, {\"status\": \"active\", \"name\": \"CentOS-5.6-cloudinit\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-27T14:24:37\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-27T14:24:47\", \"id\": 48, \"location\": \"file:///var/lib/glance/images/48\", \"checksum\": \"654fb40e9c3c2917a10b7475ce895e57\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"version\": \"5.6\", \"type\": \"machine\", \"uploader\": \"root@enc1b11\", \"distro\": \"CentOS\"}, \"size\": 2362245120}]}"
55
28
  http_version: "1.1"
data/test/cassettes/images_find.yml CHANGED
@@ -2,7 +2,7 @@
2
2
  - !ruby/struct:VCR::HTTPInteraction
3
3
  request: !ruby/struct:VCR::Request
4
4
  method: :head
5
- uri: http://10.1.170.33:9292/images/6
5
+ uri: http://gluster.trunk:9292/v1/images/4
6
6
  body:
7
7
  headers:
8
8
  accept:
@@ -23,7 +23,7 @@
23
23
  x-image-meta-property-distro:
24
24
  - Ubuntu
25
25
  x-image-meta-id:
26
- - "6"
26
+ - "4"
27
27
  x-image-meta-property-arch:
28
28
  - amd64
29
29
  x-image-meta-deleted:
@@ -31,13 +31,13 @@
31
31
  x-image-meta-container-format:
32
32
  - ami
33
33
  x-image-meta-property-uploader:
34
- - root@e3ab3
34
+ - root@enc1b11
35
35
  x-image-meta-location:
36
- - file:///var/lib/glance/images/6
36
+ - file:///var/lib/glance/images/4
37
37
  x-image-meta-deleted-at:
38
38
  - ""
39
39
  x-image-meta-created-at:
40
- - 2011-04-06T20:04:48.664176
40
+ - 2011-05-11T15:48:02
41
41
  x-image-meta-size:
42
42
  - "1476395008"
43
43
  x-image-meta-status:
@@ -45,94 +45,27 @@
45
45
  x-image-meta-property-type:
46
46
  - machine
47
47
  x-image-meta-property-kernel-name:
48
- - maverick-server-uec-amd64-vmlinuz-virtual
48
+ - natty-server-uec-amd64-vmlinuz-virtual
49
49
  x-image-meta-is-public:
50
50
  - "True"
51
51
  x-image-meta-property-kernel-id:
52
- - "5"
52
+ - "3"
53
53
  x-image-meta-updated-at:
54
- - 2011-04-06T20:04:57.042658
54
+ - 2011-05-11T15:48:08
55
55
  x-image-meta-checksum:
56
- - d511da81009517c53f36ff4e8602ff62
56
+ - b6149317c554d2c335365e7bd43e9bf0
57
57
  x-image-meta-property-version:
58
- - "10.10"
58
+ - "11.04"
59
59
  x-image-meta-disk-format:
60
60
  - ami
61
61
  x-image-meta-name:
62
- - maverick-server-uec-amd64.img
62
+ - natty-server-uec-amd64.img
63
63
  location:
64
- - http://10.1.170.33:9292/images/6
64
+ - http://gluster.trunk:9292/v1/images/4
65
65
  etag:
66
- - d511da81009517c53f36ff4e8602ff62
66
+ - b6149317c554d2c335365e7bd43e9bf0
67
67
  date:
68
- - Fri, 08 Apr 2011 17:56:53 GMT
69
- connection:
70
- - keep-alive
71
- body:
72
- http_version: "1.1"
73
- - !ruby/struct:VCR::HTTPInteraction
74
- request: !ruby/struct:VCR::Request
75
- method: :head
76
- uri: http://10.3.170.32:9292/images/6
77
- body:
78
- headers:
79
- accept:
80
- - application/json
81
- connection:
82
- - keep-alive
83
- keep-alive:
84
- - 30
85
- response: !ruby/struct:VCR::Response
86
- status: !ruby/struct:VCR::ResponseStatus
87
- code: 200
88
- message: OK
89
- headers:
90
- content-type:
91
- - text/html; charset=UTF-8
92
- content-length:
93
- - "0"
94
- x-image-meta-property-distro:
95
- - CentOS
96
- x-image-meta-id:
97
- - "6"
98
- x-image-meta-property-arch:
99
- - x86_64
100
- x-image-meta-deleted:
101
- - "False"
102
- x-image-meta-container-format:
103
- - ami
104
- x-image-meta-location:
105
- - file:///var/lib/glance/images/6
106
- x-image-meta-deleted-at:
107
- - ""
108
- x-image-meta-created-at:
109
- - 2011-04-11T21:04:51
110
- x-image-meta-size:
111
- - "816906240"
112
- x-image-meta-status:
113
- - active
114
- x-image-meta-property-type:
115
- - machine
116
- x-image-meta-property-uploader:
117
- - root@cc-01
118
- x-image-meta-is-public:
119
- - "True"
120
- x-image-meta-updated-at:
121
- - 2011-04-11T21:04:56
122
- x-image-meta-checksum:
123
- - 6277381feb8708c393c64499a0ce7e1e
124
- x-image-meta-property-version:
125
- - "5.5"
126
- x-image-meta-disk-format:
127
- - ami
128
- x-image-meta-name:
129
- - CentOS5-5.5-Base_VM-032311-212432
130
- location:
131
- - http://10.3.170.32:9292/images/6
132
- etag:
133
- - 6277381feb8708c393c64499a0ce7e1e
134
- date:
135
- - Wed, 13 Apr 2011 22:32:26 GMT
68
+ - Sat, 28 May 2011 02:32:56 GMT
136
69
  connection:
137
70
  - keep-alive
138
71
  body:
data/test/cassettes/images_runable.yml CHANGED
@@ -2,7 +2,7 @@
2
2
  - !ruby/struct:VCR::HTTPInteraction
3
3
  request: !ruby/struct:VCR::Request
4
4
  method: :get
5
- uri: http://10.3.170.32:9292/images
5
+ uri: http://gluster.trunk:9292/v1/images
6
6
  body:
7
7
  headers:
8
8
  accept:
@@ -19,10 +19,10 @@
19
19
  content-type:
20
20
  - text/html; charset=UTF-8
21
21
  content-length:
22
- - "1019"
22
+ - "1662"
23
23
  date:
24
- - Wed, 13 Apr 2011 22:32:49 GMT
24
+ - Sat, 28 May 2011 02:32:56 GMT
25
25
  connection:
26
26
  - keep-alive
27
- body: "{\"images\": [{\"name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"container_format\": \"aki\", \"disk_format\": \"aki\", \"checksum\": \"73152adae523a52d481f5150deb30356\", \"id\": 1, \"size\": 4408912}, {\"name\": \"maverick-server-uec-amd64.img\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"d2d3b3049f897dff2f86295d5a9e879e\", \"id\": 2, \"size\": 1476395008}, {\"name\": \"CentOS5-5.5-Base_VM-032311-212432\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"6277381feb8708c393c64499a0ce7e1e\", \"id\": 6, \"size\": 816906240}, {\"name\": \"initrd.img-2.6.28-11-generic\", \"container_format\": \"ari\", \"disk_format\": \"ari\", \"checksum\": \"4ee1b2aa5c15472b41dafe39f4854aac\", \"id\": 7, \"size\": 8679404}, {\"name\": \"vmlinuz-2.6.28-11-generic\", \"container_format\": \"aki\", \"disk_format\": \"aki\", \"checksum\": \"d15243d1203d0aecf187ff969d6764ea\", \"id\": 8, \"size\": 3522336}, {\"name\": \"centos.5-3.x86-64.img\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"79523e49084752f61b49398b19831b23\", \"id\": 9, \"size\": 1049624576}]}"
27
+ body: "{\"images\": [{\"name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"container_format\": \"aki\", \"disk_format\": \"aki\", \"checksum\": \"83d999516352e8311f5ee9a314679b6c\", \"id\": 1, \"size\": 4408496}, {\"name\": \"maverick-server-uec-amd64.img\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"04845edf42118420a9d13a53186a5f59\", \"id\": 2, \"size\": 1476395008}, {\"name\": \"natty-server-uec-amd64-vmlinuz-virtual\", \"container_format\": \"aki\", \"disk_format\": \"aki\", \"checksum\": \"55c855957ae2ca4b476dabc26dbb1685\", \"id\": 3, \"size\": 4592768}, {\"name\": \"natty-server-uec-amd64.img\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"b6149317c554d2c335365e7bd43e9bf0\", \"id\": 4, \"size\": 1476395008}, {\"name\": \"Gateway-copy.img\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"86c2df3d9d60fe41577aca870ee89b41\", \"id\": 16, \"size\": 21474836480}, {\"name\": \"CentOS-5.4-cloudinit\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"8731b6dcb85e7554cc69aeb8acc6ad09\", \"id\": 36, \"size\": 1430192128}, {\"name\": \"OpenVPN_Cloudpipe-base-v1\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"396c52780d4624d574704cf578e7e7dd\", \"id\": 37, \"size\": 637403136}, {\"name\": \"OpenVPN_Cloudpipe-base-v1.1\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"50b799cc99724691129a95b44256c6e1\", \"id\": 38, \"size\": 637534208}, {\"name\": \"kvm1.img\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"0d36e66650833b38bba46da56a35820f\", \"id\": 41, \"size\": 20971520000}, {\"name\": \"CentOS-5.6-cloudinit\", \"container_format\": \"ami\", \"disk_format\": \"ami\", \"checksum\": \"654fb40e9c3c2917a10b7475ce895e57\", \"id\": 48, \"size\": 2362245120}]}"
28
28
  http_version: "1.1"
data/test/cassettes/images_runable_with_details.yml CHANGED
@@ -2,7 +2,7 @@
2
2
  - !ruby/struct:VCR::HTTPInteraction
3
3
  request: !ruby/struct:VCR::Request
4
4
  method: :get
5
- uri: http://10.3.170.32:9292/images/detail
5
+ uri: http://gluster.trunk:9292/v1/images/detail
6
6
  body:
7
7
  headers:
8
8
  accept:
@@ -19,10 +19,10 @@
19
19
  content-type:
20
20
  - text/html; charset=UTF-8
21
21
  content-length:
22
- - "3113"
22
+ - "5149"
23
23
  date:
24
- - Wed, 13 Apr 2011 23:30:22 GMT
24
+ - Sat, 28 May 2011 02:32:55 GMT
25
25
  connection:
26
26
  - keep-alive
27
- body: "{\"images\": [{\"status\": \"active\", \"name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"deleted\": false, \"container_format\": \"aki\", \"created_at\": \"2011-04-11T17:18:44\", \"disk_format\": \"aki\", \"updated_at\": \"2011-04-11T17:18:44\", \"id\": 1, \"location\": \"file:///var/lib/glance/images/1\", \"checksum\": \"73152adae523a52d481f5150deb30356\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"amd64\", \"version\": \"2.6.35\", \"type\": \"kernel\", \"uploader\": \"root@cc-01\", \"distro\": \"Ubuntu\"}, \"size\": 4408912}, {\"status\": \"active\", \"name\": \"maverick-server-uec-amd64.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-04-11T17:18:45\", \"disk_format\": \"ami\", \"updated_at\": \"2011-04-11T17:18:51\", \"id\": 2, \"location\": \"file:///var/lib/glance/images/2\", \"checksum\": \"d2d3b3049f897dff2f86295d5a9e879e\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"1\", \"type\": \"machine\", \"version\": \"10.10\", \"kernel_name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"uploader\": \"root@cc-01\", \"arch\": \"amd64\", \"distro\": \"Ubuntu\"}, \"size\": 1476395008}, {\"status\": \"active\", \"name\": \"CentOS5-5.5-Base_VM-032311-212432\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-04-11T21:04:51\", \"disk_format\": \"ami\", \"updated_at\": \"2011-04-11T21:04:56\", \"id\": 6, \"location\": \"file:///var/lib/glance/images/6\", \"checksum\": \"6277381feb8708c393c64499a0ce7e1e\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"version\": \"5.5\", \"type\": \"machine\", \"uploader\": \"root@cc-01\", \"distro\": \"CentOS\"}, \"size\": 816906240}, {\"status\": \"active\", \"name\": \"initrd.img-2.6.28-11-generic\", \"deleted\": false, \"container_format\": \"ari\", \"created_at\": \"2011-04-11T21:18:33\", \"disk_format\": \"ari\", \"updated_at\": \"2011-04-11T21:18:33\", \"id\": 7, \"location\": \"file:///var/lib/glance/images/7\", \"checksum\": \"4ee1b2aa5c15472b41dafe39f4854aac\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"type\": \"ramdisk\", \"uploader\": \"root@cc-01\", \"distro\": \"CentOS\"}, \"size\": 8679404}, {\"status\": \"active\", \"name\": \"vmlinuz-2.6.28-11-generic\", \"deleted\": false, \"container_format\": \"aki\", \"created_at\": \"2011-04-11T21:18:34\", \"disk_format\": \"aki\", \"updated_at\": \"2011-04-11T21:18:34\", \"id\": 8, \"location\": \"file:///var/lib/glance/images/8\", \"checksum\": \"d15243d1203d0aecf187ff969d6764ea\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"version\": \"2.6.28-11-generic\", \"type\": \"kernel\", \"uploader\": \"root@cc-01\", \"distro\": \"CentOS\"}, \"size\": 3522336}, {\"status\": \"active\", \"name\": \"centos.5-3.x86-64.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-04-11T21:18:34\", \"disk_format\": \"ami\", \"updated_at\": \"2011-04-11T21:18:39\", \"id\": 9, \"location\": \"file:///var/lib/glance/images/9\", \"checksum\": \"79523e49084752f61b49398b19831b23\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"8\", \"arch\": \"x86_64\", \"ramdisk_id\": \"7\", \"version\": \"5.3\", \"kernel_name\": \"vmlinuz-2.6.28-11-generic\", \"ramdisk_name\": \"initrd.img-2.6.28-11-generic\", \"uploader\": \"root@cc-01\", \"type\": \"machine\", \"distro\": \"CentOS\"}, \"size\": 1049624576}]}"
27
+ body: "{\"images\": [{\"status\": \"active\", \"name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"deleted\": false, \"container_format\": \"aki\", \"created_at\": \"2011-05-10T21:53:36\", \"disk_format\": \"aki\", \"updated_at\": \"2011-05-10T21:53:36\", \"id\": 1, \"location\": \"file:///var/lib/glance/images/1\", \"checksum\": \"83d999516352e8311f5ee9a314679b6c\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"amd64\", \"version\": \"2.5.35\", \"type\": \"kernel\", \"uploader\": \"root@enc1b11\", \"distro\": \"ubuntu\"}, \"size\": 4408496}, {\"status\": \"active\", \"name\": \"maverick-server-uec-amd64.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-10T21:53:37\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-10T21:53:44\", \"id\": 2, \"location\": \"file:///var/lib/glance/images/2\", \"checksum\": \"04845edf42118420a9d13a53186a5f59\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"1\", \"type\": \"machine\", \"version\": \"10.10\", \"kernel_name\": \"maverick-server-uec-amd64-vmlinuz-virtual\", \"uploader\": \"root@enc1b11\", \"arch\": \"amd64\", \"distro\": \"Ubuntu\"}, \"size\": 1476395008}, {\"status\": \"active\", \"name\": \"natty-server-uec-amd64-vmlinuz-virtual\", \"deleted\": false, \"container_format\": \"aki\", \"created_at\": \"2011-05-11T15:48:02\", \"disk_format\": \"aki\", \"updated_at\": \"2011-05-11T15:48:02\", \"id\": 3, \"location\": \"file:///var/lib/glance/images/3\", \"checksum\": \"55c855957ae2ca4b476dabc26dbb1685\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"amd64\", \"version\": \"2.6.35\", \"type\": \"kernel\", \"uploader\": \"root@enc1b11\", \"distro\": \"ubuntu\"}, \"size\": 4592768}, {\"status\": \"active\", \"name\": \"natty-server-uec-amd64.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-11T15:48:02\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-11T15:48:08\", \"id\": 4, \"location\": \"file:///var/lib/glance/images/4\", \"checksum\": \"b6149317c554d2c335365e7bd43e9bf0\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"3\", \"type\": \"machine\", \"version\": \"11.04\", \"kernel_name\": \"natty-server-uec-amd64-vmlinuz-virtual\", \"uploader\": \"root@enc1b11\", \"arch\": \"amd64\", \"distro\": \"Ubuntu\"}, \"size\": 1476395008}, {\"status\": \"active\", \"name\": \"Gateway-copy.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-21T00:03:01\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-21T00:04:45\", \"id\": 16, \"location\": \"file:///var/lib/glance/images/16\", \"checksum\": \"86c2df3d9d60fe41577aca870ee89b41\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"version\": \"3.8\", \"type\": \"machine\", \"uploader\": \"root@enc1b11\", \"distro\": \"CentOS\"}, \"size\": 21474836480}, {\"status\": \"active\", \"name\": \"CentOS-5.4-cloudinit\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-26T15:13:11\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-26T15:13:16\", \"id\": 36, \"location\": \"file:///var/lib/glance/images/36\", \"checksum\": \"8731b6dcb85e7554cc69aeb8acc6ad09\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"version\": \"5.4\", \"type\": \"machine\", \"uploader\": \"root@enc1b11\", \"distro\": \"CentOS\"}, \"size\": 1430192128}, {\"status\": \"active\", \"name\": \"OpenVPN_Cloudpipe-base-v1\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-26T17:17:32\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-26T17:17:35\", \"id\": 37, \"location\": \"file:///var/lib/glance/images/37\", \"checksum\": \"396c52780d4624d574704cf578e7e7dd\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"3\", \"type\": \"machine\", \"version\": \"11.04\", \"kernel_name\": \"natty-server-uec-amd64-vmlinuz-virtual\", \"uploader\": \"root@enc1b11\", \"arch\": \"x86_64\", \"distro\": \"Ubuntu\"}, \"size\": 637403136}, {\"status\": \"active\", \"name\": \"OpenVPN_Cloudpipe-base-v1.1\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-26T19:05:44\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-26T19:05:47\", \"id\": 38, \"location\": \"file:///var/lib/glance/images/38\", \"checksum\": \"50b799cc99724691129a95b44256c6e1\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"3\", \"type\": \"machine\", \"version\": \"11.04\", \"kernel_name\": \"natty-server-uec-amd64-vmlinuz-virtual\", \"uploader\": \"root@enc1b11\", \"arch\": \"x86_64\", \"distro\": \"Ubuntu\"}, \"size\": 637534208}, {\"status\": \"active\", \"name\": \"kvm1.img\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-26T21:57:57\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-26T22:00:30\", \"id\": 41, \"location\": \"file:///var/lib/glance/images/41\", \"checksum\": \"0d36e66650833b38bba46da56a35820f\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"version\": \"3.8\", \"type\": \"machine\", \"uploader\": \"root@enc1b11\", \"distro\": \"CentOS\"}, \"size\": 20971520000}, {\"status\": \"active\", \"name\": \"CentOS-5.6-cloudinit\", \"deleted\": false, \"container_format\": \"ami\", \"created_at\": \"2011-05-27T14:24:37\", \"disk_format\": \"ami\", \"updated_at\": \"2011-05-27T14:24:47\", \"id\": 48, \"location\": \"file:///var/lib/glance/images/48\", \"checksum\": \"654fb40e9c3c2917a10b7475ce895e57\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"arch\": \"x86_64\", \"version\": \"5.6\", \"type\": \"machine\", \"uploader\": \"root@enc1b11\", \"distro\": \"CentOS\"}, \"size\": 2362245120}]}"
28
28
  http_version: "1.1"
data/test/lib/ogle/image_test.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  require "test_helper"
2
2
 
3
3
  CONNECTION = Ogle::Client.new(
4
- :host => "10.3.170.32"
4
+ :host => "gluster.trunk"
5
5
  )
6
6
 
7
7
  describe Ogle::Image do
@@ -66,7 +66,7 @@ describe Ogle::Image do
66
66
  describe "#find" do
67
67
  before do
68
68
  VCR.use_cassette "images_find" do
69
- @response = CONNECTION.image.find 6
69
+ @response = CONNECTION.image.find 4
70
70
  end
71
71
  end
72
72
 
@@ -87,12 +87,12 @@ describe Ogle::Image do
87
87
  end
88
88
  end
89
89
 
90
- describe "#delete" do
91
- VCR.use_cassette "image_delete" do
92
- response = CONNECTION.image.delete 15
90
+ describe "#destroy" do
91
+ VCR.use_cassette "image_destroy" do
92
+ response = CONNECTION.image.destroy 41
93
93
 
94
94
  it "returns an HTTP/1.1 200 OK" do
95
- response.code.must_equal "200"
95
+ response.code.must_equal "300"
96
96
  end
97
97
  end
98
98
  end
@@ -111,17 +111,17 @@ describe Ogle::ImageData do
111
111
  describe "#to_ami_id" do
112
112
  it "return a valid ami id" do
113
113
  VCR.use_cassette "image_find" do
114
- @response = CONNECTION.image.find 6
114
+ @response = CONNECTION.image.find 4
115
115
 
116
- @response.to_ami_id.must_equal "ami-00000006"
116
+ @response.to_ami_id.must_equal "ami-00000004"
117
117
  end
118
118
  end
119
119
 
120
120
  it "return a valid hex ami id" do
121
121
  VCR.use_cassette "image_find" do
122
- @response = CONNECTION.image.find 17
122
+ @response = CONNECTION.image.find 36
123
123
 
124
- @response.to_ami_id.must_equal "ami-00000011"
124
+ @response.to_ami_id.must_equal "ami-00000024"
125
125
  end
126
126
  end
127
127
  end
metadata CHANGED
@@ -2,15 +2,16 @@
2
2
  name: ogle
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.2.2
5
+ version: 0.2.3
6
6
  platform: ruby
7
7
  authors:
8
8
  - Kevin Bringard
9
+ - John Dewey
9
10
  autorequire:
10
11
  bindir: bin
11
12
  cert_chain: []
12
13
 
13
- date: 2011-05-17 00:00:00 -06:00
14
+ date: 2011-05-28 00:00:00 -06:00
14
15
  default_executable:
15
16
  dependencies:
16
17
  - !ruby/object:Gem::Dependency
@@ -71,6 +72,7 @@ dependencies:
71
72
  description: Exposes the API for OpenStack Glance. Go ahead and ogle, it's so much more than a glance.
72
73
  email:
73
74
  - kbringard@attinteractive.com
75
+ - john@dewey.ws
74
76
  executables: []
75
77
 
76
78
  extensions: []
@@ -88,7 +90,7 @@ files:
88
90
  - lib/ogle/image.rb
89
91
  - lib/ogle/version.rb
90
92
  - ogle.gemspec
91
- - test/cassettes/image_delete.yml
93
+ - test/cassettes/image_destroy.yml
92
94
  - test/cassettes/image_find.yml
93
95
  - test/cassettes/images_all.yml
94
96
  - test/cassettes/images_all_with_details.yml
@@ -126,7 +128,7 @@ signing_key:
126
128
  specification_version: 3
127
129
  summary: Ruby interface for OpenStack Glance
128
130
  test_files:
129
- - test/cassettes/image_delete.yml
131
+ - test/cassettes/image_destroy.yml
130
132
  - test/cassettes/image_find.yml
131
133
  - test/cassettes/images_all.yml
132
134
  - test/cassettes/images_all_with_details.yml