deltacloud-core 1.1.2 → 1.1.3

data/lib/cimi/models/volume_configuration_create.rb

@@ -0,0 +1,22 @@
+# 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::VolumeConfigurationCreate < CIMI::Model::Base
+
+  href :type
+  text :format
+  text :capacity, :required => true
+
+end

data/lib/cimi/models/volume_create.rb

@@ -17,42 +17,4 @@ class CIMI::Model::VolumeCreate < CIMI::Model::Base
 
   ref :volume_template, :required => true
 
-  def create(context)
-    validate!
-
-    if volume_template.href?
-      template = volume_template.find(context)
-    else
-      template = CIMI::Model::VolumeTemplate.from_xml(volume_template.to_xml)
-    end
-
-    volume_image = template.volume_image.href? ?
-      template.volume_image.find(context) : template.volume_image
-
-    volume_config = template.volume_config.href? ?
-      template.volume_config.find(context) : template.volume_config
-
-    params = {
-      :name => name,
-      :capacity => volume_config.capacity,
-      :snapshot_id => ref_id(volume_image.id),
-    }
-
-    unless context.driver.respond_to? :create_storage_volume
-       raise Deltacloud::Exceptions.exception_from_status(
-         501,
-         "Creating Volume is not supported by the current driver"
-       )
-    end
-
-    volume = context.driver.create_storage_volume(context.credentials, params)
-
-    result = CIMI::Model::Volume.from_storage_volume(volume, context)
-    result.name = name if result.name.nil?
-    result.description = description if description
-    result.property = property if property
-    result.save
-    result
-  end
-
 end

data/lib/cimi/models/volume_image.rb

@@ -24,34 +24,4 @@ class CIMI::Model::VolumeImage < CIMI::Model::Base
   array :operations do
     scalar :rel, :href
   end
-
-  def self.find(id, context)
-    creds = context.credentials
-    if id == :all
-      snapshots = context.driver.storage_snapshots(creds)
-      snapshots.collect{ |snapshot| from_storage_snapshot(snapshot, context) }
-    else
-      snapshot = context.driver.storage_snapshots(creds, id => :id).first
-      raise CIMI::Model::NotFound unless snapshot
-      from_storage_snapshot(snapshot, context)
-    end
-  end
-
-  def self.all(context); find(:all, context); end
-
-  def self.delete!(vol_image_id, context)
-    context.driver.destroy_storage_snapshot(context.credentials, {:id=>vol_image_id})
-  end
-
-  def self.from_storage_snapshot(snapshot, context)
-    self.new( {
-      :name => snapshot.name,
-      :description => snapshot.description,
-      :created => snapshot.created.nil? ? nil : Time.parse(snapshot.created).xmlschema,
-      :id => context.volume_image_url(snapshot.id),
-      :image_location => {:href=>context.volume_url(snapshot.storage_volume_id)},
-      :bootable => "false"  #FIXME
-    } )
-  end
-
 end

data/lib/cimi/models/volume_image_create.rb

@@ -19,29 +19,4 @@ class CIMI::Model::VolumeImageCreate < CIMI::Model::Base
   text :image_data
   text :bootable, :required => true
 
-  def create(context)
-    validate!
-
-    params = {
-      :volume_id => context.href_id(image_location.href, :volumes),
-      :name => name,
-      :description => description
-    }
-
-    unless context.driver.respond_to? :create_storage_snapshot
-      raise Deltacloud::Exceptions.exception_from_status(
-        501,
-        'Creating VolumeImage is not supported by the current driver'
-      )
-    end
-
-    new_snapshot = context.driver.create_storage_snapshot(context.credentials, params)
-    result = CIMI::Model::VolumeImage.from_storage_snapshot(new_snapshot, context)
-    result.name= name unless new_snapshot.name
-    result.description = description unless new_snapshot.description
-    result.property = property if property
-    result.save
-    result
-  end
-
 end

data/lib/cimi/models/volume_template.rb

@@ -17,8 +17,8 @@ class CIMI::Model::VolumeTemplate < CIMI::Model::Base
 
   acts_as_root_entity
 
-  ref :volume_config, :required => true
-  ref :volume_image, :required => true
+  ref :volume_config, :required => true, :class => CIMI::Model::VolumeConfiguration
+  ref :volume_image
 
   array :meter_templates do
   end
@@ -29,45 +29,4 @@ class CIMI::Model::VolumeTemplate < CIMI::Model::Base
     scalar :rel, :href
   end
 
-  def self.find(id, context)
-    if id==:all
-      if context.driver.respond_to? :volume_templates
-        context.driver.volume_templates(context.credentials, {:env=>context})
-      else
-        current_db.volume_templates.map { |t| from_db(t, context) }
-      end
-    else
-      if context.driver.respond_to? :volume_template
-        context.driver.volume_template(context.credentials, id, :env=>context)
-      else
-        template = current_db.volume_templates_dataset.first(:id => id)
-        raise CIMI::Model::NotFound unless template
-        from_db(template, context)
-      end
-    end
-  end
-
-  def self.delete!(id, context)
-    current_db.volume_templates.first(:id => id).destroy
-  end
-
-  def self.from_db(model, context)
-    self.new(
-      :id => context.volume_template_url(model.id),
-      :name => model.name,
-      :description => model.description,
-      :volume_config => {:href => model.volume_config},
-      :volume_image => {:href => model.volume_image},
-      :property => (model.ent_properties ? JSON::parse(model.ent_properties) :  nil),
-      :operations => [
-        {
-          :href => context.destroy_volume_template_url(model.id),
-          :rel => 'http://schemas.dmtf.org/cimi/1/action/delete'
-        }
-      ]
-    )
-  end
-
-
-
 end

data/lib/cimi/models/volume_template_create.rb

@@ -18,16 +18,4 @@ class CIMI::Model::VolumeTemplateCreate < CIMI::Model::Base
   ref :volume_config, :required => true
   ref :volume_image, :required => true
 
-  def create(context)
-    validate!
-    new_template = self.class.current_db.add_volume_template(
-      :name => name,
-      :description => description,
-      :volume_config => volume_config.href,
-      :volume_image => volume_image.href,
-      :ent_properties => property.to_json
-    )
-    CIMI::Model::VolumeTemplate.from_db(new_template, context)
-  end
-
 end

data/lib/cimi/service.rb

@@ -0,0 +1,82 @@
+# 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 require_relatived 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
+  module Service
+    def self.root_entities
+      CIMI::Model::root_entities.map do |m|
+        CIMI::Service.const_get(m.name.split('::').last)
+      end
+    end
+  end
+end
+
+require_relative './models'
+require_relative './../db/provider'
+require_relative './../db/entity'
+require_relative './../db/machine_template'
+require_relative './../db/address_template'
+require_relative './../db/volume_configuration'
+require_relative './../db/volume_template'
+
+require_relative './service/base'
+require_relative './service/machine'
+require_relative './service/machine_image'
+require_relative './service/volume_image'
+require_relative './service/system_template'
+require_relative './service/network_port_configuration'
+require_relative './service/credential_create'
+require_relative './service/machine_template_create'
+require_relative './service/volume_create'
+require_relative './service/network_create'
+require_relative './service/network'
+require_relative './service/forwarding_group'
+require_relative './service/volume_template_create'
+require_relative './service/system_machine'
+require_relative './service/system_volume'
+require_relative './service/system_network'
+require_relative './service/system_forwarding_group'
+require_relative './service/system_network_port'
+require_relative './service/system_address'
+require_relative './service/system_credential'
+require_relative './service/system_system'
+require_relative './service/system'
+require_relative './service/system_create'
+require_relative './service/address_template_create'
+require_relative './service/volume'
+require_relative './service/volume_image_create'
+require_relative './service/machine_configuration'
+require_relative './service/volume_template'
+require_relative './service/machine_template'
+require_relative './service/network_port'
+require_relative './service/forwarding_group_template'
+require_relative './service/credential_template'
+require_relative './service/volume_configuration'
+require_relative './service/volume_configuration_create'
+require_relative './service/cloud_entry_point'
+require_relative './service/network_configuration'
+require_relative './service/address_template'
+require_relative './service/action'
+require_relative './service/machine_create'
+require_relative './service/address'
+require_relative './service/credential'
+require_relative './service/network_port_template'
+require_relative './service/machine_image_create'
+require_relative './service/address_create'
+require_relative './service/network_template'
+require_relative './service/disk'
+require_relative './service/machine_volume'
+require_relative './service/resource_metadata'

data/lib/cimi/service/action.rb

@@ -0,0 +1,21 @@
+# 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::Service::Action < CIMI::Service::Base
+
+  def operation
+    action.split('/').last.strip.intern
+  end
+end

data/lib/cimi/service/address.rb

@@ -0,0 +1,56 @@
+# 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::Service::Address < CIMI::Service::Base
+
+  def self.find(id, context)
+    if id==:all
+      addresses = context.driver.addresses(context.credentials)
+      addresses.map{|addr| from_address(addr, context)}
+    else
+      address = context.driver.address(context.credentials, {:id=>id})
+      from_address(address, context)
+    end
+  end
+
+  def self.delete!(id, context)
+    context.driver.delete_address(context.credentials, id)
+    self.new(context, :values => { :id => id }).destroy
+  end
+
+  private
+
+  def self.from_address(address, context)
+    self.new(context, :values => {
+      :name => address.id,
+      :id => context.address_url(address.id),
+      :description => "Address #{address.id}",
+      :ip => address.id,
+      :allocation => "dynamic",
+      :default_gateway => "unknown",
+      :dns => "unknown",
+      :protocol => protocol_from_address(address.id),
+      :mask => "unknown",
+      :resource => (address.instance_id) ? {:href=> context.machine_url(address.instance_id)} : nil,
+      :network => nil
+    })
+  end
+
+  def self.protocol_from_address(address)
+    addr = IPAddr.new(address)
+    addr.ipv4? ? "ipv4" : "ipv6"
+  end
+
+end

data/lib/cimi/service/address_create.rb

@@ -0,0 +1,45 @@
+# 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::Service::AddressCreate < CIMI::Service::Base
+
+  def create
+    template = resolve(address_template)
+
+    params = {
+      :name => name,
+      :description => description,
+      :address_template => template,
+      :env => context # FIXME: We should not pass the context to the driver (!)
+    }
+
+    unless context.driver.respond_to? :create_address
+       raise Deltacloud::Exceptions.exception_from_status(
+         501,
+         "Creating Address is not supported by the current driver"
+       )
+    end
+
+    address = context.driver.create_address(context.credentials, params)
+
+    result = CIMI::Service::Address.from_address(address, context)
+    result.name = name if name
+    result.description = description if description
+    result.property = property if property
+    result.save
+    result
+  end
+
+end

data/lib/cimi/service/address_template.rb

@@ -0,0 +1,71 @@
+# 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::Service::AddressTemplate < CIMI::Service::Base
+
+  def self.find(id, context)
+    if id==:all
+      if context.driver.respond_to? :address_templates
+        context.driver.address_templates(context.credentials, {:env=>context})
+      else
+        current_db.address_templates.map { |t| from_db(t, context) }
+      end
+    else
+      if context.driver.respond_to? :address_templates
+        context.driver.address_templates(context.credentials, :id => id, :env=>context)
+      else
+        template = current_db.address_templates_dataset.first(:id => id)
+        raise CIMI::Model::NotFound unless template
+        from_db(template, context)
+      end
+    end
+  end
+
+  def self.delete!(id, context)
+    current_db.address_templates.first(:id => id).destroy
+  end
+
+  protected
+  def attributes_to_copy
+    super + [ :ip, :hostname, :allocation, :default_gateway,
+              :dns, :protocol, :mask ]
+  end
+
+  private
+
+  def self.from_db(model, context)
+    self.new(context, :values => {
+      :id => context.address_template_url(model.id),
+      :name => model.name,
+      :description => model.description,
+      :ip => model.ip,
+      :hostname => model.hostname,
+      :allocation => model.allocation,
+      :default_gateway => model.default_gateway,
+      :dns => model.dns,
+      :protocol => model.protocol,
+      :mask => model.mask,
+      :property => (model.ent_properties ? JSON::parse(model.ent_properties) :  nil),
+      :operations => [
+        {
+          :href => context.destroy_address_template_url(model.id),
+          :rel => 'http://schemas.dmtf.org/cimi/1/action/delete'
+        }
+      ]
+    })
+  end
+
+
+end