deltacloud-core 1.1.1 → 1.1.2

data/lib/cimi/collections/credentials.rb

@@ -46,11 +46,8 @@ module CIMI::Collections
       operation :create, :with_capability => :create_key do
         description "Show specific machine admin"
         control do
-          if grab_content_type(request.content_type, request.body) == :json
-            new_admin = Credential.create_from_json(request.body.read, self)
-          else
-            new_admin = Credential.create_from_xml(request.body.read, self)
-          end
+          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 }

data/lib/cimi/collections/machine_images.rb

@@ -46,7 +46,8 @@ module CIMI::Collections
       operation :create, :with_capability => :create_image do
         description "Create a new machine image."
         control do
-          machine_image = CIMI::Model::MachineImage.create(request.body, self)
+          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 }

data/lib/cimi/collections/machine_templates.rb

@@ -45,11 +45,8 @@ module CIMI::Collections
       operation :create do
         description "Create new machine template"
         control do
-          if grab_content_type(request.content_type, request.body) == :json
-            new_machine_template = CIMI::Model::MachineTemplate.create_from_json(request.body.read, self)
-          else
-            new_machine_template = CIMI::Model::MachineTemplate.create_from_xml(request.body.read, self)
-          end
+          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 }

data/lib/cimi/collections/machines.rb

@@ -46,11 +46,8 @@ module CIMI::Collections
       operation :create, :with_capability => :create_instance do
         description "Create a new Machine entity."
         control do
-          if grab_content_type(request.content_type, request.body) == :json
-            new_machine = Machine.create_from_json(request.body.read, self)
-          else
-            new_machine = Machine.create_from_xml(request.body.read, self)
-          end
+          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 }
@@ -72,7 +69,7 @@ module CIMI::Collections
         param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
-          if grab_content_type(request.content_type, request.body) == :json
+          if current_content_type == :json
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
@@ -89,7 +86,7 @@ module CIMI::Collections
         param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
-          if  grab_content_type(request.content_type, request.body) == :json
+          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"))
@@ -106,7 +103,7 @@ module CIMI::Collections
         param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
-          if  grab_content_type(request.content_type, request.body) == :json
+          if current_content_type == :json
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
@@ -174,7 +171,7 @@ module CIMI::Collections
         description "Attach CIMI Volume(s) to a machine."
         param :id,          :string,    :required
         control do
-          if  grab_content_type(request.content_type, request.body) == :json
+          if current_content_type == :json
             volume_to_attach, location = MachineVolume.find_to_attach_from_json(request.body.read, self)
           else
             volume_to_attach, location = MachineVolume.find_to_attach_from_xml(request.body.read, self)

data/lib/cimi/collections/network_ports.rb

@@ -47,7 +47,7 @@ module CIMI::Collections
       operation :create, :with_capability => :create_network_port do
         description "Create a new NetworkPort"
         control do
-          if grab_content_type(request.content_type, request.body) == :json
+          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)
@@ -73,7 +73,7 @@ module CIMI::Collections
         control do
           network_port = NetworkPort.find(params[:id], self)
           report_error(404) unless network_port
-          if grab_content_type(request.content_type, request.body) == :json
+          if current_content_type == :json
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
@@ -91,7 +91,7 @@ module CIMI::Collections
         control do
           network_port = NetworkPort.find(params[:id], self)
           report_error(404) unless network_port
-          if grab_content_type(request.content_type, request.body) == :json
+          if current_content_type == :json
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)

data/lib/cimi/collections/networks.rb

@@ -46,11 +46,8 @@ module CIMI::Collections
       operation :create, :with_capability => :create_network do
         description "Create a new Network"
         control do
-          if grab_content_type(request.content_type, request.body) == :json
-            network = Network.create(request.body.read, self, :json)
-          else
-            network = Network.create(request.body.read, self, :xml)
-          end
+          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 }
@@ -72,7 +69,7 @@ module CIMI::Collections
         control do
           network = Network.find(params[:id], self)
           report_error(404) unless network
-          if grab_content_type(request.content_type, request.body) == :json
+          if current_content_type == :json
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
@@ -90,7 +87,7 @@ module CIMI::Collections
         control do
           network = Network.find(params[:id], self)
           report_error(404) unless network
