deltacloud-core 1.1.2 → 1.1.3

data/lib/cimi/collections/systems.rb

@@ -21,59 +21,17 @@ module CIMI::Collections
     collection :systems do
       description 'List all systems'
 
-      operation :index, :with_capability => :systems do
-        description "List all systems"
-        control do
-          systems = System.list(self).select_by(params['$select']).filter_by(params['$filter'])
-          respond_to do |format|
-            format.xml { systems.to_xml }
-            format.json { systems.to_json }
-          end
-        end
-      end
-
-      operation :show, :with_capability => :systems do
-        description "Show specific system."
-        control do
-          system = System.find(params[:id], self)
-          respond_to do |format|
-            format.xml { system.to_xml }
-            format.json { system.to_json }
-          end
-        end
-      end
-
-      operation :create, :with_capability => :create_system do
-        description "Create a new System entity."
-        control do
-          if grab_content_type(request.content_type, request.body) == :json
-            new_system = System.create_from_json(request.body.read, self)
-          else
-            new_system = System.create_from_xml(request.body.read, self)
-          end
-          headers_for_create new_system
-          respond_to do |format|
-            format.json { new_system.to_json }
-            format.xml { new_system.to_xml }
-          end
-        end
-      end
-
-      operation :destroy, :with_capability => :destroy_system do
-        description "Delete a specified system."
-        control do
-          System.delete!(params[:id], self)
-          no_content_with_status(200)
-        end
-      end
+      generate_index_operation :with_capability => :systems
+      generate_show_operation :with_capability => :systems
+      generate_create_operation :with_capability => :create_system
+      generate_delete_operation :with_capability => :destroy_system
 
       action :stop, :with_capability => :stop_system do
         description "Stop specific system."
         param :id,          :string,    :required
         control do
           system = System.find(params[:id], self)
-          action = Action.parse(request.body,
-          request.content_type)
+          action = Action.parse(self)
           system.perform(action, self) do |operation|
             no_content_with_status(202) if operation.success?
             # Handle errors using operation.failure?
@@ -149,45 +107,70 @@ module CIMI::Collections
         end
       end
 
-      #use rabbit subcollections for volumes index/show:
-      collection :volumes, :with_id => :vol_id do
-
-        operation :index, :with_capability => :storage_volumes do
-          description "Retrieve the System's SystemVolumeCollection"
-          control do
-            volumes = CIMI::Model::SystemVolume.collection_for_system(params[:id], self)
-            respond_to do |format|
-              format.json {volumes.to_json}
-              format.xml  {volumes.to_xml}
-            end
-          end
-        end
+      collection :systems, :with_id => :ent_id do
+        description 'List system\'s systems'
+        generate_system_subcollection_index_operation :with_capability => :system_systems
+        generate_system_subcollection_show_operation :with_capability => :system_systems
+        generate_add_to_system_operation :with_capability => :add_system_to_system
+        generate_remove_from_system_operation :with_capability => :remove_system_from_system
+      end
 
-        operation :show, :with_capability => :storage_volumes do
-          description "Retrieve a System's specific SystemVolume"
-          control do
-            volume = CIMI::Model::SystemVolume.find(params[:id], self, params[:vol_id])
-            respond_to do |format|
-              format.json {volume.to_json}
-              format.xml  {volume.to_xml}
-            end
-          end
-        end
+      collection :machines, :with_id => :ent_id do
+        description 'List system\'s machines'
+        generate_system_subcollection_index_operation :with_capability => :system_machines
+        generate_system_subcollection_show_operation :with_capability => :system_machines
+        generate_add_to_system_operation :with_capability => :add_machine_to_system
+        generate_remove_from_system_operation :with_capability => :remove_machine_from_system
+      end
 
-        operation :destroy, :with_capability => :detach_storage_volume do
-          description "Remove/detach a volume from the System's SystemVolumeCollection"
-          control do
-            system_volume = CIMI::Model::SystemVolume.find(params[:id], self, params[:vol_id])
-            location = system_volume.initial_location
-            system_volumes = System.detach_volume(params[:vol_id], location, self)
-            respond_to do |format|
-              format.json{ system_volumes.to_json}
-              format.xml{ system_volumes.to_xml}
-            end
-          end
-        end
+      collection :credentials, :with_id => :ent_id do
+        description 'List system\'s credentials'
+        generate_system_subcollection_index_operation :with_capability => :system_credentials
+        generate_system_subcollection_show_operation :with_capability => :system_credentials
+        generate_add_to_system_operation :with_capability => :add_credential_to_system
+        generate_remove_from_system_operation :with_capability => :remove_credential_from_system
+      end
 
