fog 1.21.0 → 1.22.0

data/lib/fog/google/requests/compute/remove_target_pool_instance.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def set_metadata(instance, zone, fingerprint, metadata={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def remove_target_pool_instances(target_pool, instances)
+          api_method = @compute.target_pools.remove_instance
+          parameters = {
+            'project' => @project,
+            'targetPool' => target_pool.name,
+            'region' => target_pool.region.split('/')[-1]
+          }
+          body = {
+            'instances' => instances.collect { |i| { 'instance' => i } }
+          }
+
+          result = self.build_result(api_method, parameters, body_object=body)
+          self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/google/requests/compute/remove_target_pool_instances.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def remove_target_pool_instances(target_pool, instances)
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def remove_target_pool_instances(target_pool, instances)
+          api_method = @compute.target_pools.remove_instance
+          parameters = {
+            'project' => @project,
+            'targetPool' => target_pool.name,
+            'region' => target_pool.region.split('/')[-1]
+          }
+          body = {
+            'instances' => instances.collect { |i| { 'instance' => i } }
+          }
+
+          result = self.build_result(api_method, parameters, body_object=body)
+          self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/google/requests/compute/set_common_instance_metadata.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+        def set_common_instance_metadata(identity, current_fingerprint, metadata = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+        def set_common_instance_metadata(identity, current_fingerprint, metadata = {})
+          api_method = @compute.projects.set_common_instance_metadata
+          parameters = {
+            :project => identity,
+          }
+          body_object = {
+            :fingerprint => current_fingerprint,
+            :items => Array(metadata).map { |pair| { :key => pair[0], :value => pair[1] } },
+          }
+
+          result = self.build_result(api_method, parameters, body_object)
+          response = self.build_response(result)
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/google/requests/compute/set_forwarding_rule_target.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+        def set_forwarding_rule_target(rule, target)
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+
+        def set_forwarding_rule_target(rule, target)
+          api_method = @compute.forwarding_rules.set_target
+          parameters = {
+            'project' => @project,
+            'forwardingRule' => rule.name,
+            'region' => rule.region.split('/')[-1]
+          }
+          body = {
+            'target' => target
+          }
+
+          result = self.build_result(api_method, parameters, body_object=body)
+          self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/google/requests/compute/set_tags.rb

@@ -13,13 +13,16 @@ module Fog
       class Real
 
         def set_tags(instance, zone, tags=[])
+          me = self.servers.get(instance, zone)
+          fp = me.tags["fingerprint"]
+
           api_method = @compute.instances.set_tags
           parameters = {
             'project' => @project,
             'instance' => instance,
             'zone' => zone
           }
-          body_object = { "items" => tags }
+          body_object = { "fingerprint" => fp, "items" => tags }
           result = self.build_result(
             api_method,
             parameters,

data/lib/fog/hp/examples/compute.md

@@ -764,9 +764,9 @@ This page discusses the following topics:
 1. List all available floating ip addresses:
 
         response = conn.list_addresses
-        response.body['addresses']                  # returns an array of address hashes
-        response.headers                            # returns the headers
-        response.body['addresses'][0]['id']         # returns the id of the address
+        response.body['floating_ips']                 # returns an array of address hashes
+        response.headers                              # returns the headers
+        response.body['floating_ips'][0]['id']        # returns the id of the address
 
 2. Obtain the details of a particular address:
 

data/lib/fog/hp/examples/compute_v2.md

@@ -813,14 +813,17 @@ You can find the values the access key, secret key, and other values by clicking
 
 1. List all available floating IP addresses:
 
-        response = conn.list_server_addresses
+        server = conn.servers.first
+        response = conn.list_server_addresses(server.id)
         response.body['addresses']                  # returns an array of address hashes
         response.headers                            # returns the headers
-        response.body['addresses'][0]['id']         # returns the id of the address
+      
 
 2. List addresses by network for a server:
 
-        response = conn.list_server_addresses_by_network("<address_id>")     # get the address
+        server = conn.servers.first
+        network = network_conn.networks.first.name
+        response = conn.list_server_addresses_by_network(server.id, name)     # get the addresses (assumes server is in network)
 
 3. Obtain the details of a particular address:
 

data/lib/fog/hp/examples/networking.md

@@ -45,7 +45,7 @@ To connect to the HP Cloud Networking Service, follow these steps:
 
 3. Establish a connection to the HP Cloud Networking service
 
-        conn = Fog::HP::Networking.new(
+        conn = Fog::HP::Network.new(
                :hp_access_key  => "<your_ACCESS_KEY>",
                :hp_secret_key => "<your_SECRET_KEY>",
                :hp_auth_uri   => "<IDENTITY_ENDPOINT_URL>",

data/lib/fog/hp/models/network/router.rb

@@ -10,7 +10,7 @@ module Fog
         attribute :name
         attribute :tenant_id
         attribute :external_gateway_info
-        attribute :admin_state_up
+        attribute :admin_state_up, :type => :boolean
         attribute :status
 
         def destroy

data/lib/fog/joyent/analytics.rb

@@ -132,8 +132,8 @@ module Fog
         end
 
         def initialize(options = {})
-          @joyent_username = options[:joyent_username] || Fog.credentials[:joyent_username]
-          @joyent_password = options[:joyent_password] || Fog.credentials[:joyent_password]
+          @joyent_username = options[:joyent_username]
+          @joyent_password = options[:joyent_password]
           @joyent_url = 'https://us-sw-1.api.joyentcloud.com'
           @joyent_version = '~7'
         end

data/lib/fog/joyent/compute.rb

@@ -101,8 +101,8 @@ module Fog
         end
 
         def initialize(options = {})
-          @joyent_username = options[:joyent_username] || Fog.credentials[:joyent_username]
-          @joyent_password = options[:joyent_password] || Fog.credentials[:joyent_password]
+          @joyent_username = options[:joyent_username]
+          @joyent_password = options[:joyent_password]
         end
 
         def request(opts)

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

@@ -10,6 +10,8 @@ module Fog
         attribute :state
         attribute :type
         attribute :dataset
+        attribute :compute_node
+        attribute :networks
         attribute :ips
         attribute :memory
         attribute :disk

data/lib/fog/ninefold/compute.rb

@@ -71,9 +71,9 @@ module Fog
       class Mock
 
         def initialize(options)
-          @api_url = options[:ninefold_api_url] || Fog.credentials[:ninefold_api_url] || API_URL
-          @ninefold_compute_key = options[:ninefold_compute_key] || Fog.credentials[:ninefold_compute_key]
-          @ninefold_compute_secret = options[:ninefold_compute_secret] || Fog.credentials[:ninefold_compute_secret]
+          @api_url = options[:ninefold_api_url] || API_URL
+          @ninefold_compute_key = options[:ninefold_compute_key]
+          @ninefold_compute_secret = options[:ninefold_compute_secret]
         end
 
         def request(options)
@@ -84,9 +84,9 @@ module Fog
       class Real
 
         def initialize(options)
-          @api_url                  = options[:ninefold_api_url] || Fog.credentials[:ninefold_api_url] || API_URL
-          @ninefold_compute_key     = options[:ninefold_compute_key] || Fog.credentials[:ninefold_compute_key]
-          @ninefold_compute_secret  = options[:ninefold_compute_secret] || Fog.credentials[:ninefold_compute_secret]
+          @api_url                  = options[:ninefold_api_url] || API_URL
+          @ninefold_compute_key     = options[:ninefold_compute_key]
+          @ninefold_compute_secret  = options[:ninefold_compute_secret]
           @connection_options       = options[:connection_options] || {}
           @persistent               = options[:persistent] || false
           @connection = Fog::XML::Connection.new(@api_url, @persistent, @connection_options)

data/lib/fog/openstack/compute.rb

@@ -320,7 +320,7 @@ module Fog
           authenticate
 
           @persistent = options[:persistent] || false
-          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def credentials
@@ -390,7 +390,7 @@ module Fog
               :openstack_endpoint_type => @openstack_endpoint_type
             }
 
-            if @openstack_auth_uri.path =~ /\/v2.0\//
+            if @openstack_auth_uri.path =~ /\/v2.0/
 
               credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
             else
@@ -422,7 +422,7 @@ module Fog
 
           # Not all implementations have identity service in the catalog
           if @openstack_identity_public_endpoint || @openstack_management_url
-            @identity_connection = Fog::XML::Connection.new(
+            @identity_connection = Fog::Core::Connection.new(
               @openstack_identity_public_endpoint || @openstack_management_url,
               false, @connection_options)
           end

data/lib/fog/openstack/core.rb

@@ -63,7 +63,7 @@ module Fog
     # legacy v1.0 style auth
     def self.authenticate_v1(options, connection_options = {})
       uri = options[:openstack_auth_uri]
-      connection = Fog::XML::Connection.new(uri.to_s, false, connection_options)
+      connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
       @openstack_api_key  = options[:openstack_api_key]
       @openstack_username = options[:openstack_username]
 
@@ -102,7 +102,7 @@ module Fog
 
       unless service
         unless tenant_name
-          response = Fog::XML::Connection.new(
+          response = Fog::Core::Connection.new(
             "#{uri.scheme}://#{uri.host}:#{uri.port}/v2.0/tenants", false, connection_options).request({
             :expects => [200, 204],
             :headers => {'Content-Type' => 'application/json',
@@ -186,7 +186,7 @@ module Fog
       auth_token  = options[:openstack_auth_token] || options[:unscoped_token]
       uri         = options[:openstack_auth_uri]
 
-      connection = Fog::XML::Connection.new(uri.to_s, false, connection_options)
+      connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
       request_body = {:auth => Hash.new}
 
       if auth_token
@@ -213,7 +213,7 @@ module Fog
     end
 
     def self.get_supported_version(supported_versions, uri, auth_token, connection_options = {})
-      connection = Fog::XML::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, connection_options)
+      connection = Fog::Core::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, connection_options)
       response = connection.request({
         :expects => [200, 204, 300],
         :headers => {'Content-Type' => 'application/json',

data/lib/fog/openstack/examples/network/network_subnets_routers.rb

@@ -59,5 +59,5 @@ public_subnet = network.subnets.create :name => 'floating_ips_net',
 
 
 # Create tenant networks
-create_tenant_network, 'admin@example.net', public_net
-create_tenant_network, 'demo@example.net', public_net
+create_tenant_network 'admin@example.net', public_net
+create_tenant_network 'demo@example.net', public_net

data/lib/fog/openstack/identity.rb

@@ -200,7 +200,7 @@ module Fog
           authenticate
 
           @persistent = options[:persistent] || false
-          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def credentials

data/lib/fog/openstack/image.rb

@@ -122,7 +122,7 @@ module Fog
           authenticate
 
           @persistent = options[:persistent] || false
-          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def credentials

data/lib/fog/openstack/metering.rb

@@ -116,7 +116,7 @@ module Fog
           authenticate
 
           @persistent = options[:persistent] || false
-          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def credentials

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

@@ -32,15 +32,17 @@ module Fog
 
         def create
           requires :name
-          merge_attributes(service.create_router(self.name,
-                                                  self.attributes).body['router'])
+
+          response = service.create_router(self.name, options)
+          merge_attributes(response.body['router'])
+
           self
         end
 
         def update
           requires :id
-          merge_attributes(service.update_router(self.id,
-                                                  self.attributes).body['router'])
+          response = service.update_router(self.id, options)
+          merge_attributes(response.body['router'])
           self
         end
 
@@ -50,6 +52,21 @@ module Fog
           true
         end
 
+        private
+
+        def options
+          options = self.attributes.dup
+
+          if options[:external_gateway_info]
+            if options[:external_gateway_info].is_a?(Fog::Network::OpenStack::Network)
+               options[:external_gateway_info] = { :network_id => options[:external_gateway_info].id }
+            else
+              options[:external_gateway_info] = { :network_id => options[:external_gateway_info]}
+            end
+          end
+          options
+        end
+
       end
     end
   end

data/lib/fog/openstack/network.rb

@@ -256,7 +256,7 @@ module Fog
           authenticate
 
           @persistent = options[:persistent] || false
-          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def credentials

data/lib/fog/openstack/orchestration.rb

@@ -114,7 +114,7 @@ module Fog
           authenticate
 
           @persistent = options[:persistent] || false
-          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def credentials
@@ -214,7 +214,7 @@ module Fog
 
           # Not all implementations have identity service in the catalog
           if @openstack_identity_public_endpoint || @openstack_management_url
-            @identity_connection = Fog::XML::Connection.new(
+            @identity_connection = Fog::Core::Connection.new(
               @openstack_identity_public_endpoint || @openstack_management_url,
               false, @connection_options)
           end

data/lib/fog/openstack/requests/network/create_router.rb

@@ -14,15 +14,27 @@ module Fog
             :admin_state_up,
             :tenant_id,
             :network_id,
-            :external_gateway_info,
             :status,
             :subnet_id
           ]
-
           vanilla_options.reject{ |o| options[o].nil? }.each do |key|
             data['router'][key] = options[key]
           end
 
+          # remove this in a future
+          egi = options[:external_gateway_info]
+          if egi
+            if egi.is_a?(Fog::Network::OpenStack::Network)
+              Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \
+              Please pass  external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]"
+              data['router'][:external_gateway_info] = { :network_id => egi.id }
+            elsif egi.is_a?(Hash) && egi[:network_id]
+              data['router'][:external_gateway_info] = egi
+            else
+              raise ArgumentError.new('Invalid external_gateway_info attribute')
+            end
+          end
+
           request(
             :body     => Fog::JSON.encode(data),
             :expects  => [201],
@@ -36,17 +48,26 @@ module Fog
         def create_router(name, options = {})
           response = Excon::Response.new
           response.status = 201
+
+          # remove this in a future
+          egi = options[:external_gateway_info]
+          if egi && egi.is_a?(Fog::Network::OpenStack::Network)
+            Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \
+            Please pass  external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]"
+            egi = { :network_id => egi.id }
+          end
+
           data = {
             'router' => {
-              'id'     => Fog::Mock.random_numbers(6).to_s,
-              'status' => options[:status] || 'ACTIVE',
-              'external_gateway_info' => options[:external_gateway_info],
-              'name' => name,
-              'admin_state_up' => options[:admin_state_up],
-              'tenant_id' => '6b96ff0cb17a4b859e1e575d221683d3'
+              :id     => Fog::Mock.random_numbers(6).to_s,
+              :status => options[:status] || 'ACTIVE',
+              :external_gateway_info => egi,
+              :name => name,
+              :admin_state_up => options[:admin_state_up],
+              :tenant_id => '6b96ff0cb17a4b859e1e575d221683d3'
             }
           }
-          self.data[:routers][data['router']['id']] = data['router']
+          self.data[:routers][data['router'][:id]] = data['router']
           response.body = data
           response
         end