deltacloud-core 1.0.2 → 1.0.3

data/lib/cimi/models/volume_collection.rb

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

data/lib/cimi/models/volume_configuration_collection.rb

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

data/lib/cimi/models/volume_image_collection.rb

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

data/lib/cimi/models/volume_template_collection.rb

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

data/lib/deltacloud/api.rb

@@ -22,6 +22,7 @@ require_relative 'core_ext'
 require_relative 'models'
 require_relative 'drivers'
 require_relative 'helpers/driver_helper'
+require_relative 'version'
 
 module TestPoller
   # This method will pool the resource until condition is true
@@ -67,8 +68,6 @@ class StorageSnapshot; include TestPoller; end
 
 module Deltacloud
 
-  API_VERSION = '1.0.2'
-
   def self.drivers
     Drivers.driver_config
   end
@@ -117,7 +116,8 @@ module Deltacloud
       begin
         params = ([@credentials] + args).flatten
         backend.send(name, *params)
-      rescue ArgumentError
+      rescue ArgumentError => e
+        puts "[W] Wrong arguments for #{name}. Omitting credentials injection. (#{e.message})"
         backend.send(name, *args)
       end
     end

data/lib/deltacloud/collections/addresses.rb

@@ -41,7 +41,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.xml  { haml :"addresses/show", :ugly => true }
             format.html { haml :"addresses/_address", :layout => false }
-            format.json { convert_to_json(:address, @address) }
+            format.json { xml_to_json("addresses/show") }
           end
         end
       end

data/lib/deltacloud/collections/firewalls.rb

@@ -16,6 +16,8 @@
 module Deltacloud::Collections
   class Firewalls < Base
 
+    include Deltacloud::Features
+
     set :capability, lambda { |m| driver.respond_to? m }
 
     check_features :for => lambda { |c, f| driver.class.has_feature?(c, f) }
@@ -64,7 +66,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.xml  { haml :"firewalls/show" }
             format.html { haml :"firewalls/show" }
-            format.json { convert_to_json(:firewall, @firewall) }
+            format.json { xml_to_json("firewalls/show") }
           end
         end
       end
@@ -107,7 +109,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.xml  { haml :"firewalls/show" }
             format.html { haml :"firewalls/show" }
-            format.json { convert_to_json(:firewall, @firewall) }
+            format.json { xml_to_json("firewalls/show") }
           end
         end
       end

data/lib/deltacloud/collections/keys.rb

@@ -42,7 +42,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.xml  { haml :"keys/show", :ugly => true }
             format.html { haml :"keys/show" }
-            format.json { convert_to_json(:key, @key)}
+            format.json { xml_to_json("keys/show")}
           end
         end
       end

data/lib/deltacloud/collections/load_balancers.rb

@@ -53,7 +53,7 @@ module Deltacloud::Collections
           response['Location'] = load_balancer_url(@load_balancer.id)
           respond_to do |format|
             format.xml  { haml :"load_balancers/show" }
-            format.json { convert_to_json(:load_balancer, @load_balancer) }
+            format.json { xml_to_json("load_balancers/show")}
             format.html { redirect load_balancer_url(@load_balancer.id)}
           end
         end

data/lib/deltacloud/collections/storage_volumes.rb

@@ -48,7 +48,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.xml  { haml :"storage_volumes/show" }
             format.html { haml :"storage_volumes/show" }
-            format.json { convert_to_json(:storage_volume, @storage_volume) }
+            format.json { xml_to_json("storage_volumes/show") }
           end
         end
       end
@@ -62,7 +62,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.html { redirect(storage_volume_url(params[:id]))}
             format.xml  { haml :"storage_volumes/show" }
-            format.json { convert_to_json(:storage_volume, @storage_volume) }
+            format.json { xml_to_json("storage_volumes/show")}
           end
         end
       end
@@ -70,14 +70,14 @@ module Deltacloud::Collections
       action :detach, :with_capability => :detach_storage_volume do
         control do
           volume = driver.storage_volume(credentials, :id => params[:id])
