Advertisement
Guest User

Untitled

a guest
Mar 24th, 2016
101
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.66 KB | None | 0 0
  1. diff --git a/nova/objects/flavor.py b/nova/objects/flavor.py
  2. index a97f758..fdf512f 100644
  3. --- a/nova/objects/flavor.py
  4. +++ b/nova/objects/flavor.py
  5. @@ -51,8 +51,9 @@ def _get_projects_from_db(context, flavorid):
  6. first()
  7. if not db_flavor:
  8. raise exception.FlavorNotFound(flavor_id=flavorid)
  9. - if not db_flavor['projects']:
  10. - return []
  11. + print('Projects are: %s' % db_flavor['projects'])
  12. + #if not db_flavor['projects']:
  13. + # return []
  14. return [x['project_id'] for x in db_flavor['projects']]
  15.  
  16.  
  17. diff --git a/nova/tests/functional/db/test_flavor.py b/nova/tests/functional/db/test_flavor.py
  18. index 9fa8e46..e5abffa 100644
  19. --- a/nova/tests/functional/db/test_flavor.py
  20. +++ b/nova/tests/functional/db/test_flavor.py
  21. @@ -39,6 +39,8 @@ fake_api_flavor = {
  22.  
  23.  
  24. class FlavorObjectTestCase(test.NoDBTestCase):
  25. + USES_DB_SELF = True
  26. +
  27. def setUp(self):
  28. super(FlavorObjectTestCase, self).setUp()
  29. self.useFixture(fixtures.Database())
  30. @@ -66,6 +68,13 @@ class FlavorObjectTestCase(test.NoDBTestCase):
  31. main_flavor = db.flavor_get(self.context, flavor.id)
  32. self.assertNotEqual(flavor.name, main_flavor['name'])
  33.  
  34. + def test_get_with_no_projects(self):
  35. + fields = dict(fake_api_flavor, projects=[])
  36. + flavor = objects.Flavor(context=self.context, **fields)
  37. + flavor.create()
  38. + flavor = objects.Flavor.get_by_flavor_id(self.context, flavor.flavorid)
  39. + self.assertEqual([], flavor.projects)
  40. +
  41. def _test_query(self, flavor):
  42. flavor2 = objects.Flavor.get_by_id(self.context, flavor.id)
  43. self.assertEqual(flavor.id, flavor2.id)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement