fog 1.9.0 → 1.10.0

data/lib/fog/terremark/parsers/shared/vapp.rb

@@ -3,7 +3,7 @@ module Fog
     module Terremark
       module Shared
 
-        class Vapp < Fog::Parsers::Base
+        class Vapp < TerremarkParser
 
           def reset
             @response = { 'Links' => [], 'VirtualHardware' => {}, 'OperatingSystem' => {} }
@@ -15,23 +15,12 @@ module Fog
             super
             case name
               when 'Link'
-                link = {}
-                until attributes.empty?
-                  link[attributes.shift] = attributes.shift
-                end
+                link = extract_attributes(attributes)
                 @response['Links'] << link
               when 'OperatingSystemSection'
                 @in_operating_system = true
              when 'VApp'
-                vapp = {}
-                until attributes.empty?
-                  if attributes.first.is_a?(Array)
-                    attribute = attributes.shift
-                    vapp[attribute.first] = attribute.last
-                  else
-                    vapp[attributes.shift] = attributes.shift
-                  end
-                end
+                vapp = extract_attributes(attributes)
                 @response.merge!(vapp.reject {|key,value| !['href', 'name', 'size', 'status', 'type'].include?(key)})
              end
           end

data/lib/fog/vcloud/compute.rb

@@ -117,6 +117,7 @@ module Fog
       request :configure_vm_name_description
       request :configure_vm_disks
       request :configure_vm_password
+      request :configure_vm_network
       request :delete_vapp
       request :get_catalog_item
       request :get_customization_options

data/lib/fog/vcloud/models/compute/server.rb

@@ -18,7 +18,7 @@ module Fog
 
         attribute :vapp_scoped_local_id, :aliases => :VAppScopedLocalId
 
-        attribute :network_connections, :aliases => :NetworkConnectionSection, :squash => :NetworkConnection
+        attribute :network_connections, :aliases => :NetworkConnectionSection#, :squash => :NetworkConnection
         attribute :virtual_hardware, :aliases => :'ovf:VirtualHardwareSection', :squash => :'ovf:Item'
 
         attribute :guest_customization, :aliases => :GuestCustomizationSection
@@ -123,7 +123,14 @@ module Fog
           @update_memory_value = amount
           amount
         end
-
+        def network
+          network_connections[:NetworkConnection] if network_connections
+        end
+        def network=(network_info)
+          @changed = true
+          @update_network = network_info
+          network_info
+        end
         def disks
           disk_mess.map do |dm|
             { :number => dm[:"rasd:AddressOnParent"].to_i, :size => dm[:"rasd:HostResource"][:vcloud_capacity].to_i, :resource => dm[:"rasd:HostResource"], :disk_data => dm }
@@ -203,6 +210,12 @@ module Fog
               wait_for { ready? }
             end
 
+            if @update_network
+              network_connections[:NetworkConnection][:network] = @update_network[:network_name]
+              network_connections[:NetworkConnection][:IpAddressAllocationMode] = @update_network[:network_mode]
+              service.configure_vm_network(network_connections)
+              wait_for { ready? }
+            end
             if @disk_change == :deleted
               data = disk_mess.delete_if do |vh|
                 vh[:'rasd:ResourceType'] == '17' &&

data/lib/fog/vcloud/models/compute/vapp.rb

@@ -37,6 +37,17 @@ module Fog
                  :href => href
             )
         end
+
+        def ready?
+          reload_status # always ensure we have the correct status
+          status != '0'
+        end
+
+        private
+        def reload_status
+          vapp = service.get_vapp(href)
+          self.status = vapp.status
+        end
       end
     end
   end

data/lib/fog/vcloud/requests/compute/configure_vm_network.rb

@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+module Fog
+  module Vcloud
+    class Compute
+      class Real
+
+        def configure_vm_network(network_info)
+          edit_uri = network_info.select {|k,v| k == :Link && v[:rel] == 'edit'}
+          edit_uri = edit_uri.kind_of?(Array) ? edit_uri.flatten[1][:href] : edit_uri[:Link][:href]
+
+          body = <<EOF
+            <NetworkConnectionSection xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="#{edit_uri}">
+              <ovf:Info>Specifies the available VM network connections</ovf:Info>
+              <PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
+              <NetworkConnection network="#{network_info[:NetworkConnection][:network]}" needsCustomization="true">
+                <NetworkConnectionIndex>0</NetworkConnectionIndex>
+                <IsConnected>true</IsConnected>
+                <IpAddressAllocationMode>#{network_info[:NetworkConnection][:IpAddressAllocationMode]}</IpAddressAllocationMode>
+              </NetworkConnection>
+            </NetworkConnectionSection>
+EOF
+          print "Request: #{body}"
+          request(
+            :body     => body,
+            :expects  => 202,
+            :headers  => {'Content-Type' => network_info[:"vcloud_type"] },
+            :method   => 'PUT',
+            :uri      => "#{edit_uri}",
+            :parse    => true
+          )
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/vcloud/requests/compute/instantiate_vapp_template.rb

