deltacloud-core 0.5.0 → 1.0.0

data/views/instances/run_command.html.haml

@@ -1,16 +1,25 @@
-%h1
-  Run command on 
-  = @instance.id
+=header "Run a command on #{@instance.name}"
+=subheader "#{@instance.id}"
 
-%form{ :action => run_instance_url(@instance.id), :method => :post }
-  %p
-    %label{ :for => :cmd } Desired command:
-    %input{ :name => :cmd, :value => "", :type => :text}
-  %p
-    %label{ :for => :private_key } Private key:
-  %p
-    %small Leave private key blank if using password authentication method
-  %p
-    %textarea{ :name => :private_key, :cols => 65, :rows => 20 }
-  %p
-    %input{ :type => :submit, :value => "Execute" }
+%div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
+  %form{ :action => api_url_for('/instances/%s/run' % @instance.id), :method => :post }
+    %p
+      %label{ :for => :cmd } Desired command:
+      %input{ :name => :cmd, :value => "", :type => :text}
+    %p
+      %fieldset{ :'data-role' => :fieldcontain}
+        %legend Target instance IP address:
+        - (@instance.public_addresses | @instance.private_addresses).each_with_index do |ip, idx|
+          %label{ :for => ip.address }= "#{ip.address}"
+          %input{ :name => :ip, :value => ip.address, :id => ip.address, :type => :radio, :'data-theme' => 'b', :checked => idx == 0 || nil}/
+    %p
+      %label{ :for => :port } Target port:
+      %input{ :name => "port", :size => 5, :value => "22", :type => :text}
+    %p
+      %label{ :for => :private_key } Private key:
+    %p
+      %small Leave private key blank if using password authentication method
+    %p
+      %textarea{ :name => :private_key, :cols => 65, :rows => 20 }
+    %p
+      %input{ :type => :submit, :value => "Execute" }

data/views/instances/show.html.haml

@@ -19,7 +19,7 @@
     %li
       - prof = @instance.instance_profile
       %a{ :href => hardware_profile_url(prof.name), :'data-ajax' => 'false'}
-        =[prof.name, format_instance_profile(prof)].join(', ')
+        =[prof.name, format_instance_profile(prof)].compact.join(', ')
     %li{ :'data-role' => 'list-divider'} Realm
     %li
       - if @instance.realm_id
@@ -45,16 +45,20 @@
         %a{ :href => key_url(@instance.keyname), :'data-ajax' => 'false'}=@instance.keyname
     - if @instance.firewalls
       %li{ :'data-role' => 'list-divider'} Firewalls
-      %li=@instance.firewalls.join(", ")
+      - @instance.firewalls.each do |firewall|
+        %li
+          %a{ :href => firewall_url(firewall), :'data-ajax' => 'false'}=firewall
     - if @instance.storage_volumes
       %li{ :'data-role' => 'list-divider'} Attached Storage Volumes
       -@instance.storage_volumes.each do |vol|
         %li
-          %p{ :'data-role' => 'fieldcontain'}="#{vol.keys.first} <---> #{vol.values.first}"
+          %a{ :href => storage_volume_url("#{vol.keys.first}"), :'data-ajax' => 'false'}=["#{vol.keys.first}", "#{vol.values.first}"].compact.reject{ |e| e.empty? }.join(' <---> ')
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
         - @instance.actions.each do |action|
           =link_to_action action, self.send(:"#{action}_instance_url", @instance.id), instance_action_method(action)
+        - if @instance.state=="RUNNING" and driver.respond_to?(:run_on_instance)
+          =link_to_action 'run command', api_url_for('instances/%s/run' % @instance.id), :get
         - if @instance.can_create_image?
           =link_to_action 'Create Image', api_url_for("images/new?instance_id=#{@instance.id}"), :get

data/views/instances/show.xml.haml

@@ -45,8 +45,8 @@
     %storage_volumes<
       - @instance.storage_volumes.each do |volume|
         %storage_volume{:href=> storage_volume_url(volume.keys.first), :id => volume.keys.first, :device => volume.values.first}
-  - if driver_has_auth_features?
-    %authentication{ :type => driver_auth_feature_name }
+  - if driver.class.has_feature?(:instances, :authentication_key) or driver.class.has_feature?(:instances, :authentication_password)
+    %authentication{ :type => auth_feature_name }
       - if @instance.authn_feature_failed?
         %error  #{@instance.authn_error}
       - else

data/views/keys/show.xml.haml

@@ -1,6 +1,7 @@
 - unless defined?(partial)
   !!! XML
 %key{ :href => key_url(@key.id), :id => @key.id, :type => "#{@key.credential_type}" }
+  %name=@key.name
   %actions
     - if driver.respond_to?(:destroy_key)
       %link{ :rel => "destroy", :method => "delete", :href => destroy_key_url(@key.id)}

data/views/layout.html.haml

@@ -2,19 +2,15 @@
 %html
   %head
     %title Deltacloud API #{settings.version}
-    = stylesheet_link_tag '/stylesheets/jquery.mobile-1.0rc1.min.css'
-    = stylesheet_link_tag '/stylesheets/new.css'
+    %link{ :charset => "utf-8", :href => "/stylesheets/jquery.mobile-1.0.1.min.css", :media => "screen", :rel => "stylesheet", :type => "text/css"}
+    %link{ :charset => "utf-8", :href => "/stylesheets/new.css", :media => "screen", :rel => "stylesheet", :type => "text/css"}
     %script{:type => "text/javascript", :src => "/javascripts/jquery.min.js" }
     %script{:type => "text/javascript", :src => "/javascripts/application.js" }
-    %script{:type => "text/javascript", :src => "/javascripts/jquery.mobile-1.0rc1.min.js" }
+    %script{:type => "text/javascript", :src => "/javascripts/jquery.mobile-1.0.1.min.js" }
     :javascript
