deltacloud-core 1.1.1 → 1.1.2

data/tests/ec2/query_parser_test.rb

@@ -77,7 +77,7 @@ describe Deltacloud::EC2 do
       result.must_respond_to :'perform!'
       realms = result.perform!(@driver.credentials, @driver.backend)
       realms.wont_be_empty
-      realms.first.must_be_kind_of Realm
+      realms.first.must_be_kind_of Deltacloud::Realm
       realms.first.id.must_equal 'us'
     end
 

data/tests/test_helper.rb

@@ -8,10 +8,11 @@ require 'require_relative' if RUBY_VERSION < '1.9'
 
 require 'singleton'
 
-require_relative '../lib/deltacloud/api.rb'
-
 ENV['RACK_ENV'] = 'test'
 
+require_relative '../lib/initialize'
+require_relative '../lib/deltacloud/api.rb'
+
 if ENV['COVERAGE']
   begin
     require 'simplecov'
@@ -24,8 +25,9 @@ end
 #
 begin
   require 'turn'
+  Turn.config.format = :dot
 rescue LoadError => e
-  warn "[WARN] The 'turn' gem is not available. (#{e.message})"
+  # We'll be fine
 end
 
 begin
@@ -44,6 +46,14 @@ def record_retries(name='', opts = {})
   opts
 end
 
+def vcr_record_mode
+  (ENV['VCR_RECORD'] || :none).to_sym
+end
+
+def vcr_recording?
+  vcr_record_mode != :none
+end
+
 include Rack::Test::Methods
 
 def run_frontend(frontend=:deltacloud)
@@ -71,24 +81,70 @@ module Deltacloud
 
       def initialize
         fname = ENV["CONFIG"] || File::expand_path("~/.deltacloud/config")
+        @hash = Hash.new do |hash, driver|
+          if hash.has_key?(driver.to_s)
+            hash[driver] = hash[driver.to_s]
+          else
+            hash[driver] = {
+              "user" => "fakeuser",
+              "password" => "fakepassword",
+              "provider" => "fakeprovider"
+            }
+          end
+        end
         begin
-          @hash = YAML.load(File::open(fname))
+          @hash.merge!(YAML.load(File::open(fname)))
         rescue Errno::ENOENT
-          @hash = {}
+          # Ignore
         end
       end
 
+      # Read credentials from ${HOME/.deltacloud/config if found.
+      # e.g.:
+      # cat ${HOME/.deltacloud/config
+      # rhevm:
+      #   user:     'user@domain'
+      #   password: 'mypassword'
+      #   provider: 'https://16.0.0.7/api;b9bb11c2-f397-4f41-a57b-7ac15a894779'
+      # mock:
+      #   user: mockuser
+      #   password: mockpassword
+      #   provider: compute
       def credentials(driver)
         driver = driver.to_s
-        if @hash.has_key?(driver)
-          user = @hash[driver]["user"]
-          password = @hash[driver]["password"]
-        else
-          user = "fakeuser"
-          password = "fakepassword"
-        end
+        user = @hash[driver]["user"]
+        password = @hash[driver]["password"]
         { :user => user, :password => password }
       end
+
+      def driver(driver)
+        user = @hash[driver.to_s]["user"]
+        password = @hash[driver.to_s]["password"]
+        provider = @hash[driver.to_s]["provider"]
+        params = {:user => user, :password => password, :provider => provider}
+        Deltacloud::new(driver, params)
+      end
+
+      def preferences(driver)
+        @hash[driver.to_s]["preferred"]
+      end
+
+      def save(driver, dir, &block)
+        h = @hash[driver.to_s].dup
+        h["user"] = "fakeuser"
+        h["password"] = "fakepassword"
+        yield(h) if block_given?
+        File::open(prefs_file(dir), "w") { |f| f.write(h.to_yaml) }
+      end
+
+      def load(driver, dir)
+        @hash[driver.to_s] = YAML::load(File::open(prefs_file(dir), "r"))
+      end
+
+      private
+      def prefs_file(dir)
+        File.join(dir, 'fixtures', 'preferences.yml')
+      end
     end
 
     def self.config

