deltacloud-core 1.1.2 → 1.1.3

data/lib/cimi/collections/machines.rb

@@ -21,60 +21,18 @@ module CIMI::Collections
     collection :machines do
       description 'List all machine'
 
-      operation :index, :with_capability => :instances do
-        description "List all machines"
-        control do
-          machines = Machine.list(self).select_by(params['$select']).filter_by(params['$filter'])
-          respond_to do |format|
-            format.xml { machines.to_xml }
-            format.json { machines.to_json }
-          end
-        end
-      end
-
-      operation :show, :with_capability => :instance do
-        description "Show specific machine."
-        control do
-          machine = Machine.find(params[:id], self)
-          respond_to do |format|
-            format.xml { machine.to_xml }
-            format.json { machine.to_json }
-          end
-        end
-      end
-
-      operation :create, :with_capability => :create_instance do
-        description "Create a new Machine entity."
-        control do
-          mc = MachineCreate.parse(request.body, request.content_type)
-          new_machine = mc.create(self)
-          headers_for_create new_machine
-          respond_to do |format|
-            format.json { new_machine.to_json }
-            format.xml { new_machine.to_xml }
-          end
-        end
-      end
-
-      operation :destroy, :with_capability => :destroy_instance do
-        description "Delete a specified machine."
-        control do
-          Machine.delete!(params[:id], self)
-          no_content_with_status(200)
-        end
-      end
+      generate_show_operation :with_capability => :instance
+      generate_index_operation :with_capability => :instances
+      generate_delete_operation :with_capability => :destroy_instance
+      generate_create_operation :with_capability => :create_instance
 
       action :stop, :with_capability => :stop_instance do
         description "Stop specific machine."
         param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
-          if current_content_type == :json
-            action = Action.from_json(request.body.read)
-          else
-            action = Action.from_xml(request.body.read)
-          end
-          machine.perform(action, self) do |operation|
+          action = Action.parse(self)
+          machine.perform(action) do |operation|
             no_content_with_status(202) if operation.success?
             # Handle errors using operation.failure?
           end
@@ -86,12 +44,8 @@ module CIMI::Collections
         param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
-          if current_content_type == :json
-            action = Action.from_json(request.body.read.gsub("restart", "reboot"))
-          else
-            action = Action.from_xml(request.body.read.gsub("restart", "reboot"))
-          end
-          machine.perform(action, self) do |operation|
+          action = Action.parse(self)
+          machine.perform(action) do |operation|
             no_content_with_status(202) if operation.success?
             # Handle errors using operation.failure?
           end
@@ -103,12 +57,8 @@ module CIMI::Collections
         param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
-          if current_content_type == :json
-            action = Action.from_json(request.body.read)
-          else
-            action = Action.from_xml(request.body.read)
-          end
-          machine.perform(action, self) do |operation|
+          action = Action.parse(self)
+          machine.perform(action) do |operation|
             no_content_with_status(202) if operation.success?
             # Handle errors using operation.failure?
           end
@@ -119,7 +69,7 @@ module CIMI::Collections
         description "Retrieve the Machine's DiskCollection"
         param :id,          :string,    :required
         control do
-          disks = CIMI::Model::Disk.collection_for_instance(params[:id], self)
+          disks = Disk.collection_for_instance(params[:id], self)
           respond_to do |format|
             format.json {disks.to_json}
             format.xml  {disks.to_xml}
@@ -133,7 +83,7 @@ module CIMI::Collections
         operation :index, :with_capability => :storage_volumes do
           description "Retrieve the Machine's MachineVolumeCollection"
           control do
-            volumes = CIMI::Model::MachineVolume.collection_for_instance(params[:id], self)
+            volumes = MachineVolume.collection_for_instance(params[:id], self)
             respond_to do |format|
               format.json {volumes.to_json}
               format.xml  {volumes.to_xml}
@@ -144,7 +94,7 @@ module CIMI::Collections
         operation :show, :with_capability => :storage_volumes do
           description "Retrieve a Machine's specific MachineVolume"
           control do
-            volume = CIMI::Model::MachineVolume.find(params[:id], self, params[:vol_id])
+            volume = MachineVolume.find(params[:id], self, params[:vol_id])
             respond_to do |format|
               format.json {volume.to_json}
               format.xml  {volume.to_xml}
@@ -155,7 +105,7 @@ module CIMI::Collections
         operation :destroy, :with_capability => :detach_storage_volume do
           description "Remove/detach a volume from the Machine's MachineVolumeCollection"
           control do
-            machine_volume = CIMI::Model::MachineVolume.find(params[:id], self, params[:vol_id])
+            machine_volume = MachineVolume.find(params[:id], self, params[:vol_id])
             location = machine_volume.initial_location
             machine_volumes = Machine.detach_volume(params[:vol_id], location, self)
             respond_to do |format|

