fog 1.11.1 → 1.12.0

data/lib/fog/openstack/requests/compute/create_security_group_rule.rb

@@ -18,7 +18,7 @@ module Fog
           request(
             :expects  => 200,
             :method   => 'POST',
-            :body     => Fog::JSON.encode(data),
+            :body     => MultiJson.encode(data),
             :path     => 'os-security-group-rules.json'
           )
         end

data/lib/fog/openstack/requests/compute/create_server.rb

@@ -81,12 +81,10 @@ module Fog
           user_id = if user then
                       user.id
                     else
-                      identity.user.create(:name     => @openstack_username,
-                                           :password => 'password',
-                                           :email =>
-                                             "#{@openstack_username}@example",
-                                           :tenant_id => @openstack_tenant,
-                                           :enabled => true).id
+                       response = identity.create_user(@openstack_username,
+                         'password',
+                         "#{@openstack_username}@example.com")
+                       response.body["user"]["id"]
                     end
 
 

data/lib/fog/openstack/requests/compute/create_volume.rb

@@ -17,7 +17,7 @@ module Fog
             data['volume'][key] = options[key]
           end
           request(
-            :body     => Fog::JSON.encode(data),
+            :body     => MultiJson.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => "os-volumes"

data/lib/fog/openstack/requests/compute/create_volume_snapshot.rb

@@ -14,7 +14,7 @@ module Fog
           }
 
           request(
-            :body     => Fog::JSON.encode(data),
+            :body     => MultiJson.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => "os-snapshots"

data/lib/fog/openstack/requests/compute/list_address_pools.rb

@@ -16,6 +16,16 @@ module Fog
 
       class Mock
 
+        def list_address_pools
+          response = Excon::Response.new
+          response.status = 200
+          response.body = { 
+            'floating_ip_pools' => [
+              { 'name' => 'nova' }
+            ]
+          }
+          response
+        end
 
       end
     end

data/lib/fog/openstack/requests/compute/list_tenants.rb

@@ -11,7 +11,7 @@ module Fog
             :method  => 'GET',
             :path    => '/v2.0/tenants'
           })
-          response.body = Fog::JSON.decode(response.body)
+          response.body = MultiJson.decode(response.body)
           response
         end
       end