data/views/addresses/show.html.haml

@@ -16,5 +16,5 @@
           =link_to_action 'Disassociate', "#{address_url(@address.id)}/disassociate", :post
         - else
           - if driver.respond_to?(:associate_address)
-            =link_to_action 'Associate',"#{address_url(@address.id)}/associate", :get
+            =link_to_action 'Associate...',"#{address_url(@address.id)}/associate", :get
         =link_to_action "Destroy", destroy_address_url(@address.id), :delete

data/views/buckets/show.html.haml

@@ -19,5 +19,5 @@
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-        %a{ :href => new_blob_form_url(@bucket), :'data-role' => "button", :'data-ajax' => 'false'} Create a new blob
+        %a{ :href => new_blob_form_url(@bucket), :'data-role' => "button", :'data-ajax' => 'false'} Create new blob...
         =link_to_action 'Delete bucket', destroy_bucket_url(@bucket.name), :delete

data/views/errors/common.xml.haml

@@ -0,0 +1,17 @@
+- unless defined?(partial)
+  !!! XML
+%error{ :url => request.env['REQUEST_URI'], :status => response.status }
+  %backend{ :driver => driver_symbol, :provider => current_provider }
+  %code=response.status
+  %message<
+    - if @error.respond_to? :message
+      =cdata @error.message
+    - else
+      =translate_error_code(response.status)
+  - if @error.respond_to? :backtrace
+    %backtrace
+      =cdata @error.backtrace.nil? ? '' : @error.backtrace.join("\n")
+    %request
+      - if params
+        -params.each do |name, value|
+          %param{ :name => name }=cdata value.inspect

data/views/firewalls/index.xml.haml

@@ -15,8 +15,8 @@
       %rules
         - firewall.rules.each do |rule|
           %rule{:id => rule.id}
-          %actions
-            %link{ :rel => :rule, :href => "#{firewall_url(firewall.name)}/#{rule.id}", :method => :delete, :id =>rule.id, :rel => :destroy }
+            %actions
+              %link{ :rel => :rule, :href => "#{firewall_url(firewall.name)}/#{rule.id}", :method => :delete, :id =>rule.id, :rel => :destroy }
             - rule.attributes.select{|attr| attr != :sources && attr != :id}.each do |rule_attrib|
               - haml_tag("#{rule_attrib}".tr('-', '_'), :<) do
                 - haml_concat rule.send(rule_attrib)

data/views/firewalls/new.html.haml

@@ -1,4 +1,4 @@
-%h1 New Firewall
+%h1 New firewall
 
 %form{:action => firewalls_url, :method => :post, :'data-ajax' => 'false'}
   %label
@@ -8,4 +8,4 @@
   %label
     Firewall Description
     %input{:name => 'description', :size => 100}/
-  %input{:type => :submit, :name => "commit", :value=>"create"}
+  %input{:type => :submit, :name => "commit", :value=>"Create"}

data/views/images/show.html.haml

@@ -36,5 +36,5 @@
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-        %a{ :href => url_for("instances/new?image_id=#{@image.id}"), :'data-role' => "button", :'data-ajax' => 'false'} Launch
+        %a{ :href => url_for("instances/new?image_id=#{@image.id}"), :'data-role' => "button", :'data-ajax' => 'false'} Launch...
         = link_to_action 'Destroy', destroy_image_url(@image.id), :delete

data/views/instances/run_command.html.haml

@@ -1,4 +1,4 @@
-=header "Run a command on #{@instance.name}"
+=header "Run command on #{@instance.name}"
 =subheader "#{@instance.id}"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}

data/views/instances/show.html.haml

@@ -60,8 +60,8 @@
     %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)
+          =link_to_action action.to_s.capitalize, 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', url_for('instances/%s/run' % @instance.id), :get
+          =link_to_action 'Run command...', url_for('instances/%s/run' % @instance.id), :get
         - if @instance.can_create_image?
-          =link_to_action 'Create Image', url_for("images/new?instance_id=#{@instance.id}"), :get
+          =link_to_action 'Create image...', url_for("images/new?instance_id=#{@instance.id}"), :get

