fog 1.11.1 → 1.12.0

data/lib/fog/joyent/errors.rb

@@ -20,9 +20,9 @@ module Fog
         # https://us-west-1.api.joyentcloud.com/docs#cloudapi-http-responses
         #
         # HTTP Status Codes
-        # 
+        #
         # Your client should check for each of the following status codes from any API request:
-        # 
+        #
         # Response  Code  Description
 
         # 400 Bad Request Invalid HTTP Request

data/lib/fog/joyent/models/compute/network.rb

@@ -0,0 +1,13 @@
+module Fog
+  module Compute
+    class Joyent
+      class Network < Fog::Model
+        identity :id
+
+        attribute :name
+        attribute :public
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+require 'fog/joyent/models/compute/network'
+module Fog
+  module Compute
+    class Joyent
+      class Networks < Fog::Collection
+
+        model Fog::Compute::Joyent::Network
+
+        def all
+          load(service.list_networks.body)
+        end
+      end
+    end
+  end
+end

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

@@ -14,6 +14,7 @@ module Fog
         attribute :memory
         attribute :disk
         attribute :metadata
+        attribute :tags
 
         attribute :created, :type => :time
         attribute :updated, :type => :time
@@ -89,7 +90,7 @@ module Fog
           true
         end
 
-        def tags
+        def list_tags
           requires :id
           service.list_machine_tags(id).body
         end

data/lib/fog/joyent/models/compute/servers.rb

@@ -26,7 +26,9 @@ module Fog
 
         def get(machine_id)
           data = service.get_machine(machine_id).body
-          new(data)
+          server = new(data)
+          server.tags = server.list_tags if server.tags.nil?
+          server
         end
 
       end

data/lib/fog/joyent/requests/compute/delete_machine.rb

@@ -6,7 +6,7 @@ module Fog
           request(
             :path => "/my/machines/#{machine_id}",
             :method => "DELETE",
-            :expects => [200, 204]
+            :expects => [200, 204, 410]
           )
         end
       end

data/lib/fog/joyent/requests/compute/get_machine.rb

@@ -20,7 +20,7 @@ module Fog
           request(
             :method => "GET",
             :path => "/my/machines/#{uuid}",
-            :expects => 200
+            :expects => [200, 410]
           )
         end
       end

data/lib/fog/joyent/requests/compute/list_machines.rb

@@ -16,7 +16,8 @@ module Fog
           request(
             :path => "/my/machines",
             :method => "GET",
-            :query => options
+            :query => options,
+            :expects => 200
           )
         end
       end

