deltacloud-core 1.0.2 → 1.0.3

data/lib/cimi/models/disk_collection.rb

@@ -0,0 +1,38 @@
+# 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::DiskCollection < CIMI::Model::Base
+  text :count
+
+  #add disks array:
+  self.schema.add_collection_member_array(CIMI::Model::Disk)
+
+  array :operations do
+    scalar :rel, :href
+  end
+
+  def self.default(instance_id, context)
+    instance = context.driver.instance(context.credentials, :id=>instance_id)
+    machine_conf = CIMI::Model::MachineConfiguration.find(instance.instance_profile.name, context)
+    disks = CIMI::Model::Disk.find(instance, machine_conf, context, :all)
+    storage_override = instance.instance_profile.overrides.find { |p, v| p == :storage }
+    self.new(
+      :id => context.machine_url(instance_id)+"/disks",
+      :description => "DiskCollection for Machine #{instance_id}",
+      :created => instance.launch_time,
+      :count => disks.size,
+      :disks => disks
+    )
+  end
+end

data/lib/cimi/models/machine.rb

@@ -18,33 +18,15 @@ class CIMI::Model::Machine < CIMI::Model::Base
   text :state
   text :cpu
 
-  struct :memory do
-    scalar :quantity
-    scalar :units
-  end
+  text :memory
 
   href :event_log
 
-  array :disks do
-    struct :capacity do
-      scalar :quantity
-      scalar :units
-    end
-    scalar :format
-    scalar :attachment_point
-  end
+  href :disks
 
-  array :volumes do
-    scalar :href
-    scalar :protocol
-    scalar :attachment_point
-  end
+  href :volumes
 
-  array :network_interfaces do
-    href :vsp
-    text :hostname, :mac_address, :state, :protocol, :allocation
-    text :address, :default_gateway, :dns, :max_transmission_unit
-  end
+  href :network_interfaces
 
   array :meters do
     scalar :href
@@ -133,7 +115,7 @@ class CIMI::Model::Machine < CIMI::Model::Base
 
   private
   def self.from_instance(instance, context)
-    cpu =  memory = disks = (instance.instance_profile.id == "opaque")? "n/a" : nil
+    cpu =  memory = (instance.instance_profile.id == "opaque")? "n/a" : nil
     self.new(
       :name => instance.id,
       :description => instance.name,
@@ -142,10 +124,10 @@ class CIMI::Model::Machine < CIMI::Model::Base
       :state => convert_instance_state(instance.state),
       :cpu => cpu || convert_instance_cpu(instance.instance_profile, context),
       :memory => memory || convert_instance_memory(instance.instance_profile, context),
-      :disks => disks || convert_instance_storage(instance.instance_profile, context),
-      :network_interfaces => convert_instance_addresses(instance),
+      :disks => {:href => context.machine_url(instance.id)+"/disks"},
+      :network_interfaces => {:href => context.machine_url(instance.id+"/network_interfaces")},
       :operations => convert_instance_actions(instance, context),
-      :volumes=>convert_storage_volumes(instance, context),
+      :volumes=>{:href=>context.machine_url(instance.id)+"/volumes"},
       :property => convert_instance_properties(instance, context)
     )
   end
@@ -178,23 +160,7 @@ class CIMI::Model::Machine < CIMI::Model::Base
   def self.convert_instance_memory(profile, context)
     machine_conf = CIMI::Model::MachineConfiguration.find(profile.name, context)
     memory_override = profile.overrides.find { |p, v| p == :memory }
-    {
-      :quantity => memory_override.nil? ? machine_conf.memory[:quantity] : memory_override[1],
-      :units => machine_conf.memory[:units]
-    }
-  end
-
-  def self.convert_instance_storage(profile, context)
-    machine_conf = CIMI::Model::MachineConfiguration.find(profile.name, context)
-    return nil unless machine_conf.disks
-    storage_override = profile.overrides.find { |p, v| p == :storage }
-    [
-      { :capacity => {
-          :quantity => storage_override.nil? ? machine_conf.disks.first[:capacity][:quantity] : storage_override[1],
-          :units => machine_conf.disks.first[:capacity][:units]
-        }
-      }
-    ]
+    memory_override.nil? ? machine_conf.memory : context.to_kibibyte(memory_override[1].to_i,"MB")
   end
 
   def self.convert_instance_addresses(instance)

data/lib/cimi/models/machine_collection.rb

@@ -17,17 +17,20 @@ class CIMI::Model::MachineCollection < CIMI::Model::Base
 
   act_as_root_entity :machine
 
-  array :machines do
-    scalar :href
-  end
+  text :count
+
+  #add machines array:
+  self.schema.add_collection_member_array(CIMI::Model::Machine)
 
   def self.default(context)