-      $(document).ready(function() {
-        $(document).bind("mobileinit", function(){
-          $.mobile.ajaxEnabled = false;
+      $(document).bind("mobileinit", function(){
           $.mobile.hashListeningEnabled = false;
-        });
       })
-
   %body
     %div{ 'data-role' => :page }
       = yield
@@ -22,7 +18,7 @@
         %div{ 'data-role' => :navbar}
           %ul
             %li
-              %a{ :'data-icon' => 'home', :href => api_url_for(''), :'data-ajax' => 'false'} Home
+              %a{ :'data-icon' => 'home', :href => "#{api_url_for('').chomp("/")}", :'data-ajax' => 'false'} Home
             %li=link_to_format(:xml)
             %li=link_to_format(:json)
         %div{ 'data-role' => :header, 'data-theme' => 'a' }

data/views/load_balancers/show.html.haml

@@ -15,14 +15,21 @@
       %li
         %a{ :href => realm_url(realm.id), :'data-ajax' => 'false'}
           %h3=realm.name
-    %li{ :'data-role' => 'list-divider'} Instances
-    - @load_balancer.instances.each do |instance|
+    %li{ :'data-role' => 'list-divider'} Registered Instances
+    - @registered_instances.each do |instance|
       %li
-        %a{ :href => instance_url(instance.id), :'data-ajax' => 'false'}
-          %h3=instance.name
+        %a{ :href => instance_url(instance[:id]), :'data-ajax' => 'false'}
+          %h3=instance[:name]
+          =link_to_action "UnRegister", api_url_for("load_balancers/#{@load_balancer.id}/unregister?instance_id=#{instance[:id]}"), :post
+    %li{ :'data-role' => 'list-divider'} UnRegistered Instances
+    - @unregistered_instances.each do |instance|
+      %li
+        %a{:href => instance_url(instance[:id]), :'data-ajax' => 'false'}
+          %h3=instance[:name]
+          =link_to_action "Register", api_url_for("load_balancers/#{@load_balancer.id}/register?instance_id=#{instance[:id]}"), :post
     %li{ :'data-role' => 'list-divider'} Actions
     %li
-      =link_to_action "Destroy", destroy_load_balancer_url(@load_balancer.id), :delete
+      =link_to_action "Destroy", api_url_for("load_balancers/#{@load_balancer.id}"), :delete
 
   =header "Listeners", :back => 'false'
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
@@ -33,4 +40,3 @@
       %li{ :'data-role' => 'list-divider'} Instance port
       %li
         %p{ :'data-role' => 'fieldcontain'}=listener.instance_port
-

data/views/metrics/index.html.haml

@@ -0,0 +1,13 @@
+=header "Metrics"
+=subheader "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}"
+
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
+    %li{ :'data-role' => 'list-divider'}=driver_symbol
+    - @metrics.each do |metric|
+      %li
+        %a{ :href => metric_url(metric.id), :'data-ajax' => 'false'}
+          %img{ :class => 'ui-link-thumb', :src => '/images/metric.png'}
+          %h3= metric.id
+          %p
+            = metric.properties.map { |p| p.name }.join(', ')

data/views/metrics/index.xml.haml

@@ -0,0 +1,5 @@
+- unless defined?(partial)
+  !!!XML
+%metrics
+  - @elements.each do |c|
+    = haml :'metrics/show', :locals => { :@metric => c, :partial => true}

data/views/metrics/show.html.haml

@@ -0,0 +1,23 @@
+=header Metric
+=subheader @metric.id
+
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %div{ :'data-role' => :'collapsible-set'}
+    - @metric.properties.each do |p|
+      %div{ :'data-role' => :'collapsible', :'data-collapse' => 'true'}
+        %h3=p.name
+        %table{ :summary => "#{p.name} values"}
+          %caption Statistics for last 60 minutes
+          %tr
+            %th Time
+            %th Minumum
+            %th Maximum
+            %th Average
+            %th Units
+          - p.values.each do |v|
+            %tr
+              %td=v[:timestamp]
+              %td=v[:minimum]
+              %td=v[:maximum]
+              %td=v[:average]
+              %td=v[:unit]

data/views/metrics/show.xml.haml

@@ -0,0 +1,9 @@
+- unless defined?(partial)
+  !!! XML
+%metric{:href => metric_url(@metric.id), :id => @metric.id}
+  -haml_tag(:entity, :<) do
+    -haml_concat @metric.send(:id)
+  %properties
+    -@metric.properties.each do |prop|
+      -haml_tag(prop.name, :<) do
+        - haml_concat prop.values

data/views/realms/show.xml.haml

@@ -7,4 +7,5 @@
     =@realm.state
   - unless @realm.limit.eql?(:unlimited)
     %limit<
-      =@realm.limit
+      =cdata do
+        =@realm.limit

data/views/root/index.html.haml

@@ -1,4 +1,4 @@
 %h1
   Deltacloud:
   = DRIVER.to_s.titlecase
-= link_to 'API', api_url
+%a{ :href => api_url} API

data/views/storage_snapshots/show.html.haml

@@ -19,4 +19,4 @@
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
         - if driver.respond_to?(:destroy_storage_snapshot)
-          =link_to_action "Delete", destroy_storage_snapshot_url(@storage_snapshot.id), :delete
+          =link_to_action "Delete", api_url_for("storage_snapshots/#{@storage_snapshot.id}"), :delete

data/views/storage_snapshots/show.xml.haml

@@ -1,6 +1,7 @@
 - unless defined?(partial)
   !!! XML
 %storage_snapshot{:href => storage_snapshot_url(@storage_snapshot.id), :id => @storage_snapshot.id }
+  %name=@storage_snapshot.id
   %created<
     =@storage_snapshot.created
   %storage_volume{:href => storage_volume_url(@storage_snapshot.storage_volume_id), :id => @storage_snapshot.storage_volume_id}

data/views/storage_volumes/attach.html.haml

@@ -16,5 +16,4 @@
       Device name:
     %input{ :name => "device", :size => 10, :value => "/dev/sdc"}
   %p
-    %input{ :type => :hidden, :name => :id, :value => params[:id]}
-    %input{ :type => :submit, :name => "commit", :value => "create" }/
+    %input{ :type => :submit, :name => "commit", :value => "attach" }/

data/views/storage_volumes/index.html.haml

@@ -8,6 +8,6 @@
       %li
         %a{ :href => storage_volume_url(volume.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/volume.png'}
-          %h3= volume.id
+          %h3= volume.name ? volume.name : volume.id
           %p=[volume.realm_id, volume.capacity].join(', ')
           %span{ :class => 'ui-li-count'}=volume.state

data/views/storage_volumes/new.html.haml

@@ -1,17 +1,23 @@
-%h1 Create new storage volume
+=header "Create new Storage Volume"
 
-%form{ :action => storage_volumes_url, :method => :post }
-  %p
-    %label
-      Snapshot ID:
-    %input{ :name => 'snapshot_id', :size => 30 } (optional)
-  %p
-    %label
-      Capacity (in GB):
-    %input{ :name => "capacity", :size => 3, :value => "1"}
-  %p
-    %label
-      Realm ID:
-    %input{ :name => "realm_id", :size => 10, :value => driver.realms(credentials).first.id}
-  %p
-    %input{ :type => :submit, :name => "commit", :value => "create" }/
+
+%div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
+  %form{ :action => storage_volumes_url, :method => :post }
+    %p
+      %label
+        Name:
+      %input{ :name => 'name', :size => 30 } (optional)
+    %p
+      %label
+        Snapshot ID:
+      %input{ :name => 'snapshot_id', :size => 30 } (optional)
+    %p
+      %label
+        Capacity (in GB):
+      %input{ :name => "capacity", :size => 3, :value => "1"}
+    %p
+      %label
+        Realm ID:
+      %input{ :name => "realm_id", :size => 10, :value => driver.realms(credentials).first.id}
+    %p
+      %input{ :type => :submit, :name => "commit", :value => "create" }/

data/views/storage_volumes/show.html.haml

@@ -4,8 +4,9 @@
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
     %li{ :'data-role' => 'list-divider'} Name
+    %p{ :'data-role' => 'fieldcontain'}=@storage_volume.id
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@storage_volume.id
+      %p{ :'data-role' => 'fieldcontain'}=(@storage_volume.name ? @storage_volume.name : @storage_volume.id)
     %li{ :'data-role' => 'list-divider'} Created
     %li
       %p{ :'data-role' => 'fieldcontain'}=@storage_volume.created
@@ -20,8 +21,13 @@
       %p{ :'data-role' => 'fieldcontain'}=@storage_volume.state
     %li{ :'data-role' => 'list-divider'} Attached to
     %li
-      %a{ :href => instance_url( @storage_volume.instance_id)}
-        = @storage_volume.instance_id || 'unknown'
+      - if @storage_volume.instance_id
+        %a{ :href => instance_url( @storage_volume.instance_id)}
+          = @storage_volume.instance_id
+      - elsif @storage_volume.state == "AVAILABLE"
+        %p{ :'data-role' => 'fieldcontain'}= 'none (detached)'
+      -else
+        %p{ :'data-role' => 'fieldcontain'}= 'unknown'
     %li{ :'data-role' => 'list-divider'} Device
     %li
       %p{ :'data-role' => 'fieldcontain'}= @storage_volume.device
@@ -31,7 +37,7 @@
         - if ["AVAILABLE", "IN-USE"].include?(@storage_volume.state)
           =link_to_action "Snapshot", api_url_for("storage_snapshots/new?volume_id=#{@storage_volume.id}"), :get
           - unless @storage_volume.instance_id
-            =link_to_action "Delete", destroy_storage_volume_url(@storage_volume.id), :delete
+            =link_to_action "Delete", api_url_for("storage_volumes/#{@storage_volume.id}"), :delete
             =link_to_action "Attach", api_url_for("storage_volumes/#{@storage_volume.id}/attach_instance"), :get
           - if @storage_volume.instance_id
             =link_to_action "Detach", detach_storage_volume_url(@storage_volume.id), :post

data/views/storage_volumes/show.xml.haml

@@ -9,9 +9,8 @@
   - if @storage_volume.kind
     %kind<
       = @storage_volume.kind
-  - if @storage_volume.name
-    %name<
-      = @storage_volume.name
+  %name<
+    = @storage_volume.name || @storage_volume.id
   - if @storage_volume.device
     %device<
       = @storage_volume.device
@@ -31,4 +30,4 @@
   - if @storage_volume.actions
     %actions
       - @storage_volume.actions.each do |action|
-        %link{:rel => action, :method => action_method(action, :storage_volumes), :href => self.send("#{action}_storage_volume_url", @storage_volume.id)}
+        %link{:rel => action, :method => :post, :href => self.send("#{action}_storage_volume_url", @storage_volume.id)}

metadata

@@ -1,708 +1,736 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: deltacloud-core
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 1.0.0
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Red Hat, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70157624619940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624619940
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &70157624619160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 37
-        segments: 
-        - 2
-        - 2
-        - 17
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.17
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624619160
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70157624618340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 9
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.4
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624618340
+- !ruby/object:Gem::Dependency
+  name: sinatra-rabbit
+  requirement: &70157624617620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *70157624617620
+- !ruby/object:Gem::Dependency
+  name: crack
+  requirement: &70157624617080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70157624617080
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70157624615840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack-accept
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624615840
+- !ruby/object:Gem::Dependency
+  name: rack-accept
+  requirement: &70157624527000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624527000
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70157624526240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 1
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.9
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624526240
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: &70157624525560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624525560
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &70157624525080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 2
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624525080
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70157624524440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 4
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: aws
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624524440
+- !ruby/object:Gem::Dependency
+  name: rbovirt
+  requirement: &70157624523940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 5
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *70157624523940
+- !ruby/object:Gem::Dependency
+  name: aws
+  requirement: &70157624523240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.4
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: waz-storage
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624523240
+- !ruby/object:Gem::Dependency
+  name: waz-storage
+  requirement: &70157624522720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: cloudservers
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624522720
+- !ruby/object:Gem::Dependency
+  name: cloudservers
+  requirement: &70157624522200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: cloudfiles
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624522200
+- !ruby/object:Gem::Dependency
+  name: cloudfiles
+  requirement: &70157624521720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: fog
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624521720
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: &70157624521160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: excon
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624521160
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: &70157624520740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624520740
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70157624520120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: *70157624520120
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: &70157624519560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 1
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.1
   type: :runtime
-  version_requirements: *id017
-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"
+  prerelease: false
+  version_requirements: *70157624519560
+- !ruby/object:Gem::Dependency
+  name: openstack
+  requirement: &70157628608820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70157628608820
+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: 
+executables:
 - deltacloudd
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
-- DISCLAIMER
 - NOTICE
-files: 
+files:
 - Rakefile
 - deltacloud-core.gemspec
 - config.ru
-- config/drivers/rhevm.yaml
-- config/drivers/terremark.yaml
-- config/drivers/rackspace.yaml
+- config/drivers/azure.yaml
+- config/drivers/condor.yaml
 - config/drivers/ec2.yaml
-- config/drivers/sbc.yaml
-- config/drivers/google.yaml
-- config/drivers/opennebula.yaml
-- config/drivers/vsphere.yaml
 - config/drivers/eucalyptus.yaml
-- config/drivers/condor.yaml
-- config/drivers/mock.yaml
+- config/drivers/fgcp.yaml
 - config/drivers/gogrid.yaml
+- config/drivers/google.yaml
+- config/drivers/mock.yaml
+- config/drivers/opennebula.yaml
 - config/drivers/openstack.yaml
-- config/drivers/azure.yaml
+- config/drivers/rackspace.yaml
+- config/drivers/rhevm.yaml
 - config/drivers/rimuhosting.yaml
+- config/drivers/sbc.yaml
+- config/drivers/terremark.yaml
+- config/drivers/vsphere.yaml
 - config/condor.yaml
 - config/addresses.xml
 - support/fedora/deltacloud-core-config
 - support/fedora/deltacloud-core.init
 - support/fedora/deltacloud-core.spec
 - support/fedora/deltacloudd-fedora
-- support/condor/bash/cloud_functions
-- support/condor/bash/libvirt_cloud_script.sh
 - support/condor/bash/cached_images.sh
-- support/condor/bash/cloud_prepare_hook.sh
 - support/condor/bash/cloud_exit_hook.sh
-- support/condor/config/condor_config.local
-- support/condor/config/condor-cloud
-- support/condor/config/50condor_cloud_node.config
+- support/condor/bash/cloud_functions
+- support/condor/bash/cloud_prepare_hook.sh
+- support/condor/bash/libvirt_cloud_script.sh
 - support/condor/config/50condor_cloud.config
-- lib/cimi/model.rb
-- lib/cimi/helpers/cimi_helper.rb
+- support/condor/config/50condor_cloud_node.config
+- support/condor/config/condor-cloud
+- support/condor/config/condor_config.local
+- lib/cimi/collections/address_templates.rb
+- lib/cimi/collections/addresses.rb
+- lib/cimi/collections/cloud_entry_point.rb
+- lib/cimi/collections/entity_metadata.rb
+- lib/cimi/collections/machine_admins.rb
+- lib/cimi/collections/machine_configurations.rb
+- lib/cimi/collections/machine_images.rb
+- lib/cimi/collections/machines.rb
+- lib/cimi/collections/network_configurations.rb
+- lib/cimi/collections/network_templates.rb
+- lib/cimi/collections/networks.rb
+- lib/cimi/collections/routing_group_templates.rb
+- lib/cimi/collections/routing_groups.rb
+- lib/cimi/collections/volume_configurations.rb
+- lib/cimi/collections/volume_images.rb
+- lib/cimi/collections/volumes.rb
+- lib/cimi/collections/vsp_configurations.rb
+- lib/cimi/collections/vsp_templates.rb
+- lib/cimi/collections/vsps.rb
+- lib/cimi/collections.rb
 - lib/cimi/dependencies.rb
+- lib/cimi/helpers/cimi_helper.rb
+- lib/cimi/helpers.rb
+- lib/cimi/models/action.rb
+- lib/cimi/models/address.rb
+- lib/cimi/models/address_collection.rb
+- lib/cimi/models/address_template.rb
+- lib/cimi/models/address_template_collection.rb
+- lib/cimi/models/base.rb
+- lib/cimi/models/cloud_entry_point.rb
+- lib/cimi/models/entity_metadata.rb
+- lib/cimi/models/entity_metadata_collection.rb
+- lib/cimi/models/errors.rb
+- lib/cimi/models/machine.rb
+- lib/cimi/models/machine_admin.rb
+- lib/cimi/models/machine_admin_collection.rb
+- lib/cimi/models/machine_collection.rb
+- lib/cimi/models/machine_configuration.rb
+- lib/cimi/models/machine_configuration_collection.rb
+- lib/cimi/models/machine_image.rb
+- lib/cimi/models/machine_image_collection.rb
+- lib/cimi/models/machine_template.rb
+- lib/cimi/models/machine_template_collection.rb
+- lib/cimi/models/network.rb
+- lib/cimi/models/network_collection.rb
+- lib/cimi/models/network_configuration.rb
+- lib/cimi/models/network_configuration_collection.rb
+- lib/cimi/models/network_template.rb
+- lib/cimi/models/network_template_collection.rb
+- lib/cimi/models/routing_group.rb
+- lib/cimi/models/routing_group_collection.rb
+- lib/cimi/models/routing_group_template.rb
+- lib/cimi/models/routing_group_template_collection.rb
+- lib/cimi/models/schema.rb
+- lib/cimi/models/volume.rb
+- lib/cimi/models/volume_collection.rb
+- lib/cimi/models/volume_configuration.rb
+- lib/cimi/models/volume_configuration_collection.rb
+- lib/cimi/models/volume_image.rb
+- lib/cimi/models/volume_image_collection.rb
+- lib/cimi/models/volume_template.rb
+- lib/cimi/models/volume_template_collection.rb
+- lib/cimi/models/vsp.rb
+- lib/cimi/models/vsp_collection.rb
+- lib/cimi/models/vsp_configuration.rb
+- lib/cimi/models/vsp_configuration_collection.rb
+- lib/cimi/models/vsp_template.rb
+- lib/cimi/models/vsp_template_collection.rb
+- lib/cimi/models.rb
 - lib/cimi/server.rb
-- lib/cimi/model/base.rb
-- lib/cimi/model/machine_template.rb
-- lib/cimi/model/machine_image.rb
-- lib/cimi/model/volume_template_collection.rb
-- lib/cimi/model/machine.rb
-- lib/cimi/model/machine_configuration.rb
-- lib/cimi/model/action.rb
-- lib/cimi/model/cloud_entry_point.rb
-- lib/cimi/model/machine_admin_collection.rb
-- lib/cimi/model/network_collection.rb
-- lib/cimi/model/errors.rb
-- lib/cimi/model/entity_metadata.rb
-- lib/cimi/model/machine_collection.rb
-- lib/cimi/model/network_configuration_collection.rb
-- lib/cimi/model/volume.rb
-- lib/cimi/model/machine_template_collection.rb
-- lib/cimi/model/volume_configuration.rb
-- lib/cimi/model/machine_configuration_collection.rb
-- lib/cimi/model/volume_collection.rb
-- lib/cimi/model/volume_image_collection.rb
-- lib/cimi/model/entity_metadata_collection.rb
-- lib/cimi/model/machine_admin.rb
-- lib/cimi/model/volume_configuration_collection.rb
-- lib/cimi/model/volume_template.rb
-- lib/cimi/model/schema.rb
-- lib/cimi/model/volume_image.rb
-- lib/cimi/model/network_configuration.rb
-- lib/cimi/model/machine_image_collection.rb
-- lib/cimi/model/network.rb
-- lib/cimi/model/network_template.rb
-- lib/deltacloud.rb
-- lib/sinatra/rack_syslog.rb
-- lib/sinatra/rack_etag.rb
-- lib/sinatra/accept_media_types.rb
-- lib/sinatra/rack_runtime.rb
-- lib/sinatra/sinatra_verbose.rb
-- lib/sinatra/rack_accept.rb
-- lib/sinatra/lazy_auth.rb
-- lib/sinatra/url_for.rb
-- lib/sinatra/static_assets.rb
-- lib/sinatra/rack_matrix_params.rb
-- lib/sinatra/rack_driver_select.rb
-- lib/sinatra/body_proxy.rb
-- lib/sinatra/rabbit.rb
-- lib/sinatra/rack_date.rb
-- lib/deltacloud/hardware_profile.rb
-- lib/deltacloud/state_machine.rb
+- lib/deltacloud/api.rb
+- lib/deltacloud/collections/addresses.rb
+- lib/deltacloud/collections/buckets.rb
+- lib/deltacloud/collections/drivers.rb
+- lib/deltacloud/collections/firewalls.rb
+- lib/deltacloud/collections/hardware_profiles.rb
+- lib/deltacloud/collections/images.rb
+- lib/deltacloud/collections/instance_states.rb
+- lib/deltacloud/collections/instances.rb
+- lib/deltacloud/collections/keys.rb
+- lib/deltacloud/collections/load_balancers.rb
+- lib/deltacloud/collections/metrics.rb
+- lib/deltacloud/collections/realms.rb
+- lib/deltacloud/collections/storage_snapshots.rb
+- lib/deltacloud/collections/storage_volumes.rb
+- lib/deltacloud/collections.rb
+- lib/deltacloud/core_ext/array.rb
+- lib/deltacloud/core_ext/hash.rb
+- lib/deltacloud/core_ext/integer.rb
+- lib/deltacloud/core_ext/proc.rb
+- lib/deltacloud/core_ext/string.rb
+- lib/deltacloud/core_ext.rb
+- lib/deltacloud/drivers/azure/azure_driver.rb
+- lib/deltacloud/drivers/base_driver.rb
+- lib/deltacloud/drivers/condor/condor_client.rb
+- lib/deltacloud/drivers/condor/condor_driver.rb
+- lib/deltacloud/drivers/condor/ip_agents/confserver.rb
+- lib/deltacloud/drivers/condor/ip_agents/default.rb
 - lib/deltacloud/drivers/ec2/ec2_driver.rb
-- lib/deltacloud/drivers/ec2/ec2_mock_driver.rb
-- lib/deltacloud/drivers/rackspace/rackspace_driver.rb
-- lib/deltacloud/drivers/gogrid/gogrid_driver.rb
-- lib/deltacloud/drivers/gogrid/gogrid_client.rb
-- lib/deltacloud/drivers/rhevm/rhevm_driver.rb
-- lib/deltacloud/drivers/rhevm/rhevm_client.rb
-- lib/deltacloud/drivers/openstack/openstack_driver.rb
 - lib/deltacloud/drivers/eucalyptus/eucalyptus_driver.rb
-- lib/deltacloud/drivers/vsphere/vsphere_filemanager.rb
-- lib/deltacloud/drivers/vsphere/vsphere_client.rb
-- lib/deltacloud/drivers/vsphere/vsphere_driver.rb
+- lib/deltacloud/drivers/exceptions.rb
+- lib/deltacloud/drivers/features.rb
+- lib/deltacloud/drivers/fgcp/fgcp_client.rb
+- lib/deltacloud/drivers/fgcp/fgcp_driver.rb
+- lib/deltacloud/drivers/gogrid/gogrid_client.rb
+- lib/deltacloud/drivers/gogrid/gogrid_driver.rb
+- lib/deltacloud/drivers/google/google_driver.rb
 - lib/deltacloud/drivers/mock/mock_client.rb
 - lib/deltacloud/drivers/mock/mock_driver.rb
-- lib/deltacloud/drivers/google/google_driver.rb
-- lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb
-- lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
-- lib/deltacloud/drivers/condor/ip_agents/default.rb
-- lib/deltacloud/drivers/condor/ip_agents/confserver.rb
-- lib/deltacloud/drivers/condor/condor_driver.rb
-- lib/deltacloud/drivers/condor/condor_client.rb
-- lib/deltacloud/drivers/terremark/terremark_driver.rb
-- lib/deltacloud/drivers/sbc/sbc_driver.rb
-- lib/deltacloud/drivers/sbc/sbc_client.rb
+- lib/deltacloud/drivers/mock/mock_driver_cimi_methods.rb
 - lib/deltacloud/drivers/opennebula/cloud_client.rb
 - lib/deltacloud/drivers/opennebula/occi_client.rb
 - lib/deltacloud/drivers/opennebula/opennebula_driver.rb
-- lib/deltacloud/drivers/azure/azure_driver.rb
-- lib/deltacloud/base_driver/features.rb
-- lib/deltacloud/base_driver/mock_driver.rb
-- lib/deltacloud/base_driver/base_driver.rb
-- lib/deltacloud/base_driver/exceptions.rb
-- lib/deltacloud/helpers/hardware_profiles_helper.rb
-- lib/deltacloud/helpers/conversion_helper.rb
-- lib/deltacloud/helpers/json_helper.rb
-- lib/deltacloud/helpers/blob_stream.rb
-- lib/deltacloud/helpers/application_helper.rb
+- lib/deltacloud/drivers/openstack/openstack_driver.rb
+- lib/deltacloud/drivers/rackspace/rackspace_driver.rb
+- lib/deltacloud/drivers/rhevm/rhevm_driver.rb
+- lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
+- lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb
+- lib/deltacloud/drivers/sbc/sbc_client.rb
+- lib/deltacloud/drivers/sbc/sbc_driver.rb
+- lib/deltacloud/drivers/terremark/terremark_driver.rb
+- lib/deltacloud/drivers/vsphere/vsphere_client.rb
+- lib/deltacloud/drivers/vsphere/vsphere_driver.rb
+- lib/deltacloud/drivers/vsphere/vsphere_filemanager.rb
 - lib/deltacloud/drivers.rb
+- lib/deltacloud/helpers/auth_helper.rb
+- lib/deltacloud/helpers/blob_stream_helper.rb
+- lib/deltacloud/helpers/deltacloud_helper.rb
+- lib/deltacloud/helpers/driver_helper.rb
+- lib/deltacloud/helpers/rabbit_helper.rb
+- lib/deltacloud/helpers/url_helper.rb
 - lib/deltacloud/helpers.rb
-- lib/deltacloud/core_ext.rb
-- lib/deltacloud/validation.rb
-- lib/deltacloud/server.rb
-- lib/deltacloud/core_ext/hash.rb
-- lib/deltacloud/core_ext/proc.rb
-- lib/deltacloud/core_ext/string.rb
-- lib/deltacloud/core_ext/integer.rb
-- lib/deltacloud/core_ext/array.rb
-- lib/deltacloud/models.rb
-- lib/deltacloud/backend_capability.rb
-- lib/deltacloud/base_driver.rb
-- lib/deltacloud/models/firewall_rule.rb
-- lib/deltacloud/models/provider.rb
-- lib/deltacloud/models/base_model.rb
 - lib/deltacloud/models/address.rb
-- lib/deltacloud/models/instance_profile.rb
-- lib/deltacloud/models/load_balancer.rb
-- lib/deltacloud/models/key.rb
-- lib/deltacloud/models/instance_address.rb
+- lib/deltacloud/models/base_model.rb
+- lib/deltacloud/models/blob.rb
 - lib/deltacloud/models/bucket.rb
 - lib/deltacloud/models/firewall.rb
-- lib/deltacloud/models/blob.rb
+- lib/deltacloud/models/firewall_rule.rb
+- lib/deltacloud/models/hardware_profile.rb
+- lib/deltacloud/models/image.rb
+- lib/deltacloud/models/instance.rb
+- lib/deltacloud/models/instance_address.rb
+- lib/deltacloud/models/instance_profile.rb
+- lib/deltacloud/models/key.rb
+- lib/deltacloud/models/load_balancer.rb
+- lib/deltacloud/models/metric.rb
+- lib/deltacloud/models/provider.rb
+- lib/deltacloud/models/realm.rb
+- lib/deltacloud/models/state_machine.rb
 - lib/deltacloud/models/storage_snapshot.rb
 - lib/deltacloud/models/storage_volume.rb
-- lib/deltacloud/models/realm.rb
-- lib/deltacloud/models/instance.rb
-- lib/deltacloud/models/image.rb
+- lib/deltacloud/models.rb
 - lib/deltacloud/runner.rb
-- lib/deltacloud/method_serializer.rb
+- lib/deltacloud/server.rb
+- lib/deltacloud_rack.rb
+- lib/ec2/helpers/errors.rb
+- lib/ec2/helpers/result.rb
+- lib/ec2/helpers.rb
+- lib/ec2/query_parser.rb
+- lib/ec2/server.rb
+- lib/sinatra/accept_media_types.rb
+- lib/sinatra/body_proxy.rb
+- lib/sinatra/rack_accept.rb
+- lib/sinatra/rack_date.rb
+- lib/sinatra/rack_driver_select.rb
+- lib/sinatra/rack_etag.rb
+- lib/sinatra/rack_matrix_params.rb
+- lib/sinatra.rb
+- lib/deltacloud/drivers/mock/data/blobs/blob1.yml
+- lib/deltacloud/drivers/mock/data/blobs/blob2.yml
 - lib/deltacloud/drivers/mock/data/blobs/blob3.yml
 - lib/deltacloud/drivers/mock/data/blobs/blob4.yml
 - lib/deltacloud/drivers/mock/data/blobs/blob5.yml
-- lib/deltacloud/drivers/mock/data/blobs/blob2.yml
-- lib/deltacloud/drivers/mock/data/blobs/blob1.yml
-- lib/deltacloud/drivers/mock/data/instances/inst2.yml
+- lib/deltacloud/drivers/mock/data/buckets/bucket1.yml
+- lib/deltacloud/drivers/mock/data/buckets/bucket2.yml
+- lib/deltacloud/drivers/mock/data/images/img1.yml
+- lib/deltacloud/drivers/mock/data/images/img2.yml
+- lib/deltacloud/drivers/mock/data/images/img3.yml
 - lib/deltacloud/drivers/mock/data/instances/inst0.yml
 - lib/deltacloud/drivers/mock/data/instances/inst1.yml
-- lib/deltacloud/drivers/mock/data/storage_volumes/vol2.yml
-- lib/deltacloud/drivers/mock/data/storage_volumes/vol1.yml
-- lib/deltacloud/drivers/mock/data/storage_volumes/vol3.yml
+- lib/deltacloud/drivers/mock/data/instances/inst2.yml
+- lib/deltacloud/drivers/mock/data/keys/test-key.yml
 - lib/deltacloud/drivers/mock/data/storage_snapshots/snap1.yml
-- lib/deltacloud/drivers/mock/data/storage_snapshots/snap3.yml
 - lib/deltacloud/drivers/mock/data/storage_snapshots/snap2.yml
-- lib/deltacloud/drivers/mock/data/images/img1.yml
-- lib/deltacloud/drivers/mock/data/images/img3.yml
-- lib/deltacloud/drivers/mock/data/images/img2.yml
-- lib/deltacloud/drivers/mock/data/buckets/bucket2.yml
-- lib/deltacloud/drivers/mock/data/buckets/bucket1.yml
-- tests/cimi/features/step_definitions/machine_images_steps.rb
+- lib/deltacloud/drivers/mock/data/storage_snapshots/snap3.yml
+- lib/deltacloud/drivers/mock/data/storage_volumes/vol1.yml
+- lib/deltacloud/drivers/mock/data/storage_volumes/vol2.yml
+- lib/deltacloud/drivers/mock/data/storage_volumes/vol3.yml
+- tests/api/common.rb
+- tests/api/driver_test.rb
+- tests/api/library_test.rb
 - tests/cimi/features/step_definitions/common_steps.rb
+- tests/cimi/features/step_definitions/machine_images_steps.rb
 - tests/cimi/features/step_definitions/machines_steps.rb
 - tests/cimi/features/step_definitions/volumes_steps.rb
 - tests/cimi/features/support/env.rb
+- tests/common.rb
+- tests/core_ext/string.rb
+- tests/drivers/ec2/api_test.rb
+- tests/drivers/ec2/common.rb
+- tests/drivers/ec2/drivers_test.rb
+- tests/drivers/ec2/hardware_profiles_test.rb
+- tests/drivers/ec2/images_test.rb
+- tests/drivers/ec2/instances_test.rb
+- tests/drivers/ec2/keys_test.rb
+- tests/drivers/ec2/realms_test.rb
+- tests/drivers/fgcp/api_test.rb
+- tests/drivers/fgcp/hardware_profiles_test.rb
+- tests/drivers/fgcp/realms_test.rb
+- tests/drivers/fgcp/setup.rb
+- tests/drivers/google/api_test.rb
+- tests/drivers/google/buckets_test.rb
+- tests/drivers/google/common.rb
+- tests/drivers/mock/api_test.rb
+- tests/drivers/mock/buckets_test.rb
+- tests/drivers/mock/common.rb
+- tests/drivers/mock/drivers_test.rb
+- tests/drivers/mock/hardware_profiles_test.rb
+- tests/drivers/mock/images_test.rb
+- tests/drivers/mock/instances_test.rb
+- tests/drivers/mock/keys_test.rb
+- tests/drivers/mock/realms_test.rb
+- tests/drivers/mock/storage_snapshots_test.rb
+- tests/drivers/mock/storage_volumes_test.rb
+- tests/drivers/openstack/api_test.rb
+- tests/drivers/openstack/common.rb
+- tests/drivers/openstack/hardware_profiles_test.rb
+- tests/drivers/openstack/images_test.rb
+- tests/drivers/openstack/instances_test.rb
+- tests/drivers/openstack/realms_test.rb
+- tests/drivers/rackspace/api_test.rb
+- tests/drivers/rackspace/buckets_test.rb
+- tests/drivers/rackspace/common.rb
 - tests/drivers/rackspace/hardware_profiles_test.rb
 - tests/drivers/rackspace/images_test.rb
 - tests/drivers/rackspace/instances_test.rb
-- tests/drivers/rackspace/api_test.rb
 - tests/drivers/rackspace/realms_test.rb
-- tests/drivers/rackspace/setup.rb
-- tests/drivers/rackspace/buckets_test.rb
+- tests/drivers/rhevm/api_test.rb
+- tests/drivers/rhevm/common.rb
 - tests/drivers/rhevm/hardware_profiles_test.rb
 - tests/drivers/rhevm/images_test.rb
 - tests/drivers/rhevm/instances_test.rb
-- tests/drivers/rhevm/api_test.rb
 - tests/drivers/rhevm/realms_test.rb
-- tests/drivers/rhevm/setup.rb
-- tests/drivers/openstack/hardware_profiles_test.rb
-- tests/drivers/openstack/images_test.rb
-- tests/drivers/openstack/instances_test.rb
-- tests/drivers/openstack/api_test.rb
-- tests/drivers/openstack/realms_test.rb
-- tests/drivers/openstack/setup.rb
-- tests/drivers/mock/hardware_profiles_test.rb
-- tests/drivers/mock/url_for_test.rb
-- tests/drivers/mock/images_test.rb
-- tests/drivers/mock/instances_test.rb
-- tests/drivers/mock/api_test.rb
-- tests/drivers/mock/realms_test.rb
-- tests/drivers/mock/instance_states_test.rb
-- tests/drivers/mock/setup.rb
-- tests/drivers/google/api_test.rb
-- tests/drivers/google/setup.rb
-- tests/drivers/google/buckets_test.rb
-- tests/common.rb
+- tests/minitest_common.rb
+- tests/minitest_common_api_test.rb
 - tests/rabbit_test.rb
-- tests/core_ext/string.rb
-- views/load_balancers/show.xml.haml
-- views/load_balancers/new.html.haml
-- views/load_balancers/index.html.haml
-- views/load_balancers/index.xml.haml
-- views/load_balancers/show.html.haml
-- views/docs/operation.xml.haml
-- views/docs/collection.xml.haml
-- views/docs/operation.html.haml
-- views/docs/index.html.haml
-- views/docs/index.xml.haml
-- views/docs/collection.html.haml
+- views/addresses/_address.html.haml
+- views/addresses/associate.html.haml
+- views/addresses/index.html.haml
+- views/addresses/index.xml.haml
+- views/addresses/show.html.haml
+- views/addresses/show.xml.haml
+- views/api/show.html.haml
+- views/api/show.xml.haml
+- views/blobs/new.html.haml
+- 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/cimi/cloudEntryPoint/index.html.haml
 - views/cimi/cloudEntryPoint/index.xml.haml
-- views/cimi/errors/401.html.haml
+- views/cimi/collection/index.html.haml
+- views/cimi/collection/response.xml.haml
+- views/cimi/error.html.haml
 - views/cimi/errors/400.xml.haml
-- views/cimi/errors/404.html.haml
-- views/cimi/errors/403.html.haml
 - views/cimi/errors/401.xml.haml
-- views/cimi/errors/405.html.haml
-- views/cimi/errors/502.xml.haml
-- views/cimi/errors/502.html.haml
+- views/cimi/errors/403.xml.haml
 - views/cimi/errors/404.xml.haml
-- views/cimi/errors/500.xml.haml
 - views/cimi/errors/405.xml.haml
-- views/cimi/errors/backend_capability_failure.html.haml
-- views/cimi/errors/400.html.haml
-- views/cimi/errors/403.xml.haml
-- views/cimi/errors/500.html.haml
-- views/cimi/volumes/show.xml.haml
-- views/cimi/volumes/show.html.haml
-- views/cimi/machines/show.xml.haml
-- views/cimi/machines/show.html.haml
+- views/cimi/errors/500.xml.haml
+- views/cimi/errors/502.xml.haml
 - views/cimi/layout.html.haml
-- views/cimi/machine_images/show.xml.haml
-- views/cimi/machine_images/show.html.haml
-- views/cimi/collection/response.xml.haml
-- views/cimi/collection/index.html.haml
-- views/cimi/machine_configurations/show.xml.haml
 - views/cimi/machine_configurations/show.html.haml
-- views/cimi/error.html.haml
-- views/realms/show.xml.haml
-- views/realms/index.html.haml
-- views/realms/index.xml.haml
-- views/realms/show.html.haml
-- views/addresses/_address.html.haml
-- views/addresses/show.xml.haml
-- views/addresses/index.html.haml
-- views/addresses/associate.html.haml
-- views/addresses/index.xml.haml
-- views/addresses/show.html.haml
-- views/blobs/show.xml.haml
-- views/blobs/new.html.haml
-- views/blobs/show.html.haml
-- views/instances/show.xml.haml
-- views/instances/run.html.haml
-- views/instances/new.html.haml
-- views/instances/index.html.haml
-- views/instances/run.xml.haml
-- views/instances/index.xml.haml
-- views/instances/run_command.html.haml
-- views/instances/show.html.haml
-- views/drivers/show.xml.haml
+- views/cimi/machine_configurations/show.xml.haml
+- views/cimi/machine_images/show.html.haml
+- views/cimi/machine_images/show.xml.haml
+- views/cimi/machines/show.html.haml
+- views/cimi/machines/show.xml.haml
+- views/cimi/volumes/show.html.haml
+- views/cimi/volumes/show.xml.haml
+- views/docs/collection.html.haml
+- views/docs/collection.xml.haml
+- views/docs/index.html.haml
+- views/docs/index.xml.haml
+- views/docs/operation.html.haml
+- views/docs/operation.xml.haml
 - views/drivers/index.html.haml
 - views/drivers/index.xml.haml
 - views/drivers/show.html.haml
-- views/hardware_profiles/show.xml.haml
-- views/hardware_profiles/index.html.haml
-- views/hardware_profiles/index.xml.haml
-- views/hardware_profiles/show.html.haml
-- views/errors/401.html.haml
+- views/drivers/show.xml.haml
+- views/error.html.haml
+- views/errors/400.html.haml
 - views/errors/400.xml.haml
-- views/errors/404.html.haml
-- views/errors/backend_capability_failure.xml.haml
-- views/errors/403.html.haml
+- views/errors/401.html.haml
 - views/errors/401.xml.haml
-- views/errors/405.html.haml
-- views/errors/502.xml.haml
-- views/errors/502.html.haml
+- views/errors/403.html.haml
+- views/errors/403.xml.haml
+- views/errors/404.html.haml
 - views/errors/404.xml.haml
-- views/errors/500.xml.haml
+- views/errors/405.html.haml
 - views/errors/405.xml.haml
-- views/errors/backend_capability_failure.html.haml
-- views/errors/400.html.haml
-- views/errors/403.xml.haml
 - views/errors/500.html.haml
-- views/storage_volumes/show.xml.haml
-- views/storage_volumes/new.html.haml
-- views/storage_volumes/attach.html.haml
-- views/storage_volumes/index.html.haml
-- views/storage_volumes/index.xml.haml
-- views/storage_volumes/show.html.haml
-- views/firewalls/show.xml.haml
-- views/firewalls/new_rule.html.haml
-- views/firewalls/new.html.haml
+- views/errors/500.xml.haml
+- views/errors/501.html.haml
+- views/errors/501.xml.haml
+- views/errors/502.html.haml
+- views/errors/502.xml.haml
+- views/errors/504.html.haml
+- views/errors/504.xml.haml
+- views/errors/backend_capability_failure.html.haml
+- views/errors/backend_capability_failure.xml.haml
 - views/firewalls/index.html.haml
 - views/firewalls/index.xml.haml
+- views/firewalls/new.html.haml
+- views/firewalls/new_rule.html.haml
 - views/firewalls/show.html.haml
-- views/api/show.xml.haml
-- views/api/show.html.haml
-- views/storage_snapshots/show.xml.haml
-- views/storage_snapshots/new.html.haml
-- views/storage_snapshots/index.html.haml
-- views/storage_snapshots/index.xml.haml
-- views/storage_snapshots/show.html.haml
-- views/layout.html.haml
-- views/root/index.html.haml
-- views/instance_states/show.xml.haml
-- views/instance_states/show.html.haml
-- views/images/show.xml.haml
-- views/images/new.html.haml
+- views/firewalls/show.xml.haml
+- views/hardware_profiles/index.html.haml
+- views/hardware_profiles/index.xml.haml
+- views/hardware_profiles/show.html.haml
+- views/hardware_profiles/show.xml.haml
 - views/images/index.html.haml
 - views/images/index.xml.haml
+- views/images/new.html.haml
 - views/images/show.html.haml
-- views/buckets/show.xml.haml
-- views/buckets/new.html.haml
-- views/buckets/index.html.haml
-- views/buckets/index.xml.haml
-- views/buckets/show.html.haml
-- views/keys/show.xml.haml
-- views/keys/new.html.haml
+- views/images/show.xml.haml
+- views/instance_states/show.html.haml
+- views/instance_states/show.xml.haml
+- views/instances/index.html.haml
+- views/instances/index.xml.haml
+- views/instances/new.html.haml
+- views/instances/run.html.haml
+- views/instances/run.xml.haml
+- views/instances/run_command.html.haml
+- views/instances/show.html.haml
+- views/instances/show.xml.haml
 - views/keys/index.html.haml
 - views/keys/index.xml.haml
+- views/keys/new.html.haml
 - views/keys/show.html.haml
-- views/error.html.haml
+- views/keys/show.xml.haml
+- views/layout.html.haml
+- views/load_balancers/index.html.haml
+- views/load_balancers/index.xml.haml
+- views/load_balancers/new.html.haml
+- views/load_balancers/show.html.haml
+- views/load_balancers/show.xml.haml
+- views/metrics/index.html.haml
+- views/metrics/index.xml.haml
+- views/metrics/show.html.haml
+- views/metrics/show.xml.haml
+- views/realms/index.html.haml
+- views/realms/index.xml.haml
+- views/realms/show.html.haml
+- views/realms/show.xml.haml
+- views/root/index.html.haml
+- views/storage_snapshots/index.html.haml
+- views/storage_snapshots/index.xml.haml
+- views/storage_snapshots/new.html.haml
+- views/storage_snapshots/show.html.haml
+- views/storage_snapshots/show.xml.haml
+- views/storage_volumes/attach.html.haml
+- views/storage_volumes/index.html.haml
+- views/storage_volumes/index.xml.haml
+- views/storage_volumes/new.html.haml
+- views/storage_volumes/show.html.haml
+- views/storage_volumes/show.xml.haml
 - views/instance_states/show.png.erb
 - public/favicon.ico
-- public/images/firewall.png
-- public/images/topbar-bg.png
+- public/images/address.png
 - public/images/balancer.png
-- public/images/realm.png
+- public/images/blob.png
+- public/images/bread-bg.png
+- public/images/bucket.png
+- public/images/cloud.png
+- public/images/firewall.png
 - public/images/image.png
+- public/images/key.png
 - public/images/logo-wide.png
-- public/images/volume.png
-- public/images/address.png
-- public/images/profile.png
-- public/images/cloud.png
-- public/images/blob.png
 - public/images/machine.png
-- public/images/key.png
-- public/images/bucket.png
-- public/images/bread-bg.png
+- public/images/metric.png
+- public/images/profile.png
+- public/images/realm.png
 - public/images/snapshot.png
+- public/images/topbar-bg.png
+- public/images/volume.png
 - public/javascripts/application.js
-- public/javascripts/jquery.mobile-1.0rc1.min.js
+- public/javascripts/cmwgapp.js
 - public/javascripts/jquery-1.4.2.min.js
 - public/javascripts/jquery.min.js
-- public/javascripts/cmwgapp.js
-- public/stylesheets/jquery.mobile-1.0rc1.min.css
+- public/javascripts/jquery.mobile-1.0.1.min.js
+- public/stylesheets/jquery.mobile-1.0.1.min.css
 - public/stylesheets/new.css
-- public/stylesheets/images/icons-18-white.png
-- public/stylesheets/images/topbar-bg.png
+- public/stylesheets/images/ajax-loader.png
+- public/stylesheets/images/bread-bg.png
 - public/stylesheets/images/error.png
-- public/stylesheets/images/logo-wide.png
-- public/stylesheets/images/stopped.png
-- public/stylesheets/images/pending.png
 - public/stylesheets/images/grid.png
+- public/stylesheets/images/icon-search-black.png
+- public/stylesheets/images/icons-18-black.png
+- public/stylesheets/images/icons-18-white.png
 - public/stylesheets/images/icons-36-black.png
-- public/stylesheets/images/ajax-loader.png
 - public/stylesheets/images/icons-36-white.png
-- public/stylesheets/images/icons-18-black.png
-- public/stylesheets/images/icon-search-black.png
-- public/stylesheets/images/running.png
-- public/stylesheets/images/bread-bg.png
+- public/stylesheets/images/logo-wide.png
+- public/stylesheets/images/pending.png
 - public/stylesheets/images/rails.png
+- public/stylesheets/images/running.png
+- public/stylesheets/images/stopped.png
+- public/stylesheets/images/topbar-bg.png
 - public/stylesheets/compiled/application.css
-- public/stylesheets/compiled/print.css
 - public/stylesheets/compiled/ie.css
+- public/stylesheets/compiled/print.css
 - public/stylesheets/compiled/screen.css
 - bin/deltacloudd
 - LICENSE
-- DISCLAIMER
 - NOTICE
 homepage: http://www.deltacloud.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 53
-      segments: 
-      - 1
-      - 8
-      - 1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Deltacloud REST API
-test_files: 
+test_files:
+- tests/minitest_common_api_test.rb
 - tests/rabbit_test.rb
+has_rdoc: 'false'