data/lib/cimi/collections/network_configurations.rb

@@ -20,27 +20,9 @@ module CIMI::Collections
 
     collection :network_configurations do
 
-      operation :index, :with_capability => :network_configurations do
-        description 'List all NetworkConfigurations'
-        control do
-          network_configurations = NetworkConfiguration.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml { network_configurations.to_xml  }
-            format.json { network_configurations.to_json }
-          end
-        end
-      end
+      generate_show_operation :with_capability => :network_configurations
+      generate_index_operation :with_capability => :network_configurations
 
-      operation :show, :with_capability => :network_configurations do
-        description 'Show a specific NetworkConfiguration'
-        control do
-          network_config = NetworkConfiguration.find(params[:id], self)
-          respond_to do |format|
-            format.xml { network_config.to_xml }
-            format.json { network_config.to_json }
-          end
-        end
-      end
     end
 
   end

data/lib/cimi/collections/network_port_configurations.rb

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

data/lib/cimi/collections/network_port_templates.rb

@@ -20,29 +20,8 @@ module CIMI::Collections
 
     collection :network_port_templates do
 
-      description 'The NetworkPort Template is a set of Configuration values for realizing a NetworkPort. A NetworkPort Template may be used to create multiple NetworkPorts'
-
-      operation :index, :with_capability => :network_port_templates do
-        description 'List all NetworkPortTemplates in the NetworkPortTemplateCollection'
-        control do
-          network_port_templates = NetworkPortTemplate.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml {network_port_templates.to_xml}
-            format.json {network_port_templates.to_json}
-          end
-        end
-      end
-
-      operation :show, :with_capability => :network_port_templates do
-        description 'Show a specific NetworkPortTemplate'
-        control do
-          network_port_template = NetworkPortTemplate.find(params[:id], self)
-          respond_to do |format|
-            format.xml {network_port_template.to_xml}
-            format.json {network_port_template.to_json}
-          end
-        end
-      end
+      generate_show_operation :with_capability => :network_port_templates
+      generate_index_operation :with_capability => :network_port_templates
 
     end
 

data/lib/cimi/collections/network_ports.rb

@@ -19,53 +19,13 @@ module CIMI::Collections
     set :capability, lambda { |m| driver.respond_to? m }
 
     collection :network_ports do
+      description 'A NetworkPort is a realized connection point between a Network'+
+        ' and a resource - such as a Machine.'
 
-      description 'A NetworkPort is a realized connection point between a Network and a resource - such as a Machine.'
-
-      operation :index, :with_capability => :network_ports do
-        description 'List all NetworkPorts in the NetworkPortCollection'
-        control do
-          network_ports = NetworkPort.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml {network_ports.to_xml}
-            format.json {network_ports.to_json}
-          end
-        end
-      end
-
-      operation :show, :with_capability => :network_ports do
-        description 'Show a specific NetworkPort'
-        control do
-          network_port = NetworkPort.find(params[:id], self)
-          respond_to do |format|
-            format.xml {network_port.to_xml}
-            format.json {network_port.to_json}
-          end
-        end
-      end
-
-      operation :create, :with_capability => :create_network_port do
-        description "Create a new NetworkPort"
-        control do
-          if current_content_type == :json
-            network_port = CIMI::Model::NetworkPort.create(request.body.read, self, :json)
-          else
-            network_port = CIMI::Model::NetworkPort.create(request.body.read, self, :xml)
-          end
-          respond_to do |format|
-            format.xml { network_port.to_xml }
-            format.json { network_port.to_json }
-          end
-        end
-      end
-
-      operation :destroy, :with_capability => :delete_network_port do
-        description "Delete a specified NetworkPort"
-        control do
-          CIMI::Model::NetworkPort.delete!(params[:id], self)
-          no_content_with_status(200)
-        end
-      end
+      generate_show_operation :with_capability => :network_port
+      generate_index_operation :with_capability => :networks_ports
+      generate_create_operation :with_capability => :create_network_port
+      generate_delete_operation :with_capability => :destroy_network_port
 
       action :start, :with_capability => :start_network_port do
         description "Start specific NetworkPort."

data/lib/cimi/collections/network_templates.rb

@@ -20,27 +20,8 @@ module CIMI::Collections
 
     collection :network_templates do
 
