deltacloud-core 0.1.1 → 0.1.2

data/views/api/drivers.xml.haml

@@ -0,0 +1,6 @@
+%api{ :version => settings.version }
+  %drivers
+    - DRIVERS.each do |id, details|
+      %driver{ :id => id }
+        %name<
+          =details[:name]

data/views/api/show.html.haml

@@ -1,5 +1,5 @@
 %h1
-  API v#{@version}
+  API v#{settings.version}
 
 %ul
   - collections.keys.sort_by { |k| k.to_s }.each do |key|
@@ -12,4 +12,4 @@
             = op
   %li
     %strong
-      %a{:href => url_for("/api/docs")} Documentation (v#{@version})
+      %a{:href => url_for("/api/docs")} Documentation (#{settings.version})

data/views/api/show.xml.haml

@@ -1,4 +1,4 @@
-%api{ :version=>@version, :driver=>DRIVER }
+%api{ :version => settings.version, :driver => driver_symbol }
   - for entry_point in entry_points
     %link{ :rel=>entry_point[0], :href=>entry_point[1] }
       - for feature in driver.features(entry_point[0])

data/views/buckets/index.html.haml

@@ -30,4 +30,5 @@
           -bucket.blob_list.each do |blob|
             = blob
         %td
-          =link_to_action 'Delete', destroy_bucket_url(bucket.name), :delete
+          -if bucket.size == 0
+            =link_to_action 'Delete', destroy_bucket_url(bucket.name), :delete

data/views/buckets/show.html.haml

@@ -14,9 +14,10 @@
     %dd
       -@bucket.blob_list.each do |blob|
         = link_to blob, bucket_url(@bucket.name) + '/' + blob
-    %dt Delete bucket (must be empty)
-    %dd
     %dt Create a new blob
     %dd
       =link_to 'Create Blob', bucket_url(@bucket.name) + '/new_blob'
-      =link_to_action 'Delete', destroy_bucket_url(@bucket.name), :delete
+    %dt Delete bucket (must be empty)
+    %dd
+      -if @bucket.size == 0
+        =link_to_action 'Delete', destroy_bucket_url(@bucket.name), :delete

data/views/errors/backend_error.xml.haml

@@ -1,6 +1,6 @@
 %error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
   %kind backend_error
-  %backend{ :driver => DRIVER }
+  %backend{ :driver => driver_symbol }
     %code= @error.code
     %cause= @error.cause
     - if @error.details

data/views/images/index.xml.haml

@@ -4,5 +4,9 @@
     %image{:href => image_url(image.id), :id => image.id}
       - image.attributes.select{ |attr| attr!=:id }.each do |attribute|
         - haml_tag("#{attribute}".tr('-', '_'), :<) do
-          - haml_concat image.send(attribute)
+          - if [:name, :description].include?(attribute)
+            =cdata do
+              - haml_concat image.send(attribute)
+          - else
+            - haml_concat image.send(attribute)
 

data/views/keys/show.xml.haml

@@ -17,3 +17,5 @@
     %password<
       =cdata do
         =@key.password
+  %state<
+    =@key.state

data/views/layout.html.haml

@@ -19,7 +19,7 @@
         = yield
       #footer
         #driver_info
-          Driver: #{DRIVER}
+          Driver: #{driver_symbol} | API version: #{settings.version}
         #copyright
           Copyright 2009, 2010
           %a{:href => 'http://redhat.com'} Red Hat

data/views/realms/index.html.haml

@@ -5,15 +5,13 @@
   %thead
     %tr
       %th
-        Name
-      %th
-        Architecture
+        ID
       %th
-        Memory
+        Name
       %th
-        Storage
+        State
       %th
-        Mutable
+        Limit
   %tbody
     - @realms.each do |realm|
       %tr
@@ -25,5 +23,4 @@
           = realm.state
         %td
           = realm.limit
-        %td
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-core
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +01:00
+date: 2010-12-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -222,8 +222,8 @@ files:
 - Rakefile
 - config.ru
 - parse.rb
-- deltacloud.rb
 - test.rb
+- deltacloud.rb
 - server.rb
 - support/fedora/rubygem-deltacloud-core.spec
 - support/fedora/deltacloudd
@@ -233,21 +233,19 @@ files:
 - lib/sinatra/url_for.rb
 - lib/sinatra/lazy_auth.rb
 - lib/sinatra/rabbit.rb
+- lib/sinatra/rack_driver_select.rb
 - lib/deltacloud/models/base_model.rb
 - lib/deltacloud/models/blob.rb
 - lib/deltacloud/models/bucket.rb
+- lib/deltacloud/models/image.rb
 - lib/deltacloud/models/instance_profile.rb
+- lib/deltacloud/models/key.rb
 - lib/deltacloud/models/realm.rb
 - lib/deltacloud/models/storage_snapshot.rb
+- lib/deltacloud/models/storage_volume.rb
 - lib/deltacloud/models/load_balancer.rb
-- lib/deltacloud/models/image.rb
 - lib/deltacloud/models/instance.rb
-- lib/deltacloud/models/key.rb
-- lib/deltacloud/models/storage_volume.rb
-- lib/deltacloud/drivers/ec2/ec2_mock_driver.rb
-- lib/deltacloud/drivers/ec2/ec2_driver.rb
 - lib/deltacloud/drivers/terremark/terremark_driver.rb
-- lib/deltacloud/drivers/gogrid/test.rb
 - lib/deltacloud/drivers/gogrid/gogrid_client.rb
 - lib/deltacloud/drivers/gogrid/gogrid_driver.rb
 - lib/deltacloud/drivers/opennebula/occi_client.rb
@@ -260,20 +258,22 @@ files:
 - lib/deltacloud/drivers/rackspace/rackspace_client.rb
 - lib/deltacloud/drivers/rhevm/rhevm_driver.rb
 - lib/deltacloud/drivers/azure/azure_driver.rb
-- lib/deltacloud/base_driver/base_driver.rb
+- lib/deltacloud/drivers/ec2/ec2_mock_driver.rb
+- lib/deltacloud/drivers/ec2/ec2_driver.rb
 - lib/deltacloud/base_driver/features.rb
 - lib/deltacloud/base_driver/mock_driver.rb
+- lib/deltacloud/base_driver/base_driver.rb
 - lib/deltacloud/helpers/blob_stream.rb
 - lib/deltacloud/helpers/conversion_helper.rb
 - lib/deltacloud/helpers/hardware_profiles_helper.rb
 - lib/deltacloud/helpers/application_helper.rb
+- lib/deltacloud/backend_capability.rb
 - lib/deltacloud/base_driver.rb
 - lib/deltacloud/hardware_profile.rb
 - lib/deltacloud/helpers.rb
 - lib/deltacloud/method_serializer.rb
 - lib/deltacloud/state_machine.rb
 - lib/deltacloud/validation.rb
-- lib/deltacloud/backend_capability.rb
 - lib/drivers.rb
 - lib/deltacloud/drivers/mock/data/storage_volumes/vol1.yml
 - lib/deltacloud/drivers/mock/data/storage_volumes/vol3.yml
@@ -305,61 +305,62 @@ files:
 - views/accounts/show.html.haml
 - views/storage_snapshots/show.html.haml
 - views/storage_snapshots/index.xml.haml
-- views/storage_snapshots/show.xml.haml
 - views/storage_snapshots/index.html.haml
+- views/storage_snapshots/show.xml.haml
 - views/errors/not_found.html.haml
 - views/errors/auth_exception.xml.haml
 - views/errors/validation_failure.xml.haml
 - views/errors/not_found.xml.haml
 - views/errors/auth_exception.html.haml
-- views/errors/backend_error.html.haml
 - views/errors/validation_failure.html.haml
-- views/errors/backend_capability_failure.html.haml
-- views/errors/backend_capability_failure.xml.haml
 - views/errors/not_allowed.html.haml
 - views/errors/not_allowed.xml.haml
+- views/errors/backend_error.html.haml
+- views/errors/backend_capability_failure.html.haml
+- views/errors/backend_capability_failure.xml.haml
 - views/errors/backend_error.xml.haml
-- views/images/show.xml.haml
-- views/images/index.xml.haml
 - views/images/index.html.haml
 - views/images/show.html.haml
+- views/images/index.xml.haml
+- views/images/show.xml.haml
 - views/keys/new.html.haml
-- views/keys/index.xml.haml
 - views/keys/show.html.haml
-- views/keys/show.xml.haml
 - views/keys/index.html.haml
-- views/instances/show.xml.haml
-- views/instances/index.xml.haml
-- views/instances/new.html.haml
+- views/keys/index.xml.haml
+- views/keys/show.xml.haml
 - views/instances/index.html.haml
+- views/instances/new.html.haml
 - views/instances/show.html.haml
-- views/hardware_profiles/show.xml.haml
-- views/hardware_profiles/index.xml.haml
+- views/instances/index.xml.haml
+- views/instances/show.xml.haml
 - views/hardware_profiles/index.html.haml
 - views/hardware_profiles/show.html.haml
+- views/hardware_profiles/index.xml.haml
+- views/hardware_profiles/show.xml.haml
 - views/docs/operation.xml.haml
 - views/docs/operation.html.haml
 - views/docs/collection.xml.haml
 - views/docs/index.xml.haml
 - views/docs/index.html.haml
 - views/docs/collection.html.haml
-- views/realms/show.xml.haml
-- views/realms/index.xml.haml
 - views/realms/show.html.haml
 - views/realms/index.html.haml
-- views/blobs/show.xml.haml
+- views/realms/index.xml.haml
+- views/realms/show.xml.haml
 - views/blobs/new.html.haml
 - views/blobs/show.html.haml
-- views/buckets/index.xml.haml
+- views/blobs/show.xml.haml
 - views/buckets/new.html.haml
-- views/buckets/show.xml.haml
 - views/buckets/index.html.haml
 - views/buckets/show.html.haml
-- views/load_balancers/index.xml.haml
-- views/load_balancers/new.html.haml
-- views/load_balancers/show.xml.haml
+- views/buckets/index.xml.haml
+- views/buckets/show.xml.haml
 - views/load_balancers/index.html.haml
+- views/load_balancers/new.html.haml
+- views/load_balancers/index.xml.haml
 - views/load_balancers/show.html.haml
+- views/load_balancers/show.xml.haml
+- views/api/drivers.xml.haml
 - views/api/show.html.haml
 - views/api/show.xml.haml
 - views/layout.html.haml

data/lib/deltacloud/drivers/gogrid/test.rb

@@ -1,13 +0,0 @@
-require 'gogrid_client'
-require 'ap'
-
-user='fbb1de3897597ccf'
-password='ngieth10'
-
-client=GoGridClient.new('https://api.gogrid.com/api', user, password)
-
-ap client.request('grid/ip/list', {
-  'ip.type' => '1',
-  'ip.state' => '1',
-  'datacenter' => '1'
-})