From bb69c0b90743e563c5dc0b441973950ae998a889 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Wed, 26 Sep 2012 12:10:06 +0200
Subject: [PATCH] feature #1190: Adapt old-style CLI to new EC2QueryClient
 class

---
 src/cloud/ec2/bin/econe-attach-volume    | 5 +----
 src/cloud/ec2/bin/econe-create-volume    | 5 +----
 src/cloud/ec2/bin/econe-delete-volume    | 5 +----
 src/cloud/ec2/bin/econe-describe-volumes | 5 +----
 src/cloud/ec2/bin/econe-detach-volume    | 5 +----
 src/cloud/ec2/bin/econe-reboot-instances | 5 +----
 src/cloud/ec2/bin/econe-start-instances  | 5 +----
 src/cloud/ec2/bin/econe-stop-instances   | 5 +----
 8 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/src/cloud/ec2/bin/econe-attach-volume b/src/cloud/ec2/bin/econe-attach-volume
index 69db7c1daf..14d25ba5f5 100755
--- a/src/cloud/ec2/bin/econe-attach-volume
+++ b/src/cloud/ec2/bin/econe-attach-volume
@@ -84,7 +84,6 @@ headers = false
 url     = nil
 access  = nil
 secret  = nil
-auth    = nil
 instance = nil
 device = nil
 
@@ -122,10 +121,8 @@ if !volume_id
     exit -1
 end
 
-auth = "#{access}:#{secret}" if secret && access
-
 begin
-    ec2_client = EC2QueryClient::Client.new(auth,url)
+    ec2_client = EC2QueryClient::Client.new(access, secret, url)
 rescue Exception => e
     puts "#{cmd_name}: #{e.message}"
     exit -1
diff --git a/src/cloud/ec2/bin/econe-create-volume b/src/cloud/ec2/bin/econe-create-volume
index 3a18eb86b1..ca542f77aa 100755
--- a/src/cloud/ec2/bin/econe-create-volume
+++ b/src/cloud/ec2/bin/econe-create-volume
@@ -77,7 +77,6 @@ headers = false
 url     = nil
 access  = nil
 secret  = nil
-auth    = nil
 size = nil
 
 begin
@@ -110,10 +109,8 @@ if !size
     exit -1
 end
 
-auth = "#{access}:#{secret}" if secret && access
-
 begin
-    ec2_client = EC2QueryClient::Client.new(auth,url)
+    ec2_client = EC2QueryClient::Client.new(access, secret, url)
 rescue Exception => e
     puts "#{cmd_name}: #{e.message}"
     exit -1
diff --git a/src/cloud/ec2/bin/econe-delete-volume b/src/cloud/ec2/bin/econe-delete-volume
index 6492e37b53..4a143a82d5 100755
--- a/src/cloud/ec2/bin/econe-delete-volume
+++ b/src/cloud/ec2/bin/econe-delete-volume
@@ -75,7 +75,6 @@ headers = false
 url     = nil
 access  = nil
 secret  = nil
-auth    = nil
 
 begin
     opts.each do |opt, arg|
@@ -107,10 +106,8 @@ if !volume_id
     exit -1
 end
 
-auth = "#{access}:#{secret}" if secret && access
-
 begin
-    ec2_client = EC2QueryClient::Client.new(auth,url)
+    ec2_client = EC2QueryClient::Client.new(access, secret, url)
 rescue Exception => e
     puts "#{cmd_name}: #{e.message}"
     exit -1
diff --git a/src/cloud/ec2/bin/econe-describe-volumes b/src/cloud/ec2/bin/econe-describe-volumes
index 14c32f291b..895f2283c4 100755
--- a/src/cloud/ec2/bin/econe-describe-volumes
+++ b/src/cloud/ec2/bin/econe-describe-volumes
@@ -73,7 +73,6 @@ headers = false
 url     = nil
 access  = nil
 secret  = nil
-auth    = nil
 
 begin
     opts.each do |opt, arg|
