deltacloud-core 1.0.3 → 1.0.4

data/lib/cimi/collections/machine_configurations.rb

@@ -16,7 +16,7 @@
 module CIMI::Collections
   class MachineConfigurations < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability => lambda { |m| driver.respond_to? m }
 
     collection :machine_configurations do
       description 'List all machine configurations'
@@ -25,7 +25,7 @@ module CIMI::Collections
         param :CIMISelect,  :string,  :optional
         description "List all machine configurations"
         control do
-          machine_configs = MachineConfigurationCollection.default(self).filter_by(params[:CIMISelect])
+          machine_configs = MachineConfiguration.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
             format.xml { machine_configs.to_xml }
             format.json { machine_configs.to_json }

data/lib/cimi/collections/machine_images.rb

@@ -25,7 +25,7 @@ module CIMI::Collections
         description "List all machine configurations"
         param :CIMISelect,  :string,  :optional
         control do
-          machine_images = MachineImageCollection.default(self).filter_by(params[:CIMISelect])
+          machine_images = MachineImage.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
             format.xml { machine_images.to_xml }
             format.json { machine_images.to_json }

data/lib/cimi/collections/machines.rb

@@ -25,7 +25,7 @@ module CIMI::Collections
         param :CIMISelect,  :string,  :optional
         description "List all machines"
         control do
-          machines = MachineCollection.default(self).filter_by(params[:CIMISelect])
+          machines = Machine.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
             format.xml { machines.to_xml }
             format.json { machines.to_json }
@@ -62,7 +62,6 @@ module CIMI::Collections
 
       operation :destroy, :with_capability => :destroy_instance do
         description "Delete a specified machine."
-        param :id,          :string,    :required
         control do
           Machine.delete!(params[:id], self)
           no_content_with_status(200)
@@ -71,6 +70,7 @@ module CIMI::Collections
 
       action :stop, :with_capability => :stop_instance do
         description "Stop specific machine."
+        param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
           if request.content_type.end_with?("+json")
@@ -87,6 +87,7 @@ module CIMI::Collections
 
       action :restart, :with_capability => :restart_instance do
         description "Start specific machine."
+        param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
           if request.content_type.end_with?("+json")
@@ -103,6 +104,7 @@ module CIMI::Collections
 
       action :start, :with_capability => :start_instance do
         description "Start specific machine."
+        param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
           if request.content_type.end_with?("+json")
@@ -119,6 +121,7 @@ module CIMI::Collections
 
       operation :disks, :with_capability => :hardware_profiles do
         description "Retrieve the Machine's DiskCollection"
+        param :id,          :string,    :required
         control do
           disks = DiskCollection.default(params[:id], self)
           respond_to do |format|
@@ -130,6 +133,7 @@ module CIMI::Collections
 
       operation :volumes, :with_capability => :storage_volumes do
         description "Retrieve the Machine's MachineVolumeCollection"
+        param :id,          :string,    :required
         control do
           volumes = MachineVolumeCollection.default(params[:id], self)
           respond_to do |format|
@@ -144,6 +148,7 @@ module CIMI::Collections
       #with inclusion/ommission of the volumes you want [att|det]ached
       action :attach_volume, :http_method => :put, :with_capability => :attach_storage_volume do
         description "Attach CIMI Volume(s) to a machine."
+        param :id,          :string,    :required
         control do
           if request.content_type.end_with?("+json")
             volumes_to_attach = Volume.find_to_attach_from_json(request.body.read, self)
@@ -160,6 +165,7 @@ module CIMI::Collections
 
       action :detach_volume, :http_method => :put, :with_capability => :detach_storage_volume do
         description "Detach CIMI Volume(s) from a machine."
+        param :id,          :string,    :required
         control do
           if request.content_type.end_with?("+json")
             volumes_to_detach = Volume.find_to_attach_from_json(request.body.read, self)

data/lib/cimi/collections/network_configurations.rb

@@ -24,7 +24,7 @@ module CIMI::Collections
         description 'List all NetworkConfigurations'
         param :CIMISelect, :string, :optional
         control do
