deltacloud-core 1.1.2 → 1.1.3

data/deltacloud-core.gemspec

@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
     'support/fedora/**',
     'support/condor/bash/**',
     'support/condor/config/**',
+    'lib/*.rb',
     'lib/**/*.rb',
     'lib/**/*.yml',
     'lib/**/*.haml',
@@ -78,11 +79,8 @@ Gem::Specification.new do |s|
   s.add_dependency('require_relative') if RUBY_VERSION < '1.9'
   s.add_dependency('sequel', '<= 3.42.0')
 
-  # FIXME: These dependencies are locked due to bugs that
-  #        we will not address in this release.
-  #
-  s.add_dependency('tilt', '<=1.3.3')
-  s.add_dependency('sinatra', '<=1.3.5')
+  s.add_dependency('tilt')
+  s.add_dependency('sinatra')
 
 
   if RUBY_PLATFORM == 'java'
@@ -95,7 +93,7 @@ Gem::Specification.new do |s|
   # dependencies for various cloud providers:
 
   # RHEV-M and oVirt
-  s.add_dependency('rbovirt', '>=0.0.17')
+  s.add_dependency('rbovirt', '>=0.0.19')
 
   # Amazon EC2 S3
   s.add_dependency('aws', '>=2.7.0')
@@ -108,7 +106,6 @@ Gem::Specification.new do |s|
 
   # Terremark Vcloud Express
   s.add_dependency('fog', '>= 1.4.0')
-  s.add_dependency('excon', '>= 0.14.2', '<0.17.0' )
 
   # Rhevm and Condor Cloud
   s.add_dependency('rest-client')

data/lib/cimi/collections/address_templates.rb

@@ -20,48 +20,10 @@ module CIMI::Collections
 
     collection :address_templates do
 
-      operation :index do
-        description 'List all AddressTemplates in the AddressTemplateCollection'
-        control do
-          address_templates = AddressTemplate.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml {address_templates.to_xml}
-            format.json {address_templates.to_json}
-          end
-        end
-      end
-
-      operation :show do
-        description 'Show a specific AddressTemplate'
-        control do
-          address_template = CIMI::Model::AddressTemplate.find(params[:id], self)
-          respond_to do |format|
-            format.xml {address_template.to_xml}
-            format.json {address_template.to_json}
-          end
-        end
-      end
-
-      operation :create do
-        description "Create new AddressTemplate"
-        control do
-          addr_templ = CIMI::Model::AddressTemplateCreate.parse(request.body, request.content_type)
-          new_address_template = addr_templ.create(self)
-          headers_for_create new_address_template
-          respond_to do |format|
-            format.json { new_address_template.to_json }
-            format.xml { new_address_template.to_xml }
-          end
-        end
-      end
-
-      operation :destroy do
-        description "Delete a specified AddressTemplate"
-        control do
-          CIMI::Model::AddressTemplate.delete!(params[:id], self)
-          no_content_with_status(200)
-        end
-      end
+      generate_index_operation
+      generate_show_operation
+      generate_create_operation
+      generate_delete_operation
 
     end
 

data/lib/cimi/collections/addresses.rb

@@ -19,53 +19,15 @@ module CIMI::Collections
     set :capability, lambda { |m| driver.respond_to? m }
 
     collection :addresses do
-
       description 'An Address represents an IP address, and its associated metadata, for a particular Network.'
 
-      operation :index, :with_capability => :addresses do
-        description 'List all Addresses in the AddressCollection'
-        control do
-          addresses = Address.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml {addresses.to_xml}
-            format.json {addresses.to_json}
-          end
-        end
-      end
-
-      operation :show, :with_capability => :address do
-        description 'Show a specific Address'
-        control do
-          address = CIMI::Model::Address.find(params[:id], self)
-          respond_to do |format|
-            format.xml {address.to_xml}
-            format.json {address.to_json}
-          end
-        end
-      end
-
-      operation :create, :with_capability => :create_address do
-        description "Create a new Address"
-        control do
-          addr = CIMI::Model::AddressCreate.parse(request.body, request.content_type)
-          address = addr.create(self)
-          respond_to do |format|
-            format.xml { address.to_xml }
-            format.json { address.to_json }
-          end
-        end
-      end
-
-      operation :destroy, :with_capability => :delete_address do
-        description "Delete a specified Address"
-        param :id, :string, :required
-        control do
-          CIMI::Model::Address.delete!(params[:id], self)
-          no_content_with_status(200)
-        end
-      end
+      generate_index_operation :with_capability => :addresses
+      generate_show_operation :with_capability => :address
+      generate_delete_operation :with_capability => :destroy_address
+      generate_create_operation :with_capability => :create_address
 
     end
 