@@ -98,10 +97,8 @@ rescue Exception => e
     exit -1
 end
 
-auth = "#{access}:#{secret}" if secret && access
-
 begin
-    ec2_client = EC2QueryClient::Client.new(auth,url)
+    ec2_client = EC2QueryClient::Client.new(access, secret, url)
 rescue Exception => e
     puts "#{cmd_name}: #{e.message}"
     exit -1
diff --git a/src/cloud/ec2/bin/econe-detach-volume b/src/cloud/ec2/bin/econe-detach-volume
index 666092d2a9..85699eb909 100755
--- a/src/cloud/ec2/bin/econe-detach-volume
+++ b/src/cloud/ec2/bin/econe-detach-volume
@@ -85,7 +85,6 @@ headers = false
 url     = nil
 access  = nil
 secret  = nil
-auth    = nil
 instance = nil
 device = nil
 
@@ -123,10 +122,8 @@ if !volume_id
     exit -1
 end
 
-auth = "#{access}:#{secret}" if secret && access
-
 begin
-    ec2_client = EC2QueryClient::Client.new(auth,url)
+    ec2_client = EC2QueryClient::Client.new(access, secret, url)
 rescue Exception => e
     puts "#{cmd_name}: #{e.message}"
     exit -1
diff --git a/src/cloud/ec2/bin/econe-reboot-instances b/src/cloud/ec2/bin/econe-reboot-instances
index d264480249..d6ee877979 100755
--- a/src/cloud/ec2/bin/econe-reboot-instances
+++ b/src/cloud/ec2/bin/econe-reboot-instances
@@ -71,7 +71,6 @@ opts = GetoptLong.new(
 url     = nil
 access  = nil
 secret  = nil
-auth    = nil
 
 begin
     opts.each do |opt, arg|
@@ -103,10 +102,8 @@ if !instance
     exit -1
 end
 
-auth = "#{access}:#{secret}" if secret && access
-
 begin
-    ec2_client = EC2QueryClient::Client.new(auth,url)
+    ec2_client = EC2QueryClient::Client.new(access, secret, url)
 rescue Exception => e
     puts "#{cmd_name}: #{e.message}"
     exit -1
diff --git a/src/cloud/ec2/bin/econe-start-instances b/src/cloud/ec2/bin/econe-start-instances
index e2dd0fdd8d..b9fd0a6062 100755
--- a/src/cloud/ec2/bin/econe-start-instances
+++ b/src/cloud/ec2/bin/econe-start-instances
@@ -71,7 +71,6 @@ opts = GetoptLong.new(
 url     = nil
 access  = nil
 secret  = nil
-auth    = nil
 
 begin
     opts.each do |opt, arg|
@@ -103,10 +102,8 @@ if !instance
     exit -1
 end
 
-auth = "#{access}:#{secret}" if secret && access
-
 begin
-    ec2_client = EC2QueryClient::Client.new(auth,url)
+    ec2_client = EC2QueryClient::Client.new(access, secret, url)
 rescue Exception => e
     puts "#{cmd_name}: #{e.message}"
     exit -1
diff --git a/src/cloud/ec2/bin/econe-stop-instances b/src/cloud/ec2/bin/econe-stop-instances
index d64afab566..3b8f4865a6 100755
--- a/src/cloud/ec2/bin/econe-stop-instances
+++ b/src/cloud/ec2/bin/econe-stop-instances
@@ -71,7 +71,6 @@ opts = GetoptLong.new(
 url     = nil
 access  = nil
 secret  = nil
-auth    = nil
 
 begin
     opts.each do |opt, arg|
@@ -103,10 +102,8 @@ if !instance
     exit -1
 end
 
-auth = "#{access}:#{secret}" if secret && access
-
 begin
-    ec2_client = EC2QueryClient::Client.new(auth,url)
+    ec2_client = EC2QueryClient::Client.new(access, secret, url)
 rescue Exception => e
     puts "#{cmd_name}: #{e.message}"
     exit -1