[Ovirt-devel] [patch] Removed VM Availability Graphs

[mark wagner]

Been testing mos patches on mantis

ACK the series

-mark


Mohammed Morsi wrote:
>
> ------------------------------------------------------------------------
>
> >From 572b333c67ffcaab840b950c8cf1ab43af1fd19f Mon Sep 17 00:00:00 2001
> From: Mohammed Morsi <mmorsi at redhat.com>
> Date: Fri, 6 Jun 2008 17:38:10 -0400
> Subject: [PATCH] removed dummy vm availability graphs
>
>
> Signed-off-by: Mohammed Morsi <mmorsi at redhat.com>
> ---
>  wui/src/app/controllers/graph_controller.rb |   10 ----------
>  wui/src/app/views/hardware/show.html.erb    |    1 -
>  wui/src/app/views/resources/show.rhtml      |    1 -
>  3 files changed, 0 insertions(+), 12 deletions(-)
>
> diff --git a/wui/src/app/controllers/graph_controller.rb b/wui/src/app/controllers/graph_controller.rb
> index c21b836..bfc8969 100644
> --- a/wui/src/app/controllers/graph_controller.rb
> +++ b/wui/src/app/controllers/graph_controller.rb
> @@ -50,16 +50,6 @@ class GraphController < ApplicationController
>          end
>        end
>        total = 0 if unlimited
> -    elsif @target == 'vms'
> -      @label = "Virtual Machines"
> -      used = 15
> -      total = 20
> -      # TODO
> -    elsif @target == 'vm_quotas'
> -      @label = 'Virtual Machines'
> -      used = 10
> -      total = 15
> -      # TODO
>      end
>  
>      # bit of a hack to convert memory from kb to mb
> diff --git a/wui/src/app/views/hardware/show.html.erb b/wui/src/app/views/hardware/show.html.erb
> index 81e5a70..e029e4b 100644
> --- a/wui/src/app/views/hardware/show.html.erb
> +++ b/wui/src/app/views/hardware/show.html.erb
> @@ -6,7 +6,6 @@
>     <div id="availability_graphs">
>        <%= render_component :controller=> 'graph', :action => 'availability_graph', :id => @pool.id, :params => { :target => 'cpu' } %>
>        <%= render_component :controller=> 'graph', :action => 'availability_graph', :id => @pool.id, :params => { :target => 'memory' } %>
> -      <%= render_component :controller=> 'graph', :action => 'availability_graph', :id => @pool.id, :params => { :target => 'vms' } %>
>     </div>
>  
>     <br/><br/>
> diff --git a/wui/src/app/views/resources/show.rhtml b/wui/src/app/views/resources/show.rhtml
> index 7d4a13d..d496edf 100644
> --- a/wui/src/app/views/resources/show.rhtml
> +++ b/wui/src/app/views/resources/show.rhtml
> @@ -6,7 +6,6 @@
>     <div id="availability_graphs">
>        <%= render_component :controller=> 'graph', :action => 'availability_graph', :id => @vm_resource_pool.id, :params => { :target => 'vcpu' } %>
>        <%= render_component :controller=> 'graph', :action => 'availability_graph', :id => @vm_resource_pool.id, :params => { :target => 'vram' } %>
> -      <%= render_component :controller=> 'graph', :action => 'availability_graph', :id => @vm_resource_pool.id, :params => { :target => 'vm_quotas' } %>
>     </div>
>  
>     <%= render_component :controller=> 'graph', :action => 'history_graphs', :id => @vm_resource_pool.id, :params => { :poolType => 'vm' } %>
>   
> ------------------------------------------------------------------------
>
> _______________________________________________
> Ovirt-devel mailing list
> Ovirt-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/ovirt-devel
>