data/lib/fog/openstack/requests/compute/list_tenants_with_flavor_access.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def list_tenants_with_flavor_access(flavor_ref)
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => "flavors/#{flavor_ref}/os-flavor-access.json"
+          )
+        end
+      end
+
+      class Mock
+        def list_tenants_with_flavor_access(flavor_ref)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "flavor_access" => [{ "tenant_id" => @tenant_id, "flavor_id" => flavor_ref }]
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/compute/remove_flavor_access.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def remove_flavor_access(flavor_ref, tenant_id)
+          request(
+            :body => MultiJson.encode({
+              "removeTenantAccess" => {
+                "tenant" => tenant_id
+              }
+            }),
+            :expects  => [200, 203],
+            :method   => 'POST',
+            :path     => "flavors/#{flavor_ref}/action.json"
+          )
+        end
+      end
+
+      class Mock
+        def remove_flavor_access(flavor_ref, tenant_id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "flavor_access" => []
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/compute/update_quota.rb

@@ -6,7 +6,7 @@ module Fog
         def update_quota(tenant_id, options = {})
           options['tenant_id'] = tenant_id
           request(
-            :body => Fog::JSON.encode({ 'quota_set' => options }),
+            :body => MultiJson.encode({ 'quota_set' => options }),
             :expects => 200,
             :method => 'PUT',
             :path => "/os-quota-sets/#{tenant_id}"

data/lib/fog/openstack/requests/identity/create_ec2_credential.rb

@@ -26,7 +26,7 @@ module Fog
           data = { 'tenant_id' => tenant_id }
 
           request(
-            :body    => Fog::JSON.encode(data),
+            :body    => MultiJson.encode(data),
             :expects => [200, 202],
             :method  => 'POST',
             :path    => "users/#{user_id}/credentials/OS-EC2"

data/lib/fog/openstack/requests/identity/create_role.rb

@@ -10,7 +10,7 @@ module Fog
           }
 
           request(
-            :body     => Fog::JSON.encode(data),
+            :body     => MultiJson.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path   => '/OS-KSADM/roles'

data/lib/fog/openstack/requests/identity/create_user.rb

@@ -15,7 +15,7 @@ module Fog
           }
 
           request(
-            :body     => Fog::JSON.encode(data),
+            :body     => MultiJson.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => '/users'

data/lib/fog/openstack/requests/identity/update_user.rb

@@ -6,7 +6,7 @@ module Fog
         def update_user(user_id, options = {})
           url = options.delete('url') || "/users/#{user_id}"
           request(
-            :body     => Fog::JSON.encode({ 'user' => options }),
+            :body     => MultiJson.encode({ 'user' => options }),
             :expects  => 200,
             :method   => 'PUT',
             :path     => url

data/lib/fog/openstack/requests/image/update_image_members.rb

@@ -11,7 +11,7 @@ module Fog
           data = { 'memberships' => members }
 
           request(
-            :body    => Fog::JSON.encode(data),
+            :body    => MultiJson.encode(data),
             :expects => [200, 202],
             :method  => 'PUT',
             :path    => "images/#{image_id}/members"

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

@@ -0,0 +1,39 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def associate_lb_health_monitor(pool_id, health_monitor_id)
+          data = {
+            'health_monitor' => {
+              'id' => health_monitor_id,
+            }
+          }
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => [201],
+            :method   => 'POST',
+            :path     => "lb/pools/#{pool_id}/health_monitors"
+          )
+        end
+      end
+
+      class Mock
+        def associate_lb_health_monitor(pool_id, health_monitor_id)
+          response = Excon::Response.new
+          if pool = list_lb_pools.body['pools'].detect { |_| _['id'] == pool_id }
+            pool['health_monitors'] << health_monitor_id
+            self.data[:lb_pools][pool_id] = pool
+            response.body = { 'health_monitor' => {} }
+            response.status = 200
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def create_lb_health_monitor(type, delay, timeout, max_retries, options = {})
+          data = {
+            'health_monitor' => {
+              'type'        => type,
+              'delay'       => delay,
+              'timeout'     => timeout,
+              'max_retries' => max_retries
+            }
+          }
+
+          vanilla_options = [:http_method, :url_path, :expected_codes, :admin_state_up, :tenant_id]
+          vanilla_options.reject{ |o| options[o].nil? }.each do |key|
+            data['health_monitor'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [201],
+            :method  => 'POST',
+            :path    => 'lb/health_monitors'
+          )
+        end
+      end
+
+      class Mock
+        def create_lb_health_monitor(type, delay, timeout, max_retries, options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'id'             => Fog::Mock.random_numbers(6).to_s,
+            'type'           => type,
+            'delay'          => delay,
+            'timeout'        => timeout,
+            'max_retries'    => max_retries,
+            'http_method'    => options[:http_method],
+            'url_path'       => options[:url_path],
+            'expected_codes' => options[:expected_codes],
+            'status'         => 'ACTIVE',
+            'admin_state_up' => options[:admin_state_up],
+            'tenant_id'      => options[:tenant_id],
+          }
+
+          self.data[:lb_health_monitors][data['id']] = data
+          response.body = { 'health_monitor' => data }
+          response
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def create_lb_member(pool_id, address, protocol_port, weight, options = {})
+          data = {
+            'member' => {
+              'pool_id'       => pool_id,
+              'address'       => address,
+              'protocol_port' => protocol_port,
+              'weight'        => weight
+            }
+          }
+
+          vanilla_options = [:admin_state_up, :tenant_id]
+          vanilla_options.reject{ |o| options[o].nil? }.each do |key|
+            data['member'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [201],
+            :method  => 'POST',
+            :path    => 'lb/members'
+          )
+        end
+      end
+
+      class Mock
+        def create_lb_member(pool_id, address, protocol_port, weight, options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'id'              => Fog::Mock.random_numbers(6).to_s,
+            'pool_id'         => pool_id,
+            'address'         => address,
+            'protocol_port'   => protocol_port,
+            'weight'          => weight,
+            'status'          => 'ACTIVE',
+            'admin_state_up'  => options[:admin_state_up],
+            'tenant_id'       => options[:tenant_id],
+          }
+
+          self.data[:lb_members][data['id']] = data
+          response.body = { 'member' => data }
+          response
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def create_lb_pool(subnet_id, protocol, lb_method, options = {})
+          data = {
+            'pool' => {
+              'subnet_id' => subnet_id,
+              'protocol'  => protocol,
+              'lb_method' => lb_method
+            }
+          }
+
+          vanilla_options = [:name, :description, :admin_state_up, :tenant_id]
+          vanilla_options.reject{ |o| options[o].nil? }.each do |key|
+            data['pool'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [201],
+            :method  => 'POST',
+            :path    => 'lb/pools'
+          )
+        end
+      end
+
+      class Mock
+        def create_lb_pool(subnet_id, protocol, lb_method, options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'id'                 => Fog::Mock.random_numbers(6).to_s,
+            'subnet_id'          => subnet_id,
+            'protocol'           => protocol,
+            'lb_method'          => lb_method,
+            'name'               => options[:name],
+            'description'        => options[:description],
+            'health_monitors'    => [],
+            'members'            => [],
+            'status'             => 'ACTIVE',
+            'admin_state_up'     => options[:admin_state_up],
+            'vip_id'             => nil,
+            'tenant_id'          => options[:tenant_id],
+            'active_connections' => nil,
+            'bytes_in'           => nil,
+            'bytes_out'          => nil,
+            'total_connections'  => nil
+          }
+
+          self.data[:lb_pools][data['id']] = data
+          response.body = { 'pool' => data }
+          response
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def create_lb_vip(subnet_id, pool_id, protocol, protocol_port, options = {})
+          data = {
+            'vip' => {
+              'subnet_id'     => subnet_id,
+              'pool_id'       => pool_id,
+              'protocol'      => protocol,
+              'protocol_port' => protocol_port
+            }
+          }
+
+          vanilla_options = [:name, :description, :address, :session_persistence, :connection_limit,
+                             :admin_state_up, :tenant_id]
+          vanilla_options.reject{ |o| options[o].nil? }.each do |key|
+            data['vip'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [201],
+            :method  => 'POST',
+            :path    => 'lb/vips'
+          )
+        end
+      end
+
+      class Mock
+        def create_lb_vip(subnet_id,  pool_id, protocol, protocol_port, options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'id'                  => Fog::Mock.random_numbers(6).to_s,
+            'subnet_id'           => subnet_id,
+            'pool_id'             => pool_id,
+            'protocol'            => protocol,
+            'protocol_port'       => protocol_port,
+            'name'                => options[:name],
+            'description'         => options[:description],
+            'address'             => options[:address],
+            'port_id'             => Fog::Mock.random_numbers(6).to_s,
+            'session_persistence' => options[:session_persistence],
+            'connection_limit'    => options[:connection_limit],
+            'status'              => 'ACTIVE',
+            'admin_state_up'      => options[:admin_state_up],
+            'tenant_id'           => options[:tenant_id],
+          }
+
+          self.data[:lb_vips][data['id']] = data
+          response.body = { 'vip' => data }
+          response
+        end
+      end
+
+    end
+  end
+end