deltacloud-core 1.1.2 → 1.1.3

data/lib/cimi/models/system.rb

@@ -17,51 +17,27 @@ class CIMI::Model::System < CIMI::Model::Base
 
   acts_as_root_entity
 
-  text :state
+  text :state, :required => true
 
-#  collection :systems, :class => CIMI::Model::SystemSystem
-#  collection :machines, :class => CIMI::Model::SystemMachine
-#  collection :credentials, :class => CIMI::Model::SystemCredential
-#  collection :volumes, :class => CIMI::Model::SystemVolume
-#  collection :networks, :class => CIMI::Model::SystemNetwork
-#  collection :network_ports, :class => CIMI::Model::SystemNetworkPort
-#  collection :addresses, :class => CIMI::Model::SystemAddress
-#  collection :forwarding_groups, :class => CIMI::Model::SystemForwardingGroup
+  collection :systems, :class => CIMI::Model::SystemSystem
+  collection :machines, :class => CIMI::Model::SystemMachine
+  collection :credentials, :class => CIMI::Model::SystemCredential
+  collection :volumes, :class => CIMI::Model::SystemVolume
+  collection :networks, :class => CIMI::Model::SystemNetwork
+  collection :network_ports, :class => CIMI::Model::SystemNetworkPort
+  collection :addresses, :class => CIMI::Model::SystemAddress
+  collection :forwarding_groups, :class => CIMI::Model::SystemForwardingGroup
 
-#  array :meters do
-#    scalar :href
-#  end
+  #TODO: implement the attributes commented out
 
-#  href :event_log
+  #  array :meters do
+  #    scalar :href
+  #  end
+
+  #  href :event_log
 
   array :operations do
     scalar :rel, :href
   end
 
-  def self.find(id, context)
-    if id == :all
-      systems = context.driver.systems(context.credentials, {:env=>context})
-    else
-      systems = context.driver.systems(context.credentials, {:env=>context, :id=>id})
-      raise CIMI::Model::NotFound unless systems.first
-      systems.first
-    end
-  end
-
-  def perform(action, context, &block)
-    begin
-      if context.driver.send(:"#{action.name}_system", context.credentials, self.id.split("/").last)
-        block.callback :success
-      else
-        raise "Operation failed to execute on given System"
-      end
-    rescue => e
-      block.callback :failure, e.message
-    end
-  end
-
-  def self.delete!(id, context)
-    context.driver.destroy_system(context.credentials, id)
-  end
-
 end

data/lib/cimi/models/system_address.rb

@@ -0,0 +1,26 @@
+# 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.
+
+class CIMI::Model::SystemAddress < CIMI::Model::Base
+
+  acts_as_root_entity
+
+  href :address
+
+  array :operations do
+    scalar :rel, :href
+  end
+
+end

data/lib/cimi/models/system_create.rb

@@ -0,0 +1,20 @@
+# 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.
+
+class CIMI::Model::SystemCreate < CIMI::Model::Base
+
+  ref :system_template, :required => true
+
+end

data/lib/cimi/models/system_credential.rb

@@ -0,0 +1,26 @@
+# 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.
+
+class CIMI::Model::SystemCredential < CIMI::Model::Base
+
+  acts_as_root_entity
+
+  href :credential
+
+  array :operations do
+    scalar :rel, :href
+  end
+
+end

data/lib/cimi/models/system_forwarding_group.rb

@@ -0,0 +1,26 @@
+# 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.
+
+class CIMI::Model::SystemForwardingGroup < CIMI::Model::Base
+
+  acts_as_root_entity
+
+  href :forwarding_group
+
+  array :operations do
+    scalar :rel, :href
+  end
+
+end

data/lib/cimi/models/system_machine.rb

@@ -0,0 +1,26 @@
+# 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.
+
+class CIMI::Model::SystemMachine < CIMI::Model::Base
+
+  acts_as_root_entity
+
+  href :machine
+
+  array :operations do
+    scalar :rel, :href
+  end
+
+end

data/lib/cimi/models/system_network.rb

@@ -0,0 +1,26 @@
+# 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.
+
+class CIMI::Model::SystemNetwork < CIMI::Model::Base
+
+  acts_as_root_entity
+
+  href :network
+
+  array :operations do
+    scalar :rel, :href
+  end
+
+end

