You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by ma...@redhat.com on 2012/07/16 11:44:50 UTC
[PATCH] Deltacloud client - restore ability to use http://USER:PASSWORD@deltacloud format where possible - as well as the -U -P flags if URI parsing fails.
From: marios <ma...@redhat.com>
Addresses JIRA DTACLOUD_282
https://issues.apache.org/jira/browse/DTACLOUD-282
Signed-off-by: marios <ma...@redhat.com>
---
client/bin/deltacloudc | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/client/bin/deltacloudc b/client/bin/deltacloudc
index a6bff13..adc5d11 100755
--- a/client/bin/deltacloudc
+++ b/client/bin/deltacloudc
@@ -35,6 +35,8 @@ deltacloudc collection operation [options]
URL format:
API_URL=http://[user]:[password]@[api_url][port][/uri]
+ OR
+API_URL=http://[api_url][port][/uri] with -U and -P for credentials
Examples:
@@ -44,7 +46,7 @@ Examples:
2. To list the operations for the 'images' collection:
- deltacloudc images -l -u http://user:password@deltacloud.foo:3333/api
+ deltacloudc images -l -U username -P password -u http://deltacloud.foo:3333/api
3. To list all images (i.e. call the 'index' operation of 'images'):
@@ -52,7 +54,7 @@ Examples:
4. To get the details of image '5':
- deltacloudc images show -i 5 -u http://user:password@deltacloud.foo:3333/api
+ deltacloudc images show -i 5 -U username -P password -u http://deltacloud.foo:3333/api
Options:
BANNER
@@ -106,7 +108,7 @@ options[:collection] = ARGV[0]
options[:operation] = ARGV[1]
# Connect to Deltacloud API and fetch all entry points
-client = DeltaCloud.new(options[:api_user] || ENV['API_USER'], options[:api_password] || ENV['API_PASSWORD'], api_url)
+client = DeltaCloud.new(options[:api_user] || url.user || ENV['API_USER'], options[:api_password] || url.password || ENV['API_PASSWORD'], api_url)
collections = client.entry_points.keys
# Exclude collection which don't have methods in client library yet
--
1.7.6.5
Re: [PATCH] Deltacloud client - restore ability to use http://USER:PASSWORD@deltacloud format where possible - as well as the -U -P flags if URI parsing fails.
Posted by Michal Fojtik <mf...@redhat.com>.
ACK,
Michal Fojtik
http://deltacloud.org
mfojtik@redhat.com
On Jul 16, 2012, at 11:44 AM, marios@redhat.com wrote:
> From: marios <ma...@redhat.com>
>
> Addresses JIRA DTACLOUD_282
>
> https://issues.apache.org/jira/browse/DTACLOUD-282
>
> Signed-off-by: marios <ma...@redhat.com>
> ---
> client/bin/deltacloudc | 8 +++++---
> 1 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/client/bin/deltacloudc b/client/bin/deltacloudc
> index a6bff13..adc5d11 100755
> --- a/client/bin/deltacloudc
> +++ b/client/bin/deltacloudc
> @@ -35,6 +35,8 @@ deltacloudc collection operation [options]
>
> URL format:
> API_URL=http://[user]:[password]@[api_url][port][/uri]
> + OR
> +API_URL=http://[api_url][port][/uri] with -U and -P for credentials
>
> Examples:
>
> @@ -44,7 +46,7 @@ Examples:
>
> 2. To list the operations for the 'images' collection:
>
> - deltacloudc images -l -u http://user:password@deltacloud.foo:3333/api
> + deltacloudc images -l -U username -P password -u http://deltacloud.foo:3333/api
>
> 3. To list all images (i.e. call the 'index' operation of 'images'):
>
> @@ -52,7 +54,7 @@ Examples:
>
> 4. To get the details of image '5':
>
> - deltacloudc images show -i 5 -u http://user:password@deltacloud.foo:3333/api
> + deltacloudc images show -i 5 -U username -P password -u http://deltacloud.foo:3333/api
>
> Options:
> BANNER
> @@ -106,7 +108,7 @@ options[:collection] = ARGV[0]
> options[:operation] = ARGV[1]
>
> # Connect to Deltacloud API and fetch all entry points
> -client = DeltaCloud.new(options[:api_user] || ENV['API_USER'], options[:api_password] || ENV['API_PASSWORD'], api_url)
> +client = DeltaCloud.new(options[:api_user] || url.user || ENV['API_USER'], options[:api_password] || url.password || ENV['API_PASSWORD'], api_url)
> collections = client.entry_points.keys
>
> # Exclude collection which don't have methods in client library yet
> --
> 1.7.6.5
>