commit 1e47390305959d6b41dec47ebf8f6ef5e0d704b8
author Ameya Raut <rautameya04@gmail.com> Fri Mar 04 14:45:08 2022 +0000
committer Ameya Raut <rautameya04@gmail.com> Tue Mar 08 08:59:54 2022 +0000
tree a525fb2027ae1348dfb770dc43a698e233ae5a21
parent fd43dcc3b607603978c51ca605dc70e1b784d782

Fix for verifying introspected data

This fixes verification of introspected data.

For physical baremetal introspection scenario, specification of the
physical server may differ with existing flavor data, whereas for
virtualised baremetal server, it can be matched.

When the introspection is performed on physical baremetal server,
the introspected data does not match with flavor data causing failure
in verification of introspected data. Hence, current fix is verifying
introspected data if greater than 0.

[1] https://docs.openstack.org/ironic/latest/install/configure-nova-flavors.html

Change-Id: I9ff1364e1baf99579a3d7b8cb5fc2ab012030173

ironic_tempest_plugin/tests/scenario/test_introspection_basic.py

diff --git a/ironic_tempest_plugin/tests/scenario/test_introspection_basic.py b/ironic_tempest_plugin/tests/scenario/test_introspection_basic.py
index 9823a88..f30b5e0 100644
--- a/ironic_tempest_plugin/tests/scenario/test_introspection_basic.py
+++ b/ironic_tempest_plugin/tests/scenario/test_introspection_basic.py
@@ -24,24 +24,15 @@
         data = self.introspection_data(node['uuid'])
         self.assertEqual(data['cpu_arch'],
                          self.flavor['properties']['cpu_arch'])
-        self.assertEqual(int(data['memory_mb']),
-                         int(self.flavor['ram']))
-        self.assertEqual(int(data['cpus']), int(self.flavor['vcpus']))
+        self.assertGreater(int(data['memory_mb']), 0)
+        self.assertGreater(int(data['cpus']), 0)
 
     def verify_node_flavor(self, node):
-        expected_cpus = self.flavor['vcpus']
-        expected_memory_mb = self.flavor['ram']
         expected_cpu_arch = self.flavor['properties']['cpu_arch']
-        disk_size = self.flavor['disk']
-        ephemeral_size = self.flavor['OS-FLV-EXT-DATA:ephemeral']
-        expected_local_gb = disk_size + ephemeral_size
 
-        self.assertEqual(expected_cpus,
-                         int(node['properties']['cpus']))
-        self.assertEqual(expected_memory_mb,
-                         int(node['properties']['memory_mb']))
-        self.assertEqual(expected_local_gb,
-                         int(node['properties']['local_gb']))
+        self.assertGreater(int(node['properties']['cpus']), 0)
+        self.assertGreater(int(node['properties']['memory_mb']), 0)
+        self.assertGreater(int(node['properties']['local_gb']), 0)
         self.assertEqual(expected_cpu_arch,
                          node['properties']['cpu_arch'])