fog 1.23.0 → 1.24.0

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

@@ -30,11 +30,12 @@ module Fog
               "virtualIps"=>[
                 {"address"=> MockData.ipv4_address, "id"=>Fog::Mock.random_numbers(4), "type"=>"PUBLIC", "ipVersion"=>"IPV4"},
                 {"address"=> MockData.ipv6_address, "id"=>Fog::Mock.random_numbers(4), "type"=>"PUBLIC", "ipVersion"=>"IPV6"}],
-                "sourceAddresses"=>{"ipv6Public"=> MockData.ipv6_address, "ipv4Servicenet"=> MockData.ipv4_address, "ipv4Public"=> MockData.ipv4_address},
-                "updated"=>{"time"=>"2013-09-04T06:29:09Z"},
-                "halfClosed"=>false,
-                "connectionLogging"=>{"enabled"=>false},
-                "contentCaching"=>{"enabled"=>false}}}
+              "sourceAddresses"=>{"ipv6Public"=> MockData.ipv6_address, "ipv4Servicenet"=> MockData.ipv4_address, "ipv4Public"=> MockData.ipv4_address},
+              "updated"=>{"time"=>"2013-09-04T06:29:09Z"},
+              "halfClosed"=>false,
+              "connectionLogging"=>{"enabled"=>false},
+              "contentCaching"=>{"enabled"=>false},
+              "httpsRedirect"=>false}}
             response
          end
       end

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

@@ -9,7 +9,8 @@ module Fog
               'port' => options[:port],
               'protocol' => options[:protocol],
               'algorithm' => options[:algorithm],
