[PATCH aeolus-conductor 1/2] BZ:864192 Change Provider Account List default behaviour to return full detail
9:40 a.m.
From: Martyn Taylor <mtaylor(a)redhat.com>
---
.../controllers/provider_accounts_controller.rb | 2 +-
src/app/views/provider_accounts/_detail.xml.haml | 2 +-
src/app/views/provider_accounts/_list.xml.haml | 2 +-
.../shared_examples_for_provider_accounts_api.rb | 8 ++++++--
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/app/controllers/provider_accounts_controller.rb
b/src/app/controllers/provider_accounts_controller.rb
index a4c6ba9..bc5bc7d 100644
--- a/src/app/controllers/provider_accounts_controller.rb
+++ b/src/app/controllers/provider_accounts_controller.rb
@@ -28,7 +28,7 @@ class ProviderAccountsController < ApplicationController
#xml list of provider_accounts for aeolus-image, aeolus-image could work with prov.
accounts list for givent provider
#to resemble html views logic, so this route could be removed (provider_accounts
could be user only as nested resource)
#format.xml { render :text => ProviderAccount.xml_export(@provider_accounts) }
- format.xml { render :partial => 'list.xml', :locals => {
:provider_accounts => @provider_accounts, :with_credentials => false, :with_quota
=> false, :with_data => false } }
+ format.xml { render :partial => 'list.xml', :locals => {
:provider_accounts => @provider_accounts, :with_credentials => false, :with_quota
=> false, :minimal => false } }
end
end
diff --git a/src/app/views/provider_accounts/_detail.xml.haml
b/src/app/views/provider_accounts/_detail.xml.haml
index e8b7617..9b2688d 100644
--- a/src/app/views/provider_accounts/_detail.xml.haml
+++ b/src/app/views/provider_accounts/_detail.xml.haml
@@ -1,5 +1,5 @@
%provider_account{:id => provider_account.id, :href =>
api_provider_account_url(provider_account)}
- -if local_assigns[:with_data]
+ -unless local_assigns[:minimal]
-provider = provider_account.provider
-provider_type = provider.provider_type
%label= provider_account.name
diff --git a/src/app/views/provider_accounts/_list.xml.haml
b/src/app/views/provider_accounts/_list.xml.haml
index 8323435..cf28087 100644
--- a/src/app/views/provider_accounts/_list.xml.haml
+++ b/src/app/views/provider_accounts/_list.xml.haml
@@ -1,4 +1,4 @@
!!! XML
%provider_accounts
- provider_accounts.each do |provider_account|
- =render 'detail', :provider_account => provider_account, :with_credentials
=> with_credentials, :with_quota => with_quota, :with_data => with_data
+ =render 'detail', :provider_account => provider_account, :with_credentials
=> with_credentials, :with_quota => with_quota, :minimal => minimal
diff --git a/src/spec/support/shared_examples_for_provider_accounts_api.rb
b/src/spec/support/shared_examples_for_provider_accounts_api.rb
index b3d3157..9fbc9e6 100644
--- a/src/spec/support/shared_examples_for_provider_accounts_api.rb
+++ b/src/spec/support/shared_examples_for_provider_accounts_api.rb
@@ -12,8 +12,12 @@ shared_examples_for "having XML with provider accounts" do
xml_provider_account =
xml_provider_accounts.xpath("//provider_account[(a)id=\"#{provider_account.id}\"]")
xml_provider_account.xpath('(a)href').text.should
be_eql(api_provider_account_url(provider_account))
# xml_provider_account.xpath('label').text.should
be_eql(provider_account.name.to_s)
- # it should not have provider accounts details
- %w{label provider provider_type quota_used quota priority credentials}.each do
|element|
+
+ %w{label provider provider_type}.each do |element|
+ xml_provider_account.xpath(element).should_not be_empty
+ end
+
+ %w{quota_used quota priority credentials}.each do |element|
xml_provider_account.xpath(element).should be_empty
end
end
--
1.7.6.4
9:40 a.m.
New subject: [PATCH aeolus-conductor 2/2] BZ: 864192 Reverted rename of provider attr 'name' to 'label'
From: Martyn Taylor <mtaylor(a)redhat.com>
---
src/app/views/provider_accounts/_detail.xml.haml | 2 +-
src/spec/requests/api/provider_accounts_spec.rb | 16 ++++++++--------
.../shared_examples_for_provider_accounts_api.rb | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/app/views/provider_accounts/_detail.xml.haml
b/src/app/views/provider_accounts/_detail.xml.haml
index 9b2688d..df5ba10 100644
--- a/src/app/views/provider_accounts/_detail.xml.haml
+++ b/src/app/views/provider_accounts/_detail.xml.haml
@@ -2,7 +2,7 @@
-unless local_assigns[:minimal]
-provider = provider_account.provider
-provider_type = provider.provider_type
- %label= provider_account.name
+ %name= provider_account.name
%provider{:id => provider.id, :href => api_provider_url(provider)}=
provider.name
%provider_type= provider_type.deltacloud_driver
-if local_assigns[:with_credentials]
diff --git a/src/spec/requests/api/provider_accounts_spec.rb
b/src/spec/requests/api/provider_accounts_spec.rb
index 4c64e7e..adc985e 100644
--- a/src/spec/requests/api/provider_accounts_spec.rb
+++ b/src/spec/requests/api/provider_accounts_spec.rb
@@ -37,8 +37,8 @@ describe "ProviderAccounts" do
subject { Nokogiri::XML(response.body) }
it "should have correct nodes" do
subject.xpath('//provider_account').size.should be_eql(1)
- subject.xpath('//provider_account/label').size.should be_eql(1)
- subject.xpath('//provider_account/label').text.should
be_eql("mockaccount")
+ subject.xpath('//provider_account/name').size.should be_eql(1)
+ subject.xpath('//provider_account/name').text.should
be_eql("mockaccount")
subject.xpath('//provider_account/credentials').size.should
be_eql(1)
subject.xpath('//provider_account/credentials/username').size.should
be_eql(1)
subject.xpath('//provider_account/credentials/username').text.should
be_eql("mockuser")
@@ -72,8 +72,8 @@ describe "ProviderAccounts" do
subject { Nokogiri::XML(response.body) }
it "should have correct nodes" do
subject.xpath('//provider_account').size.should be_eql(1)
- subject.xpath('//provider_account/label').size.should be_eql(1)
- subject.xpath('//provider_account/label').text.should
be_eql("ec2account")
+ subject.xpath('//provider_account/name').size.should be_eql(1)
+ subject.xpath('//provider_account/name').text.should
be_eql("ec2account")
subject.xpath('//provider_account/credentials').size.should
be_eql(1)
subject.xpath('//provider_account/credentials/username').size.should
be_eql(1)
subject.xpath('//provider_account/credentials/username').text.should
be_eql("ec2user")
@@ -156,8 +156,8 @@ describe "ProviderAccounts" do
subject { Nokogiri::XML(response.body) }
it "should have correct nodes" do
subject.xpath('//provider_account').size.should be_eql(1)
- subject.xpath('//provider_account/label').size.should be_eql(1)
- subject.xpath('//provider_account/label').text.should
be_eql("mockaccount")
+ subject.xpath('//provider_account/name').size.should be_eql(1)
+ subject.xpath('//provider_account/name').text.should
be_eql("mockaccount")
subject.xpath('//provider_account/credentials').size.should
be_eql(1)
subject.xpath('//provider_account/credentials/username').size.should be_eql(1)
subject.xpath('//provider_account/credentials/username').text.should
be_eql("mockuser")
@@ -192,8 +192,8 @@ describe "ProviderAccounts" do
subject { Nokogiri::XML(response.body) }
it "should have correct nodes" do
subject.xpath('//provider_account').size.should be_eql(1)
- subject.xpath('//provider_account/label').size.should be_eql(1)
- subject.xpath('//provider_account/label').text.should
be_eql("ec2account")
+ subject.xpath('//provider_account/name').size.should be_eql(1)
+ subject.xpath('//provider_account/name').text.should
be_eql("ec2account")
subject.xpath('//provider_account/credentials').size.should
be_eql(1)
subject.xpath('//provider_account/credentials/username').size.should be_eql(1)
subject.xpath('//provider_account/credentials/username').text.should
be_eql("ec2user")
diff --git a/src/spec/support/shared_examples_for_provider_accounts_api.rb
b/src/spec/support/shared_examples_for_provider_accounts_api.rb
index 9fbc9e6..1bf7e8a 100644
--- a/src/spec/support/shared_examples_for_provider_accounts_api.rb
+++ b/src/spec/support/shared_examples_for_provider_accounts_api.rb
@@ -13,7 +13,7 @@ shared_examples_for "having XML with provider accounts" do
xml_provider_account.xpath('(a)href').text.should
be_eql(api_provider_account_url(provider_account))
# xml_provider_account.xpath('label').text.should
be_eql(provider_account.name.to_s)
- %w{label provider provider_type}.each do |element|
+ %w{name provider provider_type}.each do |element|
xml_provider_account.xpath(element).should_not be_empty
end
--
1.7.6.4
1:19 p.m.
New subject: [PATCH aeolus-conductor 2/2] BZ: 864192 Reverted rename of provider attr 'name' to 'label'
mtaylor(a)redhat.com writes:
From: Martyn Taylor <mtaylor(a)redhat.com>
---
src/app/views/provider_accounts/_detail.xml.haml | 2 +-
src/spec/requests/api/provider_accounts_spec.rb | 16 ++++++++--------
.../shared_examples_for_provider_accounts_api.rb | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/app/views/provider_accounts/_detail.xml.haml
b/src/app/views/provider_accounts/_detail.xml.haml
index 9b2688d..df5ba10 100644
--- a/src/app/views/provider_accounts/_detail.xml.haml
+++ b/src/app/views/provider_accounts/_detail.xml.haml
@@ -2,7 +2,7 @@
-unless local_assigns[:minimal]
-provider = provider_account.provider
-provider_type = provider.provider_type
- %label= provider_account.name
+ %name= provider_account.name
%provider{:id => provider.id, :href => api_provider_url(provider)}=
provider.name
%provider_type= provider_type.deltacloud_driver
-if local_assigns[:with_credentials]
diff --git a/src/spec/requests/api/provider_accounts_spec.rb
b/src/spec/requests/api/provider_accounts_spec.rb
index 4c64e7e..adc985e 100644
--- a/src/spec/requests/api/provider_accounts_spec.rb
+++ b/src/spec/requests/api/provider_accounts_spec.rb
@@ -37,8 +37,8 @@ describe "ProviderAccounts" do
subject { Nokogiri::XML(response.body) }
it "should have correct nodes" do
subject.xpath('//provider_account').size.should be_eql(1)
- subject.xpath('//provider_account/label').size.should be_eql(1)
- subject.xpath('//provider_account/label').text.should
be_eql("mockaccount")
+ subject.xpath('//provider_account/name').size.should be_eql(1)
+ subject.xpath('//provider_account/name').text.should
be_eql("mockaccount")
subject.xpath('//provider_account/credentials').size.should
be_eql(1)
subject.xpath('//provider_account/credentials/username').size.should
be_eql(1)
subject.xpath('//provider_account/credentials/username').text.should
be_eql("mockuser")
@@ -72,8 +72,8 @@ describe "ProviderAccounts" do
subject { Nokogiri::XML(response.body) }
it "should have correct nodes" do
subject.xpath('//provider_account').size.should be_eql(1)
- subject.xpath('//provider_account/label').size.should be_eql(1)
- subject.xpath('//provider_account/label').text.should
be_eql("ec2account")
+ subject.xpath('//provider_account/name').size.should be_eql(1)
+ subject.xpath('//provider_account/name').text.should
be_eql("ec2account")
subject.xpath('//provider_account/credentials').size.should
be_eql(1)
subject.xpath('//provider_account/credentials/username').size.should
be_eql(1)
subject.xpath('//provider_account/credentials/username').text.should
be_eql("ec2user")
@@ -156,8 +156,8 @@ describe "ProviderAccounts" do
subject { Nokogiri::XML(response.body) }
it "should have correct nodes" do
subject.xpath('//provider_account').size.should be_eql(1)
- subject.xpath('//provider_account/label').size.should be_eql(1)
- subject.xpath('//provider_account/label').text.should
be_eql("mockaccount")
+ subject.xpath('//provider_account/name').size.should be_eql(1)
+ subject.xpath('//provider_account/name').text.should
be_eql("mockaccount")
subject.xpath('//provider_account/credentials').size.should
be_eql(1)
subject.xpath('//provider_account/credentials/username').size.should be_eql(1)
subject.xpath('//provider_account/credentials/username').text.should
be_eql("mockuser")
@@ -192,8 +192,8 @@ describe "ProviderAccounts" do
subject { Nokogiri::XML(response.body) }
it "should have correct nodes" do
subject.xpath('//provider_account').size.should be_eql(1)
- subject.xpath('//provider_account/label').size.should be_eql(1)
- subject.xpath('//provider_account/label').text.should
be_eql("ec2account")
+ subject.xpath('//provider_account/name').size.should be_eql(1)
+ subject.xpath('//provider_account/name').text.should
be_eql("ec2account")
subject.xpath('//provider_account/credentials').size.should
be_eql(1)
subject.xpath('//provider_account/credentials/username').size.should be_eql(1)
subject.xpath('//provider_account/credentials/username').text.should
be_eql("ec2user")
diff --git a/src/spec/support/shared_examples_for_provider_accounts_api.rb
b/src/spec/support/shared_examples_for_provider_accounts_api.rb
index 9fbc9e6..1bf7e8a 100644
--- a/src/spec/support/shared_examples_for_provider_accounts_api.rb
+++ b/src/spec/support/shared_examples_for_provider_accounts_api.rb
@@ -13,7 +13,7 @@ shared_examples_for "having XML with provider accounts" do
xml_provider_account.xpath('(a)href').text.should
be_eql(api_provider_account_url(provider_account))
# xml_provider_account.xpath('label').text.should
be_eql(provider_account.name.to_s)
- %w{label provider provider_type}.each do |element|
+ %w{name provider provider_type}.each do |element|
xml_provider_account.xpath(element).should_not be_empty
end
--
1.7.6.4
ACK and pushed to both
4229
days inactive
4229
days old
aeolus-devel@lists.fedorahosted.org
2 comments
2 participants
participants (2)
-
John Eckersberg -
Martyn Taylor