data/lib/cimi/models/system_network_port.rb

@@ -0,0 +1,26 @@
+# 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.
+
+class CIMI::Model::SystemNetworkPort < CIMI::Model::Base
+
+  acts_as_root_entity
+
+  href :network_port
+
+  array :operations do
+    scalar :rel, :href
+  end
+
+end

data/lib/cimi/models/system_system.rb

@@ -0,0 +1,26 @@
+# 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.
+
+class CIMI::Model::SystemSystem < CIMI::Model::Base
+
+  acts_as_root_entity
+
+  href :system
+
+  array :operations do
+    scalar :rel, :href
+  end
+
+end

data/lib/cimi/models/system_template.rb

@@ -19,45 +19,29 @@ class CIMI::Model::SystemTemplate < CIMI::Model::Base
 
   array :component_descriptors do
     text :name, :description
-    hash :properties
-    text :type
+    hash_map :properties
+    text :type, :required => true
+
     #component_template, comprises:
-#    struct :machine_template, :class => CIMI::Model::MachineTemplate
-#    struct :system_template, :class => CIMI::Model::SystemTemplate
-#    struct :credential_template, :class => CIMI::Model::CredentialTemplate
-#    struct :volume_template, :class => CIMI::Model::VolumeTemplate
-#    struct :network_template, :class => CIMI::Model::NetworkTemplate
-#    struct :network_port_template, :class => CIMI::Model::NetworkPortTemplate
-#    struct :forwarding_group_template, :class => CIMI::Model::ForwardingGroupTemplate
-#    struct :address_template, :class => CIMI::Model::AddressTemplate
+    ref :machine_template, :class => CIMI::Model::MachineTemplate
+    ref :system_template, :class => CIMI::Model::SystemTemplate
+    ref :credential_template, :class => CIMI::Model::CredentialTemplate
+    ref :volume_template, :class => CIMI::Model::VolumeTemplate
+    ref :network_template, :class => CIMI::Model::NetworkTemplate
+    ref :network_port_template, :class => CIMI::Model::NetworkPortTemplate
+    ref :forwarding_group_template, :class => CIMI::Model::ForwardingGroupTemplate
+    ref :address_template, :class => CIMI::Model::AddressTemplate
     text :quantity
   end
 
-#  array :meter_templates do
-#    scalar :href
-#  end
+  #  array :meter_templates do
+  #    scalar :href
+  #  end
 
-#  href :event_log_template
+  #  href :event_log_template
 
   array :operations do
     scalar :rel, :href
   end
 
-  class << self
-    def find(id, context)
-      if id == :all
-        templates = context.driver.system_templates(context.credentials, {:env=>context})
-      else
-        templates = context.driver.system_templates(context.credentials, {:env=>context, :id=>id})
-        raise CIMI::Model::NotFound unless templates.first
-        templates.first
-      end
-    end
-
-    def delete!(id, context)
-      context.driver.destroy_system_template(context.credentials, id)
-    end
-
-  end
-
 end

data/lib/cimi/models/system_volume.rb

@@ -0,0 +1,26 @@
+# 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.
+
+class CIMI::Model::SystemVolume < CIMI::Model::Base
+
+  acts_as_root_entity
+
+  href :volume
+
+  array :operations do
+    scalar :rel, :href
+  end
+
+end

data/lib/cimi/models/volume.rb

@@ -37,63 +37,4 @@ class CIMI::Model::Volume < CIMI::Model::Base
     scalar :rel, :href
   end
 
