fog 1.24.0 → 1.25.0

data/lib/fog/google/requests/dns/delete_managed_zone.rb

@@ -1,39 +1,35 @@
 module Fog
   module DNS
     class Google
-
-      class Mock
-        def delete_managed_zone(zone_name_or_id)
-	  if self.data[:managed_zones][:by_name].has_key?(zone_name_or_id)
-            zone_name = zone_name_or_id
-            zone = self.data[:managed_zones][:by_name][zone_name]
-	    zone_id = zone['id']
-	  elsif self.data[:managed_zones][:by_id].has_key?(zone_name_or_id)
-            zone_id = zone_name_or_id
-            zone = self.data[:managed_zones][:by_name][zone_id]
-	    zone_name = zone['name']
-	  else
-	    raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{zone_name_or_id}' does not exist."
-	  end
-	  self.data[:managed_zones][:by_name].delete(zone_name)
-	  self.data[:managed_zones][:by_id].delete(zone_id)
-
-          build_excon_response(nil)
-        end
-
-      end
-
+      ##
+      # Deletes a previously created Managed Zone.
+      #
+      # @see https://developers.google.com/cloud-dns/api/v1beta1/managedZones/delete
       class Real
-        def delete_managed_zone(zone_name_or_id)
+        def delete_managed_zone(name_or_id)
           api_method = @dns.managed_zones.delete
           parameters = {
             'project' => @project,
-	    'managedZone' => zone_name_or_id,
+            'managedZone' => name_or_id,
           }
 
           request(api_method, parameters)
         end
       end
+
+      class Mock
+        def delete_managed_zone(name_or_id)
+          if self.data[:managed_zones].has_key?(name_or_id)
+            self.data[:managed_zones].delete(name_or_id)
+          elsif zone = self.data[:managed_zones].values.find { |zone| zone['name'] = name_or_id }
+            self.data[:managed_zones].delete(zone['id'])
+          else
+            raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{name_or_id}' does not exist."
+          end
+
+          build_excon_response(nil)
+        end
+      end
     end
   end
 end

data/lib/fog/google/requests/dns/get_change.rb

@@ -0,0 +1,42 @@
+module Fog
+  module DNS
+    class Google
+      ##
+      # Fetches the representation of an existing Change.
+      #
+      # @see https://developers.google.com/cloud-dns/api/v1beta1/changes/get
+      class Real
+        def get_change(zone_name_or_id, identity)
+          api_method = @dns.changes.get
+          parameters = {
+            'project' => @project,
+            'managedZone' => zone_name_or_id,
+            'changeId' => identity,
+          }
+
+          request(api_method, parameters)
+        end
+      end
+
+      class Mock
+        def get_change(zone_name_or_id, identity)
+          if self.data[:managed_zones].has_key?(zone_name_or_id)
+            zone = self.data[:managed_zones][zone_name_or_id]
+          else
+            zone = self.data[:managed_zones].values.find { |zone| zone['name'] = zone_name_or_id }
+          end
+
+          unless zone
+            raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{zone_name_or_id}' does not exist."
+          end
+
+          unless data = self.data[:changes][zone['id']].find { |c| c['id'] == identity }
+            raise Fog::Errors::NotFound, "The 'parameters.changeId' resource named '#{identity}' does not exist."
+          end
+
+          build_excon_response(data)
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/requests/dns/get_managed_zone.rb

@@ -1,31 +1,37 @@
 module Fog
   module DNS
     class Google
-
-      class Mock
-        def get_managed_zone(zone_name_or_id)
-	  if self.data[:managed_zones][:by_name].has_key?(zone_name_or_id)
-            build_excon_response(self.data[:managed_zones][:by_name][zone_name_or_id])
-	  elsif self.data[:managed_zones][:by_id].has_key?(zone_name_or_id)
-            build_excon_response(self.data[:managed_zones][:by_id][zone_name_or_id])
-	  else
-	    raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{zone_name_or_id}' does not exist."
-	  end
-        end
-
-      end
-
+      ##
+      # Fetches the representation of an existing Managed Zone.
+      #
+      # @see https://developers.google.com/cloud-dns/api/v1beta1/managedZones/get
       class Real
-        def get_managed_zone(zone_name_or_id)
+        def get_managed_zone(name_or_id)
           api_method = @dns.managed_zones.get
           parameters = {
             'project' => @project,
-	    'managedZone' => zone_name_or_id,
+            'managedZone' => name_or_id,
           }
 
           request(api_method, parameters)
         end
       end
+
+      class Mock
+        def get_managed_zone(name_or_id)
+          if self.data[:managed_zones].has_key?(name_or_id)
+            data = self.data[:managed_zones][name_or_id]
+          else
+            data = self.data[:managed_zones].values.find { |zone| zone['name'] = name_or_id }
+          end
+
+          unless data
+            raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{name_or_id}' does not exist."
+          end
+
+          build_excon_response(data)
+        end
+      end
     end
   end
 end

data/lib/fog/google/requests/dns/get_project.rb