+    machines = CIMI::Model::Machine.all(context)
     self.new(
       :id => context.machines_url,
       :name => 'default',
       :created => Time.now,
       :description => "#{context.driver.name.capitalize} MachineCollection",
-      :machines => CIMI::Model::Machine.all_uri(context)
+      :count => machines.size,
+      :machines => machines
     )
   end
 

data/lib/cimi/models/machine_configuration.rb

@@ -15,20 +15,13 @@
 
 class CIMI::Model::MachineConfiguration < CIMI::Model::Base
 
-  struct :memory do
-    scalar :quantity
-    scalar :units
-  end
-
+  text :memory
   text :cpu
 
   array :disks do
-    struct :capacity do
-      scalar :quantity
-      scalar :units
-    end
-    scalar :format
-    scalar :attachment_point
+    text :capacity
+    text :format
+    text :attachment_point
   end
 
   array :operations do
@@ -51,17 +44,17 @@ class CIMI::Model::MachineConfiguration < CIMI::Model::Base
   def self.from_hardware_profile(profile, context)
     # We accept just profiles with all properties set
     return unless profile.memory or profile.cpu or profile.storage
-    memory = profile.memory.value || profile.memory.default
+    memory = profile.memory ? context.to_kibibyte((profile.memory.value || profile.memory.default), profile.memory.unit) : nil
     cpu = (profile.cpu ? (profile.cpu.value || profile.cpu.default) : nil )
-    storage = (profile.storage ? (profile.storage.value || profile.storage.default) :  nil )
+    storage = profile.storage ? context.to_kibibyte((profile.storage.value || profile.storage.default), profile.storage.unit) :  nil
     machine_hash = {
       :name => profile.name,
       :description => "Machine Configuration with #{memory} #{profile.memory.unit} "+
         "of memory and #{cpu} CPU",
       :cpu => ( cpu if cpu ) ,
       :created => Time.now.to_s,  # FIXME: DC hardware_profile has no mention about created_at
-      :memory => { :quantity => profile.memory.value || profile.memory.default, :units => profile.memory.unit },
-      :disks => (  [ { :capacity => { :quantity => profile.storage.value || profile.storage.default, :units => profile.storage.unit } } ] if storage ),
+      :memory => (memory if memory),
+      :disks => (  [ { :capacity => storage  } ] if storage ),
       :id => context.machine_configuration_url(profile.name)
     }
     self.new(machine_hash)

data/lib/cimi/models/machine_configuration_collection.rb

@@ -17,17 +17,19 @@ class CIMI::Model::MachineConfigurationCollection < CIMI::Model::Base
 
   act_as_root_entity :machine_configuration
 
-  array :machine_configurations do
-    scalar :href
-  end
+  text :count
+
+  self.schema.add_collection_member_array(CIMI::Model::MachineConfiguration)
 
   def self.default(context)
+    machine_configurations = CIMI::Model::MachineConfiguration.all(context)
     self.new(
       :id => context.machine_configurations_url,
       :name => 'default',
       :created => Time.now,
       :description => "#{context.driver.name.capitalize} MachineConfigurationCollection",
-      :machine_configurations => CIMI::Model::MachineConfiguration.all_uri(context)
+      :count => machine_configurations.count,
+      :machine_configurations => machine_configurations
     )
   end
 

data/lib/cimi/models/machine_image_collection.rb

@@ -17,17 +17,19 @@ class CIMI::Model::MachineImageCollection < CIMI::Model::Base
 
   act_as_root_entity :machine_image
 
-  array :machine_images do
-    scalar :href
-  end
+  text :count
+
+  self.schema.add_collection_member_array(CIMI::Model::MachineImage)
 
   def self.default(context)
+    machine_images = CIMI::Model::MachineImage.all(context)
     self.new(
       :id => context.machine_images_url,
       :name => 'default',
       :created => Time.now,
       :description => "#{context.driver.name.capitalize} MachineImageCollection",
-      :machine_images => CIMI::Model::MachineImage.all_uri(context)
+      :count => machine_images.count,
+      :machine_images => machine_images
     )
   end
 

data/lib/cimi/models/machine_template_collection.rb

@@ -17,17 +17,19 @@ class CIMI::Model::MachineTemplateCollection < CIMI::Model::Base
 
   act_as_root_entity :machine_template
 
-  array :machine_templates do
-    scalar :href
-  end
+  text :count
+
+  self.schema.add_collection_member_array(CIMI::Model::MachineTemplate)
 
   def self.default(context)
+    machine_templates = CIMI::Model::MachineTemplate.all(context)
     self.new(
       :id => context.machine_template_url,
       :name => 'default',
       :created => Time.now,
       :description => "#{context.driver.name.capitalize} MachineTemplateCollection",
-      :machine_templates => CIMI::Model::MachineTemplate.all_uri(context)
+      :count => machine_templates.size,
+      :machine_templates => machine_templates
     )
   end
 

