fog 1.16.0 → 1.17.0

data/lib/fog/vcloud_director/requests/compute/post_configure_edge_gateway_services.rb

@@ -3,7 +3,7 @@ module Fog
     class VcloudDirector
       class Real
 
-        require 'fog/vcloud_director/generators/compute/edge_gateway'
+        require 'fog/vcloud_director/generators/compute/edge_gateway_service_configuration'
 
         # Configure edge gateway services like firewall, nat and load balancer.
         #
@@ -21,7 +21,7 @@ module Fog
         #   vCloud API Documentaion
         # @since vCloud API version 5.1
         def post_configure_edge_gateway_services(id, configuration)
-          body = Fog::Generators::Compute::VcloudDirector::EdgeGateway.new(configuration).generate_xml
+          body = Fog::Generators::Compute::VcloudDirector::EdgeGatewayServiceConfiguration.new(configuration).generate_xml
 
           request(
               :body => body,
@@ -34,6 +34,18 @@ module Fog
         end
 
       end
+
+      class Mock
+        def post_configure_edge_gateway_services(id, configuration)
+          unless data[:edge_gateways][id]
+            raise Fog::Compute::VcloudDirector::Forbidden.new(
+                      "No access to entity \"(com.vmware.vcloud.entity.edgegateway:#{id})\"."
+                  )
+          end
+          data[:edge_gateways][id][:Configuration][:EdgeGatewayServiceConfiguration] = configuration
+          Excon::Response.new(:body => {:name => 'mock_task', :href => '/10000000000000000000000000000000' })
+        end
+      end
     end
   end
 end

data/lib/fog/vcloud_director/requests/compute/post_instantiate_vapp_template.rb

@@ -74,10 +74,10 @@ module Fog
                         StorageLeaseInSeconds section[:StorageLeaseInSeconds]
                       end
                       if section.key?(:DeploymentLeaseExpiration)
-                        DeploymentLeaseExpiration section[:DeploymentLeaseExpiration].iso8601
+                        DeploymentLeaseExpiration section[:DeploymentLeaseExpiration].strftime('%Y-%m-%dT%H:%M:%S%z')
                       end
                       if section.key?(:StorageLeaseExpiration)
-                        StorageLeaseExpiration section[:StorageLeaseExpiration].iso8601
+                        StorageLeaseExpiration section[:StorageLeaseExpiration].strftime('%Y-%m-%dT%H:%M:%S%z')
                       end
                     }
                   end

data/lib/fog/vcloud_director/requests/compute/post_upload_disk.rb

