From 8618c13d14f4ef6b355905e8eb864fc0dca827e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Achim=20Lederm=C3=BCller?= <achim.ledermueller@netways.de>
Date: Tue, 24 Jun 2014 14:47:32 +0200
Subject: [PATCH] [opennebula] flavor: fixed get_vcpu and get_memory; added
 tests

---
 lib/fog/opennebula/models/compute/flavor.rb          | 4 ++--
 lib/fog/opennebula/requests/compute/template_pool.rb | 1 +
 tests/opennebula/models/compute/flavor_tests.rb      | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/fog/opennebula/models/compute/flavor.rb b/lib/fog/opennebula/models/compute/flavor.rb
index 5526cfe2f..57b5d7fd0 100644
--- a/lib/fog/opennebula/models/compute/flavor.rb
+++ b/lib/fog/opennebula/models/compute/flavor.rb
@@ -51,12 +51,12 @@ module Fog
         end  
 
         def get_vcpu
-          return "VCPU=1\n" unless vcpu
+          self.vcpu = 1 unless vcpu
           "VCPU=#{vcpu}\n"
         end  
 
         def get_memory
-          return "MEMORY=128\n" unless memory
+          self.memory = 128 unless memory
           "MEMORY=#{memory}\n"
         end  
 
diff --git a/lib/fog/opennebula/requests/compute/template_pool.rb b/lib/fog/opennebula/requests/compute/template_pool.rb
index 00f64acce..cedcfdc75 100644
--- a/lib/fog/opennebula/requests/compute/template_pool.rb
+++ b/lib/fog/opennebula/requests/compute/template_pool.rb
@@ -111,6 +111,7 @@ module Fog
         def template_pool(filter = { })
           nic1 = Mock_nic.new
           nic1.vnet = networks.first
+
           [ 
             {
               :content => %Q{
diff --git a/tests/opennebula/models/compute/flavor_tests.rb b/tests/opennebula/models/compute/flavor_tests.rb
index ec5374275..b599a8319 100644
--- a/tests/opennebula/models/compute/flavor_tests.rb
+++ b/tests/opennebula/models/compute/flavor_tests.rb
@@ -25,6 +25,12 @@ Shindo.tests('Fog::Compute[:opennebula] | flavor model', ['opennebula']) do
     end
     test('be a kind of Fog::Compute::OpenNebula::Flavor') { flavor.kind_of? Fog::Compute::OpenNebula::Flavor }
     test('have a nic in network fogtest') { flavor.nic[0].vnet.name == "fogtest" }
+
+    flavor.vcpu = 666
+    flavor.memory = 666
+    test('have a 666 MB memory') { flavor.get_memory == "MEMORY=666\n" }
+    test('have a 666 CPUs') { flavor.get_vcpu == "VCPU=666\n" }
+
   end
 
 end