data/views/keys/index.html.haml

@@ -8,6 +8,7 @@
         %a{ :href => key_url(key.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/key.png'}
           %h3=key.id
+          %p=key.name
           %p
             - if key.credential_type.eql?(:key)
               = key.fingerprint

data/views/keys/show.html.haml

@@ -6,6 +6,9 @@
     %li{ :'data-role' => 'list-divider'} Identifier
     %li
       %p{ :'data-role' => 'fieldcontain'}=@key.id
+    %li{ :'data-role' => 'list-divider'} Name
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@key.name
     - if @key.is_password?
       %li{ :'data-role' => 'list-divider'} Username
       %li
@@ -14,13 +17,14 @@
       %li
         %p{ :'data-role' => 'fieldcontain'}=@key.password
     - else
-      %li{ :'data-role' => 'list-divider'} Fingerprint
-      %li
-        %p{ :'data-role' => 'fieldcontain'}=@key.fingerprint
+      - if @key.fingerprint
+        %li{ :'data-role' => 'list-divider'} Fingerprint
+        %li
+          %p{ :'data-role' => 'fieldcontain'}=@key.fingerprint
       %li{ :'data-role' => 'list-divider'} PEM key
       %li
         %p{ :'data-role' => 'fieldcontain'}
-          %pre=@key.pem_rsa_key
+          %pre{:style=> 'width:600px;overflow:auto;'}=@key.pem_rsa_key
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }

data/views/keys/show.xml.haml

@@ -6,8 +6,9 @@
     - if driver.respond_to?(:destroy_key)
       %link{ :rel => "destroy", :method => "delete", :href => destroy_key_url(@key.id)}
   - if @key.is_key?
-    %fingerprint<
-      =@key.fingerprint
+    - if @key.fingerprint
+      %fingerprint<
+        =@key.fingerprint
     - unless @key.pem_rsa_key.nil?
       %pem
         ~render_cdata(@key.pem_rsa_key)

data/views/load_balancers/new.html.haml

@@ -35,5 +35,5 @@
         Instances port:
       %input{ :name => "listener_instance_port", :size => 30}
     %p
-      %input{ :type => :submit, :name => "commit", :value => "create" }/
+      %input{ :type => :submit, :name => "commit", :value => "Create" }/
 

data/views/load_balancers/show.html.haml

@@ -1,4 +1,4 @@
-=header "Loadbalancer"
+=header "Load balancer"
 =subheader @load_balancer.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
@@ -20,7 +20,7 @@
       %li
         %a{ :href => instance_url(instance[:id]), :'data-ajax' => 'false'}
           %h3=instance[:name]
-          =link_to_action "UnRegister", url_for("load_balancers/#{@load_balancer.id}/unregister?instance_id=#{instance[:id]}"), :post
+          =link_to_action "Unregister", 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

data/views/metrics/show.html.haml

@@ -7,7 +7,7 @@
       %div{ :'data-role' => :'collapsible', :'data-collapse' => 'true'}
         %h3=p.name
         %table{ :summary => "#{p.name} values"}
-          %caption Statistics for last 60 minutes
+          %caption Statistics for the last 60 minutes
           %tr
             %th Time
             %th Minimum

data/views/realms/index.html.haml

@@ -10,6 +10,4 @@
           %img{ :class => 'ui-link-thumb', :src => '/images/realm.png'}
           %h3= realm.name
           %p=[realm.id, realm.limit].join(', ')
-          -if realm.resource_types
-            %p=realm.resource_types.join(",")
           %span{ :class => 'ui-li-count'}=realm.state

data/views/realms/show.html.haml

@@ -15,7 +15,3 @@
     %li{ :'data-role' => 'list-divider'} Limit
     %li
       %p{ :'data-role' => 'fieldcontain'}=@realm.limit
-    - if @realm.resource_types
-      %li{ :'data-role' => 'list-divider'} Resource Types
-      %li
-        %p{ :'data-role' => 'fieldcontain'}=@realm.resource_types

data/views/realms/show.xml.haml

@@ -9,6 +9,3 @@
     %limit<
       =cdata do
         =@realm.limit
-  - @realm.resource_types.each do |r|
-    %resource_type<
-      =r

data/views/storage_snapshots/index.html.haml

@@ -1,4 +1,4 @@
-=header "Storage Snapshots"
+=header "Storage snapshots"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}