@@ -0,0 +1,42 @@
+module Fog
+  module DNS
+    class Google
+      ##
+      # Fetches the representation of an existing Project. Use this method to look up the limits on the number of
+      # resources that are associated with your project.
+      #
+      # @see https://developers.google.com/cloud-dns/api/v1beta1/projects/get
+      class Real
+        def get_project(identity)
+          api_method = @dns.projects.get
+          parameters = {
+            :project => identity,
+          }
+
+          request(api_method, parameters)
+        end
+      end
+
+      class Mock
+        def get_project(identity)
+          body = {
+            'kind' => 'dns#project',
+            'number' => Fog::Mock.random_numbers(12).to_s,
+            'id' => identity,
+            'quota' => {
+              'kind' => 'dns#quota',
+              'managedZones' => 100,
+              'rrsetsPerManagedZone' => 10000,
+              'rrsetAdditionsPerChange' => 100,
+              'rrsetDeletionsPerChange'=>100,
+              'totalRrdataSizePerChange' => 10000,
+              'resourceRecordsPerRrset' => 20,
+            }
+          }
+
+          build_excon_response(body)
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/requests/dns/list_changes.rb

@@ -0,0 +1,41 @@
+module Fog
+  module DNS
+    class Google
+      ##
+      # Enumerates the list of Changes.
+      #
+      # @see https://developers.google.com/cloud-dns/api/v1beta1/changes/list
+      class Real
+        def list_changes(zone_name_or_id)
+          api_method = @dns.changes.list
+          parameters = {
+            'project' => @project,
+            'managedZone' => zone_name_or_id,
+          }
+
+          request(api_method, parameters)
+        end
+      end
+
+      class Mock
+        def list_changes(zone_name_or_id)
+          if self.data[:managed_zones].has_key?(zone_name_or_id)
+            zone = self.data[:managed_zones][zone_name_or_id]
+          else
+            zone = self.data[:managed_zones].values.find { |zone| zone['name'] == zone_name_or_id }
+          end
+
+          unless zone
+            raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{zone_name_or_id}' does not exist."
+          end
+
+          body = {
+            'kind' => 'dns#changesListResponse',
+            'changes' => self.data[:changes][zone['id']],
+          }
+          build_excon_response(body)
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/requests/dns/list_managed_zones.rb

@@ -1,16 +1,10 @@
 module Fog
   module DNS
     class Google
-      class Mock
-        def list_managed_zones()
-          zones = self.data[:managed_zones][:by_id].values
-          build_excon_response({
-	    "kind" => "dns#managedZonesListResponse",
-	    "managedZones" => zones,
-          })
-        end
-      end
-
+      ##
+      # Enumerates Managed Zones that have been created but not yet deleted.
+      #
+      # @see hhttps://developers.google.com/cloud-dns/api/v1beta1/managedZones/list
       class Real
         def list_managed_zones()
           api_method = @dns.managed_zones.list
@@ -21,6 +15,17 @@ module Fog
           request(api_method, parameters)
         end
       end
+
+      class Mock
+        def list_managed_zones()
+          body = {
+            'kind' => 'dns#managedZonesListResponse',
+            'managedZones' => self.data[:managed_zones].values,
+          }
+
+          build_excon_response(body)
+        end
+      end
     end
   end
 end

data/lib/fog/google/requests/dns/list_resource_record_sets.rb

@@ -0,0 +1,50 @@
+module Fog
+  module DNS
+    class Google
+      ##
+      # Enumerates Resource Record Sets that have been created but not yet deleted.
+      #
+      # @see https://developers.google.com/cloud-dns/api/v1beta1/resourceRecordSets/list
+      class Real
+        def list_resource_record_sets(zone_name_or_id, options = {})
+          api_method = @dns.resource_record_sets.list
+          parameters = {
+            'project' => @project,
+            'managedZone' => zone_name_or_id,
+          }
+
+          [:name, :type].reject{ |o| options[o].nil? }.each do |key|
+            parameters[key] = options[key]
+          end
+
+          request(api_method, parameters)
+        end
+      end
+
+      class Mock
+        def list_resource_record_sets(zone_name_or_id, options = {})
+          if self.data[:managed_zones].has_key?(zone_name_or_id)
+            zone = self.data[:managed_zones][zone_name_or_id]
+          else
+            zone = self.data[:managed_zones].values.find { |zone| zone['name'] = zone_name_or_id }
+          end
+
+          unless zone
+            raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{zone_name_or_id}' does not exist."
+          end
+
+          rrsets = self.data[:resource_record_sets][zone['id']]
+          if options.has_key?(:name) && options.has_key?(:type)
+            rrsets.delete_if { |rrset| rrset['name'] != options[:name] || rrset['type'] != options[:type] }
+          end
+
+          body = {
+            'kind' => 'dns#resourceRecordSetsListResponse',
+            'rrsets' => rrsets,
+          }
+          build_excon_response(body)
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/storage.rb

