From 9c903ad0033ea9bf29360854f172b803ff4841db Mon Sep 17 00:00:00 2001
From: Kyle Rames <kyle.rames@rackspace.com>
Date: Thu, 28 Mar 2013 14:38:46 -0500
Subject: [PATCH] [rackspace] updated examples to use Chicago data center;
 updated error message to indicate we were using the Chicago data center.

---
 lib/fog/rackspace/examples/block_storage/create_snapshot.rb | 6 ++++--
 lib/fog/rackspace/examples/block_storage/create_volume.rb   | 1 +
 lib/fog/rackspace/examples/block_storage/delete_volume.rb   | 3 ++-
 lib/fog/rackspace/examples/compute_v2/create_image.rb       | 2 +-
 lib/fog/rackspace/examples/compute_v2/delete_image.rb       | 2 +-
 lib/fog/rackspace/examples/compute_v2/delete_server.rb      | 2 +-
 lib/fog/rackspace/examples/compute_v2/detach_volume.rb      | 4 ++--
 lib/fog/rackspace/examples/compute_v2/resize_server.rb      | 2 +-
 lib/fog/rackspace/examples/compute_v2/server_attachments.rb | 4 ++--
 lib/fog/rackspace/examples/compute_v2/server_metadata.rb    | 2 +-
 lib/fog/rackspace/examples/storage/create_cdn_directory.rb  | 3 ++-
 .../rackspace/examples/storage/create_private_directory.rb  | 3 ++-
 lib/fog/rackspace/examples/storage/delete_directory.rb      | 5 +++--
 lib/fog/rackspace/examples/storage/delete_file.rb           | 5 +++--
 lib/fog/rackspace/examples/storage/download_file.rb         | 5 +++--
 lib/fog/rackspace/examples/storage/storage_metadata.rb      | 3 ++-
 lib/fog/rackspace/examples/storage/upload_file.rb           | 3 ++-
 17 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/lib/fog/rackspace/examples/block_storage/create_snapshot.rb b/lib/fog/rackspace/examples/block_storage/create_snapshot.rb
index 9cd0d23b0..426354e04 100644
--- a/lib/fog/rackspace/examples/block_storage/create_snapshot.rb
+++ b/lib/fog/rackspace/examples/block_storage/create_snapshot.rb
@@ -11,7 +11,7 @@ def get_user_input(prompt)
 end
 
 def select_server(servers)
-  abort "\nThere are not any servers. Try running create_server.rb\n\n" if servers.empty?
+  abort "\nThere are not any servers in the Chicago region. Try running create_server.rb\n\n" if servers.empty?
   
   puts "\nSelect Server For Volume Detachment:\n\n"
   servers.each_with_index do |server, i|
@@ -23,7 +23,7 @@ def select_server(servers)
 end
 
 def select_attachment(attachments)
-  abort "\nThis server does not contain any volumes. Try running server_attachments.rb\n\n" if attachments.empty?
+  abort "\nThis server does not contain any volumes in the Chicago region. Try running server_attachments.rb\n\n" if attachments.empty?
   
   puts "\nSelect Volume To Detach:\n\n"
   attachments.each_with_index do |attachment, i|
@@ -52,12 +52,14 @@ compute_service = Fog::Compute.new({
   :rackspace_username   => rackspace_username,
   :rackspace_api_key    => rackspace_api_key,
   :version => :v2,  # Use Next Gen Cloud Servers
+  :rackspace_region => :ord #Use Chicago Region
 })
 
 #create Cloud Block Storage service
 cbs_service = Fog::Rackspace::BlockStorage.new({
   :rackspace_username => rackspace_username,
   :rackspace_api_key  => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
 })
 
 # retrieve list of servers
diff --git a/lib/fog/rackspace/examples/block_storage/create_volume.rb b/lib/fog/rackspace/examples/block_storage/create_volume.rb
index 728a6013c..dade22e1e 100644
--- a/lib/fog/rackspace/examples/block_storage/create_volume.rb
+++ b/lib/fog/rackspace/examples/block_storage/create_volume.rb
@@ -36,6 +36,7 @@ end
 service = Fog::Rackspace::BlockStorage.new({
   :rackspace_username   => rackspace_username,
   :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
 })
 
 # retrieve list of volume types