+
   end
 end

data/lib/cimi/collections/base.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-require_relative '../models'
+require_relative '../service'
 
 module CIMI::Collections
   class Base < Sinatra::Base
@@ -22,14 +22,18 @@ module CIMI::Collections
       enable :use_namespace
     end
 
+    helpers Sinatra::Rabbit::URLHelper
+
+    Sinatra::Rabbit::Collection.extend(CIMI::RabbitHelper)
+
     include Sinatra::Rabbit
     include Sinatra::Rabbit::Features
-    include CIMI::Model
+    include CIMI::Service
 
     helpers Deltacloud::Helpers::Drivers
     helpers Deltacloud::Helpers::Database
     helpers Sinatra::AuthHelper
-    helpers Sinatra::Rabbit::URLHelper
+
     helpers Deltacloud::Helpers::Application
     helpers CIMI::Helper
 
@@ -61,6 +65,10 @@ module CIMI::Collections
       report_error
     end
 
+    error CIMI::Model::NotFound do
+      report_error(404, 'Not found')
+    end
+
     error JSON::ParserError do
       report_error(400, "Bad request (#{request.env['sinatra.error'].message})")
     end

data/lib/cimi/collections/cloud_entry_point.rb

@@ -28,7 +28,7 @@ module CIMI::Collections
           if params[:force_auth]
             halt 401 unless driver.valid_credentials?(credentials)
           end
-          entry_point = CIMI::Model::CloudEntryPoint.create(self)
+          entry_point = CIMI::Service::CloudEntryPoint.create(self)
           respond_to do |format|
             format.xml { entry_point.to_xml }
             format.json { entry_point.to_json }

data/lib/cimi/collections/credentials.rb

@@ -21,49 +21,10 @@ module CIMI::Collections
     collection :credentials do
       description 'Machine Admin entity'
 
-      operation :index, :with_capability => :keys do
-        description "List all machine admins"
-        control do
-          credentials = Credential.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml { credentials.to_xml }
-            format.json { credentials.to_json }
-          end
-        end
-      end
-
-      operation :show, :with_capability => :key do
-        description "Show specific machine admin"
-        control do
-          credential = Credential.find(params[:id], self)
-          respond_to do |format|
-            format.xml { credential.to_xml }
-            format.json { credential.to_json }
-          end
-        end
-      end
-
-      operation :create, :with_capability => :create_key do
-        description "Show specific machine admin"
-        control do
-          c = CIMI::Model::CredentialCreate.parse(request.body, request.content_type)
-          new_admin = c.create(self)
-          headers_for_create new_admin
-          respond_to do |format|
-            format.json { new_admin.to_json }
-            format.xml { new_admin.to_xml }
-          end
-        end
-      end
-
-      operation :delete, :with_capability => :destroy_key do
-        description "Delete specified Credential entity"
-        control do
-          Credential.delete!(params[:id], self)
-          no_content_with_status(200)
-        end
-      end
-
+      generate_show_operation :with_capability => :keys
+      generate_index_operation :with_capability => :keys
+      generate_create_operation :with_capability => :create_key
+      generate_delete_operation :with_capability => :delete_key
     end
 
   end

data/lib/cimi/collections/forwarding_group_templates.rb

@@ -19,27 +19,9 @@ module CIMI::Collections
 
     collection :forwarding_group_templates do
 
-      operation :index, :with_capability => :forwarding_groups do
-        description 'List all ForwardingGroupTemplates in the ForwardingGroupTemplateCollection'
-        control do
-          forwarding_group_templates = ForwardingGroupTemplate.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml {forwarding_group_templates.to_xml}
-            format.json {forwarding_group_templates.to_json}
-          end
-        end
-      end
+      generate_index_operation :with_capability => :forwarding_groups
+      generate_show_operation :with_capability => :forwarding_groups
 
-      operation :show, :with_capability => :forwarding_groups do
-        description 'Show a specific ForwardingGroupTemplate'
-        control do
-          forwarding_group_template = ForwardingGroupTemplate.find(params[:id], self)
-          respond_to do |format|
-            format.xml {forwarding_group_template.to_xml}
-            format.json {forwarding_group_template.to_json}
-          end
-        end
-      end
     end
 
   end

data/lib/cimi/collections/forwarding_groups.rb

@@ -19,27 +19,8 @@ module CIMI::Collections
 
     collection :forwarding_groups do
 