+      collection :volumes, :with_id => :ent_id do
+        description 'List system\'s volumes'
+        generate_system_subcollection_index_operation :with_capability => :system_volumes
+        generate_system_subcollection_show_operation :with_capability => :system_volumes
+        generate_add_to_system_operation :with_capability => :add_volume_to_system
+        generate_remove_from_system_operation :with_capability => :remove_volume_from_system
       end
+
+      collection :networks, :with_id => :ent_id do
+        description 'List system\'s networks'
+        generate_system_subcollection_index_operation :with_capability => :system_networks
+        generate_system_subcollection_show_operation :with_capability => :system_networks
+        generate_add_to_system_operation :with_capability => :add_network_to_system
+        generate_remove_from_system_operation :with_capability => :remove_network_from_system
+      end
+
+      collection :network_ports, :with_id => :ent_id do
+        description 'List system\'s network ports'
+        generate_system_subcollection_index_operation :with_capability => :system_network_ports
+        generate_system_subcollection_show_operation :with_capability => :system_network_ports
+        generate_add_to_system_operation :with_capability => :add_network_port_to_system
+        generate_remove_from_system_operation :with_capability => :remove_network_port_from_system
+      end
+
+      collection :addresses, :with_id => :ent_id do
+        description 'List system\'s addresses'
+        generate_system_subcollection_index_operation :with_capability => :system_addresses
+        generate_system_subcollection_show_operation :with_capability => :system_addresses
+        generate_add_to_system_operation :with_capability => :add_addresses_to_system
+        generate_remove_from_system_operation :with_capability => :remove_addresses_from_system
+      end
+
+      collection :forwarding_groups, :with_id => :ent_id do
+        description 'List system\'s forwarding groups'
+        generate_system_subcollection_index_operation :with_capability => :system_forwarding_groups
+        generate_system_subcollection_show_operation :with_capability => :system_forwarding_groups
+        generate_add_to_system_operation :with_capability => :add_forwarding_groups_to_system
+        generate_remove_from_system_operation :with_capability => :remove_forwarding_groups_from_system
+      end
+
     end
 
   end

data/lib/cimi/collections/volume_configurations.rb

@@ -20,51 +20,10 @@ module CIMI::Collections
 
     collection :volume_configurations do
 
-      operation :index, :with_capability => :storage_volumes do
-        description "Get list all VolumeConfigurations"
-        control do
-          volume_configuration = VolumeConfiguration.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml { volume_configuration.to_xml }
-            format.json { volume_configuration.to_json }
-          end
-        end
-      end
-
-      operation :show, :with_capability => :storage_volume do
-        description "Get a specific VolumeConfiguration"
-        control do
-          volume_config = VolumeConfiguration.find(params[:id], self)
-          respond_to do |format|
-            format.xml { volume_config.to_xml }
-            format.json { volume_config.json }
-          end
-        end
-      end
-
-      operation :create, :with_capability => :create_storage_volume do
-        description "Create new VolumeConfiguration"
-        control do
-          if current_content_type == :json
-            new_config = CIMI::Model::VolumeConfiguration.create_from_json(request.body.read, self)
-          else
-            new_config = CIMI::Model::VolumeConfiguration.create_from_xml(request.body.read, self)
-          end
-          headers_for_create new_config
-          respond_to do |format|
-            format.json { new_config.to_json }
-            format.xml { new_config.to_xml }
-          end
-        end
-      end
-
-      operation :destroy, :with_capability => :destroy_storage_volume do
-        description "Delete a specified VolumeConfiguration"
-        control do
-          CIMI::Model::VolumeConfiguration.delete!(params[:id], self)
-          no_content_with_status(200)
-        end
-      end
+      generate_index_operation :with_capability => :storage_volumes
+      generate_show_operation :with_capability => :storage_volume
+      generate_create_operation :with_capability => :create_storage_volume
+      generate_delete_operation :with_capability => :storage_volume
 
     end
 

data/lib/cimi/collections/volume_images.rb

@@ -21,48 +21,10 @@ module CIMI::Collections
     collection :volume_images do
       description 'This entity represents an image that could be place on a pre-loaded volume.'
 
