10:53 a.m.
New subject: [PATCH aeolus-cli 1/3] Added provider acc. info to provider images
From: Maros Zatko <mzatko(a)redhat.com>
---
lib/aeolus_cli/command/list_command.rb | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/lib/aeolus_cli/command/list_command.rb
b/lib/aeolus_cli/command/list_command.rb
index fbc4ee4..f967174 100644
--- a/lib/aeolus_cli/command/list_command.rb
+++ b/lib/aeolus_cli/command/list_command.rb
@@ -67,10 +67,22 @@ module Aeolus
headers = ActiveSupport::OrderedHash.new
headers[:id] = "ID"
headers[:target_identifier] = "Target Identifier"
- headers[:provider] = "Provider"
headers[:status] = "Status"
headers[:target_image] = "Target Image"
+ headers[:account_name] = "Account"
+ headers[:provider] = "Provider"
+ headers[:account_type] = "Provider Type"
collection = @options[:id].nil? ? Aeolus::CLI::ProviderImage.all :
Aeolus::CLI::ProviderImage.find(:all, :from => Aeolus::CLI::Base.site.path +
"/target_images/" + @options[:id] + "/provider_images.xml")
+
+ paccs = Aeolus::CLI::ProviderAccount.all.group_by(&:provider)
+
+ collection.map! do |item|
+ prov = item.attributes[:provider]
+ item.attributes[:account_name] = paccs[prov].first.name
+ item.attributes[:account_type] = paccs[prov].first.provider_type
+ item
+ end
+
print_collection(collection, headers)
quit(0)
rescue => e
--
1.7.7.3
10:53 a.m.
New subject: [PATCH aeolus-cli 2/3] Modified test for listing provider images with acc.info
From: Maros Zatko <mzatko(a)redhat.com>
---
spec/command/list_command_spec.rb | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/spec/command/list_command_spec.rb b/spec/command/list_command_spec.rb
index aaed5b7..8099da8 100644
--- a/spec/command/list_command_spec.rb
+++ b/spec/command/list_command_spec.rb
@@ -121,8 +121,11 @@ module Aeolus
rescue SystemExit => e
e.status.should == 0
end
- headers = ["ID", "Target Identifier", "Provider",
"Status", "Target Image"]
- content = ["9ac21235-81f4-4140-ac25-18a19ebcb2f8",
"ami-test", "ec2-us-east-1", "COMPLETE",
"d7cab2b2-eeb8-459e-b739-a1844a5d5a62"]
+ headers = ["ID", "Target Identifier", "Provider",
"Status", "Target Image",
+ "Account", "Provider", "Provider
Type"]
+ content = ["9ac21235-81f4-4140-ac25-18a19ebcb2f8",
"ami-test", "ec2-us-east-1",
+ "COMPLETE",
"d7cab2b2-eeb8-459e-b739-a1844a5d5a62", "ec2-acc",
+ "ec2-us-east-1", "ec2"]
(headers + content).each do |expected_text|
$stdout.string.should include(expected_text)
end
@@ -130,4 +133,4 @@ module Aeolus
end
end
end
-end
\ No newline at end of file
+end
--
1.7.7.3
10:53 a.m.
New subject: [PATCH aeolus-cli 3/3] Added ProviderAccounts to provider images VCR cassette
From: Maros Zatko <mzatko(a)redhat.com>
---
.../list_all_provider_images_for_target_image.yml | 82 +++++++++++++++++++-
1 files changed, 81 insertions(+), 1 deletions(-)
diff --git
a/spec/vcr/cassettes/command/list_command/list_all_provider_images_for_target_image.yml
b/spec/vcr/cassettes/command/list_command/list_all_provider_images_for_target_image.yml
index d101db0..ce934c0 100644
---
a/spec/vcr/cassettes/command/list_command/list_all_provider_images_for_target_image.yml
+++
b/spec/vcr/cassettes/command/list_command/list_all_provider_images_for_target_image.yml
@@ -41,4 +41,84 @@
</provider_image>
</provider_images>
- http_version: "1.1"
\ No newline at end of file
+ http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction
+ request: !ruby/struct:VCR::Request
+ method: :get
+ uri: https://admin:password@localhost/conductor/api/provider_accounts.xml
+ body:
+ headers:
+ accept:
+ - application/xml
+ response: !ruby/struct:VCR::Response
+ status: !ruby/struct:VCR::ResponseStatus
+ code: 200
+ message: OK
+ headers:
+ x-ua-compatible:
+ - IE=Edge
+ etag:
+ - "\"cc06d592201615534db0988bbe9d9032\""
+ content-type:
+ - application/xml; charset=utf-8
+ server:
+ - WEBrick/1.3.1 (Ruby/1.8.7/2011-06-30)
+ date:
+ - Tue, 18 Oct 2011 11:58:20 GMT
+ x-runtime:
+ - "1.437227"
+ content-length:
+ - "2435"
+ set-cookie:
+ -
_session_id=BAh7CCIPc2Vzc2lvbl9pZCIlZmQyODRiMDEwOWYwZGY2YmM4NWQ2NTJiYWZiYjFmNmQiGXdhcmRlbi51c2VyLnVzZXIua2V5aQYiEGJyZWFkY3J1bWJzWwZ7CToKY2xhc3MiFnByb3ZpZGVyX2FjY291bnRzOg52aWV3c3RhdGUwOgluYW1lQAw6CXBhdGgiFy9wcm92aWRlcl9hY2NvdW50cw%3D%3D--89f7b144b8e02f5792f60dd2165b0f0fcd5f3b14;
path=/; HttpOnly
+ cache-control:
+ - max-age=0, private, must-revalidate
+ body: |
+ <?xml version="1.0"?>
+ <provider_accounts>
+ <provider_account>
+ <name>ec2-acc</name>
+ <provider>ec2-us-east-1</provider>
+ <provider_type>ec2</provider_type>
+ <provider_credentials>
+ <ec2_credentials>
+ <access_key>AKIAI5HJ6ZDO6KLRG7YA</access_key>
+ <account_number>8637-5181-7422</account_number>
+ <certificate>-----BEGIN CERTIFICATE-----
+ MIICdzCCAeCgAwIBAgIGANSQ1b/JMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNVBAYT
+ AlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMQwwCgYDVQQLEwNBV1MxITAfBgNVBAMT
+ GEFXUyBMaW1pdGVkLUFzc3VyYW5jZSBDQTAeFw0xMDEwMTMxNDU4MzVaFw0xMTEw
+ MTMxNDU4MzVaMFIxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMRcw
+ FQYDVQQLEw5BV1MtRGV2ZWxvcGVyczEVMBMGA1UEAxMMbjM5OHhyb2tkbWR1MIGf
+ MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCCnLDO5ePhJCvHEJ15VUszxBm+T1LN
+ dE+NOtQ4m1/4Fswz28T+ErUxpOtvureF3REBQp8f3Fvp9BAsxRXT/mCFT0Gv5bta
+ 6hpRjv3wZrK3llDZrKrzXZCvgu5TREQOT2bwdzepoe3QupgSgdT3ZZpxf8kqiPav
+ jXKyaEKlpCgdKwIDAQABo1cwVTAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0lAQH/BAww
+ CgYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUAg2H+zIo4W8GQL+K
+ aGAA1moHQ/owDQYJKoZIhvcNAQEFBQADgYEAX984N/YrujDpwhRczBiFYEwqWT0r
+ gNEw1urbUUsHy6t2+t0tjJJsKjvkdgM6Syc1VsgI2EnRaGfbOrzuoRC0Zrb+TSrB
+ JLE/dz3KCvHoq1kHeQF42HKuJJc0nTc+b1BQEefZxEpeFQrI01/Ghln5EFF7Cwje
+ laRVOzOtE+1n9nw=
+ -----END CERTIFICATE-----
+ </certificate>
+ <key>-----BEGIN PRIVATE KEY-----
+
MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIKcsM7l4+EkK8cQnXlVSzPEGb5P
+
Us10T4061DibX/gWzDPbxP4StTGk62+6t4XdEQFCnx/cW+n0ECzFFdP+YIVPQa/lu1rqGlGO/fBm
+
sreWUNmsqvNdkK+C7lNERA5PZvB3N6mh7dC6mBKB1PdlmnF/ySqI9q+NcrJoQqWkKB0rAgMBAAEC
+
gYB19XVpJg4sYzJ2UfcmgXWthsmJKrKpgwXlkt/fT9PYhx5dJ3o9zD+AWmWXPpZIe2LENJrpd2Y7
+
YITLKiOQlggskdIXQgBYACZauRhlMS8iRNWS1QgEA7EoLqg90l7NJt+MWhu9rfwgCWWYuk1awKDq
+
W9Nn6/5gx1eYo/3pn+oF4QJBAMfjO0MkUmXO47ORSan5h6Vo0PP5f0Ihacb8ucgurOPa2R/BeQoO
+
VZc36B3P0rjI7ag0WAEXmY1VspUDF4DTfVUCQQCnRwaRJwlYVyWKygf6aqlJ/SjoMFm1GGfVuFlf
+
uYzJNfQt4y+QppZUFnALT1MVpTq1Wkt7t2CTpyV0ysj8yTB/AkEAvXjNcgV5/XsxJ8NuWipnxAkp
+
GDrFwD+/7pkc2X407/9AlPNl8nxH8YFTCv82NWZwsGJ9kPt32BsFnm5B1yGhyQJAU9q6AwezmpJN
+
Io72guT3Kjz7RbH/NlYerzdzrhXg6njeiCZMENJBp7N7xV+lgcNLc9/o2QLrKflvQGXrbTUZ1wJA
+
NgArAS+yKRjxIt7orNPR/JHpghhS7xQ1KIg/v1j9HHz0Pmwg3+ZN7ejrI2miERv5CcwYYx2ZGkMs
+ Dc1go5/qpA==
+ -----END PRIVATE KEY-----</key>
+
<secret_access_key>Hz3uYk+xf9z2KGX7iOufi5XAZ9OU7CvQZEc4bm0K</secret_access_key>
+ </ec2_credentials>
+ </provider_credentials>
+ </provider_account>
+ </provider_accounts>
+
+ http_version: "1.1"
--
1.7.7.3
4565
days inactive
4566
days old
aeolus-devel@lists.fedorahosted.org
4 comments
2 participants
participants (2)
-
Maros Zatko -
Martyn Taylor