fog 1.8.0 → 1.9.0

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

@@ -0,0 +1,50 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def create_floating_ip(floating_network_id, options = {})
+          data = {
+            'floating_ip' => {
+              'floating_network_id' => floating_network_id,
+              'port_id' => options[:port_id],
+              'tenant_id' => options[:tenant_id],
+              'fixed_ip_address' => options[:fixed_ip_address],
+            }
+          }
+
+          vanilla_options = [:port_id, :tenant_id, :fixed_ip_address ]
+          vanilla_options.reject{ |o| options[o].nil? }.each do |key|
+            data['floating_ip'][key] = options[key]
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => [201],
+            :method   => 'POST',
+            :path     => 'floatingips'
+          )
+        end
+      end
+
+      class Mock
+        def create_floating_ip(floating_network_id, options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'id'                  => floating_network_id,
+            'floating_network_id' => floating_network_id,
+            'port_id'             => options[:port_id],
+            'tenant_id'           => options[:tenant_id],
+            'fixed_ip_address'    => options[:fixed_ip_address],
+            'router_id'           => nil,
+          }
+          self.data[:floating_ips][data['id']] = data
+          response.body = { 'floating_ip' => data }
+          response
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def delete_floating_ip(floating_ip_id)
+          request(
+            :expects  => 204,
+            :method   => 'DELETE',
+            :path     => "floatingips/#{floating_ip_id}"
+          )
+        end
+      end
+
+      class Mock
+        def delete_floating_ip(floating_ip_id)
+          response = Excon::Response.new
+          if list_floating_ips.body['floating_ips'].map { |r| r['id'] }.include? floating_ip_id
+            self.data[:floating_ips].delete(floating_ip_id)
+            response.status = 204
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def disassociate_floating_ip(floating_ip_id, options = {})
+          data = {
+            'floating_ip' => {
+              'port_id'    => nil,
+            }
+          }
+
+          vanilla_options = [:fixed_ip_address]
+          vanilla_options.reject{ |o| options[o].nil? }.each do |key|
+            data['floating_ip'][key] = options[key]
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => [200],
+            :method   => 'PUT',
+            :path     => "floatingips/#{floating_ip_id}"
+          )
+        end
+      end
+
+      class Mock
+        def disassociate_floating_ip(floating_ip_id, options = {})
+          response = Excon::Response.new
+          response.status = 200
+          data = {
+            'id'                  => '00000000-0000-0000-0000-000000000000',
+            'router_id'           => nil,
+            'tenant_id'           => options["tenant_id"],
+            'floating_network_id' => options["floating_network_id"],
+            'fixed_ip_address'    => nil,
+            'floating_ip_address' => options["floating_ip_address"],
+            'port_id'             => options["port_id"],
+          }
+
+          self.data[:floating_ips][data['floating_ip_id']] = data
+          response.body = { 'floating_ip' => data }
+          response
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def get_floating_ip(floating_ip_id)
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "floatingips/#{floating_ip_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_floating_ip(floating_ip_id)
+          response = Excon::Response.new
+          if data = self.data[:floating_ips][floating_ip_id]
+            response.status = 200
+            response.body = {
+              "floating_ip" => {
+                "id"                  => "00000000-0000-0000-0000-000000000000",
+                # changed
+                # "floating_ip_id" => floating_ip_id,
+                "port_id"             => data["port_id"],
+                "tenant_id"           => data["tenant_id"],
+                "fixed_ip_address"    => data["fixed_ip_address"],
+                "router_id"           => "00000000-0000-0000-0000-000000000000",
+                "floating_ip_address" => data["floating_ip_address"],
+              }
+            }
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def list_floating_ips(filters = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'floatingips',
+            :query   => filters
+          )
+        end
+      end
+
+      class Mock
+        def list_floating_ips(filters = {})
+          Excon::Response.new(
+            :body   => { 'floating_ips' => self.data[:floating_ips].values },
+            :status => 200
+          )
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/volume.rb

@@ -6,7 +6,7 @@ module Fog
 
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url, :persistent,
-                 :openstack_service_name, :openstack_tenant,
+                 :openstack_service_type, :openstack_service_name, :openstack_tenant,
                  :openstack_api_key, :openstack_username,
                  :current_user, :current_tenant
 
@@ -111,7 +111,8 @@ module Fog
           @openstack_auth_uri             = URI.parse(options[:openstack_auth_url])
           @openstack_management_url       = options[:openstack_management_url]
           @openstack_must_reauthenticate  = false
-          @openstack_service_name         = options[:openstack_service_name] || ['volume']
+          @openstack_service_type         = options[:openstack_service_type] || ['volume']
+          @openstack_service_name         = options[:openstack_service_name]
 
           @connection_options = options[:connection_options] || {}
 
@@ -182,6 +183,7 @@ module Fog
               :openstack_username => @openstack_username,
               :openstack_auth_uri => @openstack_auth_uri,
               :openstack_auth_token => @openstack_auth_token,
+              :openstack_service_type => @openstack_service_type,
               :openstack_service_name => @openstack_service_name,
               :openstack_endpoint_type => 'adminURL'
             }

data/lib/fog/ovirt/models/compute/cluster.rb

@@ -10,7 +10,7 @@ module Fog
         attribute :raw
 
         def networks
-          connection.list_networks(id)
+          service.list_networks(id)
         end
 
         def to_s

data/lib/fog/ovirt/models/compute/clusters.rb

@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::Ovirt::Cluster
 
         def all(filters = {})
-          load connection.list_clusters(filters)
+          load service.list_clusters(filters)
         end
 
         def get(id)
-          new connection.get_cluster(id)
+          new service.get_cluster(id)
         end
 
       end

data/lib/fog/ovirt/models/compute/interfaces.rb

@@ -14,16 +14,16 @@ module Fog
         def all(filters = {})
           requires :vm
           if vm.is_a? Fog::Compute::Ovirt::Server
-            load connection.list_vm_interfaces(vm.id)
+            load service.list_vm_interfaces(vm.id)
           elsif vm.is_a? Fog::Compute::Ovirt::Template
-            load connection.list_template_interfaces(vm.id)
+            load service.list_template_interfaces(vm.id)
           else
             raise 'interfaces should have vm or template'
           end
         end
 
         def get(id)
-          new connection.get_interface(id)
+          new service.get_interface(id)
         end
 
      end

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

@@ -46,51 +46,51 @@ module Fog
 
         def interfaces
           attributes[:interfaces] ||= id.nil? ? [] : Fog::Compute::Ovirt::Interfaces.new(
-              :connection => connection,
+              :service => service,
               :vm => self
           )
         end
 
         def add_interface attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.add_interface(id, attrs)
+          service.add_interface(id, attrs)
         end
 
         def update_interface attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.update_interface(id, attrs)
+          service.update_interface(id, attrs)
         end
 
         def destroy_interface attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.destroy_interface(id, attrs)
+          service.destroy_interface(id, attrs)
         end
 
         def volumes
           attributes[:volumes] ||= id.nil? ? [] : Fog::Compute::Ovirt::Volumes.new(
-              :connection => connection,
+              :service => service,
               :vm => self
           )
         end
 
         def add_volume attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.add_volume(id, attrs)
+          service.add_volume(id, attrs)
         end
 
         def destroy_volume attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.destroy_volume(id, attrs)
+          service.destroy_volume(id, attrs)
         end
 
         def start(options = {})
           wait_for { stopped? } if options[:blocking]
-          connection.vm_action(:id =>id, :action => :start)
+          service.vm_action(:id =>id, :action => :start)
           reload
         end
 
         def stop(options = {})
-          connection.vm_action(:id =>id, :action => :stop)
+          service.vm_action(:id =>id, :action => :stop)
           reload
         end
 
@@ -100,26 +100,26 @@ module Fog
         end
 
         def suspend(options = {})
-          connection.vm_action(:id =>id, :action => :suspend)
+          service.vm_action(:id =>id, :action => :suspend)
           reload
         end
 
         def destroy(options = {})
           (stop unless stopped?) rescue nil #ignore failure, destroy the machine anyway.
           wait_for { stopped? }
-          connection.destroy_vm(:id => id)
+          service.destroy_vm(:id => id)
         end
 
         def ticket(options = {})
           raise "Can not set console ticket, Server is not ready. Server status: #{status}" unless ready?
-          connection.vm_ticket(id, options)
+          service.vm_ticket(id, options)
         end
 
         def save
-          if identity
-            connection.update_vm(attributes)
+          if persisted?
+            service.update_vm(attributes)
           else
-            self.id = connection.create_vm(attributes).id
+            self.id = service.create_vm(attributes).id
           end
           reload
         end

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

@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::Ovirt::Server
 
         def all(filters = {})
-          load connection.list_virtual_machines(filters)
+          load service.list_virtual_machines(filters)
         end
 
         def get(id)
-          new connection.get_virtual_machine(id)
+          new service.get_virtual_machine(id)
         end
 
         def bootstrap(new_attributes = {})

data/lib/fog/ovirt/models/compute/template.rb

@@ -24,14 +24,14 @@ module Fog
 
         def interfaces
           attributes[:interfaces] ||= id.nil? ? [] : Fog::Compute::Ovirt::Interfaces.new(
-              :connection => connection,
+              :service => service,
               :vm => self
           )
         end
 
         def volumes
           attributes[:volumes] ||= id.nil? ? [] : Fog::Compute::Ovirt::Volumes.new(
-              :connection => connection,
+              :service => service,
               :vm => self
           )
         end
@@ -41,12 +41,12 @@ module Fog
         end
 
         def destroy(options = {})
-          connection.client.destroy_template(id)
+          service.client.destroy_template(id)
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
-          connection.client.create_template(attributes)
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          service.client.create_template(attributes)
         end
 
         def to_s

data/lib/fog/ovirt/models/compute/templates.rb

@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::Ovirt::Template
 
         def all(filters = {})
-          load connection.list_templates(filters)
+          load service.list_templates(filters)
         end
 
         def get(id)
-          new connection.get_template(id)
+          new service.get_template(id)
         end
 
       end

data/lib/fog/ovirt/models/compute/volumes.rb

@@ -14,16 +14,16 @@ module Fog
         def all(filters = {})
           requires :vm
           if vm.is_a? Fog::Compute::Ovirt::Server
-            load connection.list_vm_volumes(vm.id)
+            load service.list_vm_volumes(vm.id)
           elsif vm.is_a? Fog::Compute::Ovirt::Template
-            load connection.list_template_volumes(vm.id)
+            load service.list_template_volumes(vm.id)
           else
             raise 'volumes should have vm or template'
           end
         end
 
         def get(id)
-          new connection.get_volume(id)
+          new service.get_volume(id)
         end
 
      end