-      operation :index, :with_capability => :forwarding_groups do
-        description 'List all ForwardingGroups in the ForwardingGroupsCollection'
-        control do
-          forwarding_groups = ForwardingGroup.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml {forwarding_groups.to_xml}
-            format.json {forwarding_groups.to_json}
-          end
-        end
-      end
-
-      operation :show, :with_capability => :forwarding_groups do
-        description 'Show a specific ForwardingGroup'
-        control do
-          forwarding_group = ForwardingGroup.find(params[:id], self)
-          respond_to do |format|
-            format.xml {forwarding_group.to_xml}
-            format.json {forwarding_group.to_json}
-          end
-        end
-      end
+      generate_index_operation :with_capability => :forwarding_groups
+      generate_show_operation :with_capability => :forwarding_groups
 
     end
 

data/lib/cimi/collections/machine_configurations.rb

@@ -21,27 +21,9 @@ module CIMI::Collections
     collection :machine_configurations do
       description 'List all machine configurations'
 
-      operation :index, :with_capability => :hardware_profiles do
-        description "List all machine configurations"
-        control do
-          machine_configs = MachineConfiguration.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml { machine_configs.to_xml }
-            format.json { machine_configs.to_json }
-          end
-        end
-      end
+      generate_show_operation :with_capability => :hardware_profile
+      generate_index_operation :with_capability => :hardware_profiles
 
-      operation :show, :with_capability => :hardware_profile do
-        control do
-          machine_conf = MachineConfiguration.find(params[:id], self)
-          respond_to do |format|
-            format.xml { machine_conf.to_xml }
-            format.json { machine_conf.to_json }
-          end
-        end
-
-      end
     end
 
   end

data/lib/cimi/collections/machine_images.rb

@@ -21,48 +21,10 @@ module CIMI::Collections
     collection :machine_images do
       description 'List all machine images'
 
-      operation :index, :with_capability => :images do
-        description "List all machine configurations"
-        control do
-          machine_images = MachineImage.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml { machine_images.to_xml }
-            format.json { machine_images.to_json }
-          end
-        end
-      end
-
-      operation :show, :with_capability => :image do
-        description "Show specific machine image."
-        control do
-          machine_image = MachineImage.find(params[:id], self)
-          respond_to do |format|
-            format.xml { machine_image.to_xml }
-            format.json { machine_image.to_json }
-          end
-        end
-      end
-
-      operation :create, :with_capability => :create_image do
-        description "Create a new machine image."
-        control do
-          mi = CIMI::Model::MachineImageCreate.parse(request.body, request.content_type)
-          machine_image = mi.create(self)
-          headers_for_create machine_image
-          respond_to do |format|
-            format.xml { machine_image.to_xml }
-            format.json { machine_image.to_json }
-          end
-        end
-      end
-
-      operation :destroy, :with_capability => :destroy_image do
-        description "Delete a specified MachineImage"
-        control do
-          CIMI::Model::MachineImage.delete!(params[:id], self)
-          no_content_with_status 200
-        end
-      end
+      generate_show_operation :with_capability => :image
+      generate_index_operation :with_capability => :images
+      generate_delete_operation :with_capability => :destroy_image
+      generate_create_operation :with_capability => :create_image
 
     end
 

data/lib/cimi/collections/machine_templates.rb

@@ -20,48 +20,10 @@ module CIMI::Collections
 
     collection :machine_templates do
 
-      operation :index do
-        description "List all machine templates"
-        control do
-          machine_templates = CIMI::Model::MachineTemplate.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml { machine_templates.to_xml }
-            format.json { machine_templates.to_json }
-          end
-        end
-      end
-
-      operation :show do
-        description "Show specific machine template"
-        control do
-          machine_template = CIMI::Model::MachineTemplate.find(params[:id], self)
-          respond_to do |format|
-            format.xml { machine_template.to_xml }
-            format.json { machine_template.to_json }
-          end
-        end
-      end
-
-      operation :create do
-        description "Create new machine template"
-        control do
-          mt = CIMI::Model::MachineTemplateCreate.parse(request.body, request.content_type)
-          new_machine_template = mt.create(self)
-          headers_for_create new_machine_template
-          respond_to do |format|
-            format.json { new_machine_template.to_json }
-            format.xml { new_machine_template.to_xml }
-          end
-        end
-      end
-
-      operation :destroy do
-        description "Delete a specified machine template"
-        control do
-          CIMI::Model::MachineTemplate.delete!(params[:id], self)
-          no_content_with_status(200)
-        end
-      end
+      generate_show_operation
+      generate_index_operation
+      generate_create_operation
+      generate_delete_operation
 
     end