fog 1.18.0 → 1.19.0

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

@@ -14,7 +14,7 @@ module Fog
           data['keypair']['public_key'] = public_key unless public_key.nil?
 
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => 200,
             :method   => 'POST',
             :path     => 'os-keypairs.json'

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

@@ -12,7 +12,7 @@ module Fog
           }
 
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => 200,
             :method   => 'POST',
             :path     => 'os-security-groups.json'
@@ -23,10 +23,10 @@ module Fog
 
       class Mock
         def create_security_group(name, description)
-          Fog::Identity.new(:provider => 'OpenStack')
+          Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url])
           tenant_id = Fog::Identity::OpenStack::Mock.data[current_tenant][:tenants].keys.first
           security_group_id = Fog::Mock.random_numbers(2).to_i
-          self.data[:security_groups][security_group_id] = {
+          self.data[:security_groups][security_group_id.to_s] = {
             'tenant_id' => tenant_id,
             'rules'     => [],
             'id'        => security_group_id,
@@ -42,7 +42,7 @@ module Fog
             'Content-Length' => Fog::Mock.random_numbers(3).to_s,
             'Date'           => Date.new}
           response.body = {
-            'security_group' => self.data[:security_groups][security_group_id]
+            'security_group' => self.data[:security_groups][security_group_id.to_s]
           }
           response
         end

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

@@ -18,7 +18,7 @@ module Fog
           request(
             :expects  => 200,
             :method   => 'POST',
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :path     => 'os-security-group-rules.json'
           )
         end
@@ -47,7 +47,7 @@ module Fog
               'cidr'   => cidr
             }
           }
-          self.data[:security_groups][parent_group_id]['rules'].push(rule)
+          self.data[:security_groups][parent_group_id.to_s]['rules'].push(rule)
           response.body = {
             'security_group_rule' => rule
           }

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

@@ -13,7 +13,7 @@ module Fog
           }
 
           vanilla_options = ['metadata', 'accessIPv4', 'accessIPv6',
-                             'availability_zone', 'user_data', 'key_name', 
+                             'availability_zone', 'user_data', 'key_name',
                              'adminPass', 'config_drive', 'min_count', 'max_count',
                              'return_reservation_id'
                             ]
@@ -107,7 +107,6 @@ module Fog
                        response.body["user"]["id"]
                     end
 
-
           mock_data = {
             'addresses'    => {},
             'flavor'       => {"id" => flavor_ref, "links"=>[{"href"=>"http://nova1:8774/admin/flavors/1", "rel"=>"bookmark"}]},
@@ -127,10 +126,18 @@ module Fog
             'config_drive' => options['config_drive'] || '',
           }
 
+          if nics = options['nics']
+            nics.each do |nic|
+              mock_data["addresses"].merge!(
+                "Public" => [{ 'addr' => Fog::Mock.random_ip }]
+              )
+            end
+          end
+
           response_data = {}
           if options['return_reservation_id'] == 'True' then
             response_data = { 'reservation_id' => "r-#{Fog::Mock.random_numbers(6).to_s}" }