-          network_configurations = NetworkConfigurationCollection.default(self).filter_by(params[:CIMISelect])
+          network_configurations = NetworkConfiguration.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
             format.xml { network_configurations.to_xml  }
             format.json { network_configurations.to_json }
@@ -32,7 +32,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show, :with_capability => :network_configuration do
+      operation :show, :with_capability => :network_configurations do
         description 'Show a specific NetworkConfiguration'
         control do
           network_config = NetworkConfiguration.find(params[:id], self)

data/lib/cimi/collections/{routing_groups.rb → network_port_configurations.rb}

@@ -14,31 +14,31 @@
 # under the License.
 
 module CIMI::Collections
-  class RoutingGroups < Base
+  class NetworkPortConfigurations < Base
 
     set :capability, lambda { |m| driver.respond_to? m }
 
-    collection :routing_groups do
+    collection :network_port_configurations do
 
-      operation :index, :with_capability => :routing_groups do
-        description 'List all RoutingGroups in the RoutingGroupsCollection'
+      operation :index, :with_capability => :network_port_configurations do
+        description 'List all NetworkPortConfigurations in the NetworkPortConfigurationCollection'
         param :CIMISelect, :string, :optional
         control do
-          routing_groups = RoutingGroupCollection.default(self).filter_by(params[:CIMISelect])
+          net_port_configs = NetworkPortConfiguration.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
-            format.xml {routing_groups.to_xml}
-            format.json {routing_groups.to_json}
+            format.xml {net_port_configs.to_xml}
+            format.json {net_port_configs.to_json}
           end
         end
       end
 
-      operation :show, :with_capability => :routing_group do
-        description 'Show a specific RoutingGroup'
+      operation :show, :with_capability => :network_port_configurations do
+        description 'Show a specific NetworkPortConfiguration'
         control do
-          routing_group = RoutingGroup.find(params[:id], self)
+          net_port_config = NetworkPortConfiguration.find(params[:id], self)
           respond_to do |format|
-            format.xml {routing_group.to_xml}
-            format.json {routing_group.to_json}
+            format.xml {net_port_config.to_xml}
+            format.json {net_port_config.to_json}
           end
         end
       end

data/lib/cimi/collections/{routing_group_templates.rb → network_port_templates.rb}

@@ -14,34 +14,37 @@
 # under the License.
 
 module CIMI::Collections
-  class RoutingGroupTemplates < Base
+  class NetworkPortTemplates < Base
 
     set :capability, lambda { |m| driver.respond_to? m }
 
-    collection :routing_group_templates do
+    collection :network_port_templates do
 
-      operation :index, :with_capability => :routing_groups do
-        description 'List all RoutingGroupTemplates in the RoutingGroupTemplateCollection'
+      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'
         param :CIMISelect, :string, :optional
         control do
-          routing_group_templates = RoutingGroupTemplateCollection.default(self).filter_by(params[:CIMISelect])
+          network_port_templates = NetworkPortTemplate.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
-            format.xml {routing_group_templates.to_xml}
-            format.json {routing_group_templates.to_json}
+            format.xml {network_port_templates.to_xml}
+            format.json {network_port_templates.to_json}
           end
         end
       end
 
-      operation :show, :with_capability => :routing_group do
-        description 'Show a specific RoutingGroupTemplate'
+      operation :show, :with_capability => :network_port_templates do
+        description 'Show a specific NetworkPortTemplate'
         control do
-          routing_group_template = RoutingGroupTemplate.find(params[:id], self)
+          network_port_template = NetworkPortTemplate.find(params[:id], self)
           respond_to do |format|
-            format.xml {routing_group_template.to_xml}
-            format.json {routing_group_template.to_json}
+            format.xml {network_port_template.to_xml}
+            format.json {network_port_template.to_json}
           end
         end
       end
+
     end
 
   end

data/lib/cimi/collections/{vsps.rb → network_ports.rb}