diff --git a/lib/fog/rackspace/examples/block_storage/delete_volume.rb b/lib/fog/rackspace/examples/block_storage/delete_volume.rb
index 9dac55b5e..f94c11f89 100644
--- a/lib/fog/rackspace/examples/block_storage/delete_volume.rb
+++ b/lib/fog/rackspace/examples/block_storage/delete_volume.rb
@@ -11,7 +11,7 @@ def get_user_input(prompt)
 end
 
 def select_volume(volumes)
-  abort "\nThere are not any volumes to delete. Try running create_volume.rb\n\n" if volumes.empty?
+  abort "\nThere are not any volumes to delete in the Chicago region. Try running create_volume.rb\n\n" if volumes.empty?
   
   puts "\nSelect Volume:\n\n"
   volumes.each_with_index do |volume, i|
@@ -38,6 +38,7 @@ end
 service = Fog::Rackspace::BlockStorage.new({
   :rackspace_username   => rackspace_username,
   :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
 })
 
 # retrieve list of volumes
diff --git a/lib/fog/rackspace/examples/compute_v2/create_image.rb b/lib/fog/rackspace/examples/compute_v2/create_image.rb
index 52ded23b5..76b1060f5 100644
--- a/lib/fog/rackspace/examples/compute_v2/create_image.rb
+++ b/lib/fog/rackspace/examples/compute_v2/create_image.rb
@@ -11,7 +11,7 @@ def get_user_input(prompt)
 end
 
 def select_server(servers)
-  abort "\nThere are not any servers avaliable to image. Try running create_server.rb\n\n" if servers.empty?
+  abort "\nThere are not any servers available to image in the Chicago region. Try running create_server.rb\n\n" if servers.empty?
   
   puts "\nSelect Server To Image:\n\n"
   servers.each_with_index do |server, i|
diff --git a/lib/fog/rackspace/examples/compute_v2/delete_image.rb b/lib/fog/rackspace/examples/compute_v2/delete_image.rb
index 9508de2d1..7eae07118 100644
--- a/lib/fog/rackspace/examples/compute_v2/delete_image.rb
+++ b/lib/fog/rackspace/examples/compute_v2/delete_image.rb
@@ -11,7 +11,7 @@ def get_user_input(prompt)
 end
 
 def select_image(snapshot_images)
-  abort "\nThere are not any images to delete. Try running create_image.rb\n\n" if snapshot_images.empty?
+  abort "\nThere are not any images to delete in the Chicago region. Try running create_image.rb\n\n" if snapshot_images.empty?
   
   puts "\nSelect Image To Delete:\n\n"
   snapshot_images.each_with_index do |image, i|
diff --git a/lib/fog/rackspace/examples/compute_v2/delete_server.rb b/lib/fog/rackspace/examples/compute_v2/delete_server.rb
index b01419dc4..00f1396c0 100644
--- a/lib/fog/rackspace/examples/compute_v2/delete_server.rb
+++ b/lib/fog/rackspace/examples/compute_v2/delete_server.rb
@@ -11,7 +11,7 @@ def get_user_input(prompt)
 end
 
 def select_server(servers)
-  abort "\nThere are not any servers to delete. Try running create_server.rb\n\n" if servers.empty?
+  abort "\nThere are not any servers to delete in the Chicago region. Try running create_server.rb\n\n" if servers.empty?
   
   puts "\nSelect Server To Delete:\n\n"
   servers.each_with_index do |server, i|
diff --git a/lib/fog/rackspace/examples/compute_v2/detach_volume.rb b/lib/fog/rackspace/examples/compute_v2/detach_volume.rb
index 2be920dc9..38f99faeb 100644
--- a/lib/fog/rackspace/examples/compute_v2/detach_volume.rb
+++ b/lib/fog/rackspace/examples/compute_v2/detach_volume.rb
@@ -11,7 +11,7 @@ def get_user_input(prompt)
 end
 
 def select_server(servers)
-  abort "\nThere are not any servers. Try running create_server.rb\n\n" if servers.empty?
+  abort "\nThere are not any servers in the Chicago region. Try running create_server.rb\n\n" if servers.empty?
   
   puts "\nSelect Server For Volume Detachment:\n\n"
   servers.each_with_index do |server, i|
@@ -23,7 +23,7 @@ def select_server(servers)
 end
 
 def select_attachment(attachments)