-          if grab_content_type(request.content_type, request.body) == :json
+          if current_content_type == :json
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
@@ -108,7 +105,7 @@ module CIMI::Collections
         control do
           network = Network.find(params[:id], self)
           report_error(404) unless network
-          if grab_content_type(request.content_type, request.body) == :json
+          if current_content_type == :json
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)

data/lib/cimi/collections/system_templates.rb

@@ -0,0 +1,72 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+module CIMI::Collections
+  class SystemTemplates < Base
+
+    set :capability, lambda { |m| driver.respond_to? m }
+
+    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
+
+    end
+
+  end
+end

data/lib/cimi/collections/systems.rb

@@ -0,0 +1,194 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+module CIMI::Collections
+  class Systems < Base
+
+    set :capability, lambda { |m| driver.respond_to? m }
+
+    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
+
+      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)
+          system.perform(action, self) do |operation|
+            no_content_with_status(202) if operation.success?
+            # Handle errors using operation.failure?
+          end
+        end
+      end
+
+      action :restart, :with_capability => :reboot_system do
+        description "Restart specific system."
+        param :id,          :string,    :required
+        control do
+          system = System.find(params[:id], self)
+          if  grab_content_type(request.content_type, request.body) == :json
+            action = Action.from_json(request.body.read.gsub("restart", "reboot"))
+          else
+            action = Action.from_xml(request.body.read.gsub("restart", "reboot"))
+          end
+          system.perform(action, self) do |operation|
+            no_content_with_status(202) if operation.success?
+            # Handle errors using operation.failure?
+          end
+        end
+      end
+
+      action :start, :with_capability => :start_system do
+        description "Start specific system."
+        param :id,          :string,    :required
+        control do
+          system = System.find(params[:id], self)
+          if  grab_content_type(request.content_type, request.body) == :json
+            action = Action.from_json(request.body.read)
+          else
+            action = Action.from_xml(request.body.read)
+          end
+          system.perform(action, self) do |operation|
+            no_content_with_status(202) if operation.success?
+            # Handle errors using operation.failure?
+          end
+        end
+      end
+
+      action :pause, :with_capability => :pause_system do
+        description "Pause specific system."
+        param :id,          :string,    :required
+        control do
+          system = System.find(params[:id], self)
+          if  grab_content_type(request.content_type, request.body) == :json
+            action = Action.from_json(request.body.read)
+          else
+            action = Action.from_xml(request.body.read)
+          end
+          system.perform(action, self) do |operation|
+            no_content_with_status(202) if operation.success?
+            # Handle errors using operation.failure?
+          end
+        end
+      end
+
+      action :suspend, :with_capability => :suspend_system do
+        description "Suspend specific system."
+        param :id,          :string,    :required
+        control do
+          system = System.find(params[:id], self)
+          if  grab_content_type(request.content_type, request.body) == :json
+            action = Action.from_json(request.body.read)
+          else
+            action = Action.from_xml(request.body.read)
+          end
+          system.perform(action, self) do |operation|
+            no_content_with_status(202) if operation.success?
+            # Handle errors using operation.failure?
+          end
+        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
+
+        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
+
+        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
+
+      end
+    end
+
+  end
+end

data/lib/cimi/collections/volume_configurations.rb

@@ -45,7 +45,7 @@ module CIMI::Collections
       operation :create, :with_capability => :create_storage_volume do
         description "Create new VolumeConfiguration"
         control do
-          if grab_content_type(request.content_type, request.body) == :json
+          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)

data/lib/cimi/collections/volume_images.rb

@@ -46,7 +46,8 @@ module CIMI::Collections
       operation :create, :with_capability => :create_storage_snapshot do
         description "Create a new volume image."
         control do
-          volume_image = CIMI::Model::VolumeImage.create(request.body, self)
+          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 }

data/lib/cimi/collections/volume_templates.rb

@@ -45,8 +45,9 @@ module CIMI::Collections
       operation :create, :with_capability => :create_storage_volume do
         description "Create new VolumeTemplate"
         control do
-          content_type = grab_content_type(request.content_type, request.body)
-          new_template = CIMI::Model::VolumeTemplate.create(request.body.read, self, content_type)
+          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 }