fog 1.24.0 → 1.25.0

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

@@ -5,8 +5,21 @@ module Fog
         def container_action(options = {})
           raise ArgumentError, "instance id is a required parameter" unless options.key? :id
           raise ArgumentError, "action is a required parameter" unless options.key? :action
-          container = Docker::Container.get(options[:id])
-          downcase_hash_keys container.send(options[:action]).json
+          result = Docker::Container.get(options[:id]).send(options[:action], options[:options])
+
+          if result.is_a?(Hash)
+            downcase_hash_keys(result)
+          else
+            result
+          end
+        rescue Docker::Error::NotFoundError => e
+          raise Fog::Errors::Error::NotFound.new(e.message)
+        rescue Docker::Error::TimeoutError => e
+          raise Fog::Errors::Error::TimeoutError.new(e.message)
+        rescue Docker::Error::UnauthorizedError => e
+          raise Fog::Errors::Fogdocker::AuthenticationError.new(e.message)
+        rescue Docker::Error::DockerError => e
+          raise Fog::Errors::Fogdocker::ServiceError.new(e.message)
         end
       end
 
@@ -14,7 +27,44 @@ module Fog
         def container_action(options = {})
           raise ArgumentError, "id is a required parameter" unless options.key? :id
           raise ArgumentError, "action is a required parameter" unless options.key? :action
-          {'id' => 'a6b02c7ca29a22619f7d0e59062323247739bc0cd375d619f305f0b519af4ef3','state_running' => false}
+          response_matcher(options[:action])
+        end
+
+        private
+
+        def response_matcher(action)
+          send("#{action}_response".to_sym)
+        rescue NoMethodError
+          default_response
+        end
+
+        def default_response
+          { 'id'           => 'a6b02c7ca29a22619f7d0e59062323247739bc0cd375d619f305f0b519af4ef3',
+           'state_running' => false }
+        end
+
+        def start_response
+          default_response.merge({ 'state_running' => true })
+        end
+
+        def top_response
+          [
+            {
+              'UID'   => 'root',
+              'PID'   => '15306',
+              'PPID'  => '13567',
+              'C'     => '0',
+              'STIME' => 'Oct15',
+              'TTY'   => '?',
+              'TIME'  => '00:00:11',
+              'CMD'   => 'ping theforeman.org'
+            }
+          ]
+        end
+
+        # Sample response from a ping
+        def logs_response
+          "\u0001\u0000\u0000\u0000\u0000\u0000\u0000]64 bytes from fra07s30-in-f6.1e100.net (173.194.112.102): icmp_req=35272 ttl=52 time=36.9 ms\n\u0001\u0000\u0000\u0000\u0000\u0000\u0000]64 bytes from fra07s30-in-f6.1e100.net (173.194.112.102): icmp_req=35273 ttl=52 time=35.3 ms\n"
         end
       end
     end

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

@@ -3,26 +3,45 @@ module Fog
     class Fogdocker
       class Real
         def container_get(id)
-          downcase_hash_keys Docker::Container.get(id).json
+          raw_container = Docker::Container.get(id).json
+          processed_container = downcase_hash_keys(raw_container)
+          processed_container['hostconfig_port_bindings'] = raw_container['HostConfig']['PortBindings']
+          processed_container['hostconfig_links']         = raw_container['HostConfig']['Links']
+          processed_container['config_exposed_ports']     = raw_container['Config']['ExposedPorts']
+          processed_container
         end
       end
       class Mock
         def container_get(id)
