deltacloud-core 1.0.3 → 1.0.4

data/lib/cimi/models/collection.rb

@@ -0,0 +1,101 @@
+# 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::Model
+  class Collection < Base
+
+    class << self
+      attr_accessor :entry_name
+    end
+
+    # Make sure the base schema gets cloned
+    self.schema
+
+    def initialize(values = {})
+      if values[:entries]
+        values[self.class.entry_name] = values.delete(:entries)
+      end
+      super(values)
+    end
+
+    def entries
+      self[entry_name]
+    end
+
+    def [](a)
+      a = entry_name if a == :entries
+      super(a)
+    end
+
+    def []=(a, v)
+      a = entry_name if a == :entries
+      super(a, v)
+    end
+
+    def self.xml_tag_name
+      "Collection"
+    end
+
+    def self.generate(model_class)
+      model_name = model_class.name.split("::").last
+      coll_class = Class.new(CIMI::Model::Collection)
+      CIMI::Model.const_set(:"#{model_name}Collection", coll_class)
+      coll_class.entry_name = model_name.underscore.pluralize.to_sym
+      entry_schema = model_class.schema
+      coll_class.instance_eval do
+        text :count
+        array self.entry_name, :schema => entry_schema, :xml_name => model_name
+        array :operations do
+          scalar :rel, :href
+        end
+      end
+      coll_class
+    end
+  end
+
+  #
+  # We need to reopen Base and add some stuff to avoid circular dependencies
+  #
+  class Base
+    #
+    # Toplevel collections
+    #
+
+    class << self
+
+      attr_accessor :collection_class
+
+      def acts_as_root_entity(opts = {})
+        self.collection_class = Collection.generate(self)
+        CIMI::Model.register_as_root_entity! self, opts
+      end
+
+      # Return a collection of entities
+      def list(context)
+        entries = find(:all, context)
+        desc = "#{self.name.split("::").last} Collection for the #{context.driver.name.capitalize} driver"
+        id = context.send("#{collection_class.entry_name}_url")
+        collection_class.new(:id => id, :name => 'default',
+                             :count => entries.size,
+                             :entries => entries,
+                             :description => desc)
+      end
+    end
+
+    def self.all(context)
+      find(:all, context)
+    end
+  end
+end

data/lib/cimi/models/{machine_admin.rb → credential.rb}

@@ -13,7 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-class CIMI::Model::MachineAdmin < CIMI::Model::Base
+class CIMI::Model::Credential < CIMI::Model::Base
+
+  acts_as_root_entity
 
   text :username
   text :password
@@ -35,8 +37,8 @@ class CIMI::Model::MachineAdmin < CIMI::Model::Base
   end
 
   def self.create_from_xml(body, context)
-    machine_admin = MachineAdmin.from_xml(body)
-    key = context.driver.create_key(context.credentials, :key_name => machine_admin.name)
+    credential = Credential.from_xml(body)
+    key = context.driver.create_key(context.credentials, :key_name => credential.name)
     from_key(key, context)
   end
 
@@ -52,7 +54,7 @@ class CIMI::Model::MachineAdmin < CIMI::Model::Base
       :username => key.username,
       :password => key.is_password? ? key.password : key.fingerprint,
       :key => key.is_key? ? key.pem_rsa_key : nil,
-      :id => context.machine_admin_url(key.id),
+      :id => context.credential_url(key.id),
       :created => Time.now
     )
   end

data/lib/cimi/models/disk_collection.rb

@@ -16,7 +16,7 @@ class CIMI::Model::DiskCollection < CIMI::Model::Base
   text :count
 
   #add disks array:
-  self.schema.add_collection_member_array(CIMI::Model::Disk)
+  self << CIMI::Model::Disk
 
   array :operations do
     scalar :rel, :href
@@ -26,7 +26,6 @@ class CIMI::Model::DiskCollection < CIMI::Model::Base
     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}",

data/lib/cimi/models/{routing_group_template.rb → forwarding_group.rb}

@@ -13,7 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-class CIMI::Model::RoutingGroupTemplate < CIMI::Model::Base
+class CIMI::Model::ForwardingGroup < CIMI::Model::Base
+
+  acts_as_root_entity
 
   array :networks do
     scalar :href
@@ -25,9 +27,9 @@ class CIMI::Model::RoutingGroupTemplate < CIMI::Model::Base
 
   def self.find(id, context)
     if id==:all
-      context.driver.routing_group_templates(context.credentials, {:env=>context})
+      context.driver.forwarding_groups(context.credentials, {:env=>context})
     else
-      context.driver.routing_group_templates(context.credentials, {:env=>context, :id=>id})
+      context.driver.forwarding_groups(context.credentials, {:env=>context, :id=>id})
     end
   end
 