-          else   
+          else
             response_data = {
               'adminPass'       => 'password',
               'id'              => server_id,
@@ -156,12 +163,12 @@ module Fog
           self.data[:last_modified][:servers][server_id] = Time.now
           self.data[:servers][server_id] = mock_data
           if options['return_reservation_id'] == 'True' then
-            response.body = response_data 
+            response.body = response_data
           else
             response.body = { 'server' => response_data }
           end
           response
-        end      
+        end
       end
     end
   end

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

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

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

@@ -15,7 +15,7 @@ module Fog
 
       class Mock
         def delete_security_group(security_group_id)
-          self.data[:security_groups].delete security_group_id
+          self.data[:security_groups].delete security_group_id.to_s
 
           response = Excon::Response.new
           response.status = 202

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

@@ -15,6 +15,8 @@ module Fog
 
       class Mock
         def delete_security_group_rule(security_group_rule_id)
+          security_group = self.data[:security_groups].values.detect{|sg| sg["rules"].detect{ |sgr| sgr["id"].to_s == security_group_rule_id.to_s }}
+          security_group["rules"].reject! { |sgr| sgr["id"] == security_group_rule_id }
           response = Excon::Response.new
           response.status = 202
           response.headers = {

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

@@ -15,32 +15,22 @@ module Fog
 
       class Mock
         def get_security_group(security_group_id)
+          security_group = self.data[:security_groups][security_group_id.to_s]
           response = Excon::Response.new
-          response.status = 200
-          response.headers = {
-            "X-Compute-Request-Id" => "req-63a90344-7c4d-42e2-936c-fd748bced1b3",
-            "Content-Type" => "application/json",
-            "Content-Length" => "167",
-            "Date" => Date.new
-          }
-          response.body = {
-            "security_group" => {
-              "rules" => [{
-                "from_port" => 44,
-                "group" => {},
-                "ip_protocol" => "tcp",
-                "to_port" => 55,
-                "parent_group_id" => 1,
-                "ip_range" => {
-                  "cidr" => "10.10.10.10/24"
-                }, "id"=>1
-              }],
-              "tenant_id" => "d5183375ab0343f3a0b4b05f547aefc2",
-              "id"=>security_group_id,
-              "name"=>"default",
-              "description"=>"default"
+          if security_group
+            response.status = 200
+            response.headers = {
+              "X-Compute-Request-Id" => "req-63a90344-7c4d-42e2-936c-fd748bced1b3",
+              "Content-Type" => "application/json",
+              "Content-Length" => "167",
+              "Date" => Date.new
             }
-          }
+            response.body = {
+              "security_group" => security_group
+            }
+          else
+            raise Fog::Compute::OpenStack::NotFound, "Security group #{security_group_id} does not exist"
+          end
           response
         end
       end # mock

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

@@ -0,0 +1,38 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def get_security_group_rule(security_group_rule_id)
+          request(
+            :expects  => [200],
+            :method   => 'GET',
+            :path     => "os-security-group-rules/#{security_group_rule_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_security_group_rule(security_group_rule_id)
+          security_group_rule = nil
+          self.data[:security_groups].detect{|id, sg| security_group_rule = sg["rules"].detect{ |sgr| sgr["id"].to_s == security_group_rule_id.to_s }}
+          response = Excon::Response.new
+          if security_group_rule
+            response.status = 200
+            response.headers = {
+              "X-Compute-Request-Id" => "req-63a90344-7c4d-42e2-936c-fd748bced1b3",
+              "Content-Type" => "application/json",
+              "Content-Length" => "167",
+              "Date" => Date.new
+            }
+            response.body = {
+              "security_group_rule" => security_group_rule
+            }
+          else
+            raise Fog::Compute::OpenStack::NotFound, "Security group rule #{security_group_rule_id} does not exist"
+          end
+          response
+        end
+      end # mock
+    end # openstack
+  end #compute
+end #fog

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

@@ -14,12 +14,12 @@ module Fog
       end
 
       class Mock
-        
+
         def list_hosts
           response = Excon::Response.new
           response.status = 200
           response.body = { "hosts" => [
-              {"host_name" => "host.test.net", "service"=>"compute"}
+              {"host_name" => "host.test.net", "service"=>"compute", "zone" => "az1"}
             ]
           }
           response
@@ -29,4 +29,4 @@ module Fog
       end # mock
     end # openstack
   end # compute
-end # fog
+end # fog

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

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

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

@@ -4,7 +4,7 @@ module Fog
       class Real
         def remove_flavor_access(flavor_ref, tenant_id)
           request(
-            :body => MultiJson.encode({
+            :body => Fog::JSON.encode({
               "removeTenantAccess" => {
                 "tenant" => tenant_id.to_s
               }

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 => MultiJson.encode({ 'quota_set' => options }),
+            :body => Fog::JSON.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    => MultiJson.encode(data),
+            :body    => Fog::JSON.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     => MultiJson.encode(data),
+            :body     => Fog::JSON.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     => MultiJson.encode(data),
+            :body     => Fog::JSON.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     => MultiJson.encode({ 'user' => options }),
+            :body     => Fog::JSON.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    => MultiJson.encode(data),
+            :body    => Fog::JSON.encode(data),
             :expects => [200, 202],
             :method  => 'PUT',
             :path    => "images/#{image_id}/members"

data/lib/fog/openstack/requests/orchestration/create_stack.rb

@@ -25,12 +25,12 @@ module Fog
             :expects  => 201,
             :path => 'stacks',
             :method => 'POST',
-            :body => MultiJson.encode(params)
+            :body => Fog::JSON.encode(params)
           )
         end
 
       end
-      
+
       class Mock
         def create_stack(stack_name, options = {})
           stack_id = Fog::Mock.random_hex(32)

data/lib/fog/openstack/requests/orchestration/update_stack.rb

@@ -22,7 +22,7 @@ module Fog
             :expects  => 202,
             :path => "stacks/#{stack_name}/#{stack_id}",
             :method => 'PUT',
-            :body => MultiJson.encode(params)
+            :body => Fog::JSON.encode(params)
           )
         end
 

data/lib/fog/openstack/requests/storage/get_object_http_url.rb

@@ -0,0 +1,13 @@
+# Get an expiring object http url
+#
+# ==== Parameters
+# * container<~String> - Name of container containing object
+# * object<~String> - Name of object to get expiring url for
+# * expires<~Time> - An expiry time for this url
+#
+# ==== Returns
+# * response<~Excon::Response>:
+#   * body<~String> - url for object
+def get_object_http_url(container, object, expires, options = {})
+  create_temp_url(container, object, expires, "GET", options.merge(:scheme => "http"))
+end

data/lib/fog/openstack/requests/storage/get_object_https_url.rb

@@ -18,20 +18,6 @@ module Fog
           create_temp_url(container, object, expires, "GET", options.merge(:scheme => "https"))
         end
         
-        # Get an expiring object http url
-        #
-        # ==== Parameters
-        # * container<~String> - Name of container containing object
-        # * object<~String> - Name of object to get expiring url for
-        # * expires<~Time> - An expiry time for this url
-        #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~String> - url for object
-        def get_object_http_url(container, object, expires, options = {})
-          create_temp_url(container, object, expires, "GET", options.merge(:scheme => "http"))
-        end
-        
         # creates a temporary url 
         #
         # ==== Parameters

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

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

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

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

data/lib/fog/openstack/requests/volume/get_volume_type_details.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Volume
+    class OpenStack
+      class Real
+        def get_volume_type_details(volume_type_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "types/#{volume_type_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_volume_details(volume_type_id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "volume_type" => {
+              "id" => "1",
+              "name" => "type 1",
+              "extra_specs" => {
+                "volume_backend_name" => "type 1 backend name"
+              }
+            }
+          }
+          response
+        end
+      end
+    end
+  end
+end