fog 1.37.0 → 1.38.0

data/lib/fog/digitalocean/models/compute_v2/regions.rb

@@ -12,7 +12,7 @@ module Fog
         # @raise [Fog::Compute::DigitalOceanV2::ServiceError]
         # @see https://developers.digitalocean.com/documentation/v2/#list-all-regions
         def all(filters = {})
-          data = service.list_regions.body["regions"]
+          data = service.list_regions(filters).body["regions"]
           load(data)
         end
       end

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

@@ -13,7 +13,7 @@ module Fog
         attribute :disk
         attribute :locked
         attribute :created_at
-        attribute :status
+        attribute :status,    :aliases => 'state'
         attribute :backup_ids
         attribute :snapshot_ids
         attribute :features

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

@@ -1,10 +1,11 @@
 require 'fog/core/collection'
-require 'fog/digitalocean/models/compute/server'
+require 'fog/digitalocean/models/compute_v2/server'
+require 'fog/digitalocean/models/paging_collection'
 
 module Fog
   module Compute
     class DigitalOceanV2
-      class Servers < Fog::Collection
+      class Servers < Fog::Compute::DigitalOceanV2::PagingCollection
         model Fog::Compute::DigitalOceanV2::Server
 
         # Returns list of servers
@@ -15,8 +16,11 @@ module Fog
         # @raise [Fog::Compute::DigitalOceanV2::ServiceError]
         # @see https://developers.digitalocean.com/documentation/v2/#droplets
         def all(filters = {})
-          data = service.list_servers.body['droplets']
-          load(data)
+          data = service.list_servers(filters)
+          links = data.body["links"]
+          get_paged_links(links) 
+          droplets = data.body["droplets"]
+          load(droplets)
         end
 
         # Retrieves server

data/lib/fog/digitalocean/models/compute_v2/ssh_keys.rb

@@ -1,7 +1,9 @@
+require 'fog/digitalocean/models/paging_collection'
+
 module Fog
   module Compute
     class DigitalOceanV2
-      class SshKeys < Fog::Collection
+      class SshKeys < Fog::Compute::DigitalOceanV2::PagingCollection
         model Fog::Compute::DigitalOceanV2::SshKey
 
         # Returns list of ssh keys
@@ -12,8 +14,11 @@ module Fog
         # @raise [Fog::Compute::DigitalOceanV2::ServiceError]
         # @see https://developers.digitalocean.com/documentation/v2/#list-all-keys
         def all(filters={})
-          data = service.list_ssh_keys.body['ssh_keys']
-          load(data)
+          data = service.list_ssh_keys(filters)
+          links = data.body["links"]
+          get_paged_links(links) 
+          keys = data.body["ssh_keys"]
+          load(keys)
         end
 
         # Returns ssh key
@@ -32,4 +37,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/digitalocean/models/paging_collection.rb

@@ -0,0 +1,41 @@
+module Fog
+  module Compute
+    class DigitalOceanV2
+      class PagingCollection < Fog::Collection
+
+        attribute :next
+        attribute :last
+
+        def next_page
+          all(page: @next) if @next != @last
+        end
+
+        def previous_page
+          if @next.to_i > 2
+            all(page: @next.to_i - 2)
+          end
+        end
+
+        private
+        def deep_fetch(hash, *path)
+          path.inject(hash) do |acc, key|
+            acc.respond_to?(:keys) ? acc[key] : nil
+          end
+        end
+
+        def get_page(link)
+          if match = link.match(/page=(?<page>\d+)/)
+            match.captures.last
+          end
+        end
+
+        def get_paged_links(links)
+          next_link = deep_fetch(links, "pages", "next").to_s
+          last_link = deep_fetch(links, "pages", "last").to_s
+          @next = get_page(next_link) || @next
+          @last = get_page(last_link) || @last
+        end
+      end
+    end
+  end
+end

data/lib/fog/digitalocean/requests/compute_v2/{delete_server.rb → destroy_server.rb}

@@ -4,6 +4,10 @@ module Fog
       # noinspection RubyStringKeysInHashInspection
       class Real
         def delete_server(server_id)