-      operation :index, :with_capability => :storage_snapshots do
-        description "List all volumes images"
-        control do
-          volume_images = VolumeImage.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml { volume_images.to_xml }
-            format.json { volume_images.to_json }
-          end
-        end
-      end
-
-      operation :show, :with_capability => :storage_snapshot do
-        description "Show a specific volume image"
-        control do
-          volume_image = VolumeImage.find(params[:id], self)
-          respond_to do |format|
-            format.xml { volume_image.to_xml }
-            format.json { volume_image.to_json }
-          end
-        end
-      end
-
-      operation :create, :with_capability => :create_storage_snapshot do
-        description "Create a new volume image."
-        control do
-          img = CIMI::Model::VolumeImageCreate.parse(request.body, request.content_type)
-          volume_image = img.create(self)
-          headers_for_create volume_image
-          respond_to do |format|
-            format.xml { volume_image.to_xml }
-            format.json { volume_image.to_json }
-          end
-        end
-      end
-
-      operation :destroy, :with_capability => :destroy_storage_snapshot do
-        description "Delete a specified VolumeImage"
-        control do
-          CIMI::Model::VolumeImage.delete!(params[:id], self)
-          no_content_with_status 200
-        end
-      end
+      generate_index_operation :with_capability => :storage_snapshots
+      generate_show_operation :with_capability => :storage_snapshot
+      generate_create_operation :with_capability => :create_storage_snapshot
+      generate_delete_operation :with_capability => :destroy_storage_snapshot
 
     end
 

data/lib/cimi/collections/volume_templates.rb

@@ -20,51 +20,12 @@ module CIMI::Collections
 
     collection :volume_templates do
 
-      operation :index, :with_capability => :storage_volumes do
-        description "Retrieve the Volume Template Collection"
-        control do
-          volume_template = VolumeTemplate.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml { volume_template.to_xml }
-            format.json { volume_template.to_json }
-          end
-        end
-      end
+      generate_index_operation :with_capability => :storage_volumes
+      generate_show_operation :with_capability => :storage_volume
+      generate_create_operation :with_capability => :create_storage_volume
+      generate_delete_operation :with_capability => :destroy_storage_volume
 
-      operation :show, :with_capability => :storage_volume do
-        description "Get a specific VolumeTemplate"
-        control do
-          volume_template = VolumeTemplate.find(params[:id], self)
-          respond_to do |format|
-            format.xml { volume_template.to_xml }
-            format.json { volume_template.json }
-          end
-        end
-      end
-
-      operation :create, :with_capability => :create_storage_volume do
-        description "Create new VolumeTemplate"
-        control do
-          puts request.body
-          vol = CIMI::Model::VolumeTemplateCreate.parse(request.body, request.content_type)
-          new_template = vol.create(self)
-          headers_for_create new_template
-          respond_to do |format|
-            format.json { new_template.to_json }
-            format.xml { new_template.to_xml }
-          end
-        end
-      end
-
-      operation :destroy, :with_capability => :destroy_storage_volume do
-        description "Delete a specified VolumeTemplate"
-        control do
-          CIMI::Model::VolumeTemplate.delete!(params[:id], self)
-          no_content_with_status(200)
-        end
-      end
-
-    end
+     end
 
   end
 end

data/lib/cimi/collections/volumes.rb

@@ -19,54 +19,10 @@ module CIMI::Collections
     set :capability, lambda { |m| driver.respond_to? m }
 
     collection :volumes do
-
-      operation :index, :with_capability => :storage_volumes do
-        description "List all volumes"
-        control do
-          volumes = Volume.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml { volumes.to_xml }
-            format.json { volumes.to_json }
-          end
-        end
-      end
-
-      operation :show, :with_capability => :storage_volume do
-        description "Show specific Volume."
-        control do
-          volume = Volume.find(params[:id], self)
-          if volume
-            respond_to do |format|
-              format.xml  { volume.to_xml  }
-              format.json { volume.to_json }
-            end
-          else
-            report_error(404)
-          end
-        end
-      end
-
-      operation :create, :with_capability => :create_storage_volume do
-        description "Create a new Volume."
-        control do
-          vol = CIMI::Model::VolumeCreate.parse(request.body, request.content_type)
-          new_volume = vol.create(self)
-          headers_for_create new_volume
-          respond_to do |format|
-            format.json { new_volume.to_json }
-            format.xml { new_volume.to_xml }
-          end
-        end
-      end
-
-      operation :destroy, :with_capability => :destroy_storage_volume do
-        description "Delete a specified Volume"
-        control do
-          Volume.delete!(params[:id], self)
-          no_content_with_status(200)
-        end
-      end
-
+      generate_index_operation :with_capability => :storage_volumes
+      generate_show_operation :with_capability => :storage_volume
+      generate_create_operation :with_capability => :create_storage_volume
+      generate_delete_operation :with_capability => :destroy_storage_volume
     end
 
 

data/lib/cimi/helpers.rb