data/views/storage_snapshots/new.html.haml

@@ -6,4 +6,4 @@
       Volume ID:
     %input{ :name => 'volume_id', :size => 30, :value => params[:volume_id] }
   %p
-    %input{ :type => :submit, :name => "commit", :value => "create" }/
+    %input{ :type => :submit, :name => "commit", :value => "Create" }/

data/views/storage_volumes/new.html.haml

@@ -1,4 +1,4 @@
-=header "Create new Storage Volume"
+=header "Create new storage volume"
 
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
@@ -20,4 +20,4 @@
         Realm ID:
       %input{ :name => "realm_id", :size => 10, :value => driver.realms(credentials).first.id}
     %p
-      %input{ :type => :submit, :name => "commit", :value => "create" }/
+      %input{ :type => :submit, :name => "commit", :value => "Create" }/

data/views/storage_volumes/show.html.haml

@@ -24,7 +24,7 @@
       - if @storage_volume.instance_id
         %a{ :href => instance_url( @storage_volume.instance_id)}
           = @storage_volume.instance_id
-      - elsif @storage_volume.state == "AVAILABLE"
+      - elsif @storage_volume.state and @storage_volume.state != "IN-USE"
         %p{ :'data-role' => 'fieldcontain'}= 'none (detached)'
       -else
         %p{ :'data-role' => 'fieldcontain'}= 'unknown'
@@ -35,9 +35,9 @@
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
         - if ["AVAILABLE", "IN-USE"].include?(@storage_volume.state)
-          =link_to_action "Snapshot", url_for("storage_snapshots/new?volume_id=#{@storage_volume.id}"), :get
+          =link_to_action "Snapshot...", url_for("storage_snapshots/new?volume_id=#{@storage_volume.id}"), :get
           - unless @storage_volume.instance_id
             =link_to_action "Delete", url_for("storage_volumes/#{@storage_volume.id}"), :delete
-            =link_to_action "Attach", url_for("storage_volumes/#{@storage_volume.id}/attach_instance"), :get
+            =link_to_action "Attach...", url_for("storage_volumes/#{@storage_volume.id}/attach_instance"), :get
           - if @storage_volume.instance_id
             =link_to_action "Detach", url_for("storage_volumes/#{@storage_volume.id}/detach"), :post

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deltacloud-core
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.17
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: sinatra-rabbit
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 1.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 1.1.6
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +155,38 @@ dependencies:
     - - <=
       - !ruby/object:Gem::Version
         version: 3.42.0
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -307,6 +323,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.14.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -315,6 +334,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.14.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -402,6 +424,7 @@ description: ! "    The Deltacloud API is built as a service-based REST API.\n
 email: dev@deltacloud.apache.org
 executables:
 - deltacloudd
+- deltacloud-db-upgrade
 extensions: []
 extra_rdoc_files:
 - LICENSE
@@ -459,10 +482,19 @@ files:
 - lib/cimi/helpers/database_helper.rb
 - lib/cimi/helpers/filter_helper.rb
 - lib/cimi/models/volume_image.rb
+- lib/cimi/models/system_template.rb
 - lib/cimi/models/network_port_configuration.rb
+- lib/cimi/models/credential_create.rb
+- lib/cimi/models/machine_template_create.rb
+- lib/cimi/models/volume_create.rb
 - lib/cimi/models/network.rb
+- lib/cimi/models/network_create.rb
 - lib/cimi/models/forwarding_group.rb
+- lib/cimi/models/volume_template_create.rb
+- lib/cimi/models/system.rb
+- lib/cimi/models/address_template_create.rb
 - lib/cimi/models/volume.rb
+- lib/cimi/models/volume_image_create.rb
 - lib/cimi/models/base.rb
 - lib/cimi/models/machine_configuration.rb
 - lib/cimi/models/collection.rb