-      operation :index, :with_capability => :network_templates do
-        description 'List all Network Templates in the NetworkTemplateCollection'
-        control do
-          network_templates = NetworkTemplate.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml {network_templates.to_xml}
-            format.json {network_templates.to_json}
-          end
-        end
-      end
-
-      operation :show, :with_capability => :network_templates do
-        description 'Show a specific Network Template'
-        control do
-          network_template = NetworkTemplate.find(params[:id], self)
-          respond_to do |format|
-            format.xml {network_template.to_xml}
-            format.json {network_template.to_json}
-          end
-        end
-      end
+      generate_index_operation :with_capability => :network_templates
+      generate_show_operation :with_capability => :network_templates
 
     end
 

data/lib/cimi/collections/networks.rb

@@ -21,47 +21,11 @@ module CIMI::Collections
     collection :networks do
       description 'A Network represents an abstraction of a layer 2 broadcast domain'
 
-      operation :index, :with_capability => :networks do
-        description "List all Networks"
-        control do
-          networks = Network.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml { networks.to_xml }
-            format.json { networks.to_json }
-          end
-        end
-      end
+      generate_show_operation :with_capability => :networks
+      generate_index_operation :with_capability => :networks
+      generate_delete_operation :with_capability => :destroy_network
+      generate_create_operation :with_capability => :create_network
 
-      operation :show, :with_capability => :networks do
-        description "Show a specific Network"
-        control do
-          network = Network.find(params[:id], self)
-          respond_to do |format|
-            format.xml { network.to_xml }
-            format.json { network.to_json }
-          end
-        end
-      end
-
-      operation :create, :with_capability => :create_network do
-        description "Create a new Network"
-        control do
-          n = CIMI::Model::NetworkCreate.parse(request.body, request.content_type)
-          network = n.create(self)
-          respond_to do |format|
-            format.xml { network.to_xml}
-            format.json { network.to_json }
-          end
-        end
-      end
-
-      operation :destroy, :with_capability => :delete_network do
-        description "Delete a specified Network"
-        control do
-          Network.delete!(params[:id], self)
-          no_content_with_status(200)
-        end
-      end
 
       action :start, :with_capability => :start_network do
         description "Start specific network."

data/lib/cimi/collections/resource_metadata.rb

@@ -18,27 +18,8 @@ module CIMI::Collections
 
     collection :resource_metadata do
 
-      operation :index do
-        description "List all resource metadata defined for this provider"
-        control do
-          resource_metadata = CIMI::Model::ResourceMetadata.list(self)
-          respond_to do |format|
-            format.xml{resource_metadata.to_xml}
-            format.json{resource_metadata.to_json}
-          end
-        end
-      end
-
-      operation :show do
-        description "Get the resource metadata for a specific collection"
-        control do
-          resource_metadata = CIMI::Model::ResourceMetadata.find(params[:id], self)
-          respond_to do |format|
-            format.xml{resource_metadata.to_xml}
-            format.json{resource_metadata.to_json}
-          end
-        end
-      end
+      generate_index_operation
+      generate_show_operation
 
     end
 

data/lib/cimi/collections/system_templates.rb

@@ -20,51 +20,10 @@ module CIMI::Collections
 
     collection :system_templates do
 
-      operation :index, :with_capability => :system_templates do
-        description "List all system templates"
-        control do
-          system_templates = CIMI::Model::SystemTemplate.list(self).select_by(params['$select'])
-          respond_to do |format|
-            format.xml { system_templates.to_xml }
-            format.json { system_templates.to_json }
-          end
-        end
-      end
-
-      operation :show, :with_capability => :system_templates do
-        description "Show specific system template"
-        control do
-          system_template = CIMI::Model::SystemTemplate.find(params[:id], self)
-          respond_to do |format|
-            format.xml { system_template.to_xml }
-            format.json { system_template.to_json }
-          end
-        end
-      end
-
-      operation :create, :with_capability => :create_system_template do
-        description "Create new system template"
-        control do
-          if grab_content_type(request.content_type, request.body) == :json
-            new_system_template = CIMI::Model::SystemTemplate.create_from_json(request.body.read, self)
-          else
-            new_system_template = CIMI::Model::SystemTemplate.create_from_xml(request.body.read, self)
-          end
-          headers_for_create new_system_template
-          respond_to do |format|
-            format.json { new_system_template.to_json }
-            format.xml { new_system_template.to_xml }
-          end
-        end
-      end
-
-      operation :destroy, :with_capability => :destroy_system_template do
-        description "Delete a specified system template"
-        control do
-          CIMI::Model::SystemTemplate.delete!(params[:id], self)
-          no_content_with_status(200)
-        end
-      end
+      generate_index_operation :with_capability => :system_templates
+      generate_show_operation :with_capability => :system_templates
+      generate_create_operation :with_capability => :create_system_template
+      generate_delete_operation :with_capability => :destroy_system_template
 
     end