-              'timeout' => options[:timeout]
+              'timeout' => options[:timeout],
+              'httpsRedirect' => options[:https_redirect]
             }
           }
           request(

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

@@ -8,6 +8,7 @@ module Fog
         # * container<~String> - Name of container containing object
         # * object<~String> - Name of object to get expiring url for
         # * expires<~Time> - An expiry time for this url
+        # * options<~Hash> - Options to override the method or scheme
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -23,7 +24,7 @@ module Fog
             raise ArgumentError, "Storage must my instantiated with the :rackspace_temp_url_key option"
           end
 
-          method         = 'GET'
+          method         = options[:method] || 'GET'
           expires        = expires.to_i
           object_path_escaped   = "#{@uri.path}/#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object,"/")}"
           object_path_unescaped = "#{@uri.path}/#{Fog::Rackspace.escape(container)}/#{object}"

data/lib/fog/rackspace/storage.rb

@@ -52,10 +52,16 @@ module Fog
           @rackspace_auth_token = options[:rackspace_auth_token]
           @rackspace_storage_url = options[:rackspace_storage_url]
           @rackspace_cdn_url = options[:rackspace_cdn_url]
-          @rackspace_region = options[:rackspace_region] || :dfw
+          @rackspace_region = options[:rackspace_region]
           @rackspace_temp_url_key = options[:rackspace_temp_url_key]
           @rackspace_must_reauthenticate = false
           @connection_options = options[:connection_options] || {}
+
+          unless @rackspace_region || (@rackspace_storage_url && @rackspace_cdn_url)
+            Fog::Logger.deprecation("Default region support will be removed in an upcoming release. Please switch to manually setting your endpoint. This requires settng the :rackspace_region option.")
+          end
+
+          @rackspace_region ||= :dfw
         end
 
         def cdn

data/lib/fog/vcloud_director/README.md

@@ -953,3 +953,4 @@ template.instantiate('webserver', {
   network_id: "d5f47bbf-de27-4cf5-aaaa-56772f2ccd17"
 }
 ```
+

data/lib/fog/vcloud_director/compute.rb

@@ -1,4 +1,5 @@
 require 'fog/vcloud_director/core'
+require 'fog/vcloud_director/query'
 
 class VcloudDirectorParser < Fog::Parsers::Base
   def extract_attributes(attributes_xml)
@@ -369,7 +370,7 @@ module Fog
         def request(params)
           begin
             do_request(params)
-          rescue Excon::Errors::SocketError::EOFError
+          rescue EOFError
             # This error can occur if Vcloud receives a request from a network
             # it deems to be unauthorized; no HTTP response is sent, but the
             # connection is sent a signal to terminate early.
@@ -461,6 +462,10 @@ module Fog
         def login
           if @vcloud_token = ENV['FOG_VCLOUD_TOKEN']
             response = get_current_session
+            session_org = response.body[:org]
+            session_user = response.body[:user]
+
+            check_session_matches_credentials(session_org, session_user)
           else
             response = post_login_session
             x_vcloud_authorization = response.headers.keys.find do |key|
@@ -468,6 +473,7 @@ module Fog
             end
             @vcloud_token = response.headers[x_vcloud_authorization]
           end
+
           @org_name = response.body[:org]
           @user_name = response.body[:user]
         end
@@ -478,6 +484,21 @@ module Fog
           @vcloud_token = nil
           @org_name = nil
         end
+
+        def check_session_matches_credentials(session_org, session_user)
+          fog_credential_org = @vcloud_director_username.split('@').last
+          fog_credential_user = @vcloud_director_username.split('@')[0...-1].join
+
+          if session_org != fog_credential_org
+            raise Fog::Errors::Error.new "FOG_CREDENTIAL specified is for vCloud organisation '#{fog_credential_org}' but " +
+              "your current session is for '#{session_org}'. You should generate a new FOG_VCLOUD_TOKEN."
+          end
+
+          if session_user != fog_credential_user
+            raise Fog::Errors::Error.new "FOG_CREDENTIAL specified is for user '#{fog_credential_user}' but " +
+              "your current session is for '#{session_user}'. You should generate a new FOG_VCLOUD_TOKEN."
+          end
+        end
       end
 
       class Mock
@@ -803,6 +824,7 @@ module Fog
             :progress => 1,
             :service_namespace => 'com.vmware.vcloud',
             :start_time => now,
+            :end_time => now + 86400,
             :status => 'running',
           }.merge(options).merge(
             :operation => operation,

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

@@ -15,6 +15,7 @@ module Fog
                 build_load_balancer_service(xml)
                 build_vpn(xml)
                 build_dhcp(xml)
+                build_static_routing_service(xml)
               }
             end.to_xml
           end
@@ -177,6 +178,27 @@ module Fog
             }
           end
 
+          def build_static_routing_service(xml)
+            routing_config = @configuration[:StaticRoutingService]
+            return unless routing_config
+
+            xml.StaticRoutingService {
+              xml.IsEnabled routing_config[:IsEnabled]
+              routing_config[:StaticRoute].each do |rule|
+                xml.StaticRoute{
+                  xml.Name rule[:Name]
+                  xml.Network rule[:Network]
+                  xml.NextHopIp rule[:NextHopIp]
+                  xml.GatewayInterface(
+                    :type => rule[:GatewayInterface][:type],
+                    :name => rule[:GatewayInterface][:name],
+                    :href => rule[:GatewayInterface][:href]
+                  )
+                }
+              end
+            }
+          end
+
           def build_firewall_service(xml)
             firewall_config = @configuration[:FirewallService]
             return unless firewall_config

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

@@ -5,10 +5,17 @@ module Fog
   module Compute
     class VcloudDirector
       class Networks < Collection
+
+        include Fog::VcloudDirector::Query
+
         model Fog::Compute::VcloudDirector::Network
 
         attribute :organization
 
+        def query_type
+          "orgVdcNetwork"
+        end
+
         private
 
         def get_by_id(item_id)

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

@@ -5,10 +5,17 @@ module Fog
   module Compute
     class VcloudDirector
       class Tasks < Collection
+
+        include Fog::VcloudDirector::Query
+
         model Fog::Compute::VcloudDirector::Task
 
         attribute :organization
 
+        def query_type
+          "task"
+        end
+
         def get(id)
           data = service.get_task(id).body
           return nil unless data

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

@@ -5,16 +5,24 @@ module Fog
   module Compute
     class VcloudDirector
       class Vapps < Collection
+
+        include Fog::VcloudDirector::Query
+
         model Fog::Compute::VcloudDirector::Vapp
 
         attribute :vdc
 
+        def query_type
+          "vApp"
+        end
+
         private
 
         def get_by_id(item_id)
           item = service.get_vapp(item_id).body
           %w(:Link).each {|key_to_delete| item.delete(key_to_delete) }
           service.add_id_from_href!(item)
+          item[:Description] ||= ""
           item
         end
 

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

@@ -5,10 +5,17 @@ module Fog
   module Compute
     class VcloudDirector
       class Vdcs < Collection
+
+        include Fog::VcloudDirector::Query
+
         model Fog::Compute::VcloudDirector::Vdc
 
         attribute :organization
 
+        def query_type
+          "orgVdc"
+        end
+
         private
 
         def get_by_id(item_id)

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

@@ -5,6 +5,9 @@ module Fog
   module Compute
     class VcloudDirector
       class Vms < Collection
+
+        include Fog::VcloudDirector::Query
+
         model Fog::Compute::VcloudDirector::Vm
 
         attribute :vapp
@@ -21,6 +24,10 @@ module Fog
           new(item[:vm])
         end
 
+        def query_type
+          "vm"
+        end
+
         private
 
         def get_by_id(item_id)

data/lib/fog/vcloud_director/query.rb

@@ -0,0 +1,59 @@
+require 'pp'
+module Fog
+  module VcloudDirector
+    module Query
+
+      def find_by_query(options={})
+        type = options.fetch(:type) { self.query_type }
+
+        results = get_all_results(type, options)
+        data = results.map do |query_record|
+          model_data = {}
+          model_data[:id] = query_record[:href].split('/').last
+          model_data[:name] = query_record.fetch(:name) if query_record.key?(:name)
+          if self.methods.include?(:populate_model_from_query_record)
+            model_data.merge(self.populate_model_from_query_record(query_record))
+          else
+            model_data
+          end
+        end
+        load(data)
+      end
+
+      private
+
+      def get_all_results(type, options)
+        results = []
+        if options.key?(:page)
+          page_range = [ Integer(options[:page]) ]
+        else
+          page_range = (1..get_num_pages(type, options))
+        end
+        page_range.each do |page|
+          results += get_results_page(page, type, options) || []
+        end
+        results
+      end
+
+      def get_num_pages(type, options)
+        body = service.get_execute_query(type, options)
+        last_page = body[:lastPage] || 1
+        raise "Invalid lastPage (#{last_page}) in query results" unless last_page.is_a? Integer
+        last_page.to_i
+      end
+
+      def get_results_page(page, type, options)
+        body = service.get_execute_query(type, options.merge({:page=>page})).body
+
+        record_key = key_of_first_record_or_reference(body)
+        body[record_key] = [body[record_key]] if body[record_key].is_a?(Hash)
+        body[record_key]
+      end
+
+      def key_of_first_record_or_reference(body)
+        body.keys.detect { |key| key.to_s =~ /Record|Reference$/ }
+      end
+
+    end
+  end
+end

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

@@ -181,6 +181,9 @@ module Fog
             :xsi_schemaLocation=>xsi_schema_location,
           }
 
+          records = []
+          record_type = nil
+
           if type == 'orgVdc'
             record_type = :OrgVdcRecord
             vdc_id = data[:vdcs].keys[0]
@@ -204,10 +207,10 @@ module Fog
             body[:pageSize] = records.size.to_s  # TODO: Support pagination
             body[:total]    = records.size.to_s
             body[record_type] = records
+
           elsif type == 'orgVdcNetwork'
             record_type = :OrgVdcNetworkRecords
             data_type = :networks
-            records = []
             data[data_type].each do |id, dr|
               r = {}
               if name.nil? || dr[:name] == name
@@ -242,6 +245,7 @@ module Fog
             body[:pageSize] = records.size.to_s  # TODO: Support pagination
             body[:total]    = records.size.to_s
             body[record_type] = records
+
           elsif type == 'edgeGateway'
             record_type = :EdgeGatewayRecord
             edge_gateway_id = data[:edge_gateways].keys[0]
@@ -264,6 +268,7 @@ module Fog
             body[:pageSize] = records.size.to_s  # TODO: Support pagination
             body[:total]    = records.size.to_s
             body[record_type] = records
+
           elsif type == 'vAppTemplate'
             record_type = :VAappTemplateRecord
             records = [{
@@ -300,10 +305,94 @@ module Fog
             body[:pageSize] = records.size.to_s  # TODO: Support pagination
             body[:total]    = records.size.to_s
             body[record_type] = records
+
+          elsif type == 'vApp'
+            record_type = :VAppRecord
+            all_records = data[:vapps].map do |vapp_id, vapp|
+              {
+                :vdcName => data.fetch(:vdcs).fetch(vapp[:vdc_id]).fetch(:name),
+                :vdc => make_href("vdc/#{vapp[:vdc_id]}"),
+                :storageProfileName => "*",
+                :ownerName => "system",
+                :name => vapp.fetch(:name),
+                :status => 'POWERED_OFF',
+                :isInMaintenanceMode=> 'false',
+                :isPublic => 'false',
+                :isExpired =>"false",
+                :isEnabled =>"true",
+                :isDeployed =>"false",
+                :isBusy => "false",
+                :pvdcHighestSupportedHardwareVersion => '8',
+                :lowestHardwareVersionInVApp => '8',
+                :creationDate => "2013-09-19T22:55:30.257+01:00",
+                :href => make_href("vApp/#{vapp_id}"),
+                :honorBootOrder => "false",
+                :isVdcEnabled => "true",
+                :cpuAllocationMhz => "8",
+                :cpuAllocationInMhz => "16000",
+                :storageKB => "52428800",
+                :numberOfVMs => "1",
+                :isAutoDeleteNotified => "false",
+                :numberOfCpus => "8",
+                :isAutoUndeployNotified => "false",
+                :memoryAllocationMB => "32768",
+                :task => make_href("task/#{uuid}"),
+                :taskStatusName => 'vdcInstantiateVapp',
+                :taskStatus => 'success',
+                :taskDetails => " ",
+              }
+            end
+            records = all_records.select do |record|
+              record[:name] == name
+            end
+
+            body[:page]     = 1.to_s             # TODO: Support pagination
+            body[:pageSize] = records.size.to_s  # TODO: Support pagination
+            body[:total]    = records.size.to_s
+            body[record_type] = records
+
+          elsif type == 'task'
+
+            record_type = :TaskRecord
+            data_type = :tasks
+            data[data_type].each do |id, dr|
+              r = {}
+              if name.nil? || dr.fetch(:operation_name) == name
+                r[:name] = dr.fetch(:operation_name)
+                r[:href] = make_href("task/#{id}")
+                if dr.key?(:end_time)
+                  r[:endDate] = dr.fetch(:end_time).strftime('%Y-%m-%dT%H:%M:%S%z')
+                else
+                  r[:endDate] = nil
+                end
+                if dr.key?(:start_time)
+                  r[:startDate] = dr.fetch(:start_time).strftime('%Y-%m-%dT%H:%M:%S%z')
+                else
+                  r[:startDate] = nil
+                end
+                r[:status] = dr.fetch(:status)
+                r[:serviceNamespace] = 'com.vmware.vcloud'
+                r[:ownerName] = '000.0.000000'
+                r[:orgName] = data.fetch(:org).fetch(:name)
+                r[:org] = make_href("org/#{data[:org][:uuid]}")
+                r[:objectType] = dr.fetch(:owner).fetch(:type).split(/\./).last.split(/\+/).first
+                r[:objectName] = dr.fetch(:owner).fetch(:name, '') # objectName is optional
+                r[:object] = dr.fetch(:owner).fetch(:href)
+                r[:details] = '! []'
+
+                records << r
+              end
+            end
+
           else
             Fog::Mock.not_implemented("No 'get by name' get_execute_query Mock for #{type} (#{name})")
           end
 
+          body[:page]     = 1.to_s             # TODO: Support pagination
+          body[:pageSize] = records.size.to_s  # TODO: Support pagination
+          body[:total]    = records.size.to_s
+          body[record_type] = records
+
           body
         end
 
@@ -637,6 +726,7 @@ module Fog
             ]
           }
         end
+
       end
     end
   end