fog 1.31.0 → 1.37.0

data/lib/fog/openstack/volume_v2.rb

@@ -0,0 +1,164 @@
+require 'fog/openstack/core'
+require 'fog/openstack/common'
+require 'fog/openstack/volume'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2 < Fog::Volume::OpenStack
+        SUPPORTED_VERSIONS = /v2(\.(0-9))*/
+
+        requires :openstack_auth_url
+
+        recognizes *@@recognizes
+
+        model_path 'fog/openstack/models/volume_v2'
+
+        model :volume
+        collection :volumes
+
+        model :availability_zone
+        collection :availability_zones
+
+        model :volume_type
+        collection :volume_types
+
+        model :transfer
+        collection :transfers
+
+        request_path 'fog/openstack/requests/volume_v2'
+
+        # Volume
+        request :list_volumes
+        request :list_volumes_detailed
+        request :create_volume
+        request :get_volume_details
+        request :extend_volume
+        request :delete_volume
+
+        request :list_zones
+
+        request :list_volume_types
+        request :create_volume_type
+        request :update_volume_type
+        request :delete_volume_type
+        request :get_volume_type_details
+
+        request :create_volume_snapshot
+        request :list_snapshots
+        request :list_snapshots_detailed
+        request :get_snapshot_details
+        request :delete_snapshot
+
+        request :list_transfers
+        request :list_transfers_detailed
+        request :create_transfer
+        request :get_transfer_details
+        request :accept_transfer
+        request :delete_transfer
+
+        request :update_quota
+        request :get_quota
+        request :get_quota_defaults
+
+        request :get_quota_usage
+
+        request :set_tenant
+
+        class Mock
+          def self.data
+            @data ||= Hash.new do |hash, key|
+              hash[key] = {
+                  :users   => {},
+                  :tenants => {},
+                  :quota   => {
+                      'gigabytes' => 1000,
+                      'volumes'   => 10,
+                      'snapshots' => 10
+                  }
+              }
+            end
+          end
+
+          def self.reset
+            @data = nil
+          end
+
+          def initialize(options={})
+            @openstack_username = options[:openstack_username]
+            @openstack_tenant   = options[:openstack_tenant]
+            @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
+
+            @auth_token            = Fog::Mock.random_base64(64)
+            @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+            management_url            = URI.parse(options[:openstack_auth_url])
+            management_url.port       = 8776
+            management_url.path       = '/v1'
+            @openstack_management_url = management_url.to_s
+
+            @data ||= {:users => {}}
+            unless @data[:users].find { |u| u['name'] == options[:openstack_username] }
+              id                = Fog::Mock.random_numbers(6).to_s
+              @data[:users][id] = {
+                  'id'       => id,
+                  'name'     => options[:openstack_username],
+                  'email'    => "#{options[:openstack_username]}@mock.com",
+                  'tenantId' => Fog::Mock.random_numbers(6).to_s,
+                  'enabled'  => true
+              }
+            end
+          end
+
+          def data
+            self.class.data[@openstack_username]
+          end
+
+          def reset_data
+            self.class.data.delete(@openstack_username)
+          end
+
+          def credentials
+            {:provider                 => 'openstack',
+             :openstack_auth_url       => @openstack_auth_uri.to_s,
+             :openstack_auth_token     => @auth_token,
+             :openstack_management_url => @openstack_management_url}
+          end
+        end
+
+        class Real
+          include Fog::OpenStack::Core
+          def self.not_found_class
+            Fog::Volume::OpenStack::NotFound
+          end
+          include Fog::OpenStack::Common
+
+          def initialize(options={})
+            initialize_identity options
+
+            @openstack_service_type  = options[:openstack_service_type] || ['volumev2']
+            @openstack_service_name  = options[:openstack_service_name]
+            @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL'
+
+            @connection_options = options[:connection_options] || {}
+
+            authenticate
+
+            unless @path.match(SUPPORTED_VERSIONS)
+              @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS,
+                                                                @openstack_management_uri,
+                                                                @auth_token,
+                                                                @connection_options)
+            end
+
+            @persistent = options[:persistent] || false
+            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          end
+
+          private
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack.rb