-          {'id'         => '2ce79789656e4f7474624be6496dc6d988899af30d556574389a19aade2f9650',
-           'image'      => 'mattdm/fedora:f19',
-           'command'    => '/bin/bash',
-           'created'    => '1389876158',
-           'status'     => 'Up 45 hours',
+          {'id'                         => '2ce79789656e4f7474624be6496dc6d988899af30d556574389a19aade2f9650',
+           'image'                      => 'mattdm/fedora:f19',
+           'command'                    => '/bin/bash',
+           'created'                    => '1389876158',
+           'status'                     => 'Up 45 hours',
            'state_running'              => true,
-           'config_cpu_shares'          => '1',
            'network_settings_ipaddress' => '172.17.0.2',
            'config_memory'              => '1024',
+           'config_cpu_sets'            => '0-3',
+           'config_cpu_shares'          => '20',
            'config_hostname'            => '21341234',
-           'ports'      =>  nil,
-           'sizerw'     =>  0,
-           'sizerootfs' =>  0,
-           'name'       => '123123123',
-           'names'      =>  ['/boring_engelbert']}
+           'config_attach_stdin'        => true,
+           'config_attach_stdout'       => true,
+           'config_attach_stderr'       => true,
+           'ports'                      => nil,
+           'config_tty'                 => true,
+           'hostconfig_privileged'      => true,
+           'hostconfig_links'           => nil,
+           'hostconfig_port_bindings'   => { "29321/tcp" => [{"HostIp"=>"", "HostPort"=>"3001"}],
+                                             "39212/tcp" => [{"HostIp"=>"", "HostPort"=>"2030"}]},
+           'state_exit_code'            => 0,
+           'state_pid'                  => 2932,
+           'cpu_shares'                 => 0,
+           'volumes'                    => nil,
+           'config_exposed_ports'       => { "29321/tcp" => {}, "39212/tcp" => {} },
+           'sizerw'                     => 0,
+           'sizerootfs'                 => 0,
+           'name'                       => '123123123',
+           'names'                      =>  ['/boring_engelbert']}
         end
       end
     end

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class Fogdocker
+      class Real
+        def image_search(query = {})
+          Docker::Util.parse_json(Docker.connection.get('/images/search', query)).map do |image|
+            downcase_hash_keys(image)
+          end
+        end
+      end
+      class Mock
+        def image_search(query = {})
+          [
+              {"description" => "",
+               "is_official" => false,
+               "is_automated" => false,
+               "name" => "wma55/u1210sshd",
+               "star_count" => 0},
+              {"description" => "",
+               "is_official" => false,
+               "is_automated" => false,
+               "name" => "jdswinbank/sshd",
+               "star_count" => 0}
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/dns.rb

@@ -10,34 +10,68 @@ module Fog
       GOOGLE_DNS_BASE_URL        = 'https://www.googleapis.com/dns/'
       GOOGLE_DNS_API_SCOPE_URLS  = %w(https://www.googleapis.com/auth/ndev.clouddns.readwrite)
 
+      ##
+      # MODELS
+      model_path 'fog/google/models/dns'
+
+      # Zone
+      model :zone
+      collection :zones
+
+      # Record
+      model :record
+      collection :records
+
+      # Change
+      model :change
+      collection :changes
+
+      # Project
+      model :project
+      collection :projects
+
+      ##
+      # REQUESTS
       request_path 'fog/google/requests/dns'
+
+      # Zone
       request :create_managed_zone
       request :delete_managed_zone
       request :get_managed_zone
       request :list_managed_zones
 
+      # Record
+      request :list_resource_record_sets
+
+      # Change
+      request :create_change
+      request :get_change
+      request :list_changes
+
+      # Project
+      request :get_project
+
       class Mock
-	include Fog::Google::Shared
+        include Fog::Google::Shared
 
         def initialize(options)
           shared_initialize(options[:google_project], GOOGLE_DNS_API_VERSION, GOOGLE_DNS_BASE_URL)
         end
 
-	def self.data(api_version)
-	  @data ||= {}
-	end
+        def self.data(api_version)
+          @data ||= {}
+        end
 
-	def self.reset
-	  @data = nil
-	end
+        def self.reset
+          @data = nil
+        end
 
         def data(project=@project)
           self.class.data(api_version)[project] ||= {
-              :managed_zones => {
-                  :by_id => {},
-                  :by_name => {},
-              },
-	  }
+            :managed_zones => {},
+            :resource_record_sets => {},
+            :changes => {},
+          }
         end
 
         def reset_data

data/lib/fog/google/examples/dns/project.rb

@@ -0,0 +1,8 @@
+def test
+  connection = Fog::DNS::Google.new
+
+  puts 'Get the Project limits...'
+  puts '-------------------------'
+  connection.projects.get(Fog::DNS[:google].project)
+
+end

data/lib/fog/google/examples/dns/zones.rb

@@ -0,0 +1,43 @@
+def test
+  connection = Fog::DNS::Google.new
+
+  puts 'Create a Zone...'
+  puts '----------------'
+  zone = connection.zones.create(name: 'mytestdomain', domain: 'example.org.', description: 'This is my test domain')
+
+  puts 'List all Zones...'
+  puts '-----------------'
+  connection.zones.all
+
+  puts 'Get the Zone...'
+  puts '---------------'
+  zone = connection.zones.get(zone.id)
+
+  puts 'Create an "A" Record...'
+  puts '-----------------------'
+  record = zone.records.create(name: 'test.example.org.', type: 'A', ttl: 3600, rrdatas: ['192.168.1.1'])
+
+  puts 'Get the Zone Resource Record Sets...'
+  puts '------------------------------------'
+  zone.records
+
+  puts 'Get the Record...'
+  puts '-----------------'
+  record = connection.records(zone: zone).get(name: 'test.example.org.', type: 'A')
+
+  puts 'Modify the "A" Record...'
+  puts '------------------------'
+  record.modify(ttl: 2600)
+
+  puts 'Delete the "A" Record...'
+  puts '------------------------'
+  record.destroy
+
+  puts 'Get the Zone Changes...'
+  puts '-----------------------'
+  zone.changes
+
+  puts 'Delete the Zone...'
+  puts '------------------'
+  zone.destroy
+end

data/lib/fog/google/models/compute/images.rb

@@ -17,7 +17,8 @@ module Fog
           'google-containers',
           'opensuse-cloud',
           'rhel-cloud',
-          'suse-cloud'
+          'suse-cloud',
+          'ubuntu-os-cloud'
         ]
 
         def all

