ogle 0.2.4 → 0.2.5

data/test/cassettes/{images_runable.yml → image_runable.yml}

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :get
-    uri: http://gluster.trunk:9292/v1/images
+    uri: http://glance.trunk:9292/v1/images
     body: 
     headers: 
       accept: 

data/test/cassettes/{images_runable_with_details.yml → image_runable_with_details.yml}

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :get
-    uri: http://gluster.trunk:9292/v1/images/detail
+    uri: http://glance.trunk:9292/v1/images/detail
     body: 
     headers: 
       accept: 

data/test/cassettes/image_update_metadata.yml

@@ -0,0 +1,120 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: http://glance.trunk:9292/v1/images
+    body: |
+      Test-Image
+
+    headers: 
+      accept: 
+      - application/json
+      content-type: 
+      - application/octet-stream
+      content-length: 
+      - 11
+      transfer-encoding: 
+      - chunked
+      x-image-meta-name: 
+      - image_update_metadata
+      x-image-meta-is-public: 
+      - "true"
+      x-image-meta-property-distro: 
+      - test-distro
+      x-image-meta-property-arch: 
+      - test-arch
+      x-image-meta-property-uploader: 
+      - test-uploader
+      x-image-meta-property-type: 
+      - test-type
+      x-image-meta-property-kernel-name: 
+      - test-kernel-name
+      x-image-meta-property-kernel-id: 
+      - test-kernel-id
+      x-image-meta-property-version: 
+      - test-version
+      connection: 
+      - keep-alive
+      keep-alive: 
+      - 30
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 201
+      message: Created
+    headers: 
+      content-type: 
+      - text/plain; charset=UTF-8
+      content-length: 
+      - "565"
+      location: 
+      - http://glance.trunk:9292/v1/images/83
+      etag: 
+      - 8cb22c184821cdc62a9dc5c34cf8a125
+      date: 
+      - Wed, 08 Jun 2011 05:48:48 GMT
+      connection: 
+      - keep-alive
+    body: "{\"image\": {\"status\": \"active\", \"name\": \"image_update_metadata\", \"deleted\": false, \"container_format\": null, \"created_at\": \"2011-06-08T05:48:48\", \"disk_format\": null, \"updated_at\": \"2011-06-08T05:48:48\", \"id\": 83, \"location\": \"file:///var/lib/glance/images/83\", \"checksum\": \"8cb22c184821cdc62a9dc5c34cf8a125\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"test-kernel-id\", \"type\": \"test-type\", \"version\": \"test-version\", \"kernel_name\": \"test-kernel-name\", \"uploader\": \"test-uploader\", \"arch\": \"test-arch\", \"distro\": \"test-distro\"}, \"size\": 11}}"
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :put
+    uri: http://glance.trunk:9292/v1/images/83
+    body: 
+    headers: 
+      accept: 
+      - application/json
+      content-type: 
+      - application/json
+      x-image-meta-is-public: 
+      - "false"
+      connection: 
+      - keep-alive
+      keep-alive: 
+      - 30
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      content-type: 
+      - text/plain; charset=UTF-8
+      content-length: 
+      - "379"
+      location: 
+      - http://glance.trunk:9292/images/83
+      etag: 
+      - 8cb22c184821cdc62a9dc5c34cf8a125
+      date: 
+      - Wed, 08 Jun 2011 05:48:48 GMT
+      connection: 
+      - keep-alive
+    body: "{\"image\": {\"status\": \"active\", \"name\": \"image_update_metadata\", \"deleted\": false, \"container_format\": null, \"created_at\": \"2011-06-08T05:48:48\", \"disk_format\": null, \"updated_at\": \"2011-06-08T05:48:48\", \"id\": 83, \"location\": \"file:///var/lib/glance/images/83\", \"checksum\": \"8cb22c184821cdc62a9dc5c34cf8a125\", \"is_public\": false, \"deleted_at\": null, \"properties\": {}, \"size\": 11}}"
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :delete
+    uri: http://glance.trunk:9292/v1/images/83
+    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"
+      date: 
+      - Wed, 08 Jun 2011 05:48:48 GMT
+      connection: 
+      - keep-alive
+    body: 
+    http_version: "1.1"

data/test/cassettes/image_update_properties.yml

