fog 1.18.0 → 1.19.0

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

@@ -11,13 +11,15 @@ module Fog
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/GET-VAppMetadata.html
         # @since vCloud API version 1.5
         def get_vapp_metadata(id)
-          request(
+          response = request(
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::ToHashDocument.new,
             :path       => "vApp/#{id}/metadata/"
           )
+          ensure_list! response.body, :MetadataEntry
+          response
         end
       end
     end

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

@@ -26,7 +26,7 @@ module Fog
               :xmlns => 'http://www.vmware.com/vcloud/v1.5'
             }
             DiskAttachOrDetachParams(attrs) {
-              Disk(:href => "#{@end_point}disk/#{media_id}")
+              Disk(:href => "#{end_point}disk/#{disk_id}")
               if options.key?(:BusNumber)
                 BusNumber options[:BusNumber]
               end

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

@@ -42,8 +42,26 @@ module Fog
                       "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' })
+
+          owner = {:href => '', :name => nil, :type => nil} #known-bug: admin-api does not return owner.
+          task_id = enqueue_task(
+              "Configuring edgegateway(#{id})", 'networkConfigureEdgeGatewayServices', owner,
+              :on_success => lambda do
+                data[:edge_gateways][id][:Configuration][:EdgeGatewayServiceConfiguration] = configuration
+              end
+          )
+
+          body = {
+              :xmlns => xmlns,
+              :xmlns_xsi => xmlns_xsi,
+              :xsi_schemaLocation => xsi_schema_location,
+          }.merge(task_body(task_id))
+
+          Excon::Response.new(
+              :status => 202,
+              :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+              :body => body
+          )
         end
       end
     end

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

@@ -0,0 +1,176 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        require 'fog/vcloud_director/generators/compute/org_vdc_network'
+
+        # Create an Org vDC network.
+        #
+        # This operation is asynchronous and returns a task that you can
+        # monitor to track the progress of the request.
+        #
+        # Produce media type(s):
+        # application/vnd.vmware.vcloud.orgVdcNetwork+xml
+        # Output type:
+        # OrgVdcNetworkType
+        #
+        # @param [String] vdc_id Object identifier of the vDC
+        # @param [String] name   The name of the entity.
+        # @param [Hash] options
+        # @option options [String] :Description Optional description.
+        # @option options [Hash] :Configuration Network configuration.
+        # @option options [Hash] :EdgeGateway  EdgeGateway that connects this
+        #   Org vDC network. Applicable only for routed networks.
+        # @option options [Hash] :ServiceConfig Specifies the service
+        #   configuration for an isolated Org vDC networks.
+        # @option options [Boolean] :IsShared True if this network is shared
+        #   to multiple Org vDCs.
+        #   * :Configuration<~Hash>: NetworkConfigurationType
+        #     * :IpScopes<~Hash>:
+        #       * :IpScope<~Hash>:
+        #         * :IsInherited<~Boolean>: ?
+        #         * :Gateway<~String>: IP address of gw
+        #         * :Netmask<~String>: Subnet mask of network
+        #         * :Dns1<~String>: Primary DNS server.
+        #         * :Dns2<~String>: Secondary DNS server.
+        #         * :DnsSuffix<~String>: DNS suffix.
+        #         * :IsEnabled<~String>: Indicates if subnet is enabled or not.
+        #                                Default value is True.
+        #         * :IpRanges<~Array>: IP ranges used for static pool allocation
+        #                             in the network. Array of Hashes of:
+        #                               * :StartAddress - start IP in range
+        #                               * :EndAddress - end IP in range
+        #   * :EdgeGateway<~Hash>: EdgeGateway that connects this Org vDC
+        #                          network. Applicable only for routed networks.
+        #   * :ServiceConfig<~Hash>: Specifies the service configuration for an
+        #                            isolated network
+        #
+        # @return [Excon::Response]
+        #   * body<~Hash>:
+        #
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-CreateOrgVdcNetwork.html
+        # @since vCloud API version 5.1
+        def post_create_org_vdc_network(vdc_id, name, options={})
+
+          body = Fog::Generators::Compute::VcloudDirector::OrgVdcNetwork.new(options.merge(:name => name)).generate_xml
+
+          request(
+            :body    => body,
+            :expects => 201,
+            :headers => {'Content-Type' => 'application/vnd.vmware.vcloud.orgVdcNetwork+xml'},
+            :method  => 'POST',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "admin/vdc/#{vdc_id}/networks"
+          )
+
+        end
+      end
+
+      class Mock
+
+        def post_create_org_vdc_network(vdc_id, name, options={})
+          unless data[:vdcs][vdc_id]
+            raise Fog::Compute::VcloudDirector::Forbidden.new(
+              "No access to entity \"(com.vmware.vcloud.entity.vdc:#{vdc_id})\"."
+            )
+          end
+
+          type = 'network'
+          id = uuid
+
+          # Description
+          # Configuration
+          #   IpScopes
+          #     IpScope
+          #       IsInherited
+          #       Gateway
+          #       Netmask
+          #       Dns1
+          #       Dns2
+          #       DnsSuffix
+          #       IsEnabled
+          #       IpRanges
+          #         IpRange
+          #           StartAddress
+          #           EndAddress
+          #   FenceMode
+          # EdgeGateway
+          # IsShared
+
+          network_body = {
+            :name           => name,
+            :vdc            => vdc_id,
+          }
+
+          [:Description, :IsShared].each do |key|
+            network_body[key] = options[key] if options.key?(key)
+          end
+
+          if options.key?(:EdgeGateway)
+            network_body[:EdgeGateway] =
+              options[:EdgeGateway][:href].split('/').last
+          end
+
+          if configuration = options[:Configuration]
+            if ip_scopes = configuration[:IpScopes]
+              if ip_scope = ip_scopes[:IpScope]
+                [:IsInherited, :Gateway, :Netmask,
+                  :Dns1, :Dns2, :DnsSuffix, :IsEnabled].each do |key|
+                    network_body[key] = ip_scope[key] if ip_scope.key?(key)
+                end
+                if ip_ranges = ip_scope[:IpRanges]
+                  network_body[:IpRanges] = []
+                  ip_ranges.each do |ipr|
+                    network_body[:IpRanges] << {
+                      :StartAddress => ipr[:IpRange][:StartAddress],
+                      :EndAddress   => ipr[:IpRange][:EndAddress]
+                    }
+                  end
+                end
+              end
+            end
+            network_body[:FenceMode] = configuration[:FenceMode] if ip_scope.key?(:FenceMode)
+          end
+
+          owner = {
+            :href => make_href("#{type}/#{id}"),
+            :type => "application/vnd.vmware.vcloud.#{type}+xml"
+          }
+          task_id = enqueue_task(
+            "Adding #{type} #{name} (#{id})", 'CreateOrgVdcNetwork', owner,
+            :on_success => lambda do
+              data[:networks][id] = network_body
+            end
+          )
+
+          body = {
+            :xmlns => xmlns,
+            :xmlns_xsi => xmlns_xsi,
+            :xsi_schemaLocation => xsi_schema_location,
+            :href => make_href("admin/network/#{id}"),
+            :name => name,
+            :id => "urn:vcloud:network:#{id}",
+            :type => "application/vnd.vmware.vcloud.orgVdcNetwork+xml",
+            :Link => [
+              {:rel=>"up", :type=>"application/vnd.vmware.vcloud.vdc+xml", :href=>make_href("vdc/#{vdc_id}")},
+              {:rel=>"down", :type=>"application/vnd.vmware.vcloud.metadata+xml", :href=>make_href("admin/network/#{id}/metadata")},
+              {:rel=>"down", :type=>"application/vnd.vmware.vcloud.allocatedNetworkAddress+xml", :href=>make_href("admin/network/#{id}/allocatedAddresses/")},
+            ],
+          }.merge(options)
+
+          body[:Tasks] = {
+            :Task => task_body(task_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_detach_disk.rb

@@ -20,7 +20,7 @@ module Fog
               :xmlns => 'http://www.vmware.com/vcloud/v1.5'
             }
             DiskAttachOrDetachParams(attrs) {
-              Disk(:href => "#{@end_point}disk/#{media_id}")
+              Disk(:href => "#{end_point}disk/#{disk_id}")
             }
           end.to_xml
 

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

@@ -20,7 +20,7 @@ module Fog
               :xmlns => 'http://www.vmware.com/vcloud/v1.5'
             }
             MediaInsertOrEjectParams(attrs) {
-              Media(:href => "#{@end_point}media/#{media_id}")
+              Media(:href => "#{end_point}media/#{media_id}")
             }
           end.to_xml
 

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

@@ -20,7 +20,7 @@ module Fog
               :xmlns => 'http://www.vmware.com/vcloud/v1.5'
             }
             MediaInsertOrEjectParams(attrs) {
-              Media(:href => "#{@end_point}media/#{media_id}")
+              Media(:href => "#{end_point}media/#{media_id}")
             }
           end.to_xml
 

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