-          @storage_volume =  driver.detach_storage_volume(credentials, :id => volume.id, 
+          @storage_volume =  driver.detach_storage_volume(credentials, :id => volume.id,
                                                           :instance_id => volume.instance_id,
                                                           :device => volume.device)
           status 202
           respond_to do |format|
             format.html { redirect(storage_volume_url(params[:id]))}
             format.xml  { haml :"storage_volumes/show" }
-            format.json { convert_to_json(:storage_volume, @storage_volume) }
+            format.json {  xml_to_json("storage_volumes/show") }
           end
         end
       end

data/lib/deltacloud/drivers/base_driver.rb

@@ -19,7 +19,6 @@ module Deltacloud
   require_relative '../core_ext.rb'
   require_relative './exceptions.rb'
   require_relative './features.rb'
-  require_relative '../models/hardware_profile.rb'
   require_relative '../models/state_machine.rb'
 
   class BaseDriver
@@ -69,19 +68,13 @@ module Deltacloud
       ExceptionHandler::exceptions(&block)
     end
 
-    def self.define_hardware_profile(name,&block)
+    def self.define_hardware_profile(profile_id, &block)
       @hardware_profiles ||= []
-      hw_profile = @hardware_profiles.find{|e| e.name == name}
+      hw_profile = @hardware_profiles.find{|e| e.id == profile_id }
       return if hw_profile
-      hw_profile = ::Deltacloud::HardwareProfile.new( name, &block )
+      hw_profile = ::Deltacloud::HardwareProfile.new(profile_id, &block )
       @hardware_profiles << hw_profile
       hw_profile.params
-      # FIXME: Features
-      #unless hw_params.empty?
-      #  feature :instances, :hardware_profiles do
-      #    decl.operation(:create) { add_params(hw_params) }
-      #  end
-      #end
     end
 
     def self.hardware_profiles
@@ -89,14 +82,14 @@ module Deltacloud
       @hardware_profiles
     end
 
-    def hardware_profiles(credentials, opts = nil)
+    def hardware_profiles(credentials, opts = {})
       results = self.class.hardware_profiles
       filter_hardware_profiles(results, opts)
     end
 
-    def hardware_profile(credentials, name)
-      name = name[:id] if name.kind_of? Hash
-      hardware_profiles(credentials, :id => name).first
+    def hardware_profile(credentials, profile_id)
+      profile_id = profile_id[:id] if profile_id.kind_of? Hash
+      hardware_profiles(credentials, :id => profile_id).first
     end
 
     def filter_hardware_profiles(profiles, opts)
@@ -104,25 +97,24 @@ module Deltacloud
         if v = opts[:architecture]
           profiles = profiles.select { |hwp| hwp.include?(:architecture, v) }
         end
-        # As a request param, we call 'name' 'id'
         if v = opts[:id]
-          profiles = profiles.select { |hwp| hwp.name == v }
+          profiles = profiles.select { |hwp| hwp.id == v }
         end
       end
       profiles
     end
 
-    def find_hardware_profile(credentials, name, image_id)
+    def find_hardware_profile(credentials, profile_id, image_id)
       hwp = nil
       if name
-        unless hwp = hardware_profiles(credentials, :id => name).first
+        unless hwp = hardware_profile(credentials, profile_id)
           raise BackendError.new(400, "bad-hardware-profile-name",
-            "Hardware profile '#{name}' does not exist", nil)
+                                 "Hardware profile '#{name}' does not exist", nil)
         end
       else
         unless image = image(credentials, :id=>image_id)
           raise BackendError.new(400, "bad-image-id",
-              "Image with ID '#{image_id}' does not exist", nil)
+                                 "Image with ID '#{image_id}' does not exist", nil)
         end
         hwp = hardware_profiles(credentials,
                                 :architecture=>image.architecture).first

data/lib/deltacloud/drivers/ec2/aws_vpc_monkey_patch.rb

