deltacloud-core 0.0.6 → 0.0.7

data/tests/instance_states_test.rb

@@ -42,10 +42,9 @@ module DeltacloudUnitTest
     end
 
     def test_it_responses_to_png
-      do_request '/api/instance_states', {}, false, { :format => :png }
+      do_request '/api/instance_states', { :format => 'png' }, false
       last_response.status.should == 200
       last_response.headers['Content-Type'].should == 'image/png'
-      #last_response.headers['Content-Length'].should == '4371'
     end
 
   end

data/tests/instances_test.rb

@@ -70,8 +70,9 @@ module DeltacloudUnitTest
       params = {
         :image_id => 'img1'
       }
-      post '/api/instances', params, authenticate(:format => :xml)
-      last_response.status.should == 302
+      header 'Accept', accept_header(:xml)
+      post '/api/instances', params, authenticate
+      last_response.status.should == 201
       last_response.headers['Location'].should_not == nil
       do_xml_request last_response.headers['Location'], {}, true
       (last_xml_response/'instance/name').should_not == nil
@@ -84,8 +85,9 @@ module DeltacloudUnitTest
         :image_id => 'img1',
         :name => "unit_test_instance1"
       }
+      header 'Accept', accept_header(:xml)
       post '/api/instances', params, authenticate(:format => :xml)
-      last_response.status.should == 302
+      last_response.status.should == 201
       last_response.headers['Location'].should_not == nil
       do_xml_request last_response.headers['Location'], {}, true
       (last_xml_response/'instance/name').text.should == 'unit_test_instance1'
@@ -99,8 +101,9 @@ module DeltacloudUnitTest
         :name => "unit_test_instance1",
         :hwp_id => "m1-xlarge"
       }
+      header 'Accept', accept_header(:xml)
       post '/api/instances', params, authenticate(:format => :xml)
-      last_response.status.should == 302
+      last_response.status.should == 201
       last_response.headers['Location'].should_not == nil
       do_xml_request last_response.headers['Location'], {}, true
       (last_xml_response/'instance/name').text.should == 'unit_test_instance1'
@@ -114,7 +117,7 @@ module DeltacloudUnitTest
         do_xml_request "/api/instances/#{instance_id}", {}, true
         stop_url = (last_xml_response/'actions/link[@rel="stop"]').first['href']
         stop_url.should_not == nil
-        post create_url(stop_url), {}, authenticate(:format => :xml)
+        post create_url(stop_url), { :format => 'xml' }, authenticate
         last_response.status.should == 200
         instance = Nokogiri::XML(last_response.body)
         test_instance_attributes(instance)
@@ -122,7 +125,7 @@ module DeltacloudUnitTest
         do_xml_request "/api/instances/#{instance_id}", {}, true
         start_url = (last_xml_response/'actions/link[@rel="start"]').first['href']
         start_url.should_not == nil
-        post create_url(start_url), {}, authenticate(:format => :xml)
+        post create_url(start_url), { :format => 'xml'}, authenticate
         last_response.status.should == 200
         instance = Nokogiri::XML(last_response.body)
         test_instance_attributes(instance)
@@ -135,7 +138,7 @@ module DeltacloudUnitTest
         do_xml_request "/api/instances/#{instance_id}", {}, true
         reboot_url = (last_xml_response/'actions/link[@rel="reboot"]').first['href']
         reboot_url.should_not == nil
-        post create_url(reboot_url), {}, authenticate(:format => :xml)
+        post create_url(reboot_url), { :format => "xml"}, authenticate
         last_response.status.should == 200
         instance = Nokogiri::XML(last_response.body)
         test_instance_attributes(instance)
@@ -148,7 +151,7 @@ module DeltacloudUnitTest
         do_xml_request "/api/instances/#{instance_id}", {}, true
         stop_url = (last_xml_response/'actions/link[@rel="stop"]').first['href']
         stop_url.should_not == nil
