Fix up flavor related unit tests

Author: JohnGarbutt

os_capacity/data/flavors.py

@@ -22,12 +22,15 @@
 def get_all(compute_client, include_extra_specs=True):
     response = compute_client.get('/flavors/detail').json()
     raw_flavors = response['flavors']
+
+    extra_specs = {}
     if include_extra_specs:
         for flavor in raw_flavors:
             url = '/flavors/%s/os-extra_specs' % flavor['id']
             response = compute_client.get(url).json()
-            flavor['extra_specs'] = response['extra_specs']
+            extra_specs[flavor['id']] = response['extra_specs']
+
     return [Flavor(f['id'], f['name'], f['vcpus'], f['ram'],
                    (f['disk'] + f['OS-FLV-EXT-DATA:ephemeral']),
-                   f.get('extra_specs'))
+                   extra_specs.get(f['id']))
             for f in raw_flavors]

os_capacity/tests/unit/fakes.py

@@ -33,6 +33,8 @@
 }
 FLAVOR_RESPONSE = {'flavors': [FLAVOR]}
 
+FLAVOR_EXTRA_RESPONSE = {'extra_specs': {"example_key": "example_value"}}
+
 RESOURCE_PROVIDER = {
     'generation': 6,
     'name': 'name1',

os_capacity/tests/unit/test_data.py

@@ -24,16 +24,35 @@
 
 class TestFlavor(unittest.TestCase):
 
-    def test_get_all(self):
+    def test_get_all_no_extra_specs(self):
         fake_response = mock.MagicMock()
         fake_response.json.return_value = fakes.FLAVOR_RESPONSE
         compute_client = mock.MagicMock()
         compute_client.get.return_value = fake_response
 
-        result = flavors.get_all(compute_client)
+        result = flavors.get_all(compute_client, False)
 
         compute_client.get.assert_called_once_with("/flavors/detail")
-        expected_flavors = [(fakes.FLAVOR['id'], 'compute-GPU', 8, 2048, 30)]
+        expected_flavors = [flavors.Flavor(fakes.FLAVOR['id'], 'compute-GPU',
+                                           8, 2048, 30, None)]
+        self.assertEqual(expected_flavors, result)
+
+    def test_get_all(self):
+        fake_response1 = mock.MagicMock()
+        fake_response1.json.return_value = fakes.FLAVOR_RESPONSE
+        fake_response2 = mock.MagicMock()
+        fake_response2.json.return_value = fakes.FLAVOR_EXTRA_RESPONSE
+        compute_client = mock.MagicMock()
+        compute_client.get.side_effect = [fake_response1, fake_response2]
+
+        result = flavors.get_all(compute_client)
+
+        compute_client.get.assert_has_calls([
+            mock.call("/flavors/detail"),
+            mock.call("/flavors/%s/os-extra_specs" % fakes.FLAVOR['id'])])
+        expected_flavors = [flavors.Flavor(fakes.FLAVOR['id'], 'compute-GPU',
+                                           8, 2048, 30,
+                                           {'example_key': 'example_value'})]
         self.assertEqual(expected_flavors, result)