[PATCH conductor 0/2] #770377 - Cleans up deployment errors
by Matt Wagner
Hi all,
This cleans up the error presented in https://bugzilla.redhat.com/show_bug.cgi?id=770377 where attempting to launch a deployable/deployment into a realm where none of the images have been pushed. (e.g., build an image for EC2 only, and then attempt to launch into a RHEV-only realm.) I cleaned up an error message that was misleading at best, and then provided for sensible display of multiple error conditions, rather than joining them into one big string with commas.
Hopefully this doesn't seem too insane.
-- Matt
12 years, 3 months
[PATCH aeolus-image-rubygem] BZ 783028 - empty request path
by Jan Provazník
From: Jan Provaznik <jprovazn(a)redhat.com>
Changed default path from '' to '/'. When fetching buckets from warehouse,
we do 'GET http://localhost:9090' and oauth lib complains that there is missing
path
---
.../model/warehouse/warehouse_client.rb | 2 +-
spec/models/warehouse/warehouse_client_spec.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/aeolus_image/model/warehouse/warehouse_client.rb b/lib/aeolus_image/model/warehouse/warehouse_client.rb
index 1f67ec9..96565fb 100644
--- a/lib/aeolus_image/model/warehouse/warehouse_client.rb
+++ b/lib/aeolus_image/model/warehouse/warehouse_client.rb
@@ -136,7 +136,7 @@ module Aeolus
end
end
- def do_request(path = '', opts={})
+ def do_request(path = '/', opts={})
opts[:method] ||= :get
opts[:content] ||= ''
opts[:plain] ||= false
diff --git a/spec/models/warehouse/warehouse_client_spec.rb b/spec/models/warehouse/warehouse_client_spec.rb
index 797f92a..3b2a2e9 100644
--- a/spec/models/warehouse/warehouse_client_spec.rb
+++ b/spec/models/warehouse/warehouse_client_spec.rb
@@ -333,7 +333,7 @@ module Aeolus
context "with no parameters" do
it "should call RestClient::Request.execute with meaningful defaults" do
- RestClient::Request.should_receive(:execute).with(:method => :get, :url => uri + '', :payload => '', :headers => {})
+ RestClient::Request.should_receive(:execute).with(:method => :get, :url => uri + '/', :payload => '', :headers => {})
subject.do_request()
end
end
--
1.7.7.5
12 years, 3 months
[PATCH conductor] BZ772755, BZ773010, BZ773198: Change uptime label in deployment card
by Imre Farkas
From: Imre Farkas <ifarkas(a)redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=772755
https://bugzilla.redhat.com/show_bug.cgi?id=773010
https://bugzilla.redhat.com/show_bug.cgi?id=773198
---
src/app/models/deployment.rb | 1 -
src/app/views/pools/_deployments.html.haml | 4 ----
src/config/locales/en.yml | 2 +-
3 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
index 14dfd57..6187d3f 100644
--- a/src/app/models/deployment.rb
+++ b/src/app/models/deployment.rb
@@ -411,7 +411,6 @@ class Deployment < ActiveRecord::Base
:failed_instances_count => failed_instances.count,
:instances_count_text => I18n.t('instances.instances', :count => instances.count.to_i),
:uptime => ApplicationHelper.count_uptime(uptime_1st_instance),
- :global_uptime => ApplicationHelper.count_uptime(uptime_all),
:pool => {
:name => pool.name,
:id => pool.id,
diff --git a/src/app/views/pools/_deployments.html.haml b/src/app/views/pools/_deployments.html.haml
index 5079b07..0aa6143 100644
--- a/src/app/views/pools/_deployments.html.haml
+++ b/src/app/views/pools/_deployments.html.haml
@@ -5,8 +5,6 @@
%li.deployment
%h3.name
= link_to deployment.name, deployment_path(deployment)
- = t 'pools.index.global_uptime'
- = count_uptime(deployment.uptime_all)
%dl.statistics
%ul
%li.right
@@ -22,8 +20,6 @@
<li class="deployment">
<h3 class="name">
<a href="#{deployment_path('replace_id').sub('replace_id', '${id}')}">${name}</a>
- #{t 'pools.index.global_uptime'}
- ${global_uptime}
</h3>
<dl class="statistics">
<ul>
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index e4d4d1e..2ab2ef4 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -1081,7 +1081,7 @@ en:
generic: "Could not validate config server connection (url: %{url}). Check the connection parameters and try again."
generic_with_message: "Could not validate config server connection (url: %{url}). %{msg}"
unhandled_response: "Could not validate config server connection (url: %{url}). HTTP Status Code: %{code}"
- uptime: Uptime
+ uptime: 'Total Usage Time'
deltacloud:
unreachable: "Deltacloud is unreachable. Please verify that it is running."
connection_refused: "The connection to the remote host was refused."
--
1.7.6.5
12 years, 3 months