Merge lp:~gnuoy/nova/bug1314677 into lp:~ubuntu-server-dev/nova/icehouse

[Liam Young]

[James Page (james-page)]

Hi Liam

Thanks for the MP; a few comments

1) has this patch been cherry picked upstream for the stable/icehouse branch? If no please submit a review following https://wiki.openstack.org/wiki/StableBranch

2) I'd like to see either a) a full annotate git patch as would be committed upstream or b) appropriate patch headers (see http://dep.debian.net/deps/dep5/) so we can track the heritage of this patch.

Also its good practice to leave the changelog entry as UNRELEASED (instead of trusty) so dch keeps appending to the existing UNRELEASED version.

Cheers

James

review: Needs Fixing

[lp:~gnuoy/nova/bug1314677]

696. By Liam Young on 2014-09-30

Copied cells patch from stable/icehouse submission and updated cell patch meta info

[Corey Bryant (corey.bryant)]

Looks good. Thanks Liam!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-12 19:48:49 +0000
+++ debian/changelog	2014-09-30 09:26:06 +0000
@@ -1,3 +1,11 @@
+nova (1:2014.1.2-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/patches/cells-json-store.patch Fix nova-cells fails when using
+    JSON file to store cell information
+    (LP: #1314677)
+
+ -- Liam Young <[e-mail]>  Mon, 29 Sep 2014 12:59:24 +0000
+
 nova (1:2014.1.2-0ubuntu1) trusty; urgency=medium
 
   [ Corey Bryant ]

=== added file 'debian/patches/cells-json-store.patch'
--- debian/patches/cells-json-store.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/cells-json-store.patch	2014-09-30 09:26:06 +0000
@@ -0,0 +1,76 @@
+Description: Fix nova cells failing with a json topology file bug
+Author: Liam Young <[e-mail]>
+Bug: https://bugs.launchpad.net/nova/+bug/1314677
+Forwarded: https://review.openstack.org/#/c/124811/
+diff --git a/nova/cells/state.py b/nova/cells/state.py
+index b9112bd..1e12450 100644
+--- a/nova/cells/state.py
++++ b/nova/cells/state.py
+@@ -152,10 +152,7 @@ class CellStateManager(base.Base):
+             cells_config = CONF.cells.cells_config
+ 
+         if cells_config:
+-            config_path = CONF.find_file(cells_config)
+-            if not config_path:
+-                raise cfg.ConfigFilesNotFoundError(config_files=[cells_config])
+-            return CellStateManagerFile(cell_state_cls, config_path)
++            return CellStateManagerFile(cell_state_cls)
+ 
+         return CellStateManagerDB(cell_state_cls)
+ 
+@@ -450,8 +447,11 @@ class CellStateManagerDB(CellStateManager):
+ 
+ 
+ class CellStateManagerFile(CellStateManager):
+-    def __init__(self, cell_state_cls, cells_config_path):
+-        self.cells_config_path = cells_config_path
++    def __init__(self, cell_state_cls=None):
++        cells_config = CONF.cells.cells_config
++        self.cells_config_path = CONF.find_file(cells_config)
++        if not self.cells_config_path:
++            raise cfg.ConfigFilesNotFoundError(config_files=[cells_config])
+         super(CellStateManagerFile, self).__init__(cell_state_cls)
+ 
+     def _cell_data_sync(self, force=False):
+diff --git a/nova/tests/cells/test_cells_state_manager.py b/nova/tests/cells/test_cells_state_manager.py
+index 1c29927..4841e14 100644
+--- a/nova/tests/cells/test_cells_state_manager.py
++++ b/nova/tests/cells/test_cells_state_manager.py
+@@ -16,12 +16,16 @@
+ Tests For CellStateManager
+ """
+ 
++import mock
++import six
++
+ from oslo.config import cfg
+ 
+ from nova.cells import state
+ from nova import db
+ from nova.db.sqlalchemy import models
+ from nova import exception
++from nova.openstack.common import fileutils
+ from nova import test
+ 
+ 
+@@ -78,6 +82,19 @@ class TestCellsStateManager(test.TestCase):
+                               state.CellStateManager)
+         self.assertEqual(['no_such_file_exists.conf'], e.config_files)
+ 
++    @mock.patch.object(cfg.ConfigOpts, 'find_file')
++    @mock.patch.object(fileutils, 'read_cached_file')
++    def test_filemanager_returned(self, mock_read_cached_file, mock_find_file):
++        mock_find_file.return_value = "/etc/nova/cells.json"
++        mock_read_cached_file.return_value = (False, six.StringIO({}))
++        self.flags(cells_config='cells.json', group='cells')
++        self.assertIsInstance(state.CellStateManager(),
++                              state.CellStateManagerFile)
++
++    def test_dbmanager_returned(self):
++        self.assertIsInstance(state.CellStateManager(),
++                              state.CellStateManagerDB)
++
+     def test_capacity_no_reserve(self):
+         # utilize entire cell
+         cap = self._capacity(0.0)
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-08-08 17:43:35 +0000
+++ debian/patches/series	2014-09-30 09:26:06 +0000
@@ -1,4 +1,5 @@
 # Ubuntu specific patches below here. Note these can be dropped eventually.
+cells-json-store.patch
 libvirt-convert-cpu-features-attribute-from-list-to-.patch
 fix-requirements.patch
 skip_ipv6_test.patch