-        post create_url(stop_url), {}, authenticate(:format => :xml)
+        post create_url(stop_url), {}, authenticate
         last_response.status.should == 200
         instance = Nokogiri::XML(last_response.body)
         test_instance_attributes(instance)
@@ -161,7 +164,7 @@ module DeltacloudUnitTest
         do_xml_request "/api/instances/#{instance_id}", {}, true
         destroy_url = (last_xml_response/'actions/link[@rel="destroy"]').first['href']
         destroy_url.should_not == nil
-        delete create_url(destroy_url), {}, authenticate(:format => :xml)
+        delete create_url(destroy_url), {}, authenticate
         last_response.status.should == 302
         do_xml_request last_response.headers['Location'], {}, true
         (last_xml_response/'instances').should_not == nil

data/tests/url_for_test.rb

@@ -30,7 +30,7 @@ module DeltacloudUnitTest
 
     def verify_url_for(url, expected_url, mode=:path_only, params={}, rack_env={})
       # generate a unique url for each test
-      test_url = "/url_for_test/#{expected_url.hash}/#{Time.now.to_f}"
+      test_url = "/url_for_test/#{expected_url.hash}/#{Time.now.to_i}"
       # Create our sinatra test endpoint
       self.class.create_test_url_content(test_url, url, mode)
 

data/views/blobs/show.html.haml

@@ -0,0 +1,20 @@
+%h1 Blob
+%h2
+  = @blob.id
+
+%dl
+  %dt bucket
+  %dd
+    = @blob.bucket
+  %dt Content_Length
+  %dd
+    = @blob.content_length
+  %dt Content_Type
+  %dd
+    = @blob.content_type
+  %dt Last_Modified
+  %dd
+    = @blob.last_modified
+  %dt Content
+  %dd
+    =link_to 'Blob content', bucket_url(@blob.bucket) + '/' + @blob.id + '/content'

data/views/blobs/show.xml.haml

@@ -0,0 +1,7 @@
+!!! XML
+%blob{:href => bucket_url(@blob.bucket) + '/' + @blob.id, :id => @blob.id}
+  - @blob.attributes.select{ |attr| attr!=:id}.each do |attribute|
+    - unless attribute == :content
+      - haml_tag(attribute, :<) do
+        - haml_concat @blob.send(attribute)
+  %content{:href => bucket_url(@blob.bucket) + '/' + @blob.id + '/content'}

data/views/buckets/index.html.haml

@@ -0,0 +1,33 @@
+%h1
+  Buckets
+%br
+%p
+  =link_to 'Create new bucket', "/api/buckets/new"
+
+%table.display
+  %thead
+    %tr
+      %th
+        ID
+      %th
+        Name
+      %th
+        Size
+      %th
+        Blob List
+      %th
+
+  %tbody
+    - @buckets.each do |bucket|
+      %tr
+        %td
+          = link_to bucket.id, bucket_url(bucket.id)
+        %td
+          = bucket.name
+        %td
+          = bucket.size
+        %td
+          -bucket.blob_list.each do |blob|
+            = blob
+        %td
+          =link_to 'Delete', destroy_bucket_url(bucket.name), :class => 'delete'

data/views/buckets/index.xml.haml

@@ -0,0 +1,10 @@
+!!! XML
+%buckets
+  - @elements.each do |bucket|
+    %bucket{:href => bucket_url(bucket.id), :id => bucket.id}
+      - bucket.attributes.select{ |attr| attr!=:id }.each do |attribute|
+        - unless attribute == :blob_list
+          - haml_tag("#{attribute}".tr('-', '_'), :<) do
+            - haml_concat bucket.send(attribute)
+      - bucket.blob_list.each do |blb|
+        %blob{ :id => blb, :href => bucket_url(bucket.id) +"/#{blb}"}

data/views/buckets/new.html.haml