@@ -0,0 +1,294 @@
+# This is a copy of code that has been submitted upstream
+# https://github.com/appoxy/aws/pull/116
+#
+# If you make changes here, make sure they go upstream, too
+
+unless Aws::Ec2::method_defined?(:create_vpc)
+  class Aws::Ec2
+    #-----------------------------------------------------------------
+    #      VPC related
+    #-----------------------------------------------------------------
+
+    # Create VPC
+    # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateVpc.html
+    #
+    # ec2.create_vpc("10.0.0.0/16")
+    # FIXME: EVen though the EC2 docs describe the parameter instanceTenancy,
+    # I could not get it to recognize that
+    def create_vpc(cidr_block = "10.0.0.0/16")
+      params = { "CidrBlock" => cidr_block }
+      link = generate_request("CreateVpc", params)
+      request_info(link, QEc2VpcsParser.new("vpc", :logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+
+    # Describe  VPC's
+    # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeVpcs.html
+    #
+    # ec2.describe_vpcs
+    # ec2.describe_vpcs(vpcId1, vpcId2, 'Filter.1.Name' => 'state', 'Filter.1.Value' = > 'pending', ...)
+    def describe_vpcs(*args)
+      if args.last.is_a?(Hash)
+        params = args.pop.dup
+      else
+        params = {}
+      end
+      1.upto(args.size) { |i| params["VpcId.#{i}"] = args[i-1] }
+      link = generate_request("DescribeVpcs", params)
+      request_info(link, QEc2VpcsParser.new("item", :logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Delete VPC
+    # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteVpc.html
+    #
+    # ec2.delete_vpc(vpc_id)
+    def delete_vpc(vpc_id)
+      params = { "VpcId" => vpc_id }
+      link = generate_request("DeleteVpc", params)
+      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Create subnet in a VPC
+    # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateSubnet.html
+    #
+    # ec2.create_subnet(vpc_id, cidr_block)
+    # ec2.create_subnet(vpc_id, cidr_block, availability_zone))
+    def create_subnet(vpc_id, cidr_block, availability_zone = nil)
+      params = { "VpcId" => vpc_id, "CidrBlock" => cidr_block }
+      params["AvailabilityZone"] = availability_zone if availability_zone
+      link = generate_request("CreateSubnet", params)
+      request_info(link, QEc2SubnetsParser.new("subnet", :logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Describe subnets
+    # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSubnets.html
+    #
+    # ec2.describe_subnets
+    # ecs.describe_subnets(subnetId1, SubnetId2, ...,
+    #                      'Filter.1.Name' => 'state',
+    #                      'Filter.1.Value.1' => 'pending',
+    #                      'Filter.2.Name' => ...)
+    def describe_subnets(*args)
+      if args.last.is_a?(Hash)
+        params = args.pop.dup
+      else
+        params = {}
+      end
+      1.upto(args.size) { |i| params["SubnetId.#{i}"] = args[i-1] }
+      link = generate_request("DescribeSubnets", params)
+      request_info(link, QEc2SubnetsParser.new("item", :logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Delete Subnet
+    # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteSubnet.html
+    #
+    # ec2.delete_subnet(subnet_id)
+    def delete_subnet(subnet_id)
+      params = { "SubnetId" => subnet_id }
+      link = generate_request("DeleteSubnet", params)
+      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # The only change in this class compared to upstream is
+    # that we parse out subnetId and vpcId
+    class QEc2DescribeInstancesParser < Aws::AwsParser #:nodoc:
+      def tagstart(name, attributes)
+        # DescribeInstances property
+        if (name == 'item' && @xmlpath == 'DescribeInstancesResponse/reservationSet') ||
+            # RunInstances property
+        (name == 'RunInstancesResponse')
+          @reservation = {:aws_groups    => [],
+                          :instances_set => []}
+
+        elsif (name == 'item') &&
+            # DescribeInstances property
+        (@xmlpath=='DescribeInstancesResponse/reservationSet/item/instancesSet' ||
+            # RunInstances property
+        @xmlpath=='RunInstancesResponse/instancesSet')
+          # the optional params (sometimes are missing and we dont want them to be nil)
+          @instance = {:aws_reason        => '',
+                       :dns_name          => '',
+                       :private_dns_name  => '',
+                       :ami_launch_index  => '',
+                       :ssh_key_name      => '',
+                       :aws_state         => '',
+                       :root_device_type  => '',
+                       :root_device_name  => '',
+                       :architecture      => '',
+                       :subnet_id         => '',
+                       :vpc_id            => '',
+                       :block_device_mappings => [],
+                       :aws_product_codes => [],
+                       :tags              => {}}
+        end
+      end
+
+      def tagend(name)
+        case name
+          when  'rootDeviceType' then
+            @instance[:root_device_type] = @text
+          when 'architecture' then
+            @instance[:architecture] = @text
+          when 'rootDeviceName' then
+            @instance[:root_device_name] = @text
+          # reservation
+          when 'reservationId' then
+            @reservation[:aws_reservation_id] = @text
+          when 'ownerId' then
+            @reservation[:aws_owner] = @text
+          when 'groupId' then
+            @reservation[:aws_groups] << @text
+          # instance
+          when 'instanceId' then
+            @instance[:aws_instance_id] = @text
+          when 'imageId' then
+            @instance[:aws_image_id] = @text
+          when 'dnsName' then
+            @instance[:dns_name] = @text
+          when 'privateDnsName' then
+            @instance[:private_dns_name] = @text
+          when 'reason' then
+            @instance[:aws_reason] = @text
+          when 'keyName' then
+            @instance[:ssh_key_name] = @text
+          when 'amiLaunchIndex' then
+            @instance[:ami_launch_index] = @text
+          when 'code' then
+            @instance[:aws_state_code] = @text
+          when 'name' then
+            @instance[:aws_state] = @text
+          when 'productCode' then
+            @instance[:aws_product_codes] << @text
+          when 'instanceType' then
+            @instance[:aws_instance_type] = @text
+          when 'launchTime' then
+            @instance[:aws_launch_time] = @text
+          when 'kernelId' then
+            @instance[:aws_kernel_id] = @text
+          when 'ramdiskId' then
+            @instance[:aws_ramdisk_id] = @text
+          when 'platform' then
+            @instance[:aws_platform] = @text
+          when 'availabilityZone' then
+            @instance[:aws_availability_zone] = @text
+          when 'privateIpAddress' then
+            @instance[:aws_private_ip_address] = @text
+          when 'subnetId' then
+            @instance[:subnet_id] = @text
+          when 'vpcId' then
+            @instance[:vpc_id] = @text
+          when 'key' then
+            @tag_key = @text
+          when 'value' then
+            @tag_value = @text
+          when 'deviceName' then
+            @device_name = @text
+          when 'volumeId' then
+            @volume_id = @text
+          when 'state'
+            if @xmlpath == 'DescribeInstancesResponse/reservationSet/item/instancesSet/item/monitoring' || # DescribeInstances property
+            @xmlpath == 'RunInstancesResponse/instancesSet/item/monitoring' # RunInstances property
+              @instance[:monitoring_state] = @text
+            end
+          when 'item'
+            if @xmlpath=='DescribeInstancesResponse/reservationSet/item/instancesSet/item/tagSet' # Tags
+              @instance[:tags][@tag_key] = @tag_value
+            elsif @xmlpath == 'DescribeInstancesResponse/reservationSet/item/instancesSet/item/blockDeviceMapping' # Block device mappings
+              @instance[:block_device_mappings] << { @device_name => @volume_id }
+            elsif @xmlpath == 'DescribeInstancesResponse/reservationSet/item/instancesSet' || # DescribeInstances property
+            @xmlpath == 'RunInstancesResponse/instancesSet' # RunInstances property
+              @reservation[:instances_set] << @instance
+            elsif @xmlpath=='DescribeInstancesResponse/reservationSet' # DescribeInstances property
+              @result << @reservation
+            end
+          when 'RunInstancesResponse' then
+            @result << @reservation # RunInstances property
+        end
+      end
+
+      def reset
+        @result = []
+      end
+    end
+
+    #-----------------------------------------------------------------
+    #      PARSERS: Vpc
+    #-----------------------------------------------------------------
+
+    class QEc2VpcsParser < Aws::AwsParser #:nodoc:
+      def initialize(wrapper, opts = {})
+        super(opts)
+        @wrapper = wrapper
+      end
+
+      def tagstart(name, attribute)
+        @vpc = {} if name == @wrapper
+      end
+
+      def tagend(name)
+        case name
+        when 'vpcId' then
+          @vpc[:vpc_id] = @text
+        when 'state' then
+          @vpc[:state] = @text
+        when 'cidrBlock' then
+          @vpc[:cidr_block] = @text
+        when 'dhcpOptionsId' then
+          @vpc[:dhcp_options_id] = @text
+        when @wrapper
+          @result << @vpc
+        end
+      end
+
+      def reset
+        @result = []
+      end
+    end
+
+    class QEc2SubnetsParser < Aws::AwsParser #:nodoc
+      def initialize(wrapper, opts = {})
+        super(opts)
+        @wrapper = wrapper
+      end
+
+      def tagstart(name, attribute)
+        @subnet = {} if name == @wrapper
+      end
+
+      def tagend(name)
+        case name
+        when 'subnetId' then
+          @subnet[:subnet_id] = @text
+        when 'state' then
+          @subnet[:state] = @text
+        when 'vpcId' then
+          @subnet[:vpc_id] = @text
+        when 'cidrBlock' then
+          @subnet[:cidr_block] = @text
+        when 'availableIpAddressCount' then
+          @subnet[:available_ip_address_count] = @text
+        when 'availabilityZone' then
+          @subnet[:availability_zone] = @text
+        when @wrapper
+          @result << @subnet
+        end
+      end
+
+      def reset
+        @result = []
+      end
+    end
+  end
+end