@@ -0,0 +1,120 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: http://glance.trunk:9292/v1/images
+    body: |
+      Test-Image
+
+    headers: 
+      accept: 
+      - application/json
+      content-type: 
+      - application/octet-stream
+      content-length: 
+      - 11
+      transfer-encoding: 
+      - chunked
+      x-image-meta-name: 
+      - image_update_properties
+      x-image-meta-is-public: 
+      - "true"
+      x-image-meta-property-distro: 
+      - test-distro
+      x-image-meta-property-arch: 
+      - test-arch
+      x-image-meta-property-uploader: 
+      - test-uploader
+      x-image-meta-property-type: 
+      - test-type
+      x-image-meta-property-kernel-name: 
+      - test-kernel-name
+      x-image-meta-property-kernel-id: 
+      - test-kernel-id
+      x-image-meta-property-version: 
+      - test-version
+      connection: 
+      - keep-alive
+      keep-alive: 
+      - 30
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 201
+      message: Created
+    headers: 
+      content-type: 
+      - text/plain; charset=UTF-8
+      content-length: 
+      - "567"
+      location: 
+      - http://glance.trunk:9292/v1/images/85
+      etag: 
+      - 8cb22c184821cdc62a9dc5c34cf8a125
+      date: 
+      - Wed, 08 Jun 2011 05:51:19 GMT
+      connection: 
+      - keep-alive
+    body: "{\"image\": {\"status\": \"active\", \"name\": \"image_update_properties\", \"deleted\": false, \"container_format\": null, \"created_at\": \"2011-06-08T05:51:19\", \"disk_format\": null, \"updated_at\": \"2011-06-08T05:51:19\", \"id\": 85, \"location\": \"file:///var/lib/glance/images/85\", \"checksum\": \"8cb22c184821cdc62a9dc5c34cf8a125\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"test-kernel-id\", \"type\": \"test-type\", \"version\": \"test-version\", \"kernel_name\": \"test-kernel-name\", \"uploader\": \"test-uploader\", \"arch\": \"test-arch\", \"distro\": \"test-distro\"}, \"size\": 11}}"
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :put
+    uri: http://glance.trunk:9292/v1/images/85
+    body: 
+    headers: 
+      accept: 
+      - application/json
+      content-type: 
+      - application/json
+      x-image-meta-property-kernel-id: 
+      - updated-test-kernel-id
+      connection: 
+      - keep-alive
+      keep-alive: 
+      - 30
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      content-type: 
+      - text/plain; charset=UTF-8
+      content-length: 
+      - "417"
+      location: 
+      - http://glance.trunk:9292/images/85
+      etag: 
+      - 8cb22c184821cdc62a9dc5c34cf8a125
+      date: 
+      - Wed, 08 Jun 2011 05:51:19 GMT
+      connection: 
+      - keep-alive
+    body: "{\"image\": {\"status\": \"active\", \"name\": \"image_update_properties\", \"deleted\": false, \"container_format\": null, \"created_at\": \"2011-06-08T05:51:19\", \"disk_format\": null, \"updated_at\": \"2011-06-08T05:51:19\", \"id\": 85, \"location\": \"file:///var/lib/glance/images/85\", \"checksum\": \"8cb22c184821cdc62a9dc5c34cf8a125\", \"is_public\": true, \"deleted_at\": null, \"properties\": {\"kernel_id\": \"updated-test-kernel-id\"}, \"size\": 11}}"
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :delete
+    uri: http://glance.trunk:9292/v1/images/85
+    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"
+      date: 
+      - Wed, 08 Jun 2011 05:51:19 GMT
+      connection: 
+      - keep-alive
+    body: 
+    http_version: "1.1"

data/test/lib/ogle/image_test.rb