@@ -35,4 +35,5 @@ require_relative '../deltacloud/helpers/deltacloud_helper'
 require_relative '../deltacloud/helpers/rabbit_helper'
 
 require_relative './helpers/cimi_helper'
+require_relative './helpers/cimi_rabbit_helper'
 require_relative './helpers/database_helper'

data/lib/cimi/helpers/cimi_helper.rb

@@ -72,7 +72,7 @@ module CIMI
     end
 
     def deltacloud_create_method_for(cimi_entity)
-      case cimi_entity
+      case cimi_entity.to_s
         when "machine"                then "create_instance"
         when "machine_configuration"  then "create_hardware_profile"
         when "machine_image"          then "create_image"

data/lib/cimi/helpers/cimi_rabbit_helper.rb

@@ -0,0 +1,113 @@
+module CIMI
+  module RabbitHelper
+
+    def generate_delete_operation(opts={})
+      collection_name = @collection_name.to_s.singularize.camelize
+      operation :destroy, :with_capability => opts[:with_capability] do
+        description "Delete specified Credential entity"
+        control do
+          CIMI::Service.const_get(collection_name).delete!(params[:id], self)
+          no_content_with_status(200)
+        end
+      end
+    end
+
+    def generate_create_operation(opts={})
+      collection_name = @collection_name.to_s.singularize.camelize
+      operation :create, :with_capability => opts[:with_capability] do
+        description "Create new #{collection_name} entity"
+        control do
+          ent = CIMI::Service.const_get("#{collection_name}Create").parse(self).create
+          headers_for_create ent
+          respond_to do |format|
+            format.json { ent.to_json }
+            format.xml { ent.to_xml }
+          end
+        end
+      end
+    end
+
+    def generate_index_operation(opts={})
+      collection_name = @collection_name.to_s.singularize.camelize
+      operation :index, :with_capability => opts[:with_capability] do
+        description "List all entities in #{collection_name} collection"
+        control do
+          ent = CIMI::Service.const_get(collection_name).list(self)
+          respond_to do |format|
+            format.xml { ent.to_xml }
+            format.json { ent.to_json }
+          end
+        end
+      end
+    end
+
+    def generate_show_operation(opts={})
+      collection_name = @collection_name.to_s.singularize.camelize
+      operation :show, :with_capability => opts[:with_capability] do
+        description "Show details about #{collection_name} entity"
+        control do
+          ent = CIMI::Service.const_get(collection_name).find(params[:id], self)
+          respond_to do |format|
+            format.xml { ent.to_xml }
+            format.json { ent.to_json }
+          end
+        end
+      end
+    end
+
+    def generate_remove_from_system_operation(opts={})
+      collection_name = "System#{@collection_name.to_s.singularize.camelize}"
+      operation :destroy, :with_capability => opts[:with_capability] do
+        description "Remove specified #{collection_name} entity from System"
+        control do
+          CIMI::Service.const_get(collection_name).delete!(params[:id], self, params[:ent_id])
+          no_content_with_status(200)
+        end
+      end
+    end
+
+    def generate_add_to_system_operation(opts={})
+      collection_name = "System#{@collection_name.to_s.singularize.camelize}"
+      operation :create, :with_capability => opts[:with_capability] do
+        description "Add specified #{collection_name} entity to System"
+        control do
+          ent = CIMI::Service.const_get("#{collection_name}Create").parse(params[:id], self).create
+          headers_for_create ent
+          respond_to do |format|
+            format.json { ent.to_json }
+            format.xml { ent.to_xml }
+          end
+        end
+      end
+    end
+
+    def generate_system_subcollection_index_operation(opts={})
+      collection_name = "System#{@collection_name.to_s.singularize.camelize}"
+      operation :index, :with_capability => opts[:with_capability] do
+        description "List all entities in System's #{collection_name} collection"
+        control do
+          ent = CIMI::Service.const_get(collection_name).collection_for_system(params[:id], self)
+          respond_to do |format|
+            format.xml { ent.to_xml }
+            format.json { ent.to_json }
+          end
+        end
+      end
+    end
+
+    def generate_system_subcollection_show_operation(opts={})
+      collection_name = "System#{@collection_name.to_s.singularize.camelize}"
+      operation :show, :with_capability => opts[:with_capability] do
+        description "Show details of System's #{collection_name} entity"
+        control do
+          ent = CIMI::Service.const_get(collection_name).find(params[:id], self, params[:ent_id])
+          respond_to do |format|
+            format.xml { ent.to_xml }
+            format.json { ent.to_json }
+          end
+        end
+      end
+    end
+
+  end
+end