@@ -471,6 +503,7 @@ files:
 - lib/cimi/models/network_port.rb
 - lib/cimi/models/forwarding_group_template.rb
 - lib/cimi/models/resource.rb
+- lib/cimi/models/credential_template.rb
 - lib/cimi/models/machine.rb
 - lib/cimi/models/volume_configuration.rb
 - lib/cimi/models/cloud_entry_point.rb
@@ -478,10 +511,13 @@ files:
 - lib/cimi/models/address_template.rb
 - lib/cimi/models/action.rb
 - lib/cimi/models/machine_image.rb
+- lib/cimi/models/machine_create.rb
 - lib/cimi/models/schema.rb
 - lib/cimi/models/address.rb
 - lib/cimi/models/credential.rb
 - lib/cimi/models/network_port_template.rb
+- lib/cimi/models/machine_image_create.rb
+- lib/cimi/models/address_create.rb
 - lib/cimi/models/network_template.rb
 - lib/cimi/models/disk.rb
 - lib/cimi/models/errors.rb
@@ -505,6 +541,8 @@ files:
 - lib/cimi/collections/volume_configurations.rb
 - lib/cimi/collections/network_configurations.rb
 - lib/cimi/collections/addresses.rb
+- lib/cimi/collections/systems.rb
+- lib/cimi/collections/system_templates.rb
 - lib/cimi/collections/resource_metadata.rb
 - lib/cimi/collections/networks.rb
 - lib/cimi/collections/volumes.rb
@@ -531,6 +569,7 @@ files:
 - lib/deltacloud/helpers/blob_stream_helper.rb
 - lib/deltacloud/helpers/auth_helper.rb
 - lib/deltacloud/helpers/rabbit_helper.rb
+- lib/deltacloud/helpers/collection_helper.rb
 - lib/deltacloud/helpers/deltacloud_helper.rb
 - lib/deltacloud/helpers/driver_helper.rb
 - lib/deltacloud/core_ext.rb
@@ -602,6 +641,7 @@ files:
 - lib/deltacloud/drivers/sbc/sbc_driver.rb
 - lib/deltacloud/drivers/sbc/sbc_client.rb
 - lib/deltacloud/drivers/fgcp/fgcp_driver.rb
+- lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb
 - lib/deltacloud/drivers/fgcp/fgcp_client.rb
 - lib/deltacloud/drivers/opennebula/occi_client.rb
 - lib/deltacloud/drivers/opennebula/cloud_client.rb
@@ -609,6 +649,7 @@ files:
 - lib/deltacloud/drivers/cimi_features.rb
 - lib/deltacloud/drivers/exceptions.rb
 - lib/deltacloud/drivers/terremark/terremark_driver.rb
+- lib/initialize.rb
 - lib/sinatra.rb
 - lib/db/volume_template.rb
 - lib/db/machine_template.rb
@@ -616,6 +657,9 @@ files:
 - lib/db/entity.rb
 - lib/db/provider.rb
 - lib/db/address_template.rb
+- lib/initializers/database_initialize.rb
+- lib/initializers/frontend_initialize.rb
+- lib/initializers/mock_initialize.rb
 - lib/deltacloud/drivers/mock/data/instances/inst0.yml
 - lib/deltacloud/drivers/mock/data/instances/inst2.yml
 - lib/deltacloud/drivers/mock/data/instances/inst1.yml
@@ -654,6 +698,7 @@ files:
 - lib/ec2/views/stop_instances.haml
 - lib/ec2/views/describe_images.haml
 - lib/ec2/views/create_key_pair.haml
+- db/migrations/1_add_realm_to_machine_template.rb
 - tests/ec2/server_test.rb
 - tests/ec2/common.rb
 - tests/ec2/query_parser_test.rb
@@ -662,13 +707,18 @@ files:
 - tests/cimi/model/machine_configuration_spec.rb
 - tests/cimi/model/collection_spec.rb
 - tests/cimi/model/volume_spec.rb