@@ -14,89 +14,90 @@
 # under the License.
 
 module CIMI::Collections
-  class Vsps < Base
+  class NetworkPorts < Base
 
     set :capability, lambda { |m| driver.respond_to? m }
 
-    collection :vsps do
+    collection :network_ports do
 
-      description 'A VSP represents the connection parameters of a network port'
+      description 'A NetworkPort is a realized connection point between a Network and a resource - such as a Machine.'
 
-      operation :index, :with_capability => :vsps do
-        description 'List all VSPs in the VSPCollection'
+      operation :index, :with_capability => :network_ports do
+        description 'List all NetworkPorts in the NetworkPortCollection'
         param :CIMISelect, :string, :optional
         control do
-          vsps = VSPCollection.default(self).filter_by(params[:CIMISelect])
+          network_ports = NetworkPort.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
-            format.xml {vsps.to_xml}
-            format.json {vsps.to_json}
+            format.xml {network_ports.to_xml}
+            format.json {network_ports.to_json}
           end
         end
       end
 
-      operation :show, :with_capability => :vsp do
-        description 'Show a specific VSP'
+      operation :show, :with_capability => :network_ports do
+        description 'Show a specific NetworkPort'
         control do
-          vsp = VSP.find(params[:id], self)
+          network_port = NetworkPort.find(params[:id], self)
           respond_to do |format|
-            format.xml {vsp.to_xml}
-            format.json {vsp.to_json}
+            format.xml {network_port.to_xml}
+            format.json {network_port.to_json}
           end
         end
       end
 
-      operation :create, :with_capability => :create_vsp do
-        description "Create a new VSP"
+      operation :create, :with_capability => :create_network_port do
+        description "Create a new NetworkPort"
         control do
           if request.content_type.end_with?("json")
-            vsp = CIMI::Model::VSP.create(request.body.read, self, :json)
+            network_port = CIMI::Model::NetworkPort.create(request.body.read, self, :json)
           else
-            vsp = CIMI::Model::VSP.create(request.body.read, self, :xml)
+            network_port = CIMI::Model::NetworkPort.create(request.body.read, self, :xml)
           end
           respond_to do |format|
-            format.xml { vsp.to_xml }
-            format.json { vsp.to_json }
+            format.xml { network_port.to_xml }
+            format.json { network_port.to_json }
           end
         end
       end
 
-      operation :destroy, :with_capability => :delete_vsp do
-        description "Delete a specified VSP"
+      operation :destroy, :with_capability => :delete_network_port do
+        description "Delete a specified NetworkPort"
         control do
-          CIMI::Model::VSP.delete!(params[:id], self)
+          CIMI::Model::NetworkPort.delete!(params[:id], self)
           no_content_with_status(200)
         end
       end
 
-      action :start, :with_capability => :start_vsp do
-        description "Start specific VSP."
+      action :start, :with_capability => :start_network_port do
+        description "Start specific NetworkPort."
         param :id,          :string,    :required
         control do
-          vsp = VSP.find(params[:id], self)
-          report_error(404) unless vsp
+          network_port = NetworkPort.find(params[:id], self)
+          report_error(404) unless network_port
           if request.content_type.end_with?("json")
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
           end
-          vsp.perform(action, self) do |operation|
+          network_port.perform(action, self) do |operation|
             no_content_with_status(202) if operation.success?
             # Handle errors using operation.failure?
           end
         end
       end
 
-      action :stop, :with_capability => :stop_vsp do
-        description "Stop specific VSP."
+      action :stop, :with_capability => :stop_network_port do
+        description "Stop specific NetworkPort."
+        param :id,          :string,    :required
         control do
-          vsp = VSP.find(params[:id], self)
-          report_error(404) unless vsp
+          network_port = NetworkPort.find(params[:id], self)
+          report_error(404) unless network_port
           if request.content_type.end_with?("json")
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
           end
-          vsp.perform(action, self) do |operation|
+          network_port.perform(action, self) do |operation|
             no_content_with_status(202) if operation.success?
             # Handle errors using operation.failure?
           end