@@ -10,7 +10,7 @@ module Fog
           unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
-          
+
           catalog_item_uri = options[:catalog_item_uri]
 
           # Figure out the template_uri
@@ -49,8 +49,13 @@ module Fog
               if options[:network_uri]
                 # TODO - implement properly
                 xml.NetworkConfigSection {
-                  xml.NetworkConfig {
-                    xml.NetworkAssociation( :href => options[:network_uri] )
+                  xml.tag!("ovf:Info"){ "Configuration parameters for logical networks" }
+                  xml.NetworkConfig("networkName" => options[:network_name]) {
+                    # xml.NetworkAssociation( :href => options[:network_uri] )
+                      xml.Configuration {
+                        xml.ParentNetwork("name" => options[:network_name], "href" => options[:network_uri])
+                        xml.FenceMode("bridged")
+                    }
                   }
                 }
               end
@@ -67,7 +72,6 @@ module Fog
 
         def instantiate_vapp_template options = {}
           validate_instantiate_vapp_template_options options
-
           request(
             :body     => generate_instantiate_vapp_template_request(options),
             :expects  => 201,

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.9.0'
+  VERSION = '1.10.0'
 end

data/lib/fog/volume.rb

@@ -7,13 +7,13 @@ module Fog
 
     def self.new(attributes)
       attributes = attributes.dup # Prevent delete from having side effects
-      case provider = attributes.delete(:provider).to_s.downcase.to_sym
-      when :openstack
-        require 'fog/openstack/volume'
-        Fog::Volume::OpenStack.new(attributes)
-      else
-        raise ArgumentError.new("#{provider} has no identity service")
+      provider = attributes.delete(:provider).to_s.downcase.to_sym
+      if self.providers.include?(provider)
+        require "fog/#{provider}/volume"
+        return Fog::Volume.const_get(Fog.providers[provider]).new(attributes)
       end
+
+      raise ArgumentError.new("#{provider} has no identity service")
     end
 
     def self.providers

data/lib/fog/vsphere/requests/compute/create_vm.rb

@@ -39,7 +39,7 @@ module Fog
         def device_change attributes
           devices = []
           if (nics = attributes[:interfaces])
-            devices << nics.map { |nic| create_interface(nic, nics.index(nic)) }
+            devices << nics.map { |nic| create_interface(nic, nics.index(nic), :add, attributes) }
           end
 
           if (disks = attributes[:volumes])
@@ -49,7 +49,22 @@ module Fog
           devices.flatten
         end
 
-        def create_interface nic, index = 0, operation = :add
+        def create_nic_backing nic, attributes
+          raw_network = get_raw_network(nic.network, attributes[:datacenter])
+
+          if raw_network.kind_of? RbVmomi::VIM::DistributedVirtualPortgroup
+            RbVmomi::VIM.VirtualEthernetCardDistributedVirtualPortBackingInfo(
+              :port => RbVmomi::VIM.DistributedVirtualSwitchPortConnection(
+                :portgroupKey => raw_network.key,
+                :switchUuid   => raw_network.config.distributedVirtualSwitch.uuid
+              )
+            )
+          else
+            RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo(:deviceName => nic.network)
+          end
+        end
+
+        def create_interface nic, index = 0, operation = :add, attributes = {}
           {
             :operation => operation,
             :device    => nic.type.new(
@@ -59,7 +74,7 @@ module Fog
                   :label   => nic.name,
                   :summary => nic.summary,
                 },
-              :backing     => RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo(:deviceName => nic.network),
+              :backing     => create_nic_backing(nic, attributes),
               :addressType => 'generated')
           }
         end

data/lib/fog/vsphere/requests/compute/list_vm_interfaces.rb

@@ -33,7 +33,7 @@ module Fog
             {
               :name    => nic.deviceInfo.label,
               :mac     => nic.macAddress,
-              :network => nic.backing.network.name,
+              :network => nic.backing.respond_to?("network") ? nic.backing.network.name : nic.backing.port.portgroupKey,
               :status  => nic.connectable.status,
               :summary => nic.deviceInfo.summary,
               :type    => nic.class,

data/lib/fog/vsphere/requests/compute/vm_reconfig_hardware.rb

@@ -5,7 +5,7 @@ module Fog
         def vm_reconfig_hardware(options = {})
           raise ArgumentError, "hardware_spec is a required parameter" unless options.has_key? 'hardware_spec'
           raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid'
-          vm_mob_ref = get_vm_by_ref(options['instance_uuid'])
+          vm_mob_ref = get_vm_ref(options['instance_uuid'])
           task = vm_mob_ref.ReconfigVM_Task(:spec => RbVmomi::VIM.VirtualMachineConfigSpec(options['hardware_spec']))
           task.wait_for_completion
            { 'task_state' => task.info.state }

data/tests/aws/models/data_pipeline/pipeline_tests.rb

@@ -0,0 +1,8 @@
+Shindo.tests("AWS::DataPipeline | pipelines", ['aws', 'data_pipeline']) do
+  pending if Fog.mocking?
+
+  unique_id = uniq_id
+  model_tests(Fog::AWS[:data_pipeline].pipelines, { :id => unique_id, :name => "#{unique_id}-name", :unique_id => unique_id }) do
+    @instance.wait_for { state }
+  end
+end

data/tests/aws/models/data_pipeline/pipelines_tests.rb

@@ -0,0 +1,8 @@
+Shindo.tests("AWS::DataPipeline | pipelines", ['aws', 'data_pipeline']) do
+  pending if Fog.mocking?
+
+  unique_id = uniq_id
+  collection_tests(Fog::AWS[:data_pipeline].pipelines, { :id => unique_id, :name => "#{unique_id}-name", :unique_id => unique_id }) do
+    @instance.wait_for { state }
+  end
+end

data/tests/aws/models/rds/server_tests.rb

@@ -1,4 +1,6 @@
 Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
+  # Disabled due to https://github.com/fog/fog/1546
+  pending
 
   model_tests(Fog::AWS[:rds].servers, rds_default_server_params) do
     # We'll need this later; create it early to avoid waiting
@@ -17,9 +19,8 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
         snapshot = @instance.snapshots.create(:id => 'fog-test-snapshot')
       end
 
-      snapshot.wait_for {ready?}
+      snapshot.wait_for { ready?}
 
-      @instance.reload
       @instance.wait_for { ready? }
 
       returns(true) { @instance.snapshots.map{|s| s.id}.include?(snapshot.id) }
@@ -41,7 +42,7 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
       }
 
       @instance.modify(true, modify_options)
-      @instance.reload
+      @instance.wait_for { ready? }
 
       returns(parameter_group.id, 'new parameter group') do
         @instance.db_parameter_groups.first['DBParameterGroupName']
@@ -52,8 +53,8 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
       end
 
       @instance.reboot
-      @instance.reload.wait_for { state == 'rebooting' }
-      @instance.reload.wait_for { ready? }
+      @instance.wait_for { state == 'rebooting' }
+      @instance.wait_for { ready? }
 
       # Restore back to original state using symbols
       restore_options = {
@@ -63,8 +64,8 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
       @instance.modify(true, restore_options)
 
       @instance.reboot
-      @instance.reload.wait_for { state == 'rebooting' }
-      @instance.reload.wait_for do
+      @instance.wait_for { state == 'rebooting' }
+      @instance.wait_for do
         ready? &&
           db_security_groups.all? {|hash| hash['Status'] == 'active'} &&
           db_parameter_groups.all? {|hash| hash['ParameterApplyStatus'] == 'in-sync' }
@@ -77,8 +78,8 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
     tests("#reboot").succeeds do
       @instance.reboot
     end
-    @instance.reload.wait_for {state == 'rebooting'}
-    @instance.reload.wait_for { ready? }
+    @instance.wait_for { state == 'rebooting' }
+    @instance.wait_for { ready? }
 
     tests('#create_read_replica').succeeds do
 

data/tests/aws/requests/compute/image_tests.rb

@@ -2,7 +2,7 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
   @describe_images_format = {
     'imagesSet'    => [{
       'architecture'        => String,
-      'blockDeviceMapping'  => [],
+      'blockDeviceMapping'  => [Fog::Nullable::Hash],
       'description'         => Fog::Nullable::String,
       'hypervisor'          => String,
       'imageId'             => String,
@@ -135,4 +135,4 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
       Fog::Compute[:aws].modify_image_attribute('ami-00000000', { 'Add.UserId' => ['123456789012'] }).body
     end
   end
-end
+end

data/tests/aws/requests/compute/security_group_tests.rb

@@ -15,7 +15,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
         'fromPort'    => Fog::Nullable::Integer,
         'groups'      => [{ 'groupName' => Fog::Nullable::String, 'userId' => String, 'groupId' => String }],
         'ipProtocol'  => String,
-        'ipRanges'    => [],
+        'ipRanges'    => [Fog::Nullable::Hash],
         'toPort'      => Fog::Nullable::Integer,
       }],
       'ipPermissionsEgress' => [],

data/tests/aws/requests/compute/spot_instance_tests.rb

@@ -12,6 +12,7 @@ Shindo.tests('Fog::Compute[:aws] | spot instance requests', ['aws']) do
         'imageId'             => String,
         'instanceType'        => String,
         'monitoring'          => Fog::Boolean,
+        'ebsOptimized'        => Fog::Boolean,
         'subnetId'            => Fog::Nullable::String,
         'iamInstanceProfile'  => Fog::Nullable::Hash,
       },
@@ -38,13 +39,13 @@ Shindo.tests('Fog::Compute[:aws] | spot instance requests', ['aws']) do
     pending if Fog.mocking?
 
     tests("#request_spot_instances('ami-3202f25b', 't1.micro', '0.001')").formats(@spot_instance_requests_format) do
-      data = Fog::Compute[:aws].request_spot_instances('ami-3202f25b', 't1.micro', '0.001').body
+      data = Fog::Compute[:aws].request_spot_instances('ami-3202f25b', 't1.micro', '0.001',{'LaunchSpecification.EbsOptimized' => false}).body
       @spot_instance_request_id = data['spotInstanceRequestSet'].first['spotInstanceRequestId']
       data
     end
 
     tests("#describe_spot_instance_requests").formats(@spot_instance_requests_format) do
-      Fog::Compute[:aws].describe_spot_instance_requests.body
+      Fog::Compute[:aws].describe_spot_instance_requests('spot-instance-request-id' => [@spot_instance_request_id]).body
     end
 
     tests("#cancel_spot_instance_requests('#{@spot_instance_request_id}')").formats(@cancel_spot_instance_request_format) do

data/tests/aws/requests/data_pipeline/helper.rb

@@ -0,0 +1,44 @@
+class AWS
+  module DataPipeline
+    module Formats
+
+      BASIC = {
+        'pipelineId' => String,
+      }
+
+      LIST_PIPELINES = {
+        "hasMoreResults" => Fog::Nullable::Boolean,
+        "marker" => Fog::Nullable::String,
+        "pipelineIdList" => [
+          {
+            "id" => String,
+            "name" => String,
+          }
+        ]
+      }
+
+      DESCRIBE_PIPELINES = {
+        "pipelineDescriptionList" => [
+          {
+            "description" => Fog::Nullable::String,
+            "name" => String,
+            "pipelineId" => String,
+            "fields" => [
+              {
+                "key" => String,
+                "refValue" => Fog::Nullable::String,
+                "stringValue" => Fog::Nullable::String,
+              }
+            ]
+          }
+        ]
+      }
+
+      PUT_PIPELINE_DEFINITION = {
+        "errored" => Fog::Boolean,
+        "validationErrors" => Fog::Nullable::Array,
+      }
+	
+    end
+  end
+end

data/tests/aws/requests/data_pipeline/pipeline_tests.rb

@@ -0,0 +1,54 @@
+Shindo.tests('AWS::DataPipeline | pipeline_tests', ['aws', 'data_pipeline']) do
+  pending if Fog.mocking?
+
+  @pipeline_id = nil
+
+  tests('success') do
+    tests("#create_pipeline").formats(AWS::DataPipeline::Formats::BASIC) do
+      unique_id = 'fog-test-pipeline-unique-id'
+      name = 'fog-test-pipeline-name'
+      description = 'Fog test pipeline'
+
+      result = Fog::AWS[:data_pipeline].create_pipeline(unique_id, name, description)
+      @pipeline_id = result['pipelineId']
+      result
+    end
+
+    tests("#list_pipelines").formats(AWS::DataPipeline::Formats::LIST_PIPELINES) do
+      Fog::AWS[:data_pipeline].list_pipelines()
+    end
+
+    tests("#describe_pipelines").formats(AWS::DataPipeline::Formats::DESCRIBE_PIPELINES) do
+      ids = [@pipeline_id]
+      Fog::AWS[:data_pipeline].describe_pipelines(ids)
+    end
+
+    tests("#put_pipeline_definition").formats(AWS::DataPipeline::Formats::PUT_PIPELINE_DEFINITION) do
+      objects = [
+        {
+          "id" => "Nightly",
+          "type" => "Schedule",
+          "startDateTime" => Time.now.strftime("%Y-%m-%dT%H:%M:%S"),
+          "period" => "24 hours",
+        },
+        {
+          "id" => "Default",
+          "role" => "role-dumps",
+          "resourceRole" => "role-dumps-inst",
+          "schedule" => { "ref" => "Nightly" },
+        },
+      ]
+
+      Fog::AWS[:data_pipeline].put_pipeline_definition(@pipeline_id, objects)
+    end
+
+    tests("#activate_pipeline") do
+      Fog::AWS[:data_pipeline].activate_pipeline(@pipeline_id)
+    end
+
+    tests("#delete_pipeline") do
+      Fog::AWS[:data_pipeline].delete_pipeline(@pipeline_id)
+    end
+
+  end
+end