@@ -0,0 +1,13 @@
+%h1 New Bucket
+
+%form{ :action => buckets_url, :method => :post }
+  %label
+    Bucket Name:
+    %input{ :name => 'name', :size => 250}/
+    %br
+  -if driver_has_bucket_location_feature?
+    %p
+      %label
+        Location: (optional)
+        %input{ :name => 'location', :size => 20 }/
+  %input{ :type => :submit, :name => "commit", :value => "create"}/

data/views/buckets/show.html.haml

@@ -0,0 +1,19 @@
+%h1 Bucket
+%h2
+  = @bucket.id
+
+%dl
+  %di
+    %dt Name
+    %dd
+      = @bucket.name
+    %dt Size
+    %dd
+      = @bucket.size
+    %dt Blobs
+    %dd
+      -@bucket.blob_list.each do |blob|
+        = link_to blob, bucket_url(@bucket.name) + '/' + blob
+    %dt delete bucket (must be empty)
+    %dd
+      =link_to 'Delete', destroy_bucket_url(@bucket.name), :class => 'delete'

data/views/buckets/show.xml.haml

@@ -0,0 +1,8 @@
+!!! XML
+%bucket{:href => bucket_url(@bucket.id), :id => @bucket.id}
+  - @bucket.attributes.select{ |attr| attr!=:id }.each do |attribute|
+    - unless attribute == :blob_list
+      -haml_tag(attribute, :<) do
+        - haml_concat @bucket.send(attribute)
+  - @bucket.blob_list.each do |blb|
+    %blob{:id => blb, :href => bucket_url(@bucket.id) +"/#{blb}"}

data/views/instance_states/show.html.haml

@@ -1,7 +1,7 @@
 %h1 Instance States
 
 %div#state_graph
-  = image_tag url_for( '/api/instance_states.png' )
+  = image_tag url_for( '/api/instance_states?format=png' )
 
 %table.states
   %thead

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-core
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +02:00
+date: 2010-09-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,9 +99,25 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: thin
+  name: rack-accept
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 4
+        - 3
+        version: 0.4.3
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: thin
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,11 +129,11 @@ dependencies:
         - 5
         version: 1.2.5
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rerun
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,11 +145,11 @@ dependencies:
         - 2
         version: 0.5.2
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -141,15 +157,15 @@ dependencies:
         hash: 1
         segments: 
         - 1
-        - 4
-        - 3
-        version: 1.4.3
+        - 1
+        - 9
+        version: 1.1.9
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: compass
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -161,11 +177,11 @@ dependencies:
         - 17
         version: 0.8.17
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -177,11 +193,11 @@ dependencies:
         - 1
         version: 1.4.1
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -193,11 +209,11 @@ dependencies:
         - 3
         version: 0.5.3
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -209,11 +225,11 @@ dependencies:
         - 3
         version: 0.6.3
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -225,7 +241,7 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 description: "    The Deltacloud API is built as a service-based REST API.\n    You do not directly link a Deltacloud library into your program to use it.\n    Instead, a client speaks the Deltacloud API over HTTP to a server\n    which implements the REST interface.\n"
 email: deltacloud-users@lists.fedorahosted.org
 executables: 
@@ -242,13 +258,13 @@ files:
 - server.rb
 - support/fedora/rubygem-deltacloud-core.spec
 - support/fedora/deltacloudd
-- lib/drivers.rb
-- lib/sinatra/respond_to.rb
 - lib/sinatra/lazy_auth.rb
 - lib/sinatra/accept_media_types.rb
 - lib/sinatra/static_assets.rb
 - lib/sinatra/url_for.rb
 - lib/sinatra/rabbit.rb
+- lib/sinatra/respond_to_old.rb
+- lib/sinatra/respond_to.rb
 - lib/deltacloud/models/base_model.rb
 - lib/deltacloud/models/realm.rb
 - lib/deltacloud/models/instance.rb
@@ -257,6 +273,8 @@ files:
 - lib/deltacloud/models/storage_volume.rb
 - lib/deltacloud/models/storage_snapshot.rb
 - lib/deltacloud/models/image.rb