@@ -7,7 +7,7 @@ CONNECTION = Ogle::Client.new(
 describe Ogle::Image do
   describe "#all" do
     before do
-      VCR.use_cassette "images_all" do
+      VCR.use_cassette "image_all" do
         @response = CONNECTION.image.all
       end
     end
@@ -23,12 +23,12 @@ describe Ogle::Image do
 
   describe "#all with details" do
     before do
-      VCR.use_cassette "images_all_with_details" do
+      VCR.use_cassette "image_all_with_details" do
         @response = CONNECTION.image.all true
       end
     end
 
-    it "returns detailed images" do
+    it "returns all images" do
       @response.size.must_be :>=, 1
     end
 
@@ -39,7 +39,7 @@ describe Ogle::Image do
 
   describe "#runable" do
     before do
-      VCR.use_cassette "images_runable" do
+      VCR.use_cassette "image_runable" do
         @response = CONNECTION.image.runable
       end
     end
@@ -54,8 +54,8 @@ describe Ogle::Image do
   end
 
   describe "#runable with details" do
-    VCR.use_cassette "images_runable_with_details" do
-      response = CONNECTION.image.runable(true)
+    VCR.use_cassette "image_runable_with_details" do
+      response = CONNECTION.image.runable true
 
       it "returns metadata" do
         must_have_valid_methods response.first, DETAILED_METADATA_KEYS
@@ -65,12 +65,19 @@ describe Ogle::Image do
 
   describe "#find" do
     before do
-      VCR.use_cassette "images_find" do
-        @response = CONNECTION.image.find 4
+      VCR.use_cassette "image_find" do
+        @image_id = upload("image_find").id
+        @response = CONNECTION.image.find @image_id
       end
     end
 
-    it "returns X-Image-Meta-* headers as a hash" do
+    after do
+      VCR.use_cassette "image_find" do
+        CONNECTION.image.destroy @image_id
+      end
+    end
+
+    it "returns metadata with details" do
       must_have_valid_methods @response, DETAILED_METADATA_KEYS
     end
 
@@ -88,33 +95,95 @@ describe Ogle::Image do
   end
 
   describe "#destroy" do
-    VCR.use_cassette "image_destroy" do
-      response = CONNECTION.image.destroy 56
+    before do
+      VCR.use_cassette "image_destroy" do
+        @image_id = upload("image_destroy").id
+      end
+    end
+
+    it "returns OK" do
+      VCR.use_cassette "image_destroy" do
+        response = CONNECTION.image.destroy @image_id
 
-      it "returns an HTTP/1.1 200 OK" do
-        response.code.must_equal "200"
+        response.return.must_equal true
       end
     end
   end
 
   describe "#create" do
-    VCR.use_cassette "image_create" do
-      testfile = File.join TEST_ROOT, "support", "test-image"
-      metadata = {
-        "x-image-meta-is-public" => "true",
-        "x-image-meta-property-test" => "yes",
-        "x-image-meta-property-distro" => "test-distro",
-        "x-image-meta-property-version" => "test-version-1"
-      }
+    before do
+      VCR.use_cassette "image_create" do
+        @response = upload "image_create"
+      end
+    end
 
-      response = CONNECTION.image.create "#{testfile}", "test-image", metadata
+    it "returns metadata" do
+      must_have_valid_methods @response, METADATA_KEYS
+    end
 
-      it "returns an HTTP/1.1 201 OK" do
-        response.code.must_equal "201"
-      end
+    it "returns a nested properties hash" do
+      must_have_valid_keys @response.properties, %w(
+        distro
+        arch
+        uploader
+        type
+        kernel_name
+        kernel_id
+        version
+      )
     end
   end
 
+  describe "#update" do
+    describe "metadata" do
+      before do
+        VCR.use_cassette "image_update_metadata" do
+          @image = upload "image_update_metadata"
+        end
+      end
+
+      after do
+        VCR.use_cassette "image_update_metadata" do
+          CONNECTION.image.destroy @image.id
+        end
+      end
+
+      it "updates metadata" do
+        VCR.use_cassette "image_update_metadata" do
+          @image.is_public.must_equal true
+
+          response = CONNECTION.image.update @image.id, { "x-image-meta-is-public" => "false" }
+
+          response.is_public.must_equal false
+        end
+      end
+    end
+
+    describe "properties" do
+      before do
+        VCR.use_cassette "image_update_properties" do
+          @image = upload "image_update_properties"
+          @image.properties['kernel_id'].must_equal "test-kernel-id"
+
+          @response = CONNECTION.image.update @image.id, { "x-image-meta-property-kernel_id" => "updated-test-kernel-id" }
+        end
+      end
+
+      after do
+        VCR.use_cassette "image_update_properties" do
+          CONNECTION.image.destroy @image.id
+        end
+      end
+
+      it "updates property hash" do 
+        @response.properties['kernel_id'].must_equal "updated-test-kernel-id"
+      end
+
+      it "doesn't maintain old properties" do
+        @response.properties.size.must_equal 1
+      end
+    end
+  end
 
   def must_have_valid_keys response, keys
     raise "The response passed in is empty." if response.keys.empty?
@@ -124,21 +193,47 @@ describe Ogle::Image do
   def must_have_valid_methods response, keys
     keys.each { |k| response.respond_to? k }
   end
+
+  def upload name
+    image    = File.join TEST_ROOT, "support", "test-image"
+    metadata = {
+      "x-image-meta-is-public"            => "true",
+      "x-image-meta-property-distro"      => "test-distro",
+      "x-image-meta-property-arch"        => "test-arch",
+      "x-image-meta-property-uploader"    => "test-uploader",
+      "x-image-meta-property-type"        => "test-type",
+      "x-image-meta-property-kernel_name" => "test-kernel-name",
+      "x-image-meta-property-kernel_id"   => "test-kernel-id",
+      "x-image-meta-property-version"     => "test-version"
+    }
+
+    CONNECTION.image.create name, image, metadata
+  end
 end
 
+##
+# These test expect images with ids of:
+#   - for decimal (0-9)
+#   - for hex >9
+
 describe Ogle::ImageData do
+  before do
+    @decimal_image_id     = 4
+    @hexadecimal_image_id = 36
+  end
+  
   describe "#to_ami_id" do
     it "return a valid ami id" do
-      VCR.use_cassette "image_find" do
-        @response = CONNECTION.image.find 4
+      VCR.use_cassette "image_find_with_decimal" do
+        @response = CONNECTION.image.find @decimal_image_id
 
         @response.to_ami_id.must_equal "ami-00000004"
       end
     end
 
     it "return a valid hex ami id" do
-      VCR.use_cassette "image_find" do
-        @response = CONNECTION.image.find 36
+      VCR.use_cassette "image_find_with_hexadecimal" do
+        @response = CONNECTION.image.find @hexadecimal_image_id
 
         @response.to_ami_id.must_equal "ami-00000024"
       end

metadata

@@ -2,7 +2,7 @@
 name: ogle
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Kevin Bringard
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 -06:00
+date: 2011-06-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.6.0
+        version: 2.7.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -90,14 +90,17 @@ files:
 - lib/ogle/image.rb
 - lib/ogle/version.rb
 - ogle.gemspec
+- test/cassettes/image_all.yml
+- test/cassettes/image_all_with_details.yml
 - test/cassettes/image_create.yml
 - test/cassettes/image_destroy.yml
 - test/cassettes/image_find.yml
-- test/cassettes/images_all.yml
-- test/cassettes/images_all_with_details.yml
-- test/cassettes/images_find.yml
-- test/cassettes/images_runable.yml
-- test/cassettes/images_runable_with_details.yml
+- test/cassettes/image_find_with_decimal.yml
+- test/cassettes/image_find_with_hexadecimal.yml
+- test/cassettes/image_runable.yml
+- test/cassettes/image_runable_with_details.yml
+- test/cassettes/image_update_metadata.yml
+- test/cassettes/image_update_properties.yml
 - test/lib/ogle/image_test.rb
 - test/support/test-image
 - test/test_helper.rb
@@ -130,14 +133,17 @@ signing_key:
 specification_version: 3
 summary: Ruby interface for OpenStack Glance
 test_files: 
+- test/cassettes/image_all.yml
+- test/cassettes/image_all_with_details.yml
 - test/cassettes/image_create.yml
 - test/cassettes/image_destroy.yml
 - test/cassettes/image_find.yml
-- test/cassettes/images_all.yml
-- test/cassettes/images_all_with_details.yml
-- test/cassettes/images_find.yml
-- test/cassettes/images_runable.yml
-- test/cassettes/images_runable_with_details.yml
+- test/cassettes/image_find_with_decimal.yml
+- test/cassettes/image_find_with_hexadecimal.yml
+- test/cassettes/image_runable.yml
+- test/cassettes/image_runable_with_details.yml
+- test/cassettes/image_update_metadata.yml
+- test/cassettes/image_update_properties.yml
 - test/lib/ogle/image_test.rb
 - test/support/test-image
 - test/test_helper.rb