@@ -62,6 +62,7 @@ module Fog
             :change_sid => :ChangeSid,
             :join_domain_enabled => :JoinDomainEnabled,
             :use_org_settings => :UseOrgSettings,
+            :admin_password => :AdminPassword,
             :admin_password_enabled => :AdminPasswordEnabled,
             :admin_password_auto => :AdminPasswordAuto,
             :reset_password_required => :ResetPasswordRequired,

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

@@ -0,0 +1,37 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        require 'fog/vcloud_director/generators/compute/vapp'
+
+        # Modify the name or description of a vApp.
+        #
+        # 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 vApp.
+        # @param [String] name of the vApp.
+        # @param [Hash] options
+        #   * :Description<~String>: - description to be assigned (optional)
+        # @return [Excon::Response]
+        #   * body<~Hash>:
+        #
+        # @see http://pubs.vmware.com/vcd-55/topic/com.vmware.vcloud.api.reference.doc_55/doc/operations/PUT-VAppNameAndDescription.html
+        # @since vCloud API version 0.9
+        def put_vapp_name_and_description(id, name, options={})
+          body = Fog::Generators::Compute::VcloudDirector::Vapp.new(name, options).generate_xml
+          request(
+            :body    => body,
+            :expects => 202,
+            :headers => {'Content-Type' => 'application/vnd.vmware.vcloud.vApp+xml'},
+            :method  => 'PUT',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "vApp/#{id}"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        require 'fog/vcloud_director/generators/compute/vm'
+
+        # Update the name, description and storage profile for 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 [String] name of the VM.
+        # @param [Hash] options
+        #   * :Description<~String>: - description to be assigned.
+        #   * :StorageProfile<~Hash>: - storage profile to be assigned.
+        #     * :name<~String>
+        #     * :href<~String>
+        # @return [Excon::Response]
+        #   * body<~Hash>:
+        #
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/PUT-Vm.html
+        # @since vCloud API version 0.9
+        def put_vm(id, name, options)
+          body = Fog::Generators::Compute::VcloudDirector::Vm.new(options.merge(:name => name)).generate_xml
+          request(
+            :body    => body,
+            :expects => 202,
+            :headers => {'Content-Type' => 'application/vnd.vmware.vcloud.vm+xml'},
+            :method  => 'PUT',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "vApp/#{id}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.18.0'
+  VERSION = '1.19.0'
 end

data/lib/fog/vsphere/compute.rb

@@ -37,6 +37,7 @@ module Fog
       collection :customvalues
       model :customfield
       collection :customfields
+      model :scsicontroller
 
       request_path 'fog/vsphere/requests/compute'
       request :current_time
@@ -78,6 +79,8 @@ module Fog
       request :get_interface_type
       request :list_vm_customvalues
       request :list_customfields
+      request :get_vm_first_scsi_controller
+      request :set_vm_customvalue
 
       module Shared
 

data/lib/fog/vsphere/models/compute/datastore.rb

@@ -12,6 +12,7 @@ module Fog
         attribute :freespace
         attribute :accessible # reachable by at least one hypervisor
         attribute :capacity
+        attribute :uncommitted
 
         def to_s
           name

data/lib/fog/vsphere/models/compute/interface.rb

@@ -4,6 +4,8 @@ module Fog
 
       class Interface < Fog::Model
 
+        SAVE_MUTEX = Mutex.new
+
         identity :mac
         alias :id :mac
 
@@ -14,11 +16,18 @@ module Fog
         attribute :type
         attribute :key
         attribute :virtualswitch
+        attribute :server_id
+
+        def initialize(attributes = {})
+          # Assign server first to prevent race condition with persisted?
+          self.server_id = attributes.delete(:server_id)
 
-        def initialize(attributes={} )
           if attributes.has_key? :type and attributes[:type].is_a? String then
-             attributes[:type]=Fog.class_from_string(attributes[:type], "RbVmomi::VIM")
+            attributes[:type] = Fog.class_from_string(attributes[:type], "RbVmomi::VIM")
+          else
+            attributes[:type] = Fog.class_from_string("VirtualE1000", "RbVmomi::VIM")
           end
+
           super defaults.merge(attributes)
         end
 
@@ -26,6 +35,45 @@ module Fog
           name
         end
 
+        def server
+          requires :server_id
+          service.servers.get(server_id)
+        end
+
+        def destroy
+          requires :server_id, :key, :type
+
+          service.destroy_vm_interface(server_id, :key => key, :type => type)
+        end
+
+        def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          requires :server_id, :type, :network
+
+          # Our approach of finding the newly created interface is rough.  We assume that the :key value always increments
+          # and thus the highest :key value must correspond to the created interface.  Since this has an inherent race
+          # condition we need to gate the saves.
+          SAVE_MUTEX.synchronize do
+            data = service.add_vm_interface(server_id, attributes)
+
+            if data['task_state'] == 'success'
+              # We have to query vSphere to get the interface attributes since the task handle doesn't include that info.
+              created = server.interfaces.all.sort_by(&:key).last
+
+              self.mac = created.mac
+              self.name = created.name
+              self.status = created.status
+              self.summary = created.summary
+              self.key = created.key
+              self.virtualswitch = created.virtualswitch
+
+              true
+            else
+              false
+            end
+          end
+        end
+
         private
 
         def defaults