-  abort "\nThis server does not contain any volumes. Try running server_attachments.rb\n\n" if attachments.empty?
+  abort "\nThis server does not contain any volumes in the Chicago region. Try running server_attachments.rb\n\n" if attachments.empty?
   
   puts "\nSelect Volume To Detach:\n\n"
   attachments.each_with_index do |attachment, i|
diff --git a/lib/fog/rackspace/examples/compute_v2/resize_server.rb b/lib/fog/rackspace/examples/compute_v2/resize_server.rb
index b909ba153..0f7253708 100644
--- a/lib/fog/rackspace/examples/compute_v2/resize_server.rb
+++ b/lib/fog/rackspace/examples/compute_v2/resize_server.rb
@@ -22,7 +22,7 @@ def select_flavor(flavors, server)
 end
 
 def select_server(servers)
-  abort "\nThere are not any servers to resize. Try running create_server.rb\n\n" if servers.empty?
+  abort "\nThere are not any servers to resize in the Chicago region. Try running create_server.rb\n\n" if servers.empty?
   
   puts "\nSelect Server Resize:\n\n"
   servers.each_with_index do |server, i|
diff --git a/lib/fog/rackspace/examples/compute_v2/server_attachments.rb b/lib/fog/rackspace/examples/compute_v2/server_attachments.rb
index 11a12f197..8023a6a4e 100644
--- a/lib/fog/rackspace/examples/compute_v2/server_attachments.rb
+++ b/lib/fog/rackspace/examples/compute_v2/server_attachments.rb
@@ -11,7 +11,7 @@ def get_user_input(prompt)
 end
 
 def select_server(servers)
-  abort "\nThere are not any servers. Try running create_server.rb\n\n" if servers.empty?
+  abort "\nThere are not any servers in the Chicago region. Try running create_server.rb\n\n" if servers.empty?
   
   puts "\nSelect Server For Attachment:\n\n"
   servers.each_with_index do |server, i|
