ogle 0.0.5 → 0.0.6

data/README.md

@@ -23,15 +23,15 @@ Depending on the call you make, glance will sometimes return JSON and others XML
     )
 
     # This will give a list of all the images
-    response = CONNECTION.images.all
+    response = CONNECTION.image.all
     puts response
 
     # This will give a detailed list of all the images
-    response = CONNECTION.images true
+    response = CONNECTION.image true
     puts response
 
     # This will return headers for a specific image as a hash
-    response = CONNECTION.images.find 6
+    response = CONNECTION.image.find 6
     puts response
 
 ## Compatability
@@ -41,3 +41,8 @@ ruby 1.9.2
 ## Testing
 
     $ bundle exec rake
+
+## TODOs
+
+* Image#all should return all public/runnable images.
+  See lib/nephophobia/image.rb#pubic?

data/lib/ogle/image.rb

@@ -38,5 +38,20 @@ module Ogle
         end
       end
     end
+
+    def runable
+      all.select do |image|
+        runable? image
+      end
+    end
+
+  private
+    ##
+    # Kernels and Ramdisks are not runable, so we want to ignore them.
+
+    def runable? image
+      image['container_format'] == "ami" &&
+      image['disk_format'] == "ami"
+    end
   end
 end

data/lib/ogle/version.rb

@@ -1,3 +1,3 @@
 module Ogle
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/cassettes/images_all.yml

@@ -26,3 +26,30 @@
       - keep-alive
     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}]}"
     http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://10.3.170.32:9292/images
+    body: 
+    headers: 
+      accept: 
+      - application/json
+      connection: 
+      - keep-alive
+      keep-alive: 
+      - 30
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      content-type: 
+      - text/html; charset=UTF-8
+      content-length: 
+      - "1019"
+      date: 
+      - Wed, 13 Apr 2011 22:32:26 GMT
+      connection: 
+      - keep-alive
+    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}]}"
+    http_version: "1.1"

data/test/cassettes/images_all_runable.yml

@@ -0,0 +1,28 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://10.3.170.32:9292/images
+    body: 
+    headers: 
+      accept: 
+      - application/json
+      connection: 
+      - keep-alive
+      keep-alive: 
+      - 30
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      content-type: 
+      - text/html; charset=UTF-8
+      content-length: 
+      - "1019"
+      date: 
+      - Wed, 13 Apr 2011 22:32:49 GMT
+      connection: 
+      - keep-alive
+    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}]}"
+    http_version: "1.1"

data/test/cassettes/images_all_verbose.yml

@@ -26,3 +26,30 @@
       - keep-alive
     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}]}"
     http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://10.3.170.32:9292/images/detail
+    body: 
+    headers: 
+      accept: 
+      - application/json
+      connection: 
+      - keep-alive
+      keep-alive: 
+      - 30
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      content-type: 
+      - text/html; charset=UTF-8
+      content-length: 
+      - "3113"
+      date: 
+      - Wed, 13 Apr 2011 22:32:27 GMT
+      connection: 
+      - keep-alive
+    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}]}"
+    http_version: "1.1"

data/test/cassettes/images_find.yml

@@ -70,3 +70,70 @@
       - keep-alive
     body: 
     http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :head
+    uri: http://10.3.170.32:9292/images/6
+    body: 
+    headers: 
+      accept: 
+      - application/json
+      connection: 
+      - keep-alive
+      keep-alive: 
+      - 30
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      content-type: 
+      - text/html; charset=UTF-8
+      content-length: 
+      - "0"
+      x-image-meta-property-distro: 
+      - CentOS
+      x-image-meta-id: 
+      - "6"
+      x-image-meta-property-arch: 
+      - x86_64
+      x-image-meta-deleted: 
+      - "False"
+      x-image-meta-container-format: 
+      - ami
+      x-image-meta-location: 
+      - file:///var/lib/glance/images/6
+      x-image-meta-deleted-at: 
+      - ""
+      x-image-meta-created-at: 
+      - 2011-04-11T21:04:51
+      x-image-meta-size: 
+      - "816906240"
+      x-image-meta-status: 
+      - active
+      x-image-meta-property-type: 
+      - machine
+      x-image-meta-property-uploader: 
+      - root@cc-01
+      x-image-meta-is-public: 
+      - "True"
+      x-image-meta-updated-at: 
+      - 2011-04-11T21:04:56
+      x-image-meta-checksum: 
+      - 6277381feb8708c393c64499a0ce7e1e
+      x-image-meta-property-version: 
+      - "5.5"
+      x-image-meta-disk-format: 
+      - ami
+      x-image-meta-name: 
+      - CentOS5-5.5-Base_VM-032311-212432
+      location: 
+      - http://10.3.170.32:9292/images/6
+      etag: 
+      - 6277381feb8708c393c64499a0ce7e1e
+      date: 
+      - Wed, 13 Apr 2011 22:32:26 GMT
+      connection: 
+      - keep-alive
+    body: 
+    http_version: "1.1"

data/test/lib/ogle/resource_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 
 CONNECTION = Ogle::Client.new(
-  :host => "10.1.170.33"
+  :host => "10.3.170.32"
 )
 
 def must_have_valid_keys response, keys
@@ -18,7 +18,7 @@ describe Ogle::Image do
     end
 
     it "returns a hash of images" do
-      @response.size.must_be :>=, 1
+      @response.size.must_be :>=, 5
     end
 
     it "returns metadata" do
@@ -41,7 +41,7 @@ describe Ogle::Image do
     end
 
     it "returns a detailed hash of images" do
-      @response.size.must_be :>=, 1
+      @response.size.must_be :>=, 5
     end
 
     it "returns metadata" do
@@ -64,6 +64,21 @@ describe Ogle::Image do
     end
   end
 
+  ##
+  # TODO: Make these tests less brittle
+  
+  describe "#all runable" do
+    before do
+      VCR.use_cassette "images_all_runable" do
+        @response = CONNECTION.image.runable
+      end
+    end
+
+    it "returns a hash of all images which are runable" do
+      @response.size.must_be :==, 3
+    end
+  end
+
   describe "#find" do
     before do
       VCR.use_cassette "images_find" do

data/test/test_helper.rb

@@ -8,7 +8,7 @@ end
 VCR.config do |c|
   c.stub_with :webmock
   c.cassette_library_dir     = "test/cassettes"
-  c.default_cassette_options = { :record => :none }
+  c.default_cassette_options = { :record => :new_episodes }
 end
 
 MiniTest::Unit.autorun

metadata

@@ -2,7 +2,7 @@
 name: ogle
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Kevin Bringard
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 -06:00
+date: 2011-04-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ files:
 - lib/ogle/version.rb
 - ogle.gemspec
 - test/cassettes/images_all.yml
+- test/cassettes/images_all_runable.yml
 - test/cassettes/images_all_verbose.yml
 - test/cassettes/images_find.yml
 - test/lib/ogle/resource_test.rb
@@ -123,6 +124,7 @@ specification_version: 3
 summary: Ruby interface for OpenStack Glance
 test_files: 
 - test/cassettes/images_all.yml
+- test/cassettes/images_all_runable.yml
 - test/cassettes/images_all_verbose.yml
 - test/cassettes/images_find.yml
 - test/lib/ogle/resource_test.rb