@@ -1,10 +1,15 @@
 require 'fog/openstack/compute'
 require 'fog/openstack/identity_v2'
+require 'fog/openstack/identity_v3'
 require 'fog/openstack/image'
+require 'fog/openstack/image_v1'
+require 'fog/openstack/image_v2'
 require 'fog/openstack/metering'
 require 'fog/openstack/network'
 require 'fog/openstack/orchestration'
 require 'fog/openstack/storage'
 require 'fog/openstack/volume'
+require 'fog/openstack/volume_v1'
+require 'fog/openstack/volume_v2'
 require 'fog/openstack/baremetal'
 require 'fog/openstack/planning'

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

@@ -9,6 +9,7 @@ module Fog
         identity :id
 
         attribute :name
+        attribute :comment
         attribute :description
         attribute :profile
         attribute :display

data/lib/fog/ovirt/models/compute/template.rb

@@ -7,6 +7,7 @@ module Fog
         attr_accessor :raw
 
         attribute :name
+        attribute :comment
         attribute :description
         attribute :profile
         attribute :display

data/lib/fog/rackspace/compute_v2.rb

@@ -117,6 +117,7 @@ module Fog
       request :list_virtual_interfaces
       request :create_virtual_interface
       request :delete_virtual_interface
+      request :get_vnc_console
 
       class Mock < Fog::Rackspace::Service
         include Fog::Rackspace::MockData

data/lib/fog/rackspace/docs/compute_v2.md

@@ -120,7 +120,7 @@ To see a list of requests supported by the service:
 	
 This returns:
 
-	:list_servers, :get_server, :create_server, :update_server, :delete_server, :change_server_password, :reboot_server, :rebuild_server, :resize_server, :confirm_resize_server, :revert_resize_server, :list_images, :get_image, :list_flavors, :get_flavor, :attach_volume, :get_attachment, :list_attachments, :delete_attachment
+	:list_servers, :get_server, :create_server, :update_server, :delete_server, :change_server_password, :reboot_server, :rebuild_server, :resize_server, :confirm_resize_server, :revert_resize_server, :list_images, :get_image, :list_flavors, :get_flavor, :attach_volume, :get_attachment, :list_attachments, :delete_attachment, :get_vnc_console
 
 
 #### Example Request

data/lib/fog/rackspace/docs/queues.md

@@ -28,7 +28,7 @@ Next, create a connection to queue service:
 
 Using a US-based account:
 
