You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by ma...@apache.org on 2012/07/16 13:35:04 UTC
git commit: Deltacloud client - restore ability to use
http://USER:PASSWORD@deltacloud format where possible - as well as the -U -P
flags if URI parsing fails.
Updated Branches:
refs/heads/master 0f9e7fcc1 -> 381622059
Deltacloud client - restore ability to use http://USER:PASSWORD@deltacloud
format where possible - as well as the -U -P flags if URI parsing fails.
Addresses JIRA DTACLOUD_282
https://issues.apache.org/jira/browse/DTACLOUD-282
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/38162205
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/38162205
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/38162205
Branch: refs/heads/master
Commit: 3816220591d59e658493f31c76130e60eb3aceaa
Parents: 0f9e7fc
Author: marios <ma...@redhat.com>
Authored: Mon Jul 16 12:43:29 2012 +0300
Committer: marios <ma...@redhat.com>
Committed: Mon Jul 16 12:43:29 2012 +0300
----------------------------------------------------------------------
client/bin/deltacloudc | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/38162205/client/bin/deltacloudc
----------------------------------------------------------------------
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