data/lib/cimi/models/{routing_group.rb → forwarding_group_template.rb}

@@ -13,7 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-class CIMI::Model::RoutingGroup < CIMI::Model::Base
+class CIMI::Model::ForwardingGroupTemplate < CIMI::Model::Base
+
+  acts_as_root_entity
 
   array :networks do
     scalar :href
@@ -25,9 +27,9 @@ class CIMI::Model::RoutingGroup < CIMI::Model::Base
 
   def self.find(id, context)
     if id==:all
-      context.driver.routing_groups(context.credentials, {:env=>context})
+      context.driver.forwarding_group_templates(context.credentials, {:env=>context})
     else
-      context.driver.routing_groups(context.credentials, {:env=>context, :id=>id})
+      context.driver.forwarding_group_templates(context.credentials, {:env=>context, :id=>id})
     end
   end
 

data/lib/cimi/models/machine.rb

@@ -15,6 +15,8 @@
 
 class CIMI::Model::Machine < CIMI::Model::Base
 
+  acts_as_root_entity
+
   text :state
   text :cpu
 
@@ -63,8 +65,8 @@ class CIMI::Model::Machine < CIMI::Model::Base
     image_id = machine_template['machineImage'][0]["href"].split('/').last
     additional_params = {}
     additional_params[:name] =xml['name'][0] if xml['name']