@@ -0,0 +1,133 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+        # Create a disk.
+        #
+        # @param [String] id Object identifier of the vDC.
+        # @param [String] name The name of the disk.
+        # @param [Integer] size Size of the disk. For modify operation this is
+        #   required only for the XSD validation it could not be changed.
+        # @param [Hash] options
+        # @option options [String] :operationKey Optional unique identifier to
+        #   support idempotent semantics for create and delete operations.
+        # @option options [Integer] :busSubType Disk bus sub type.
+        # @option options [Integer] :busType Disk bus type.
+        # @option options [String] :Description Optional description.
+        # @return [Excon::Response]
+        #   * body<~Hash>:
+        #     * :href<~String> - The URI of the disk.
+        #     * :type<~String> - The MIME type of the disk.
+        #     * :id<~String> - The disk identifier, expressed in URN format.
+        #     * :operationKey<~String> - Optional unique identifier to support
+        #       idempotent semantics for create and delete operations.
+        #     * :name<~String> - The name of the disk.
+        #     * :status<~String> - Creation status of the disk.
+        #     * :busSubType<~String> - Disk bus sub type.
+        #     * :busType<~String> - Disk bus type.
+        #     * :size<~String> - Size of the disk.
+        #     * :Link:
+        #     * :Description<~String> - Optional description.
+        #     * :Tasks<~Hash>:
+        #     * :StorageProfile<~Hash> - Storage profile of the disk.
+        #       * :href<~String> - Contains the URI to the entity.
+        #       * :name<~String> - Contains the name of the entity.
+        #       * :type<~String> - Contains the type of the entity.
+        #     * :Owner<~Hash> - Disk owner.
+        #       * :type<~String> - The MIME type of the entity.
+        #       * :User<~Hash> - Reference to the user who is the owner of this
+        #         disk.
+        #         * :href<~String> - Contains the URI to the entity.
+        #         * :name<~String> - Contains the name of the entity.
+        #         * :type<~String> - Contains the type of the entity.
+        #
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-CreateDisk.html
+        # @since vCloud API version 5.1
+        def post_upload_disk(id, name, size, options={})
+          body = Nokogiri::XML::Builder.new do
+            DiskCreateParams(:xmlns => 'http://www.vmware.com/vcloud/v1.5') {
+              attrs = {
+                :name => name,
+                :size => size
+              }
+              attrs[:operationKey] = options[:operationKey] if options.key?(:operationKey)
+              attrs[:busSubType] = options[:busSubType] if options.key?(:busSubType)
+              attrs[:busType] = options[:busType] if options.key?(:busType)
+              Disk(attrs) {
+                if options.key?(:Description)
+                  Description options[:Description]
+                end
+                if options.key?(:StorageProfile)
+                  attrs = {
+                    :href => options[:StorageProfile][:href]
+                  }
+                  StorageProfile(attrs)
+                end
+              }
+            }
+          end.to_xml
+
+          request(
+            :body    => body,
+            :expects => 201,
+            :headers => {'Content-Type' => 'application/vnd.vmware.vcloud.diskCreateParams+xml'},
+            :method  => 'POST',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "vdc/#{id}/disk"
+          )
+        end
+      end
+
+      class Mock
+        def post_upload_disk(id, name, size, options={})
+          unless size.to_s =~ /^\d+$/
+            raise Fog::Compute::VcloudDirector::BadRequest.new(
+              "validation error on field 'diskSpec.sizeBytes': must be greater than or equal to 0"
+            )
+          end
+          unless data[:vdcs][id]
+            raise Fog::Compute::VcloudDirector::Forbidden.new(
+              'No access to entity "(com.vmware.vcloud.entity.vdc:%s)".' % id
+            )
+          end
+
+          disk_id = uuid
+
+          owner = {
+            :href => make_href("disk/#{disk_id}"),
+            :type => 'application/vnd.vmware.vcloud.disk+xml'
+          }
+          task_id = enqueue_task(
+            "Creating Disk #{name}(#{disk_id})", 'vdcCreateDisk', owner,
+            :on_success => lambda do
+              data[:disks][disk_id][:status] = 1
+            end
+          )
+
+          disk = {
+            :description => options[:Description],
+            :name => name,
+            :size => size.to_i,
+            :status => 0,
+            :tasks => [task_id],
+            :vdc_id => id,
+            :vdc_storage_class => data[:vdc_storage_classes].detect {|k,v| v[:default]}.first
+          }
+          data[:disks][disk_id] = disk
+
+          body = {
+            :xmlns => xmlns,
+            :xmlns_xsi => xmlns_xsi,
+            :xsi_schemaLocation => xsi_schema_location
+          }.merge(disk_body(disk_id))
+
+          Excon::Response.new(
+            :status => 201,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud_director/requests/compute/post_upload_media.rb

@@ -22,6 +22,7 @@ module Fog
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-UploadMedia.html
         # @since vCloud API version 0.9
+        # @todo Support vDC Storage Profiles.
         def post_upload_media(vdc_id, name, image_type, size, options={})
           body = Nokogiri::XML::Builder.new do
             attrs = {
@@ -38,7 +39,7 @@ module Fog
             }
           end.to_xml
 
-          request(
+          response = request(
             :body    => body,
             :expects => 201,
             :headers => {'Content-Type' => 'application/vnd.vmware.vcloud.media+xml'},
@@ -46,6 +47,8 @@ module Fog
             :parser  => Fog::ToHashDocument.new,
             :path    => "vdc/#{vdc_id}/media"
           )
+          ensure_list! response.body, :Files, :File
+          response
         end
       end
 
@@ -61,14 +64,55 @@ module Fog
               'validation error on field \'size\': must be greater than or equal to 0'
             )
           end
-          unless vdc = data[:vdcs][vdc_id]
+          unless data[:vdcs][vdc_id]
             raise Fog::Compute::VcloudDirector::Forbidden.new(
               "No access to entity \"(com.vmware.vcloud.entity.vdc:#{vdc_id})\"."
             )
           end
 
-          Fog::Mock.not_implemented
-          vdc.is_used_here # avoid warning from syntax checker
+          media_id = uuid
+          file_id = uuid
+
+          owner = {
+            :href => make_href("media/#{media_id}"),
+            :type => 'application/vnd.vmware.vcloud.media+xml'
+          }
+          task_id = enqueue_task(
+            "Importing Media File #{name}(#{file_id})", 'vdcUploadMedia', owner,
+            :on_success => lambda do
+              media = data[:medias][media_id]
+              media[:file][:bytes_transferred] = media[:size]
+              media[:status] = 1
+            end
+          )
+
+          media = {
+            :description => options[:Description],
+            :file => {
+              :bytes_transferred => 0,
+              :uuid => file_id
+            },
+            :image_type => image_type,
+            :name => name,
+            :size => size.to_i,
+            :status => 0,
+            :tasks => [task_id],
+            :vdc_id => vdc_id,
+            :vdc_storage_class => data[:vdc_storage_classes].detect {|k,v| v[:default]}.first
+          }
+          data[:medias][media_id] = media
+
+          body = {
+            :xmlns => xmlns,
+            :xmlns_xsi => xmlns_xsi,
+            :xsi_schemaLocation => xsi_schema_location
+          }.merge(media_body(media_id))
+
+          Excon::Response.new(
+            :status => 201,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
         end
       end
     end

data/lib/fog/vcloud_director/requests/compute/put_guest_customization_section_vapp.rb

@@ -5,50 +5,127 @@ module Fog
         extend Fog::Deprecation
         deprecate :put_vm_customization, :put_guest_customization_section_vapp
 
-        require 'fog/vcloud_director/generators/compute/customization'
-
         # Updates the guest customization section of a VM.
         #
         # This operation is asynchronous and returns a task that you can
         # monitor to track the progress of the request.
         #
         # @param [String] id Object identifier of the VM.
-        # @param [Hash] customization
-        # @option customization [Boolean] :enabled True if guest customization
-        #   is enabled.
-        # @option customization [Boolean] :change_sid True if customization can
-        #   change the Windows SID of this virtual machine.
-        # @option customization [Boolean] :join_domain_enabled True if this
-        #   virtual machine can join a Windows Domain.
-        # @option customization [Boolean] :use_org_settings True if
-        #   customization should use organization settings
-        #   (OrgGuestPersonalizationSettings) when joining a Windows Domain.
-        # @option customization [String] :domain_name NOT IMPLEMENTED
-        # @option customization [String] :domain_user_name NOT IMPLEMENTED
-        # @option customization [String] :domain_user_password NOT IMPLEMENTED
-        # @option customization [String] :machine_object_ou NOT IMPLEMENTED
-        # @option customization [Boolean] :admin_password_enabled True if guest
+        # @param [Hash] options
+        # @option options [Boolean] :Enabled True if guest customization is
+        #   enabled.
+        # @option options [Boolean] :ChangeSid True if customization can change
+        #   the Windows SID of this virtual machine.
+        # @option options [Boolean] :JoinDomainEnabled True if this virtual
+        #   machine can join a Windows Domain.
+        # @option options [Boolean] :UseOrgSettings True if customization
+        #   should use organization settings (OrgGuestPersonalizationSettings)
+        #   when joining a Windows Domain.
+        # @option options [String] :DomainName The name of the Windows Domain
+        #   to join.
+        # @option options [String] :DomainUserName User name to specify when
+        #   joining a Windows Domain.
+        # @option options [String] :DomainUserPassword Password to use with
+        #   :DomainUserName.
+        # @option options [String] :MachineObjectOU The name of the Windows
+        #   Domain Organizational Unit (OU) in which the computer account for
+        #   this virtual machine will be created.
+        # @option options [Boolean] :AdminPassword_enabled True if guest
         #   customization can modify administrator password settings for this
         #   virtual machine.
-        # @option customization [Boolean] :admin_password_auto NOT IMPLEMENTED
-        # @option customization [String] :admin_password NOT IMPLEMENTED
-        # @option customization [Boolean] :reset_password_required True if the
+        # @option options [Boolean] :AdminPassword_auto True if the
+        #   administrator password for this virtual machine should be
+        #   automatically generated.
+        # @option options [String] :AdminPassword True if the administrator
+        #   password for this virtual machine should be set to this string.
+        #   (:AdminPasswordAuto must be false.)
+        # @option options [Boolean] :ResetPasswordRequired True if the
         #   administrator password for this virtual machine must be reset after
         #   first use.
-        # @option customization [String] :customization_script Script to run on
-        #   guest customization. The entire script must appear in this element.
-        # @option customization [String] :computer_name Computer name to assign
+        # @option customization [String] :CustomizationScript Script to run on
+        #  guest customization. The entire script must appear in this element.
+        # @option customization [String] :ComputerName Computer name to assign
         #   to this virtual machine.
         # @return [Excon::Response]
         #   * body<~Hash>:
+        #     * :Tasks<~Hash>:
+        #       * :Task<~Hash>:
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/PUT-GuestCustomizationSection-vApp.html
         # @since vCloud API version 1.0
-        def put_guest_customization_section_vapp(id, customization={})
-          data = Fog::Generators::Compute::VcloudDirector::Customization.new(customization)
+        def put_guest_customization_section_vapp(id, options={})
+          options = options.dup
+
+          # Mutate options to new format.
+          deprecated = {
+            :enabled => :Enabled,
+            :change_sid => :ChangeSid,
+            :join_domain_enabled => :JoinDomainEnabled,
+            :use_org_settings => :UseOrgSettings,
+            :admin_password_enabled => :AdminPasswordEnabled,
+            :admin_password_auto => :AdminPasswordAuto,
+            :reset_password_required => :ResetPasswordRequired,
+            :customization_script => :CustomizationScript,
+            :computer_name => :ComputerName
+          }
+          deprecated.each do |from, to|
+            options[to] = options.delete(from) if options.key?(from)
+          end
+
+          body = Nokogiri::XML::Builder.new do
+            attrs = {
+              :xmlns => 'http://www.vmware.com/vcloud/v1.5',
+              'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1'
+            }
+            GuestCustomizationSection(attrs) {
+              self['ovf'].Info 'Specifies Guest OS Customization Settings'
+              if options.key?(:Enabled)
+                Enabled options[:Enabled]
+              end
+              if options.key?(:ChangeSid)
+                ChangeSid options[:ChangeSid]
+              end
+              if options.key?(:JoinDomainEnabled)
+                JoinDomainEnabled options[:JoinDomainEnabled]
+              end
+              if options.key?(:UseOrgSettings)
+                UseOrgSettings options[:UseOrgSettings]
+              end
+              if options.key?(:DomainName)
+                DomainName options[:DomainName]
+              end
+              if options.key?(:DomainUser)
+                DomainUser options[:DomainUser]
+              end
+              if options.key?(:DomainUserPassword)
+                DomainUserPassword options[:DomainUserPassword]
+              end
+              if options.key?(:MachineObjectOU)
+                MachineObjectOU options[:MachineObjectOU]
+              end
+              if options.key?(:AdminPasswordEnabled)
+                AdminPasswordEnabled options[:AdminPasswordEnabled]
+              end
+              if options.key?(:AdminPasswordAuto)
+                AdminPasswordAuto options[:AdminPasswordAuto]
+              end
+              if options.key?(:AdminPassword)
+                AdminPassword options[:AdminPassword]
+              end
+              if options.key?(:ResetPasswordRequired)
+                ResetPasswordRequired options[:ResetPasswordRequired]
+              end
+              if options.key?(:CustomizationScript)
+                CustomizationScript options[:CustomizationScript]
+              end
+              if options.key?(:ComputerName)
+                ComputerName options[:ComputerName]
+              end
+            }
+          end.to_xml
 
           request(
-            :body    => data.generate_xml,
+            :body    => body,
             :expects => 202,
             :headers => {'Content-Type' => 'application/vnd.vmware.vcloud.guestCustomizationSection+xml'},
             :method  => 'PUT',

data/lib/fog/vcloud_director/requests/compute/put_network_connection_system_section_vapp.rb

@@ -5,51 +5,109 @@ module Fog
         extend Fog::Deprecation
         deprecate :put_vm_network, :put_network_connection_system_section_vapp
 
-        require 'fog/vcloud_director/generators/compute/vm_network'
-
         # Update the network connection section of a VM.
         #
         # This operation is asynchronous and returns a task that you can
         # monitor to track the progress of the request.
         #
         # @param [String] id Object identifier of the VM.
-        # @param [Hash] network
-        # @option network [String] :info
-        # @option network [Integer] :primary_network_connection_index Virtual
-        #   slot number associated with the NIC that should be considered this
-        #   virtual machine's primary network connection. Defaults to slot 0.
-        # @option network [Boolean] :needs_customization True if this NIC needs
-        #   customization.
-        # @option network [String] :network Name of the network to which this
-        #   NIC is connected.
-        # @option network [Integer] :network_connection_index Virtual slot
-        #   number associated with this NIC.  First slot number is 0.
-        # @option network [String] :ip_address IP address assigned to this NIC.
-        # @option network [Boolean] :is_connected<~Boolean> If the virtual
-        #   machine is undeployed, this value specifies whether the NIC should
-        #   be connected upon deployment. If the virtual machine is deployed,
-        #   this value reports the current status of this NIC's connection, and
-        #   can be updated to change that connection status.
-        # @option network [String] :mac_address MAC address associated with the
-        #   NIC.
-        # @option network [String] :ip_address_allocation_mode IP address
-        #   allocation mode for this connection. One of:
-        #   * POOL (A static IP address is allocated automatically from a pool
-        #     of addresses.)
-        #   * DHCP (The IP address is obtained from a DHCP service.)
-        #   * MANUAL (The IP address is assigned manually in the :ip_address
-        #     element.)
-        #   * NONE (No IP addressing mode specified.)
+        # @param [Hash] options Container for the network connections of this
+        #   virtual machine.
+        # @option options [Integer] :PrimaryNetworkConnectionIndex (0)
+        #   Virtual slot number associated with the NIC that should be
+        #   considered this virtual machine's primary network connection.
+        #   Defaults to slot 0.
+        # @option options [Array<Hash>] :NetworkConnection
+        #   * :needsCustomization<~Boolean> - True if this NIC needs
+        #     customization.
+        #   * :network<~String> - Name of the network to which this NIC is
+        #     connected.
+        #   * :NetworkConnectionIndex<~Integer> - Virtual slot number
+        #     associated with this NIC. First slot number is 0.
+        #   * :IpAddress<~String> - IP address assigned to this NIC.
+        #   * :IsConnected<~Boolean> - If the virtual machine is undeployed,
+        #     this value specifies whether the NIC should be connected upon
+        #     deployment. If the virtual machine is deployed, this value
+        #     reports the current status of this NIC's connection, and can be
+        #     updated to change that connection status.
+        #   * :MACAddress<~String> - MAC address associated with the NIC.
+        #   * :IpAddressAllocationMode<~String> - IP address allocation mode
+        #     for this connection. One of:
+        #     - POOL (A static IP address is allocated automatically from a
+        #       pool of addresses.)
+        #     - DHCP (The IP address is obtained from a DHCP service.)
+        #     - MANUAL (The IP address is assigned manually in the :IpAddress
+        #       element.)
+        #     - NONE (No IP addressing mode specified.)
         # @return [Excon::Response]
         #   * body<~Hash>:
+        #     * :Tasks<~Hash>:
+        #       * :Task<~Hash>:
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/PUT-NetworkConnectionSystemSection-vApp.html
         # @since vCloud API version 0.9
-        def put_network_connection_system_section_vapp(id, network={})
-          data = Fog::Generators::Compute::VcloudDirector::VmNetwork.new(network)
+        def put_network_connection_system_section_vapp(id, options={})
+          options = options.dup
+
+          # Mutate options to new format.
+          deprecated = {
+            :needs_customization => :needsCustomization,
+            :network => :network,
+            :network_connection_index => :NetworkConnectionIndex,
+            :ip_address => :IpAddress,
+            :is_connected => :IsConnected,
+            :mac_address => :MACAddress,
+            :ip_address_allocation_mode => :IpAddressAllocationMode
+          }
+          option = options.delete(:primary_network_connection_index)
+          options[:PrimaryNetworkConnectionIndex] ||= option unless option.nil?
+          unless options.key?(:NetworkConnection)
+            deprecated.each do |from, to|
+              if options.key?(from)
+                options[:NetworkConnection] ||= [{}]
+                options[:NetworkConnection].first[to] = options.delete(from)
+              end
+            end
+          end
+
+          options[:NetworkConnection] = [options[:NetworkConnection]] if options[:NetworkConnection].is_a?(Hash)
+
+          body = Nokogiri::XML::Builder.new do
+            attrs = {
+              :xmlns => 'http://www.vmware.com/vcloud/v1.5',
+              'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1'
+            }
+            NetworkConnectionSection(attrs) {
+              self[:ovf].Info 'Specifies the available VM network connections'
+              if options.key?(:PrimaryNetworkConnectionIndex)
+                PrimaryNetworkConnectionIndex options[:PrimaryNetworkConnectionIndex]
+              end
+              if network_connection = options[:NetworkConnection]
+               network_connection.each do |nic|
+                  attrs = {
+                    :network => nic[:network]
+                  }
+                  if nic.key?(:needsCustomization)
+                    attrs[:needsCustomization] = nic[:needsCustomization]
+                  end
+                  NetworkConnection(attrs) {
+                    NetworkConnectionIndex nic[:NetworkConnectionIndex]
+                    if nic.key?(:IpAddress)
+                      IpAddress nic[:IpAddress]
+                    end
+                    IsConnected nic[:IsConnected]
+                    if nic.key?(:MACAddress)
+                      MACAddress nic[:MACAddress]
+                    end
+                    IpAddressAllocationMode nic[:IpAddressAllocationMode]
+                  }
+                end
+              end
+            }
+          end.to_xml
 
           request(
-            :body    => data.generate_xml,
+            :body    => body,
             :expects => 202,
             :headers => {'Content-Type' => 'application/vnd.vmware.vcloud.networkConnectionSection+xml'},
             :method  => 'PUT',