+- lib/deltacloud/models/blob.rb
+- lib/deltacloud/models/bucket.rb
 - lib/deltacloud/method_serializer.rb
 - lib/deltacloud/helpers.rb
 - lib/deltacloud/drivers/ec2/ec2_mock_driver.rb
@@ -265,25 +283,28 @@ files:
 - lib/deltacloud/drivers/gogrid/test.rb
 - lib/deltacloud/drivers/gogrid/gogrid_client.rb
 - lib/deltacloud/drivers/gogrid/gogrid_driver.rb
-- lib/deltacloud/drivers/opennebula/opennebula_driver.rb
 - lib/deltacloud/drivers/opennebula/occi_client.rb
 - lib/deltacloud/drivers/opennebula/cloud_client.rb
+- lib/deltacloud/drivers/opennebula/opennebula_driver.rb
 - lib/deltacloud/drivers/mock/mock_driver.rb
 - lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb
 - lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
 - lib/deltacloud/drivers/rackspace/rackspace_client.rb
 - lib/deltacloud/drivers/rackspace/rackspace_driver.rb
 - lib/deltacloud/drivers/rhevm/rhevm_driver.rb
+- lib/deltacloud/drivers/azure/azure_driver.rb
 - lib/deltacloud/hardware_profile.rb
 - lib/deltacloud/validation.rb
-- lib/deltacloud/base_driver/mock_driver.rb
 - lib/deltacloud/base_driver/base_driver.rb
 - lib/deltacloud/base_driver/features.rb
+- lib/deltacloud/base_driver/mock_driver.rb
 - lib/deltacloud/helpers/hardware_profiles_helper.rb
-- lib/deltacloud/helpers/application_helper.rb
 - lib/deltacloud/helpers/conversion_helper.rb
+- lib/deltacloud/helpers/blob_stream.rb
+- lib/deltacloud/helpers/application_helper.rb
 - lib/deltacloud/state_machine.rb
 - lib/deltacloud/base_driver.rb
+- lib/drivers.rb
 - lib/deltacloud/drivers/mock/data/storage_volumes/vol1.yml
 - lib/deltacloud/drivers/mock/data/storage_volumes/vol3.yml
 - lib/deltacloud/drivers/mock/data/storage_volumes/vol2.yml
@@ -348,7 +369,14 @@ files:
 - views/realms/index.xml.haml
 - views/realms/show.html.haml
 - views/realms/index.html.haml
-- views/instance_states/show.gv.erb
+- views/blobs/show.html.haml
+- views/blobs/show.xml.haml
+- views/buckets/index.html.haml
+- views/buckets/index.xml.haml
+- views/buckets/new.html.haml
+- views/buckets/show.html.haml
+- views/buckets/show.xml.haml
+- views/instance_states/show.png.erb
 - public/favicon.ico
 - public/images/topbar-bg.png
 - public/images/grid.png
@@ -362,12 +390,12 @@ files:
 - public/stylesheets/compiled/screen.css
 - bin/deltacloudd
 - COPYING
-- tests/instance_states_test.rb
 - tests/api_test.rb
-- tests/instances_test.rb
 - tests/hardware_profiles_test.rb
 - tests/realms_test.rb
 - tests/images_test.rb
+- tests/instance_states_test.rb
+- tests/instances_test.rb
 - tests/url_for_test.rb
 has_rdoc: true
 homepage: http://www.deltacloud.org
@@ -406,10 +434,10 @@ signing_key:
 specification_version: 3
 summary: Deltacloud REST API
 test_files: 
-- tests/instance_states_test.rb
 - tests/api_test.rb
-- tests/instances_test.rb
 - tests/hardware_profiles_test.rb
 - tests/realms_test.rb
 - tests/images_test.rb
+- tests/instance_states_test.rb
+- tests/instances_test.rb
 - tests/url_for_test.rb