-	service = Fog::Rackspace::Queues(
+	service = Fog::Rackspace::Queues.new(
 		:rackspace_username  => RACKSPACE_USER_NAME,   # Your Rackspace Username
 		:rackspace_api_key   => RACKSPACE_API,         # Your Rackspace API key
 		:rackspace_region    => :ord,                  # Your desired region
@@ -38,7 +38,7 @@ Using a US-based account:
 
 Using a UK-based account:
 
-	service = Fog::Rackspace::Queues(
+	service = Fog::Rackspace::Queues.new(
 		:rackspace_username  => RACKSPACE_USER_NAME,        # Your Rackspace Username
 		:rackspace_api_key   => RACKSPACE_API,              # Your Rackspace API key
 		:rackspace_auth_url  => Fog::Rackspace::UK_AUTH_ENDPOINT,

data/lib/fog/rackspace/examples/compute_v2/create_network.rb

@@ -58,7 +58,7 @@ puts "\nNow creating server '#{server.name}' connected the the Internet and '#{n
 
 begin
   # Check every 5 seconds to see if server is in the active state (ready?).
-  # If the server has not been built in 5 minutes (600 seconds) an exception will be raised.
+  # If the server has not been built in 10 minutes (600 seconds) an exception will be raised.
   server.wait_for(600, 5) do
     print "."
     STDOUT.flush

data/lib/fog/rackspace/models/block_storage/snapshot.rb

@@ -42,6 +42,10 @@ module Fog
         # @return [String] region of the snapshot
         attribute :availability_zone
 
+        # @!attribute [r] force
+        # @return [Boolean] `force` creation flag
+        attribute :force
+
         # Returns true if the snapshot is in a ready state
         # @return [Boolean] returns true if snapshot is in a ready state
         def ready?
@@ -59,7 +63,7 @@ module Fog
         # @note A snapshot object cannot be updated
         # @note All writes to the volume should be flushed before creating the snapshot, either by un-mounting any file systems on the volume or by detaching the volume.
         # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/POST_createSnapshot__v1__tenant_id__snapshots.html
-        def save(force = false)
+        def save
           requires :volume_id
           raise IdentifierTaken.new('Resaving may cause a duplicate snapshot to be created') if persisted?
           data = service.create_snapshot(volume_id, {

data/lib/fog/rackspace/models/compute_v2/server.rb

@@ -153,6 +153,11 @@ module Fog
         # @see http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot
         attribute :boot_volume_id
 
+        # @!attribute [w] boot_volume_size
+        # @return [Integer] The Size of the boot volume to be created by the BlockStorage service.
+        # @see http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot
+        attribute :boot_volume_size
+
         # @!attribute [w] boot_image_id
         # @return [String] The ID of an image to create a bootable volume from.
         # @see http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot
@@ -264,6 +269,7 @@ module Fog
           modified_options[:key_name] ||= attributes[:key_name]
           modified_options[:boot_volume_id] ||= attributes[:boot_volume_id]
           modified_options[:boot_image_id] ||= attributes[:boot_image_id]
+          modified_options[:boot_volume_size] ||= attributes[:boot_volume_size]
 
           if modified_options[:networks]
             modified_options[:networks].map! { |id| { :uuid => id } }
@@ -612,6 +618,20 @@ module Fog
           @virtual_interfaces ||= Fog::Compute::RackspaceV2::VirtualInterfaces.new :server => self, :service => service
         end
 
+        # VNC Console URL
+        # @param [String] Type of vnc console to get ('novnc' or 'xvpvnc')
+        # @return [String] returns URL to vnc console
+        # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::RackspaceV2::ServiceError]
+        # @note This URL will time out due to inactivity
+        def get_vnc_console(console_type = "xvpvnc")
+          requires :identity
+          data = service.get_vnc_console(identity, console_type)
+          data.body['console']['url']
+        end
+
         private
 
         def adminPass=(new_admin_pass)
@@ -619,7 +639,11 @@ module Fog
         end
 
         def password_lock
-          "passwd -l #{username}" unless attributes[:no_passwd_lock]
+          if !attributes[:no_passwd_lock].nil?
+            Fog::Logger.warning("Rackspace[:no_passwd_lock] is deprecated since it is now the default behavior, use Rackspace[:passwd_lock] instead")
+          end
+
+          "passwd -l #{username}" if attributes[:passwd_lock]
         end
 
         def user_data_encoded

data/lib/fog/rackspace/models/compute_v2/servers.rb

@@ -27,8 +27,8 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @note This method is compatible with Cloud Servers utlizing RackConnect ***if and only if***
-        #       provided the attribute "no_passwd_lock" set to *true*.
+        # @note This method is incompatible with Cloud Servers utlizing RackConnect ***if and only if***
+        #       provided the attribute "passwd_lock" left at *false*.
         # @example
         #   service.servers.bootstrap :name => 'bootstrap-server',
         #                             :flavor_id => service.flavors.first.id,

data/lib/fog/rackspace/requests/compute_v2/create_server.rb

@@ -18,6 +18,7 @@ module Fog
         #   attachment of volumes to this server. Mutually exclusive with :volume_id or :volume_image_id. If provided, leave image_id
         #   as "". See http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot for details.
         # @option options [String] boot_volume_id Id of a pre-created bootable volume to use for this server. If provided, leave image_id as "".
+        # @option options [Integer] boot_volume_size Size of the bootable volume to be created expressed in GB. (defaults to 100)
         # @option options [String] boot_image_id Id of an image to create a bootable volume from and attach to this server. If provided,
         #   leave image_id as "".
         # @return [Excon::Response] response:
@@ -96,12 +97,16 @@ module Fog
                 Fog::Logger.warning(":boot_volume_id overrides :boot_image_id!")
               end
 
+              if options[:boot_volume_size]
+                Fog::Logger.warning("Boot volume size: " + options[:boot_volume_size] + "GB")
+              end
+
               data['server']['block_device_mapping_v2'] = [{
                 'boot_index' => '0',
                 'uuid' => options[:boot_volume_id],
                 'source_type' => 'volume',
                 'destination_type' => 'volume',
-                'volume_size' => 100
+                'volume_size' => options[:boot_volume_size] ? options[:boot_volume_size] : 100
               }]
             end
 
@@ -111,7 +116,7 @@ module Fog
                 'uuid' => options[:boot_image_id],
                 'source_type' => 'image',
                 'destination_type' => 'volume',
-                'volume_size' => 100
+                'volume_size' => options[:boot_volume_size] ? options[:boot_volume_size] : 100
               }]
             end
         end

data/lib/fog/rackspace/requests/compute_v2/get_vnc_console.rb

@@ -0,0 +1,45 @@
+module Fog
+  module Compute
+    class RackspaceV2
+      class Real
+        # Get a vnc console for an instance.
+        #
+        # === Parameters
+        # * server_id <~String> - The ID of the server.
+        # * console_type <~String> - Type of vnc console to get ('novnc' or 'xvpvnc').
+        # === Returns
+        # * response <~Excon::Response>:
+        #   * body <~Hash>:
+        #     * url <~String>
+        #     * type <~String>
+        def get_vnc_console(server_id, console_type)
+          data = {
+            'os-getVNCConsole' => {
+              'type' => console_type
+            }
+          }
+          request(
+            :body => Fog::JSON.encode(data),
+            :expects => [200],
+            :method => 'POST',
+            :path => "servers/#{server_id}/action"
+          )
+        end # def get_vnc_console
+      end # class Real
+
+      class Mock
+        def get_vnc_console(server_id, console_type)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "console" => {
+              "url"  => "http://192.168.27.100:6080/vnc_auto.html?token=c3606020-d1b7-445d-a88f-f7af48dd6a20",
+              "type" => "novnc"
+            }
+          }
+          response
+        end # def get_vnc_console
+      end # class Mock
+    end # class OpenStack
+  end # module Compute
+end # module Fog

data/lib/fog/rackspace/requests/load_balancers/create_node.rb

@@ -15,7 +15,7 @@ module Fog
             data['nodes'][0]['weight'] = options[:weight]
           end
           if options.key? :type
-            data['node']['type'] = options[:type]
+            data['nodes'][0]['type'] = options[:type]
           end
           request(
             :body     => Fog::JSON.encode(data),

data/lib/fog/rackspace/requests/storage/get_object_https_url.rb

@@ -33,8 +33,19 @@ module Fog
           hmac = Fog::HMAC.new('sha1', @rackspace_temp_url_key)
           sig  = sig_to_hex(hmac.sign(string_to_sign))
 
-          scheme = options[:scheme] ? options[:scheme] : @uri.scheme
-          "#{scheme}://#{@uri.host}#{object_path_escaped}?temp_url_sig=#{sig}&temp_url_expires=#{expires}"
+          temp_url_query = {
+              :temp_url_sig => sig,
+              :temp_url_expires => expires
+          }
+          temp_url_query.merge!(:inline => true) if options[:inline]
+          temp_url_query.merge!(:filename => options[:filename]) if options[:filename]
+          temp_url_options = {
+              :scheme => options[:scheme] || @uri.scheme,
+              :host => @uri.host,
+              :path => object_path_escaped,
+              :query => temp_url_query.map { |param, val| "#{CGI.escape(param.to_s)}=#{CGI.escape(val.to_s)}" }.join('&')
+          }
+          URI::Generic.build(temp_url_options).to_s
         end
 
         private

data/lib/fog/rackspace/requests/storage/put_container.rb

@@ -11,12 +11,16 @@ module Fog
         # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
         # @raise [Fog::Storage::Rackspace::ServiceError]
         def put_container(name, options={})
-          request(
-            :expects  => [201, 202],
-            :method   => 'PUT',
-            :headers => options,
-            :path     => Fog::Rackspace.escape(name)
-          )
+          if name =~ /\//
+            raise Fog::Errors::Error.new('Folder names cannot include "/".')
+          else
+            request(
+              :expects  => [201, 202],
+              :method   => 'PUT',
+              :headers => options,
+              :path     => Fog::Rackspace.escape(name)
+            )
+          end
         end
       end
 

data/lib/fog/vcloud_director/compute.rb

@@ -225,6 +225,7 @@ module Fog
       request :post_power_off_vapp
       request :post_power_on_vapp
       request :post_reboot_vapp
+      request :post_reconfigure_vm
       request :post_remove_all_snapshots
       request :post_reset_vapp
       request :post_revert_snapshot
@@ -506,12 +507,16 @@ module Fog
       class Mock
         attr_reader :end_point, :api_version
 
+        # This is used in some mocks so it's a method rather than a variable
+        def default_network_uuid
+          @default_network_uuid ||= uuid
+        end
+
         def data
           @@data ||= Hash.new do |hash, key|
 
             vdc1_uuid = uuid
             vdc2_uuid = uuid
-            default_network_uuid = uuid
             uplink_network_uuid  = uuid
             isolated_vdc1_network_uuid = uuid
             isolated_vdc2_network_uuid = uuid
@@ -521,6 +526,7 @@ module Fog
             vapp2vm1_id = "vm-#{uuid}"
             vapp2vm2_id = "vm-#{uuid}"
             catalog_uuid = uuid
+            template_uuid = uuid
 
             hash[key] = {
               :catalogs => {
@@ -533,9 +539,16 @@ module Fog
                   :type    => 'vAppTemplate',
                   :name    => 'vAppTemplate 1',
                   :catalog => catalog_uuid,
+                  :template_id => template_uuid
+                }
+              },
+              :disks => {
+                uuid => {
+                  :name => 'Hard Disk 1',
+                  :capacity => 10240,
+                  :parent_vm => vapp1vm1_id
                 }
               },
-              :disks => {},
               :edge_gateways => {
                 uuid => {
                   :name => 'MockEdgeGateway',
@@ -677,6 +690,9 @@ module Fog
                 :name => org_name,
                 :uuid => uuid
               },
+              
+              :tags => {},
+              
               :tasks => {},
 
               :vapps => {

data/lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb

@@ -47,37 +47,39 @@ module Fog
 
             xml.GatewayIpsecVpnService {
               xml.IsEnabled vpn_config[:IsEnabled] if vpn_config.key?(:IsEnabled)
-              tunnel_config = vpn_config[:Tunnel]
-              xml.Tunnel {
-                xml.Name tunnel_config[:Name]
-                xml.Description tunnel_config[:Description]
-                xml.IpsecVpnLocalPeer {
-                  xml.Id tunnel_config[:IpsecVpnLocalPeerId]
-                  xml.Name tunnel_config[:IpsecVpnLocalPeerName]
-                }
-                xml.PeerIpAddress tunnel_config[:PeerIpAddress]
-                xml.PeerId tunnel_config[:PeerId]
-                xml.LocalIpAddress tunnel_config[:LocalIpAddress]
-                xml.LocalId tunnel_config[:LocalId]            
-                tunnel_config[:LocalSubnet].each do |subnet|
-                  xml.LocalSubnet {
-                    xml.Name subnet[:Name]
-                    xml.Gateway subnet[:Gateway]
-                    xml.Netmask subnet[:Netmask]
+              vpn_config[:Tunnel].each do |tunnel_config|
+                xml.Tunnel {
+                  xml.Name tunnel_config[:Name]
+                  xml.Description tunnel_config[:Description]
+                  xml.IpsecVpnLocalPeer {
+                    xml.Id tunnel_config[:IpsecVpnLocalPeerId]
+                    xml.Name tunnel_config[:IpsecVpnLocalPeerName]
                   }
-                end
-                peer_subnet_config = tunnel_config[:PeerSubnet]
-                xml.PeerSubnet {
-                  xml.Name peer_subnet_config[:Name]
-                  xml.Gateway peer_subnet_config[:Gateway]
-                  xml.Netmask peer_subnet_config[:Netmask]
+                  xml.PeerIpAddress tunnel_config[:PeerIpAddress]
+                  xml.PeerId tunnel_config[:PeerId]
+                  xml.LocalIpAddress tunnel_config[:LocalIpAddress]
+                  xml.LocalId tunnel_config[:LocalId]            
+                  tunnel_config[:LocalSubnet].each do |subnet|
+                    xml.LocalSubnet {
+                      xml.Name subnet[:Name]
+                      xml.Gateway subnet[:Gateway]
+                      xml.Netmask subnet[:Netmask]
+                    }
+                  end
+                  tunnel_config[:PeerSubnet].each do |subnet|
+                    xml.PeerSubnet {
+                      xml.Name subnet[:Name]
+                      xml.Gateway subnet[:Gateway]
+                      xml.Netmask subnet[:Netmask]
+                    }
+                  end
+                  xml.SharedSecret tunnel_config[:SharedSecret]
+                  xml.SharedSecretEncrypted tunnel_config[:SharedSecretEncrypted] if tunnel_config.key?(:SharedSecretEncrypted)
+                  xml.EncryptionProtocol tunnel_config[:EncryptionProtocol]
+                  xml.Mtu tunnel_config[:Mtu]
+                  xml.IsEnabled tunnel_config[:IsEnabled]
                 }
-                xml.SharedSecret tunnel_config[:SharedSecret]
-                xml.SharedSecretEncrypted tunnel_config[:SharedSecretEncrypted] if tunnel_config.key?(:SharedSecretEncrypted)
-                xml.EncryptionProtocol tunnel_config[:EncryptionProtocol]
-                xml.Mtu tunnel_config[:Mtu]
-                xml.IsEnabled tunnel_config[:IsEnabled]
-              }
+              end
             }
           end
 
@@ -217,7 +219,7 @@ module Fog
 
                   xml.Protocols {
                     rule[:Protocols].each do |key, value|
-                      xml.send(key.to_s.capitalize, value)
+                    xml.send(key.to_s.capitalize, value)
                     end
                   }
                   xml.IcmpSubType rule[:IcmpSubType] if rule.key?(:IcmpSubType)

data/lib/fog/vcloud_director/models/compute/disks.rb

@@ -32,6 +32,12 @@ module Fog
           end
           items
         end
+        
+        # Returns only disk drives (OVF resource type 17) and not controllers,
+        # etc. See <https://blogs.vmware.com/vapp/2009/11/virtual-hardware-in-ovf-part-1.html>
+        def storage_only
+          select {|d| d.resource_type == 17}
+        end
       end
     end
   end

data/lib/fog/vcloud_director/models/compute/networks.rb

@@ -11,6 +11,7 @@ module Fog
         model Fog::Compute::VcloudDirector::Network
 
         attribute :organization
+        attribute :vdc
 
         def query_type
           "orgVdcNetwork"
@@ -46,8 +47,12 @@ module Fog
         end
 
         def item_list
-          data = service.get_organization(organization.id).body
-          items = data[:Link].select { |link| link[:type] == "application/vnd.vmware.vcloud.orgNetwork+xml" }
+          items = if vdc
+            vdc.available_networks.select {|link| link[:type] == "application/vnd.vmware.vcloud.network+xml"}
+          else
+            data = service.get_organization(organization.id).body
+            data[:Link].select { |link| link[:type] == "application/vnd.vmware.vcloud.orgNetwork+xml" }
+          end
           items.each{|item| service.add_id_from_href!(item) }
           items
         end

data/lib/fog/vcloud_director/models/compute/task.rb

@@ -35,7 +35,7 @@ module Fog
 
         def non_running?
           if @service.show_progress? && (@last_progress ||= 0) < 100
-            if status == 'running'
+            if status == 'running' || status == 'queued'
               Fog::Formatador.redisplay_progressbar(progress, 100, :label => operation_name, :started_at => start_time)
               @last_progress = progress
             elsif status == 'success'
@@ -43,7 +43,7 @@ module Fog
               @last_progress = 100
             end
           end
-          status != 'running'
+          ! %w(running queued).include?(status)
         end
 
         def cancel