@@ -46,7 +46,7 @@ compute_service = Fog::Compute.new({
 cbs_service = Fog::Rackspace::BlockStorage.new({
   :rackspace_username => rackspace_username,
   :rackspace_api_key  => rackspace_api_key,
-  :rackspace_endpoint => Fog::Rackspace::BlockStorage::ORD_ENDPOINT #Use Chicago Region  
+  :rackspace_region => :ord #Use Chicago Region
 })
 
 # retrieve list of servers
diff --git a/lib/fog/rackspace/examples/compute_v2/server_metadata.rb b/lib/fog/rackspace/examples/compute_v2/server_metadata.rb
index 56e36f7bd..27fed6891 100644
--- a/lib/fog/rackspace/examples/compute_v2/server_metadata.rb
+++ b/lib/fog/rackspace/examples/compute_v2/server_metadata.rb
@@ -54,7 +54,7 @@ end
 
 puts "[DONE]\n\n"
 
-puts "Initial Metadata\n"                                
+puts "Initial Metadata\n"
 print_metadata(server)
 
 puts "Adding New Metadata\n"
diff --git a/lib/fog/rackspace/examples/storage/create_cdn_directory.rb b/lib/fog/rackspace/examples/storage/create_cdn_directory.rb
index 66c7af53b..96e4649f9 100644
--- a/lib/fog/rackspace/examples/storage/create_cdn_directory.rb
+++ b/lib/fog/rackspace/examples/storage/create_cdn_directory.rb
@@ -26,7 +26,8 @@ end
 service = Fog::Storage.new({
   :provider             => 'Rackspace',
   :rackspace_username   => rackspace_username,
-  :rackspace_api_key    => rackspace_api_key 
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
   }) 
   
 # prompt for directory name
diff --git a/lib/fog/rackspace/examples/storage/create_private_directory.rb b/lib/fog/rackspace/examples/storage/create_private_directory.rb
index 9290d2b09..951cf0e93 100644
--- a/lib/fog/rackspace/examples/storage/create_private_directory.rb
+++ b/lib/fog/rackspace/examples/storage/create_private_directory.rb
@@ -26,7 +26,8 @@ end
 service = Fog::Storage.new({
   :provider             => 'Rackspace',
   :rackspace_username   => rackspace_username,
-  :rackspace_api_key    => rackspace_api_key 
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
   })
   
   
diff --git a/lib/fog/rackspace/examples/storage/delete_directory.rb b/lib/fog/rackspace/examples/storage/delete_directory.rb
index 6b1361284..14198ed87 100644
--- a/lib/fog/rackspace/examples/storage/delete_directory.rb
+++ b/lib/fog/rackspace/examples/storage/delete_directory.rb
@@ -11,7 +11,7 @@ def get_user_input(prompt)
 end
 
 def select_directory(directories)
-  abort "\nThere are not any directories to delete. Try running create_directory.rb\n\n" if directories.empty?
+  abort "\nThere are not any directories to delete in the Chicago region. Try running create_directory.rb\n\n" if directories.empty?
   
   puts "\nSelect Directory To Delete:\n\n"
   directories.each_with_index do |dir, i|
@@ -38,7 +38,8 @@ end
 service = Fog::Storage.new({
   :provider             => 'Rackspace',
   :rackspace_username   => rackspace_username,
-  :rackspace_api_key    => rackspace_api_key 
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
   })
   
 # retrieve directories  
diff --git a/lib/fog/rackspace/examples/storage/delete_file.rb b/lib/fog/rackspace/examples/storage/delete_file.rb
index 83628b2ee..6560a318d 100644
--- a/lib/fog/rackspace/examples/storage/delete_file.rb
+++ b/lib/fog/rackspace/examples/storage/delete_file.rb
@@ -11,7 +11,7 @@ def get_user_input(prompt)
 end
 
 def select_directory(directories)
-  abort "\nThere are not any directories with files to delete. Try running create_file.rb\n\n" if directories.empty?
+  abort "\nThere are not any directories with files to delete in the Chicago region. Try running create_file.rb\n\n" if directories.empty?
   
   puts "\nSelect Directory:\n\n"
   directories.each_with_index do |dir, i|
@@ -48,7 +48,8 @@ end
 service = Fog::Storage.new({
   :provider             => 'Rackspace',
   :rackspace_username   => rackspace_username,
-  :rackspace_api_key    => rackspace_api_key 
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
   })
   
 # retrieve directories with files
diff --git a/lib/fog/rackspace/examples/storage/download_file.rb b/lib/fog/rackspace/examples/storage/download_file.rb
index 0f8b7d00e..c39e14e7e 100644
--- a/lib/fog/rackspace/examples/storage/download_file.rb
+++ b/lib/fog/rackspace/examples/storage/download_file.rb
@@ -11,7 +11,7 @@ def get_user_input(prompt)
 end
 
 def select_directory(directories)
-  abort "\nThere are not any directories with files. Try running create_file.rb\n\n" if directories.empty?
+  abort "\nThere are not any directories with files in the Chicago region. Try running create_file.rb\n\n" if directories.empty?
   
   puts "\nSelect Directory:\n\n"
   directories.each_with_index do |dir, i|
@@ -48,7 +48,8 @@ end
 service = Fog::Storage.new({
   :provider             => 'Rackspace',
   :rackspace_username   => rackspace_username,
-  :rackspace_api_key    => rackspace_api_key 
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
   })
   
 # retrieve directories with files
diff --git a/lib/fog/rackspace/examples/storage/storage_metadata.rb b/lib/fog/rackspace/examples/storage/storage_metadata.rb
index eeb501ee6..aeac0a579 100644
--- a/lib/fog/rackspace/examples/storage/storage_metadata.rb
+++ b/lib/fog/rackspace/examples/storage/storage_metadata.rb
@@ -28,7 +28,8 @@ end
 service = Fog::Storage.new({
   :provider             => 'Rackspace',
   :rackspace_username   => rackspace_username,
-  :rackspace_api_key    => rackspace_api_key 
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
   })
   
 
diff --git a/lib/fog/rackspace/examples/storage/upload_file.rb b/lib/fog/rackspace/examples/storage/upload_file.rb
index 7b7817b4f..2dcb39876 100644
--- a/lib/fog/rackspace/examples/storage/upload_file.rb
+++ b/lib/fog/rackspace/examples/storage/upload_file.rb
@@ -26,7 +26,8 @@ end
 service = Fog::Storage.new({
   :provider             => 'Rackspace',
   :rackspace_username   => rackspace_username,
-  :rackspace_api_key    => rackspace_api_key 
+  :rackspace_api_key    => rackspace_api_key,
+  :rackspace_region => :ord #Use Chicago Region
   })
   
 # prompt for directory name