-    if machine_template.has_key? 'machineAdmin'
-      additional_params[:keyname] = machine_template['machineAdmin'][0]["href"].split('/').last
+    if machine_template.has_key? 'credential'
+      additional_params[:keyname] = machine_template['credential'][0]["href"].split('/').last
     end
     instance = context.driver.create_instance(context.credentials, image_id, {
       :hwp_id => hardware_profile_id
@@ -88,9 +90,9 @@ class CIMI::Model::Machine < CIMI::Model::Base
     context.driver.destroy_instance(context.credentials, id)
   end
 
-  def self.create_entity_metadata(context)
-    cimi_entity = self.name.split("::").last
-    metadata = CIMI::Model::EntityMetadata.metadata_from_deltacloud_features(cimi_entity, :instances, context)
+  def self.create_resource_metadata(context)
+    cimi_resource = self.name.split("::").last
+    metadata = CIMI::Model::ResourceMetadata.metadata_from_deltacloud_features(cimi_resource, :instances, context)
     unless metadata.includes_attribute?(:name)
       metadata.attributes << {:name=>"name", :required=>"false",
                    :constraints=>"Determined by the cloud provider", :type=>"xs:string"}
@@ -143,7 +145,7 @@ class CIMI::Model::Machine < CIMI::Model::Base
     properties = {}
     properties["machine_image"] = context.machine_image_url(instance.image_id)
     if instance.respond_to? :keyname
-      properties["machine_admin"] = context.machine_admin_url(instance.keyname)
+      properties["credential"] = context.credential_url(instance.keyname)
     end
     properties
   end
@@ -180,7 +182,7 @@ class CIMI::Model::Machine < CIMI::Model::Base
     instance.actions.collect do |action|
       action = :destroy if action == :delete # In CIMI destroy operation become delete
       action = :restart if action == :reboot  # In CIMI reboot operation become restart
-      { :href => context.send(:"#{action}_machine_url", instance.id), :rel => "http://www.dmtf.org/cimi/action/#{action}" }
+      { :href => context.send(:"#{action}_machine_url", instance.id), :rel => "http://schemas.dmtf.org/cimi/1/action/#{action}" }
     end
   end
 

data/lib/cimi/models/machine_configuration.rb

@@ -15,6 +15,8 @@
 
 class CIMI::Model::MachineConfiguration < CIMI::Model::Base
 
+  acts_as_root_entity :as => "machineConfigs"
+
   text :memory
   text :cpu
 

data/lib/cimi/models/machine_image.rb

@@ -15,6 +15,8 @@
 
 class CIMI::Model::MachineImage < CIMI::Model::Base
 
+  acts_as_root_entity
+
   href :image_location
   text :image_data
 

data/lib/cimi/models/machine_template.rb

@@ -15,9 +15,11 @@
 
 class CIMI::Model::MachineTemplate < CIMI::Model::Base
 
+  acts_as_root_entity
+
   href :machine_config
   href :machine_image
-  href :machine_admin
+  href :credential
 
   array :volumes do
     scalar :href

data/lib/cimi/models/machine_volume_collection.rb

@@ -16,7 +16,7 @@ class CIMI::Model::MachineVolumeCollection < CIMI::Model::Base
 
   text :count
 
-  self.schema.add_collection_member_array(CIMI::Model::MachineVolume)
+  self << CIMI::Model::MachineVolume
 
   array :operations do
     scalar :rel, :href

data/lib/cimi/models/network.rb

@@ -15,6 +15,8 @@
 
 class CIMI::Model::Network < CIMI::Model::Base
 
+  acts_as_root_entity
+
   text :state
 
   text :network_type

data/lib/cimi/models/network_configuration.rb

@@ -15,17 +15,13 @@
 
 class CIMI::Model::NetworkConfiguration < CIMI::Model::Base
 
-  text :access
+  acts_as_root_entity :as => "networkConfigs"
 
-  text :bandwidth_limit
+  text :network_type
 
-  text :traffic_priority
+  text :mtu
 
-  text :max_traffic_delay
-
-  text :max_traffic_loss
-
-  text :max_traffic_jitter
+  text :class_of_service
 
   array :operations do
     scalar :rel, :href

data/lib/cimi/models/{vsp.rb → network_port.rb}

@@ -13,21 +13,17 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-class CIMI::Model::VSP < CIMI::Model::Base
+class CIMI::Model::NetworkPort < CIMI::Model::Base
+
+  acts_as_root_entity
 
   text :state
 
   href :network
 
-  text :bandwidth_reservation
-
-  text :traffic_priority
-
-  text :max_traffic_delay
-
-  text :max_traffic_loss
+  text :port_type
 
-  text :max_traffic_jitter
+  text :class_of_service
 
   href :event_log
 
@@ -41,9 +37,9 @@ class CIMI::Model::VSP < CIMI::Model::Base
 
   def self.find(id, context)
     if id==:all
-      context.driver.vsps(context.credentials, {:env=>context})
+      context.driver.network_ports(context.credentials, {:env=>context})
     else
-      context.driver.vsps(context.credentials, {:id=>id, :env=>context})
+      context.driver.network_ports(context.credentials, {:id=>id, :env=>context})
     end
   end
 

data/lib/cimi/models/{network_configuration_collection.rb → network_port_collection.rb}

@@ -13,21 +13,38 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-class CIMI::Model::NetworkConfigurationCollection < CIMI::Model::Base
+class CIMI::Model::NetworkPortCollection < CIMI::Model::Base
 
-  act_as_root_entity :network_configuration
+  act_as_root_entity :network_port
 
-  array :network_configurations do
-    scalar :href
-  end
+  text :count
+
+  #add member array:
+  self << CIMI::Model::NetworkPort
 
   def self.default(context)
+    network_ports = CIMI::Model::NetworkPort.all(context)
+    self.new(
+      :id => context.network_ports_url,
+      :name => 'default',
+      :created => Time.now,
+      :description => "#{context.driver.name.capitalize} NetworkPortCollection",
+      :count => network_ports.size,
+      :network_ports => network_ports
+    )
+  end
+
+  def self.for_network(network_id, context)
+    net_url = context.network_url(network_id)
+    network_ports = CIMI::Model::NetworkPort.all(context)
+    ports_collection = network_ports.inject([]){|res, current| res << current if current.network.href == net_url ; res}
     self.new(
-      :id => context.network_configurations_url,
+      :id => net_url+"/network_ports",
       :name => 'default',
       :created => Time.now,
-      :description => "#{context.driver.name.capitalize} NetworkConfigurationCollection",
-      :network_configurations => CIMI::Model::NetworkConfiguration.all(context).map { |c| { :href => c.id } }
+      :description => "#{context.driver.name.capitalize} NetworkPortCollection",
+      :count => ports_collection.size,
+      :network_ports => ports_collection
     )
   end
 

data/lib/cimi/models/{vsp_configuration.rb → network_port_configuration.rb}

@@ -13,17 +13,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-class CIMI::Model::VSPConfiguration < CIMI::Model::Base
+class CIMI::Model::NetworkPortConfiguration < CIMI::Model::Base
 
-  text :bandwidth_reservation
+  acts_as_root_entity :as => "networkPortConfigs"
 
-  text :traffic_priority
+  text :class_of_service
 
-  text :max_traffic_delay
-
-  text :max_traffic_loss
-
-  text :max_traffic_jitter
+  text :port_type
 
   array :operations do
     scalar :rel, :href
@@ -31,9 +27,9 @@ class CIMI::Model::VSPConfiguration < CIMI::Model::Base
 
   def self.find(id, context)
     if id==:all
-      context.driver.vsp_configurations(context.credentials, {:env=>context})
+      context.driver.network_port_configurations(context.credentials, {:env=>context})
     else
-      context.driver.vsp_configurations(context.credentials, {:env=>context, :id=>id})
+      context.driver.network_port_configurations(context.credentials, {:env=>context, :id=>id})
     end
   end
 

data/lib/cimi/models/{network_collection.rb → network_port_configuration_collection.rb}

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