@@ -211,7 +211,6 @@ module Fog
         # ==== Returns
         # * Storage object with connection to google.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @google_storage_access_key_id = options[:google_storage_access_key_id]
           @google_storage_secret_access_key = options[:google_storage_secret_access_key]

data/lib/fog/hp/storage.rb

@@ -326,7 +326,7 @@ module Fog
           auth_version = auth_version.to_s.downcase.to_sym
 
           ### Pass the service name for object storage to the authentication call
-          options[:hp_service_type] ||= " object-store"
+          options[:hp_service_type] ||= "object-store"
           @hp_tenant_id = options[:hp_tenant_id]
           @hp_avl_zone  = options[:hp_avl_zone]
 

data/lib/fog/internet_archive/storage.rb

@@ -240,7 +240,6 @@ module Fog
         # ==== Returns
         # * S3 object with connection to aws.
         def initialize(options={})
-          require 'fog/core/parser'
 
           setup_credentials(options)
           @connection_options     = options[:connection_options] || {}

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

@@ -66,9 +66,9 @@ module Fog
 
         def start
           return true if active?
-          service.vm_action(uuid, :create)
+          action_status = service.vm_action(uuid, :create)
           reload
-          true
+          action_status
         end
 
         def mac
@@ -87,23 +87,33 @@ module Fog
         end
 
         def reboot
-          service.vm_action(uuid, :reboot)
+          action_status = service.vm_action(uuid, :reboot)
+          reload
+          action_status
         end
 
         def poweroff
-          service.vm_action(uuid, :destroy)
+          action_status = service.vm_action(uuid, :destroy)
+          reload
+          action_status
         end
 
         def shutdown
-          service.vm_action(uuid, :shutdown)
+          action_status = service.vm_action(uuid, :shutdown)
+          reload
+          action_status
         end
 
         def resume
-          service.vm_action(uuid, :resume)
+          action_status = service.vm_action(uuid, :resume)
+          reload
+          action_status
         end
 
         def suspend
-          service.vm_action(uuid, :suspend)
+          action_status = service.vm_action(uuid, :suspend)
+          reload
+          action_status
         end
 
         def stopped?

data/lib/fog/opennebula/models/compute/flavor.rb

@@ -19,6 +19,8 @@ module Fog
         attribute :os
         attribute :graphics
         attribute :raw
+        attribute :context
+        attribute :user_variables
 
 
         def to_label
@@ -37,20 +39,24 @@ module Fog
             + get_sched_requirements \
             + get_sched_ds_requirements \
             + get_sched_rank \
-            + get_sched_ds_rank
+            + get_sched_ds_rank \
+            + get_context \
+            + get_user_variables
         end
 
         def get_cpu
-          "CPU=#{vcpu.to_f/10}\n"
+          return "CPU=#{vcpu.to_f/10}\n" unless cpu
+          return "CPU=#{vcpu}\n" if cpu.to_i > vcpu.to_i
+          "CPU=#{cpu}\n"
         end  
 
         def get_vcpu
-          vcpu = 1 unless vcpu
+          return "VCPU=1\n" unless vcpu
           "VCPU=#{vcpu}\n"
         end  
 
         def get_memory
-          memory = 128 unless memory
+          return "MEMORY=128\n" unless memory
           "MEMORY=#{memory}\n"
         end  
 
@@ -95,11 +101,12 @@ module Fog
 
         def get_nic
           # NIC=[MODEL="virtio",NETWORK="vlan17",NETWORK_UNAME="oneadmin"]
-          return "" if( nic.nil? || !(nic.is_a? Array))
+          return "" if nic.nil?
           ret = ""
-
-          nic.each do |n|
-            ret += %Q|NIC=[MODEL="#{n.model}",NETWORK_ID="#{n.vnet.id}"]\n|
+          if nic.is_a? Array
+            nic.each do |n|
+              ret += %Q|NIC=[MODEL="#{n.model}",NETWORK_ID="#{n.vnet.id}"]\n| unless n.vnet.nil?
+            end
           end
           #ret.gsub!(/\{/, '[')
           #ret.gsub!(/\}/, ']')
@@ -127,6 +134,37 @@ module Fog
           %Q|SCHED_RANK="#{sched_rank}"\n|
         end
 
+        def get_context
+          return "" unless context
+          if context.is_a? String
+            return %Q|CONTEXT= [ #{context} ]\n|
+          elsif context.is_a? Hash
+            ret = ""
+            context.each do |key, value|
+              ret << %Q|"#{key}"="#{value}",|
+            end
+            ret.chop! if ret.end_with?(',')
+            return %Q|CONTEXT=[ #{ret} ]\n|
+          else
+            return ""
+          end
+        end
+
+        def get_user_variables
+          return "" unless user_variables
+          if user_variables.is_a? String
+            return %Q|#{user_variables}\n|
+          elsif user_variables.is_a? Hash
+            ret = ""
+            user_variables.each do |key, value|
+              ret << %Q|#{key}="#{value}"\n|
+            end
+            return ret
+          else
+            return ""
+          end
+        end
+
       end
     end
   end