data/lib/fog/google/models/dns/change.rb

@@ -0,0 +1,40 @@
+require 'fog/core/model'
+
+module Fog
+  module DNS
+    class Google
+      ##
+      # Represents a Change resource
+      #
+      # @see https://developers.google.com/cloud-dns/api/v1beta1/changes
+      class Change < Fog::Model
+        identity :id
+
+        attribute :kind
+        attribute :start_time, :aliases => 'startTime'
+        attribute :status
+        attribute :additions
+        attribute :deletions
+
+        DONE_STATE    = 'done'
+        PENDING_STATE = 'pending'
+
+        ##
+        # Checks if the change operation is pending
+        #
+        # @return [Boolean] True if the change operation is pending; False otherwise
+        def pending?
+          self.status == PENDING_STATE
+        end
+
+        ##
+        # Checks if the change operation is done
+        #
+        # @return [Boolean] True if the change operation is done; False otherwise
+        def ready?
+          self.status == DONE_STATE
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/models/dns/changes.rb

@@ -0,0 +1,52 @@
+require 'fog/core/collection'
+require 'fog/google/models/dns/zone'
+
+module Fog
+  module DNS
+    class Google
+      class Changes < Fog::Collection
+        model Fog::DNS::Google::Change
+
+        attribute :zone
+
+        ##
+        # Enumerates the list of Changes
+        #
+        # @return [Array<Fog::DNS::Google::Change>] List of Changes resources
+        def all
+          requires :zone
+
+          data = service.list_changes(zone.identity).body['changes'] || []
+          load(data)
+        rescue Fog::Errors::NotFound
+          []
+        end
+
+        ##
+        # Fetches the representation of an existing Change
+        #
+        # @param [String] identity Change identity
+        # @return [Fog::DNS::Google::Change] Change resource
+        def get(identity)
+          requires :zone
+
+          if change = service.get_change(zone.identity, identity).body
+            new(change)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+
+        ##
+        # Creates a new instance of a Change
+        #
+        # @return [Fog::DNS::Google::Change] Change resource
+        def new(attributes = {})
+          requires :zone
+
+          super({ :zone => zone }.merge!(attributes))
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/models/dns/project.rb

@@ -0,0 +1,75 @@
+require 'fog/core/model'
+
+module Fog
+  module DNS
+    class Google
+      ##
+      # Represents a Project resource
+      #
+      # @see https://developers.google.com/cloud-dns/api/v1beta1/projects
+      class Project < Fog::Model
+        identity :id
+
+        attribute :kind
+        attribute :number
+        attribute :quota
+
+        # These attributes are not available in the representation of a 'Project' returned by the Google DNS API
+        attribute :managed_zones
+        attribute :rrsets_per_managed_zone
+        attribute :resource_records_per_rrset
+        attribute :rrset_additions_per_change
+        attribute :rrset_deletions_per_change
+        attribute :total_rrdatasize_per_change
+
+        ##
+        # Returns the maximum allowed number of managed zones in the project
+        #
+        # @return [Integer] Maximum allowed number of managed zones in the project
+        def managed_zones
+          self.quota['managedZones']
+        end
+
+        ##
+        # Returns the maximum allowed number of ResourceRecordSets per zone in the project
+        #
+        # @return [Integer] The maximum allowed number of ResourceRecordSets per zone in the project
+        def rrsets_per_managed_zone
+          self.quota['rrsetsPerManagedZone']
+        end
+
+        ##
+        # Returns the maximum allowed number of resource records per ResourceRecordSet
+        #
+        # @return [Integer] The maximum allowed number of resource records per ResourceRecordSet
+        def resource_records_per_rrset
+          self.quota['resourceRecordsPerRrset']
+        end
+
+        ##
+        # Returns the maximum allowed number of ResourceRecordSets to add per Changes.create request
+        #
+        # @return [Integer] The maximum allowed number of ResourceRecordSets to add per Changes.create request
+        def rrset_additions_per_change
+          self.quota['rrsetAdditionsPerChange']
+        end
+
+        ##
+        # Returns the maximum allowed number of ResourceRecordSets to delete per Changes.create request
+        #
+        # @return [Integer] The maximum allowed number of ResourceRecordSets to delete per Changes.create request
+        def rrset_deletions_per_change
+          self.quota['rrsetDeletionsPerChange']
+        end
+
+        ##
+        # Returns the maximum allowed size in bytes for the rrdata field in one Changes.create request
+        #
+        # @return [Integer] The maximum allowed size in bytes for the rrdata field in one Changes.create request
+        def total_rrdatasize_per_change
+          self.quota['totalRrdataSizePerChange']
+        end
+      end
+    end
+  end
+end