Merge pull request #351 from izapolsk/fix_vm_hardware_in_sprout

[RFR] wrongly updated method during wrapanapi 3.0 conversion
RedHatQE · Jan 4, 2019 · f20d2ea · f20d2ea
2 parents 860bddb + 74fb3c4
commit f20d2ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/wrapanapi/systems/rhevm.py b/wrapanapi/systems/rhevm.py
@@ -368,7 +368,7 @@ def mark_as_template(self, template_name=None, cluster=None, delete=True, delete
     def get_hardware_configuration(self):
         self.refresh()
         return {
-            'ram': self.raw.memory,
+            'ram': self.raw.memory / 1024 / 1024,
             'cpu': self.raw.cpu.topology.cores * self.raw.cpu.topology.sockets
         }
 

diff --git a/wrapanapi/systems/scvmm.py b/wrapanapi/systems/scvmm.py
@@ -223,7 +223,7 @@ def enable_virtual_services(self):
 
     def get_hardware_configuration(self):
         self.refresh(read_from_hyperv=True)
-        data = {'mem': self.raw['CPUCount'], 'cpu': self.raw['Memory']}
+        data = {'mem': self.raw['Memory'], 'cpu': self.raw['CPUCount']}
         return {
             key: str(val) if isinstance(val, six.string_types) else val
             for key, val in data.items()