fog-maestrodev 1.18.0.20131121075022 → 1.18.0.20131122203507

data/lib/fog/openstack/metering.rb

@@ -43,7 +43,6 @@ 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])
@@ -90,8 +89,6 @@ 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 +162,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end

data/lib/fog/openstack/network.rb

@@ -179,8 +179,6 @@ module Fog
         attr_reader :current_tenant
 
         def initialize(options={})
-          require 'multi_json'
-
           @openstack_auth_token = options[:openstack_auth_token]
 
           unless @openstack_auth_token
@@ -254,7 +252,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end

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

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

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

@@ -6,7 +6,7 @@ module Fog
         def allocate_address(pool = nil)
 
           request(
-            :body     => MultiJson.encode({'pool' => pool}),
+            :body     => Fog::JSON.encode({'pool' => pool}),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => 'os-floating-ips.json'

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

@@ -11,7 +11,7 @@ module Fog
             }
           }
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => "servers/%s/os-volume_attachments" % [server_id]

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

@@ -29,7 +29,7 @@ module Fog
           end
 
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => '/os-volumes_boot.json'

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

@@ -35,7 +35,7 @@ module Fog
           }
 
           request(
-            :body => MultiJson.encode(data),
+            :body => Fog::JSON.encode(data),
             :expects => 200,
             :method => 'POST',
             :path => 'flavors'

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'

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

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/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/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/volume.rb

@@ -61,7 +61,6 @@ 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])
@@ -108,8 +107,6 @@ module Fog
         attr_reader :current_tenant
 
         def initialize(options={})
-          require 'multi_json'
-
           @openstack_auth_token = options[:openstack_auth_token]
 
           unless @openstack_auth_token
@@ -181,7 +178,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end

data/lib/fog/rackspace/compute_v2.rb

@@ -1,3 +1,4 @@
+require 'fog/rackspace'
 require 'fog/compute'
 
 module Fog

data/lib/fog/rackspace/examples/queues/claim_messages.rb

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+
+# This example demonstrates claiming messages with the Rackpace Open Cloud
+
+require 'rubygems' #required for Ruby 1.8.x
+require 'fog'
+
+def get_user_input(prompt)
+  print "#{prompt}: "
+  gets.chomp
+end
+
+def select_queue(queues)
+  abort "\nThere are not any queues the Chicago region. Try running create_queue.rb\n\n" if queues.empty?
+
+  puts "\nSelect Queue To Delete:\n\n"
+  queues.each_with_index do |queue, i|
+    puts "\t #{i}. #{queue.name}"
+  end
+
+  delete_str = get_user_input "\nEnter Queue Number"
+  queues[delete_str.to_i]
+end
+
+# Use username defined in ~/.fog file, if absent prompt for username.
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_username
+  Fog.credentials[:rackspace_username] || get_user_input("Enter Rackspace Username")
+end
+
+# Use api key defined in ~/.fog file, if absent prompt for api key
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_api_key
+  Fog.credentials[:rackspace_api_key] || get_user_input("Enter Rackspace API key")
+end
+
+# create Queue Service
+service = Fog::Rackspace::Queues.new({
+  :rackspace_username   => rackspace_username,
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
+})
+
+# retrieve list of queues
+queues = service.queues
+
+# prompt for queue
+queue = select_queue(queues)
+
+# prompt for number of messages to claim
+num_claims = get_user_input "Enter Number of Messages to Claim"
+
+# Claim messages
+claim = queue.claims.create :ttl => 300, :grace => 100, :limit => num_claims
+
+puts "The following messages have been claimed for the next 5 minutes [#{claim.id}]"
+
+claim.messages.each do |message|
+  puts "\t[#{message.id}] #{message.body[0..50]}"
+end

data/lib/fog/rackspace/examples/queues/create_queue.rb

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+# This example demonstrates creating a queue with the Rackpace Open Cloud
+
+require 'rubygems' #required for Ruby 1.8.x
+require 'fog'
+
+def get_user_input(prompt)
+  print "#{prompt}: "
+  gets.chomp
+end
+
+# Use username defined in ~/.fog file, if absent prompt for username.
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_username
+  Fog.credentials[:rackspace_username] || get_user_input("Enter Rackspace Username")
+end
+
+# Use api key defined in ~/.fog file, if absent prompt for api key
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_api_key
+  Fog.credentials[:rackspace_api_key] || get_user_input("Enter Rackspace API key")
+end
+
+# create Queue Service
+service = Fog::Rackspace::Queues.new({
+  :rackspace_username   => rackspace_username,
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
+})
+
+#prompt for queue name
+queue_name = get_user_input "Enter name for queue"
+
+begin
+  # create queue
+  queue = service.queues.create :name => queue_name
+  puts "Queue #{queue_name} was successfully created"
+
+  puts "To delete the queue please execute the delete_queue.rb script\n\n"
+rescue Fog::Rackspace::Queues::ServiceError => e
+  if e.status_code == 204
+    puts "Queue #{queue_name} already exists"
+  end
+end

data/lib/fog/rackspace/examples/queues/delete_message.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+
+# This example demonstrates deleting a message with the Rackpace Open Cloud
+
+require 'rubygems' #required for Ruby 1.8.x
+require 'fog'
+
+def get_user_input(prompt)
+  print "#{prompt}: "
+  gets.chomp
+end
+
+def select_queue(queues)
+  abort "\nThere are not any queues in the Chicago region. Try running create_queue.rb\n\n" if queues.empty?
+
+  puts "\nSelect Queue To Delete:\n\n"
+  queues.each_with_index do |queue, i|
+    puts "\t #{i}. #{queue.name}"
+  end
+
+  delete_str = get_user_input "\nEnter Queue Number"
+  queues[delete_str.to_i]
+end
+
+def select_message(messages)
+  abort "\nThere are not any messages in the Chicago region. Try running post_message.rb\n\n" if messages.empty?
+
+  puts "\nSelect Message To Delete:\n\n"
+  messages.each_with_index do |message, i|
+    puts "\t #{i}. [#{message.id}] #{message.body[0..50]}"
+  end
+
+  delete_str = get_user_input "\nEnter Message Number"
+  messages[delete_str.to_i]
+end
+
+
+# Use username defined in ~/.fog file, if absent prompt for username.
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_username
+  Fog.credentials[:rackspace_username] || get_user_input("Enter Rackspace Username")
+end
+
+# Use api key defined in ~/.fog file, if absent prompt for api key
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_api_key
+  Fog.credentials[:rackspace_api_key] || get_user_input("Enter Rackspace API key")
+end
+
+# create Queue Service
+service = Fog::Rackspace::Queues.new({
+  :rackspace_username   => rackspace_username,
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
+})
+
+# retrieve list of queues
+queues = service.queues
+
+# prompt for queue
+queue = select_queue(queues)
+
+#retrieve list of messages
+messages = queue.messages
+
+# prompt for message
+message = select_message(messages)
+
+# delete message
+message.destroy
+
+puts "\nMessage #{message.id} has been destroyed\n"