data/lib/cimi/models/machine_volume.rb

@@ -0,0 +1,42 @@
+# 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::MachineVolume < CIMI::Model::Base
+
+  text :initial_location
+  href :volume
+
+  array :operations do
+    scalar :rel, :href
+  end
+
+  def self.find(instance_id, context, id=:all)
+    if id == :all
+      volumes = context.driver.storage_volumes(context.credentials)
+      volumes.inject([]) do |attached, vol|
+        attached <<  self.new(
+          :id => context.machine_url(instance_id)+"/volumes/#{vol.id}",
+          :name => vol.id,
+          :description => "MachineVolume #{vol.id} for Machine #{instance_id}",
+          :created => vol.created,
+          :initial_location => vol.device,
+          :volume => {:href=>context.volume_url(vol.id)}
+          ) if vol.instance_id == instance_id
+        attached
+      end
+    else
+    end
+  end
+end

data/lib/cimi/models/machine_volume_collection.rb

@@ -0,0 +1,34 @@
+# 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::MachineVolumeCollection < CIMI::Model::Base
+
+  text :count
+
+  self.schema.add_collection_member_array(CIMI::Model::MachineVolume)
+
+  array :operations do
+    scalar :rel, :href
+  end
+
+  def self.default(instance_id, context)
+    volumes = CIMI::Model::MachineVolume.find(instance_id, context)
+    self.new(
+      :id => context.machine_url(instance_id)+"/volumes",
+      :description => "MachineVolumeCollection for Machine #{instance_id}",
+      :count => volumes.size,
+      :machine_volumes => volumes
+    )
+  end
+end

data/lib/cimi/models/network.rb

@@ -17,19 +17,15 @@ class CIMI::Model::Network < CIMI::Model::Base
 
   text :state
 
-  text :access
+  text :network_type
 
-  text :bandwidth_limit
+  text :mtu
 
-  text :traffic_priority
+  text :class_of_service
 
-  text :max_traffic_delay
+  href :network_ports
 
-  text :max_traffic_loss
-
-  text :max_traffic_jitter
-
-  href :routing_group
+  href :forwarding_group
 
   href :event_log
 

data/lib/cimi/models/network_collection.rb

@@ -12,22 +12,23 @@
 # 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::NetworkCollection < CIMI::Model::Base
 
   act_as_root_entity :network
+  text :count
 
-  array :networks do
-    scalar :href
-  end
+#add networks Array:
+  self.schema.add_collection_member_array(CIMI::Model::Network)
 
   def self.default(context)
+    networks = CIMI::Model::Network.all(context)
     self.new(
       :id => context.networks_url,
       :name => 'default',
       :created => Time.now,
       :description => "#{context.driver.name.capitalize} NetworkCollection",
-      :networks => CIMI::Model::Network.all(context).map { |c| { :href => c.id } }
+      :count => networks.size,
+      :networks => networks
     )
   end
 

data/lib/cimi/models/schema.rb

@@ -14,6 +14,8 @@
 # under the License.
 #
 
+require_relative "../../deltacloud/core_ext"
+
 # The smarts of converting from XML and JSON into internal objects
 class CIMI::Model::Schema
 
@@ -79,6 +81,9 @@ class CIMI::Model::Schema
   end
 
   class Struct < Attribute
+
+    attr_accessor :schema
+
     def initialize(name, opts, &block)
       content = opts[:content]
       super(name, opts)
@@ -144,6 +149,9 @@ class CIMI::Model::Schema
   end
 
   class Array < Attribute
+
+    attr_accessor :struct
+
     # For an array :funThings, we collect all <funThing/> elements (XmlSimple
     # actually does the collecting)
     def initialize(name, opts = {}, &block)
@@ -206,6 +214,9 @@ class CIMI::Model::Schema
   #
   # The actual Schema class
   #
+
+  attr_accessor :attributes
+
   def initialize
     @attributes = []
   end
@@ -228,6 +239,15 @@ class CIMI::Model::Schema
     xml
   end
 
+  #For MachineCollection, copy over the schema of Machine to hold
+  #each member of the collection - avoid duplicating the schemas
+  def add_collection_member_array(model)
+    member_symbol = model.name.split("::").last.underscore.pluralize.to_sym
+    members = CIMI::Model::Schema::Array.new(member_symbol)
+    members.struct.schema.attributes = model.schema.attributes
+    self.attributes << members
+  end
+
   def to_json(model, json = {})
     @attributes.freeze
     @attributes.each { |attr| attr.to_json(model, json) }