Merge pull request ManageIQ#11827 from yrudman/show-memory-graph-for-…

…azure-instances Show 'Memory (MB)' chart for azure instance
chessbyte · Oct 14, 2016 · 3f1916e · 3f1916e
2 parents 63d27e6 + 29b5625
commit 3f1916e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/app/models/manageiq/providers/azure/cloud_manager/vm.rb b/app/models/manageiq/providers/azure/cloud_manager/vm.rb
@@ -32,6 +32,10 @@ def disconnected?
     false
   end
 
+  def memory_mb_available?
+    true
+  end
+
   def self.calculate_power_state(raw_power_state)
     case raw_power_state.downcase
     when /running/, /starting/

diff --git a/spec/services/charts_layout_service_spec.rb b/spec/services/charts_layout_service_spec.rb
@@ -45,5 +45,13 @@
       expect(chart.count { |x| x[:title] == "CPU (%)" }).to equal 0
       expect(chart.count { |x| x[:title] == "CPU (Mhz)" }).to equal 1
     end
+
+    it "includes Memory (MB) chart for azure instance" do
+      ems_azure = FactoryGirl.create(:ems_azure)
+      host = FactoryGirl.create(:host, :ext_management_system => ems_azure)
+      vm_azure =  FactoryGirl.create(:vm_azure, :ext_management_system => ems_azure, :host => host)
+      chart = ChartsLayoutService.layout(vm_azure,  UiConstants::CHARTS_LAYOUTS_FOLDER, 'daily_perf_charts', 'VmOrTemplate')
+      expect(chart.count { |x| x[:title] == "Memory (MB)" }).to equal 1
+    end
   end
 end