data/lib/cimi/collections/network_templates.rb

@@ -24,7 +24,7 @@ module CIMI::Collections
         description 'List all Network Templates in the NetworkTemplateCollection'
         param :CIMISelect, :string, :optional
         control do
-          network_templates = NetworkTemplateCollection.default(self).filter_by(params[:CIMISelect])
+          network_templates = NetworkTemplate.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
             format.xml {network_templates.to_xml}
             format.json {network_templates.to_json}
@@ -32,7 +32,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show, :with_capability => :network_template do
+      operation :show, :with_capability => :network_templates do
         description 'Show a specific Network Template'
         control do
           network_template = NetworkTemplate.find(params[:id], self)

data/lib/cimi/collections/networks.rb

@@ -25,7 +25,7 @@ module CIMI::Collections
         description "List all Networks"
         param :CIMISelect,  :string,  :optional
         control do
-          networks = NetworkCollection.default(self).filter_by(params[:CIMISelect])
+          networks = Network.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
             format.xml { networks.to_xml }
             format.json { networks.to_json }
@@ -61,7 +61,6 @@ module CIMI::Collections
 
       operation :destroy, :with_capability => :delete_network do
         description "Delete a specified Network"
-        param :id, :string, :required
         control do
           Network.delete!(params[:id], self)
           no_content_with_status(200)
@@ -70,6 +69,7 @@ module CIMI::Collections
 
       action :start, :with_capability => :start_network do
         description "Start specific network."
+        param :id, :string, :required
         control do
           network = Network.find(params[:id], self)
           report_error(404) unless network
@@ -87,6 +87,7 @@ module CIMI::Collections
 
       action :stop, :with_capability => :stop_network do
         description "Stop specific network."
+        param :id, :string, :required
         control do
           network = Network.find(params[:id], self)
           report_error(404) unless network
@@ -104,6 +105,7 @@ module CIMI::Collections
 
       action :suspend, :with_capability => :suspend_network do
         description "Suspend specific network."
+        param :id, :string, :required
         control do
           network = Network.find(params[:id], self)
           report_error(404) unless network
@@ -119,6 +121,19 @@ module CIMI::Collections
         end
       end
 
+      operation :network_ports, :with_capability => :network_ports do
+        description "Retrieve the Network's NetworkPortCollection"
+        param :id, :string, :required
+        control do
+          network_ports = NetworkPortCollection.for_network(params[:id], self)
+          respond_to do |format|
+            format.json {network_ports.to_json}
+            format.xml  {network_ports.to_xml}
+          end
+        end
+      end
+
+
     end
 
   end

data/lib/cimi/collections/{entity_metadata.rb → resource_metadata.rb}

@@ -14,28 +14,28 @@
 # under the License.
 
 module CIMI::Collections
-  class EntityMetadata < Base
+  class ResourceMetadata < Base
 
-    collection :entity_metadata do
+    collection :resource_metadata do
 
       operation :index do
-        description "List all entity metadata defined for this provider"
+        description "List all resource metadata defined for this provider"
         control do
-          entity_metadata = CIMI::Model::EntityMetadataCollection.default(self)
+          resource_metadata = CIMI::Model::ResourceMetadata.list(self)
           respond_to do |format|
-            format.xml{entity_metadata.to_xml}
-            format.json{entity_metadata.to_json}
+            format.xml{resource_metadata.to_xml}
+            format.json{resource_metadata.to_json}
           end
         end
       end
 
       operation :show do
-        description "Get the entity metadata for a specific collection"
+        description "Get the resource metadata for a specific collection"
         control do
-          entity_metadata = EntityMetadata.find(params[:id], self)
+          resource_metadata = ResourceMetadata.find(params[:id], self)
           respond_to do |format|
-            format.xml{entity_metadata.to_xml}
-            format.json{entity_metadata.to_json}
+            format.xml{resource_metadata.to_xml}
+            format.json{resource_metadata.to_json}
           end
         end
       end