+          Fog::Logger.warning("delete_server method has been deprecated, use destroy_server instead")
+          destroy_server(server_id)
+        end
+        def destroy_server(server_id)
           request(
             :expects         => [204],
             :headers         => {
@@ -17,7 +21,10 @@ module Fog
 
       # noinspection RubyStringKeysInHashInspection
       class Mock
-        def delete_server(_)
+        def delete_server(server_id)
+          destroy_server(server_id)
+        end
+        def destroy_server(_)
           response        = Excon::Response.new
           response.status = 204
           response

data/lib/fog/digitalocean/requests/compute_v2/list_images.rb

@@ -2,18 +2,18 @@ module Fog
   module Compute
     class DigitalOceanV2
       class Real
-        def list_images
+        def list_images(filters = {})
           request(
             :expects => [200],
             :method  => 'GET',
-            :path    => '/v2/images'
+            :path    => "/v2/images?#{filters.to_a.map { |x| "#{x[0]}=#{x[1]}" }.join("&")}"
           )
         end
       end
 
       # noinspection RubyStringKeysInHashInspection
       class Mock
-        def list_images
+        def list_images(filters = {})
           response        = Excon::Response.new
           response.status = 200
           response.body   = {

data/lib/fog/digitalocean/requests/compute_v2/list_regions.rb

@@ -2,18 +2,18 @@ module Fog
   module Compute
     class DigitalOceanV2
       class Real
-        def list_regions
+        def list_regions(filters = {})
           request(
             :expects => [200],
             :method  => 'GET',
-            :path    => '/v2/regions'
+            :path    => "/v2/regions?#{filters.to_a.map { |x| "#{x[0]}=#{x[1]}" }.join("&")}"
           )
         end
       end
 
       # noinspection RubyStringKeysInHashInspection
       class Mock
-        def list_regions
+        def list_regions(filters = {})
           response        = Excon::Response.new
           response.status = 200
           response.body   = {

data/lib/fog/digitalocean/requests/compute_v2/list_servers.rb

@@ -2,18 +2,18 @@ module Fog
   module Compute
     class DigitalOceanV2
       class Real
-        def list_servers
+        def list_servers(filters = {})
           request(
             :expects => [200],
             :method => 'GET',
-            :path => '/v2/droplets'
+            :path => "/v2/droplets?#{filters.to_a.map { |x| "#{x[0]}=#{x[1]}" }.join("&")}"
           )
         end
       end
 
       # noinspection RubyStringKeysInHashInspection
       class Mock
-        def list_servers
+        def list_servers(filters = {})
           response = Excon::Response.new
           response.status = 200
           response.body = {
@@ -25,4 +25,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/fogdocker/requests/compute/container_action.rb

@@ -13,9 +13,9 @@ module Fog
             result
           end
         rescue Docker::Error::NotFoundError => e
-          raise Fog::Errors::Error::NotFound.new(e.message)
+          raise Fog::Errors::NotFound.new(e.message)
         rescue Docker::Error::TimeoutError => e
-          raise Fog::Errors::Error::TimeoutError.new(e.message)
+          raise Fog::Errors::TimeoutError.new(e.message)
         rescue Docker::Error::UnauthorizedError => e
           raise Fog::Errors::Fogdocker::AuthenticationError.new(e.message)
         rescue Docker::Error::DockerError => e

data/lib/fog/vcloud_director/README.md

@@ -12,8 +12,11 @@ organizations
                                               -> disks -> disk
                                               -> tags -> tag
                                               -> power_on
+                            
+                            vapp_templates -> vms -> vm
     networks -> network
     catalogs -> catalog -> catalog_items -> catalog_item -> instantiate_vapp
+                                                         -> vapp_template -> vms -> vm
     medias -> media
 ```
 

data/lib/fog/vcloud_director/compute.rb

@@ -30,6 +30,7 @@ module Fog
         PORT        = 443
         SCHEME      = 'https'
         API_VERSION = '5.1'
+        OMIT_DEFAULT_PORT = true
       end
 
       class ServiceError < Fog::VcloudDirector::Errors::ServiceError; end
@@ -54,6 +55,10 @@ module Fog
       model      :organization
       collection :organizations
       model      :catalog_item
+      collection :vapp_templates
+      model      :vapp_template
+      collection :template_vms
+      model      :template_vm
       collection :catalog_items
       model      :custom_field
       collection :custom_fields
@@ -158,6 +163,8 @@ module Fog
       request :get_supported_versions
       request :get_task
       request :get_task_list
+      request :get_template_vm
+      request :get_template_vms
       request :get_thumbnail
       request :get_users_from_query
       request :get_vapp
@@ -209,6 +216,8 @@ module Fog
       request :post_create_catalog_item
       request :post_create_org_vdc_network
       request :post_deploy_vapp
+      request :post_compose_vapp
+      request :post_recompose_vapp
       request :post_detach_disk
       request :post_disable_nested_hv
       request :post_disable_vapp_template_download
@@ -337,6 +346,7 @@ module Fog
           @vcloud_director_password = options[:vcloud_director_password]
           @vcloud_director_username = options[:vcloud_director_username]
           @connection_options = options[:connection_options] || {}
+          @connection_options[:omit_default_port] = Fog::Compute::VcloudDirector::Defaults::OMIT_DEFAULT_PORT unless @connection_options[:omit_default_port]
           @host       = options[:vcloud_director_host]
           @path       = options[:path]        || Fog::Compute::VcloudDirector::Defaults::PATH
           @persistent = options[:persistent]  || false

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

@@ -0,0 +1,121 @@
+module Fog
+  module Generators
+    module Compute
+      module VcloudDirector
+        module ComposeCommon
+
+          def initialize(configuration={})
+            @configuration = configuration
+          end
+
+          private
+
+          def vapp_attrs
+            attrs = {
+              :xmlns => 'http://www.vmware.com/vcloud/v1.5',
+              'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1'
+            }
+
+            [:deploy, :powerOn, :name].each do |a|
+              attrs[a] = @configuration[a] if @configuration.key?(a)
+            end
+            
+            attrs
+          end
+
+          def has_source_items?
+            (@configuration[:source_vms] && (@configuration[:source_vms].size > 0)) || 
+            (@configuration[:source_templates] && (@configuration[:source_templates].size > 0))
+          end
+
+          def build_vapp_instantiation_params(xml)
+            xml.Description @configuration[:Description]
+            
+            vapp = @configuration[:InstantiationParams]
+
+            xml.InstantiationParams {
+              xml.DefaultStorageProfileSection {
+                  xml.StorageProfile vapp[:DefaultStorageProfile]
+              } if (vapp.key? :DefaultStorageProfile)
+              xml.NetworkConfigSection {
+                xml['ovf'].Info
+                vapp[:NetworkConfig].each do |network|
+                  xml.NetworkConfig(:networkName => network[:networkName]) {
+                    xml.Configuration {
+                      xml.ParentNetwork(:href => network[:networkHref])
+                      xml.FenceMode network[:fenceMode]
+                    }
+                  }
+                end if vapp[:NetworkConfig]
+              }
+            }
+          end
+          
+          def build_source_template(xml)
+            xml.Source(:href => @configuration[:Source])
+          end
+
+          def build_source_items(xml)
+            vms = @configuration[:source_vms]
+            vms.each do |vm|
+              xml.SourcedItem {
+                xml.Source(:name =>vm[:name], :href => vm[:href])
+                xml.VmGeneralParams {
+                  xml.Name vm[:name]
+                  xml.Description vm[:Description] if vm[:Description]
+                  xml.NeedsCustomization if vm[:NeedsCustomization]
+                } if vm[:name]
+                xml.InstantiationParams {
+                  if vm[:networks]
+                    xml.NetworkConnectionSection(:href => "#{vm[:href]}/networkConnectionSection/", :type => "application/vnd.vmware.vcloud.networkConnectionSection+xml", 'xmlns:ovf' => "http://schemas.dmtf.org/ovf/envelope/1", "ovf:required" => "false") {
+                      xml['ovf'].Info
+                      xml.PrimaryNetworkConnectionIndex 0
+                      vm[:networks].each_with_index do |network, i|
+                        xml.NetworkConnection(:network => network[:networkName]) {
+                          xml.NetworkConnectionIndex i
+                          xml.IpAddress network[:IpAddress] if (network.key? :IpAddress)
+                          xml.ExternalIpAddress network[:ExternalIpAddress] if (network.key? :ExternalIpAddress)
+                          xml.IsConnected network[:IsConnected]
+                          xml.MACAddress network[:MACAddress] if (network.key? :MACAddress)
+                          xml.IpAddressAllocationMode network[:IpAddressAllocationMode]
+                        }
+                      end
+                    }
+                  end
+                  if customization = vm[:guest_customization]
+                    xml.GuestCustomizationSection(:xmlns => "http://www.vmware.com/vcloud/v1.5", 'xmlns:ovf' => "http://schemas.dmtf.org/ovf/envelope/1") {
+                      xml['ovf'].Info
+                      xml.Enabled (customization[:Enabled] || false)
+                      xml.ChangeSid customization[:ChangeSid] if (customization.key? :ChangeSid)
+                      xml.JoinDomainEnabled customization[:JoinDomainEnabled] if (customization.key? :JoinDomainEnabled)
+                      xml.UseOrgSettings customization[:UseOrgSettings] if (customization.key? :UseOrgSettings)
+                      xml.DomainName customization[:DomainName] if (customization.key? :DomainName)
+                      xml.DomainUserName customization[:DomainUserName] if (customization.key? :DomainUserName)
+                      xml.DomainUserPassword customization[:DomainUserPassword] if (customization.key? :DomainUserPassword)
+                      xml.MachineObjectOU customization[:MachineObjectOU] if (customization.key? :MachineObjectOU)
+                      xml.AdminPasswordEnabled customization[:AdminPasswordEnabled] if (customization.key? :AdminPasswordEnabled)
+                      xml.AdminPasswordAuto customization[:AdminPasswordAuto] if (customization.key? :AdminPasswordAuto)
+                      xml.AdminPassword customization[:AdminPassword] if (customization.key? :AdminPassword)
+                      xml.ResetPasswordRequired customization[:ResetPasswordRequired] if (customization.key? :ResetPasswordRequired)
+                      xml.CustomizationScript CGI::escapeHTML(customization[:CustomizationScript]).gsub(/\r/, "
") if (customization.key? :CustomizationScript)
+                      xml.ComputerName customization[:ComputerName]
+                    }
+                  end
+                }
+                xml.StorageProfile(:href => vm[:StorageProfileHref]) if (vm.key? :StorageProfileHref)
+              }
+            end if vms
+
+            templates = @configuration[:source_templates]
+            templates.each do |template|
+              xml.SourcedItem { xml.Source(:href => template[:href]) }
+            end if templates
+
+            xml.AllEULAsAccepted (@configuration[:AllEULAsAccepted] || true)
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'fog/vcloud_director/generators/compute/compose_common'
+
+module Fog
+  module Generators
+    module Compute
+      module VcloudDirector
+        # @see http://pubs.vmware.com/vcd-51/index.jsp#types/ComposeVAppParamsType.html
+        class ComposeVapp
+
+          include ComposeCommon
+
+          def generate_xml
+            Nokogiri::XML::Builder.new do |xml|
+              xml.ComposeVAppParams(vapp_attrs) {
+                build_vapp_instantiation_params(xml)
+                build_source_items(xml)
+              }
+            end.to_xml
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -58,7 +58,7 @@ module Fog
                   xml.PeerIpAddress tunnel_config[:PeerIpAddress]
                   xml.PeerId tunnel_config[:PeerId]
                   xml.LocalIpAddress tunnel_config[:LocalIpAddress]
-                  xml.LocalId tunnel_config[:LocalId]            
+                  xml.LocalId tunnel_config[:LocalId]
                   tunnel_config[:LocalSubnet].each do |subnet|
                     xml.LocalSubnet {
                       xml.Name subnet[:Name]

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

@@ -0,0 +1,30 @@
+require 'fog/vcloud_director/generators/compute/compose_common'
+
+module Fog
+  module Generators
+    module Compute
+      module VcloudDirector
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/VAppType.html
+        class InstantiateVappTemplateParams
+          attr_reader :options
+          
+          include ComposeCommon
+        
+          def generate_xml
+            Nokogiri::XML::Builder.new do |xml|
+
+              
+              xml.InstantiateVAppTemplateParams((vapp_attrs)) {
+                build_vapp_instantiation_params(xml)
+                build_source_template(xml)
+                build_source_items(xml)
+              }
+            end.to_xml
+
+          end
+          
+        end
+      end
+    end
+  end
+end