+- tests/cimi/model/machine_create_spec.rb
 - tests/cimi/model/volume_template_spec.rb
 - tests/cimi/model/schema_spec.rb
 - tests/cimi/model/volume_image_spec.rb
 - tests/cimi/model/machine_image_spec.rb
 - tests/cimi/model/volume_configuration_spec.rb
 - tests/cimi/model/credential_spec.rb
+- tests/cimi/model/resource_spec.rb
 - tests/cimi/spec_helper.rb
+- tests/cimi/collections/system_templates_test.rb
+- tests/cimi/collections/machine_templates_test.rb
+- tests/cimi/collections/systems_test.rb
 - tests/cimi/collections/common.rb
 - tests/cimi/collections/cloud_entry_point_test.rb
 - tests/cimi/collections/machines_test.rb
@@ -754,6 +804,13 @@ files:
 - tests/drivers/models/keys_test.rb
 - tests/drivers/models/instance_profile_test.rb
 - tests/drivers/models/hardware_profile_test.rb
+- tests/drivers/fgcp/realms_test.rb
+- tests/drivers/fgcp/firewall_test.rb
+- tests/drivers/fgcp/images_test.rb
+- tests/drivers/fgcp/storage_volumes_test.rb
+- tests/drivers/fgcp/common.rb
+- tests/drivers/fgcp/provider_test.rb
+- tests/drivers/fgcp/hardware_profiles_test.rb
 - views/instances/run.xml.haml
 - views/instances/show.xml.haml
 - views/instances/run.html.haml
@@ -782,28 +839,10 @@ files:
 - views/realms/index.html.haml
 - views/realms/index.xml.haml
 - views/realms/show.html.haml
-- views/errors/504.html.haml
-- views/errors/409.xml.haml
-- views/errors/501.xml.haml
-- views/errors/404.html.haml
-- views/errors/502.html.haml
-- views/errors/401.xml.haml
-- views/errors/404.xml.haml
-- views/errors/403.html.haml
-- views/errors/405.html.haml
+- views/errors/common.html.haml
 - views/errors/backend_capability_failure.xml.haml
 - views/errors/backend_capability_failure.html.haml
-- views/errors/501.html.haml
-- views/errors/400.xml.haml
-- views/errors/400.html.haml
-- views/errors/502.xml.haml
-- views/errors/405.xml.haml
-- views/errors/401.html.haml
-- views/errors/500.xml.haml
-- views/errors/403.xml.haml
-- views/errors/409.html.haml
-- views/errors/500.html.haml
-- views/errors/504.xml.haml
+- views/errors/common.xml.haml
 - views/load_balancers/show.xml.haml
 - views/load_balancers/new.html.haml
 - views/load_balancers/index.html.haml
@@ -927,6 +966,7 @@ files:
 - public/stylesheets/compiled/screen.css
 - public/stylesheets/compiled/ie.css
 - bin/deltacloudd
+- bin/deltacloud-db-upgrade
 - LICENSE
 - NOTICE
 homepage: http://www.deltacloud.org
@@ -949,7 +989,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2269388389884938239
+      hash: -1292396733782227782
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -959,6 +999,9 @@ summary: Deltacloud REST API
 test_files:
 - tests/ec2/server_test.rb
 - tests/ec2/query_parser_test.rb
+- tests/cimi/collections/system_templates_test.rb
+- tests/cimi/collections/machine_templates_test.rb
+- tests/cimi/collections/systems_test.rb
 - tests/cimi/collections/cloud_entry_point_test.rb
 - tests/cimi/collections/machines_test.rb
 - tests/cimi/collections/machine_images_test.rb
@@ -1031,3 +1074,9 @@ test_files:
 - tests/drivers/models/keys_test.rb
 - tests/drivers/models/instance_profile_test.rb
 - tests/drivers/models/hardware_profile_test.rb
+- tests/drivers/fgcp/realms_test.rb
+- tests/drivers/fgcp/firewall_test.rb
+- tests/drivers/fgcp/images_test.rb
+- tests/drivers/fgcp/storage_volumes_test.rb
+- tests/drivers/fgcp/provider_test.rb
+- tests/drivers/fgcp/hardware_profiles_test.rb