data/lib/fog/joyent/requests/compute/list_networks.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Compute
+    class Joyent
+
+      class Mock
+        def list_networks(options={})
+          res = Excon::Response.new
+          res.status = 200
+          res.body = self.data[:networks].values
+          res
+        end
+      end
+
+      class Real
+        def list_networks(options={})
+          request(
+            :path => "/my/networks",
+            :method => "GET",
+            :query => options,
+            :expects => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/joyent/requests/compute/resize_machine.rb

@@ -6,7 +6,8 @@ module Fog
         request(
           :method => "POST",
           :path => "/my/machines/#{id}",
-          :query => {"action" => "resize", "package" => package}
+          :query => {"action" => "resize", "package" => package},
+          :expects => [202]
         )
       end
      end

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

@@ -7,6 +7,7 @@ module Fog
       class Nic < Fog::Model
 
         identity :mac
+        attribute :id
         attribute :type
         attribute :network
         attribute :bridge

data/lib/fog/linode/models/dns/record.rb

@@ -23,7 +23,6 @@ module Fog
         # "PORT":0,
 
         def initialize(attributes={})
-          self.ttl    ||= 3600
           super
         end
 

data/lib/fog/linode/models/dns/zone.rb

@@ -24,7 +24,6 @@ module Fog
 
         def initialize(attributes={})
           self.type ||= 'master'
-          self.ttl  ||= 3600
           super
         end
 

data/lib/fog/local/models/storage/files.rb

@@ -14,19 +14,19 @@ module Fog
         def all
           requires :directory
           if directory.collection.get(directory.key)
-            pwd = Dir.pwd
-            Dir.chdir(service.path_to(directory.key))
-            data = Dir.glob('**/*').reject do |file|
-              ::File.directory?(file)
-            end.map do |key|
-              path = file_path(key)
-              {
-                :content_length => ::File.size(path),
-                :key            => key,
-                :last_modified  => ::File.mtime(path)
-              }
-            end
-            Dir.chdir(pwd)
+            data = []
+            Dir.chdir(service.path_to(directory.key)) {
+              data = Dir.glob('**/*').reject do |file|
+                ::File.directory?(file)
+              end.map do |key|
+                path = file_path(key)
+                {
+                  :content_length => ::File.size(path),
+                  :key            => key,
+                  :last_modified  => ::File.mtime(path)
+                }
+              end
+            }
             load(data)
           else
             nil

data/lib/fog/monitoring.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Monitoring
+
+    def self.[](provider)
+      self.new(:provider => provider)
+    end
+
+    def self.new(attributes)
+      attributes = attributes.dup
+      provider = attributes.delete(:provider).to_s.downcase.to_sym
+      if provider == :stormondemand
+        require 'fog/storm_on_demand/billing'
+        Fog::Monitoring::StormOnDemand.new(attributes)
+      else
+        raise ArgumentError.new("#{provider} has no monitoring service")
+      end
+    end
+
+    def self.providers
+      Fog.services[:monitoring]
+    end
+
+  end
+end

data/lib/fog/network.rb

@@ -9,7 +9,10 @@ module Fog
       attributes = attributes.dup # Prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
-      if self.providers.include?(provider)
+      if provider == :stormondemand
+        require "fog/storm_on_demand/network"
+        return Fog::Network::StormOnDemand.new(attributes)
+      elsif self.providers.include?(provider)
         require "fog/#{provider}/network"
         return Fog::Network.const_get(Fog.providers[provider]).new(attributes)
       end

data/lib/fog/openstack/compute.rb

@@ -93,6 +93,11 @@ module Fog
       request :create_flavor
       request :delete_flavor
 
+      # Flavor Access
+      request :add_flavor_access
+      request :remove_flavor_access
+      request :list_tenants_with_flavor_access
+
       # Metadata
       request :list_metadata
       request :get_metadata

data/lib/fog/openstack/identity.rb

@@ -95,6 +95,7 @@ module Fog
         end
 
         def initialize(options={})
+          require 'multi_json'
           @openstack_username = options[:openstack_username] || 'admin'
           @openstack_tenant   = options[:openstack_tenant]   || 'admin'
           @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
@@ -245,7 +246,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
+            response.body = MultiJson.decode(response.body)
           end
           response
         end

data/lib/fog/openstack/image.rb

@@ -46,6 +46,7 @@ module Fog
         end
 
         def initialize(options={})
+          require 'multi_json'
           @openstack_username = options[:openstack_username]
           @openstack_tenant   = options[:openstack_tenant]
           @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
@@ -93,6 +94,8 @@ module Fog
         attr_reader :current_tenant
 
         def initialize(options={})
+          require 'multi_json'
+
           @openstack_auth_token = options[:openstack_auth_token]
 
           unless @openstack_auth_token
@@ -165,7 +168,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
+            response.body = MultiJson.decode(response.body)
           end
           response
         end

data/lib/fog/openstack/models/image/images.rb

@@ -18,6 +18,7 @@ module Fog
         def find_by_id(id)
           self.find {|image| image.id == id}
         end
+        alias_method :get, :find_by_id
 
         def public
           images = load(service.list_public_images_detailed.body['images'])

data/lib/fog/openstack/models/network/lb_health_monitor.rb

@@ -0,0 +1,68 @@
+require 'fog/core/model'
+
+module Fog
+  module Network
+    class OpenStack
+      class LbHealthMonitor < Fog::Model
+        identity :id
+
+        attribute :type
+        attribute :delay
+        attribute :timeout
+        attribute :max_retries
+        attribute :http_method
+        attribute :url_path
+        attribute :expected_codes
+        attribute :status
+        attribute :admin_state_up
+        attribute :tenant_id
+
+        def initialize(attributes)
+          prepare_service_value(attributes)
+          super
+        end
+
+        def save
+          requires :type, :delay, :timeout, :max_retries
+          identity ? update : create
+        end
+
+        def create
+          requires :type, :delay, :timeout, :max_retries
+          merge_attributes(service.create_lb_health_monitor(self.type,
+                                                            self.delay,
+                                                            self.timeout,
+                                                            self.max_retries,
+                                                            self.attributes).body['health_monitor'])
+          self
+        end
+
+        def update
+          requires :id, :type, :delay, :timeout, :max_retries
+          merge_attributes(service.update_lb_health_monitor(self.id,
+                                                            self.attributes).body['health_monitor'])
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_lb_health_monitor(self.id)
+          true
+        end
+
+        def associate_to_pool(pool_id)
+          requires :id
+          service.associate_lb_health_monitor(pool_id, self.id)
+          true
+        end
+
+        def disassociate_from_pool(pool_id)
+          requires :id
+          service.disassociate_lb_health_monitor(pool_id, self.id)
+          true
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/network/lb_health_monitors.rb

@@ -0,0 +1,34 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/network/lb_health_monitor'
+
+module Fog
+  module Network
+    class OpenStack
+      class LbHealthMonitors < Fog::Collection
+
+        attribute :filters
+
+        model Fog::Network::OpenStack::LbHealthMonitor
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        def all(filters = filters)
+          self.filters = filters
+          load(service.list_lb_health_monitors(filters).body['health_monitors'])
+        end
+
+        def get(health_monitor_id)
+          if health_monitor = service.get_lb_health_monitor(health_monitor_id).body['health_monitor']
+            new(health_monitor)
+          end
+        rescue Fog::Network::OpenStack::NotFound
+          nil
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/network/lb_member.rb

@@ -0,0 +1,53 @@
+require 'fog/core/model'
+
+module Fog
+  module Network
+    class OpenStack
+      class LbMember < Fog::Model
+        identity :id
+
+        attribute :pool_id
+        attribute :address
+        attribute :protocol_port
+        attribute :weight
+        attribute :status
+        attribute :admin_state_up
+        attribute :tenant_id
+
+        def initialize(attributes)
+          prepare_service_value(attributes)
+          super
+        end
+
+        def save
+          requires :pool_id, :address, :protocol_port, :weight
+          identity ? update : create
+        end
+
+        def create
+          requires :pool_id, :address, :protocol_port, :weight
+          merge_attributes(service.create_lb_member(self.pool_id,
+                                                    self.address,
+                                                    self.protocol_port,
+                                                    self.weight,
+                                                    self.attributes).body['member'])
+          self
+        end
+
+        def update
+          requires :id, :pool_id, :address, :protocol_port, :weight
+          merge_attributes(service.update_lb_member(self.id,
+                                                    self.attributes).body['member'])
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_lb_member(self.id)
+          true
+        end
+
+      end
+    end
+  end
+end