-  def self.find(id, context)
-    creds = context.credentials
-    if id == :all
-      volumes = context.driver.storage_volumes(creds)
-      volumes.collect{ |volume| from_storage_volume(volume, context) }
-    else
-      volume = context.driver.storage_volumes(creds, :id => id).first
-      raise CIMI::Model::NotFound unless volume
-      from_storage_volume(volume, context)
-    end
-  end
-
-  def self.all(context); find(:all, context); end
-
-  def self.delete!(id, context)
-    context.driver.destroy_storage_volume(context.credentials, {:id=>id} )
-    new(:id => id).destroy
-  end
-
-  def self.find_to_attach_from_json(json_in, context)
-    json = JSON.parse(json_in)
-    json["volumes"].map{|v| {:volume=>self.find(v["volume"]["href"].split("/volumes/").last, context),
-                             :initial_location=>v["initialLocation"]  }}
-  end
-
-  def self.find_to_attach_from_xml(xml_in, context)
-    xml = XmlSimple.xml_in(xml_in)
-    xml["volume"].map{|v| {:volume => self.find(v["href"].split("/volumes/").last, context),
-                           :initial_location=>v["initialLocation"] }}
-  end
-
-  def self.from_storage_volume(volume, context)
-    self.new( { :name => volume.id,
-                :created => volume.created.nil? ? nil : Time.parse(volume.created).xmlschema,
-                :id => context.volume_url(volume.id),
-                :capacity => context.to_kibibyte(volume.capacity, 'GB'),
-                :bootable => "false", #fixme ... will vary... ec2 doesn't expose this
-                :snapshots => [], #fixme...
-                :type => 'http://schemas.dmtf.org/cimi/1/mapped',
-                :state => volume.state == 'IN-USE' ? 'AVAILABLE' : volume.state,
-                :meters => [],
-                :operations => [{:href=> context.volume_url(volume.id), :rel => "delete"}]
-            } )
-  end
-
-  def self.collection_for_instance(instance_id, context)
-    instance = context.driver.instance(context.credentials, :id => instance_id)
-    volumes = instance.storage_volumes.map do |mappings|
-      mappings.keys.map { |volume_id| from_storage_volume(context.driver.storage_volume(context.credentials, :id => volume_id), context) }
-    end.flatten
-    CIMI::Model::VolumeCollection.new(
-      :id => context.url("/machines/#{instance_id}/volumes"),
-      :name => 'default',
-      :count => volumes.size,
-      :description => "Volume collection for Machine #{instance_id}",
-      :entries => volumes
-    )
-  end
-
 end

data/lib/cimi/models/volume_configuration.rb

@@ -19,73 +19,10 @@ class CIMI::Model::VolumeConfiguration < CIMI::Model::Base
 
   href :type
   text :format
-  text :capacity, :required => true
+  text :capacity
 
   array :operations do
     scalar :rel, :href
   end
 
-  def self.create_from_json(body, context)
-    json = JSON.parse(body)
-    new_config = current_db.add_volume_configuration(
-      :name => json['name'],
-      :description => json['description'],
-      :format => json['format'],
-      :capacity => json['capacity'],
-      :ent_properties => (json['properties'] || {}).to_json
-    )
-    from_db(new_config, context)
-  end
-
-  def self.create_from_xml(body, context)
-    xml = XmlSimple.xml_in(body)
-    xml['property'] ||= []
-    new_config = current_db.add_volume_configuration(
-      :name => xml['name'].first,
-      :description => xml['description'].first,
-      :format => xml['format'].first,
-      :capacity => xml['capacity'].first,
-      :ent_properties =>  JSON::dump((xml['property'] || {}).inject({}){ |r, p| r[p['key']]=p['content']; r })
-    )
-    from_db(new_config, context)
-  end
-
-  def self.delete!(id, context)
-    current_db.volume_configurations.first(:id => id).destroy
-  end
-
-  def self.find(id, context)
-    if id==:all
-      if context.driver.respond_to? :volume_configurations
-        context.driver.volume_configurations(context.credentials, {:env=>context})
-      else
-        current_db.volume_configurations.map { |t| from_db(t, context) }
-      end
-    else
-      if context.driver.respond_to? :volume_configuration
-        context.driver.volume_configuration(context.credentials, id, :env=>context)
-      else
-        config = current_db.volume_configurations_dataset.first(:id => id)
-        raise CIMI::Model::NotFound unless config
-        from_db(config, context)
-      end
-    end
-  end
-
-  private
-
-  def self.from_db(model, context)
-    self.new(
-      :id => context.volume_configuration_url(model.id),
-      :name => model.name,
-      :description => model.description,
-      :format => model.format,
-      :capacity => context.to_kibibyte(model.capacity, "GB"),
-      :property => (model.ent_properties ? JSON::parse(model.ent_properties) :  nil),
-      :operations => [
-        { :href => context.destroy_volume_configuration_url(model.id), :rel => 'http://schemas.dmtf.org/cimi/1/action/delete' }
-      ]
-    )
-  end
-
 end