Merge lp:~corey.bryant/charms/trusty/neutron-api/db-stamp into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

[Corey Bryant]

[lp:~corey.bryant/charms/trusty/neutron-api/db-stamp]

58. By Corey Bryant on 2014-10-16

Stamp neutron database before upgrade.

[Ryan Beisner (1chb1n)]

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#456 neutron-api-next for corey.bryant mp238550
charm_unit_test

This build:
http://10.98.191.181:8080/job/charm_unit_test/456/

MP URL:
https://code.launchpad.net/~corey.bryant/charms/trusty/neutron-api/db-stamp/+merge/238550

Proposed branch:
lp:~corey.bryant/charms/trusty/neutron-api/db-stamp

Results summary:
    UNIT OK: believed to pass, but you should confirm results

UNIT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.456:
Starting tests...
.......................................................
Name Stmts Miss Cover Missing
---------------------------------------------------------
hooks/neutron_api_context 80 6 93% 22, 34-36, 78, 110
hooks/neutron_api_hooks 190 16 92% 120-121, 179-180, 193, 258, 303, 322-333, 408-409
hooks/neutron_api_utils 105 8 92% 216, 249-261
---------------------------------------------------------
TOTAL 375 30 92%
----------------------------------------------------------------------
Ran 55 tests in 3.681s

OK

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#650 neutron-api-next for corey.bryant mp238550
charm_lint_check

This build:
http://10.98.191.181:8080/job/charm_lint_check/650/

MP URL:
https://code.launchpad.net/~corey.bryant/charms/trusty/neutron-api/db-stamp/+merge/238550

Proposed branch:
lp:~corey.bryant/charms/trusty/neutron-api/db-stamp

Results summary:
    LINT OK: believed to pass, but you should confirm results

LINT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.650:
I: config.yaml: option ssl_key has no default value
I: config.yaml: option os-admin-network has no default value
I: config.yaml: option nsx-controllers has no default value
I: config.yaml: option vip has no default value
I: config.yaml: option nsx-l3-uuid has no default value
I: config.yaml: option ssl_ca has no default value
I: config.yaml: option ssl_cert has no default value
I: config.yaml: option os-internal-network has no default value
I: config.yaml: option os-public-network has no default value
I: config.yaml: option nsx-tz-uuid has no default value

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#229 neutron-api-next for corey.bryant mp238550
charm_amulet_test

This build:
http://10.98.191.181:8080/job/charm_amulet_test/229/

MP URL:
https://code.launchpad.net/~corey.bryant/charms/trusty/neutron-api/db-stamp/+merge/238550

Proposed branch:
lp:~corey.bryant/charms/trusty/neutron-api/db-stamp

Results summary:
    AMULET FAIL: amulet-test missing

AMULET Results not found.

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/neutron_api_hooks.py'
--- hooks/neutron_api_hooks.py	2014-10-14 16:12:41 +0000
+++ hooks/neutron_api_hooks.py	2014-10-16 12:57:15 +0000
@@ -165,7 +165,7 @@
     if not relation_ids('neutron-api'):
         log('Not running neutron database migration, no nova-cloud-controller'
             'is present.')
-    elif os_release('nova-common') <= 'icehouse':
+    elif os_release('neutron-server') <= 'icehouse':
         log('Not running neutron database migration as migrations are handled'
             'by the neutron-server process.')
     else:
 
=== modified file 'hooks/neutron_api_utils.py'
--- hooks/neutron_api_utils.py	2014-10-07 12:29:50 +0000
+++ hooks/neutron_api_utils.py	2014-10-16 12:57:15 +0000
@@ -159,7 +159,7 @@
 
 
 def register_configs(release=None):
-    release = release or os_release('nova-common')
+    release = release or os_release('neutron-server')
     configs = templating.OSConfigRenderer(templates_dir=TEMPLATES,
                                           openstack_release=release)
     for cfg, rscs in resource_map().iteritems():
@@ -189,6 +189,7 @@
 
     :param configs: The charms main OSConfigRenderer object.
     """
+    cur_os_rel = os_release('neutron-server')
     new_src = config('openstack-origin')
     new_os_rel = get_os_codename_install_source(new_src)
 
@@ -210,11 +211,28 @@
 
     # set CONFIGS to load templates from new release
     configs.set_release(openstack_release=new_os_rel)
+
+    if cur_os_rel == 'icehouse':
+        stamp_neutron_database('icehouse')
     migrate_neutron_database()
 
 
+def stamp_neutron_database(release):
+    '''Stamp the database with the current release before upgrade.'''
+    log('Stamping the neutron database with release %s.' % release)
+    plugin = config('neutron-plugin')
+    cmd = ['neutron-db-manage',
+           '--config-file', NEUTRON_CONF,
+           '--config-file', neutron_plugin_attribute(plugin,
+                                                     'config',
+                                                     'neutron'),
+           'stamp',
+           release]
+    subprocess.check_output(cmd)
+
+
 def migrate_neutron_database():
-    '''Runs neutron-db-manage to init a new database or migrate existing'''
+    '''Initializes a new database or upgrades an existing database.'''
     log('Migrating the neutron database.')
     plugin = config('neutron-plugin')
     cmd = ['neutron-db-manage',
 
=== modified file 'unit_tests/test_neutron_api_utils.py'
--- unit_tests/test_neutron_api_utils.py	2014-09-30 09:17:06 +0000
+++ unit_tests/test_neutron_api_utils.py	2014-10-16 12:57:15 +0000
@@ -146,29 +146,45 @@
             nutils.keystone_ca_cert_b64()
             self.assertTrue(self.b64encode.called)
 
-    def test_do_openstack_upgrade(self):
+    @patch.object(nutils, 'migrate_neutron_database')
+    @patch.object(nutils, 'stamp_neutron_database')
+    def test_do_openstack_upgrade(self, stamp_neutron_db, migrate_neutron_db):
         self.config.side_effect = self.test_config.get
-        self.test_config.set('openstack-origin', 'cloud:precise-havana')
-        self.get_os_codename_install_source.return_value = 'havana'
+        self.test_config.set('openstack-origin', 'cloud:trusty-juno')
+        self.os_release.side_effect = 'icehouse'
+        self.get_os_codename_install_source.return_value = 'juno'
         configs = MagicMock()
         nutils.do_openstack_upgrade(configs)
-        configs.set_release.assert_called_with(openstack_release='havana')
+        self.os_release.assert_called_with('neutron-server')
         self.log.assert_called()
+        self.configure_installation_source.assert_called_with(
+            'cloud:trusty-juno'
+        )
         self.apt_update.assert_called_with(fatal=True)
         dpkg_opts = [
             '--option', 'Dpkg::Options::=--force-confnew',
             '--option', 'Dpkg::Options::=--force-confdef',
         ]
+        self.apt_upgrade.assert_called_with(options=dpkg_opts,
+                                            fatal=True,
+                                            dist=True)
         pkgs = nutils.BASE_PACKAGES
         pkgs.sort()
-        self.apt_install.assert_called_with(
-            options=dpkg_opts,
-            packages=pkgs,
-            fatal=True
-        )
-        self.configure_installation_source.assert_called_with(
-            'cloud:precise-havana'
-        )
+        self.apt_install.assert_called_with(packages=pkgs,
+                                            options=dpkg_opts,
+                                            fatal=True)
+        configs.set_release.assert_called_with(openstack_release='juno')
+        stamp_neutron_db.assert_called()
+        migrate_neutron_db.assert_called()
+
+    def test_stamp_neutron_database(self):
+        nutils.stamp_neutron_database('icehouse')
+        cmd = ['neutron-db-manage',
+               '--config-file', '/etc/neutron/neutron.conf',
+               '--config-file', '/etc/neutron/plugins/ml2/ml2_conf.ini',
+               'stamp',
+               'icehouse']
+        self.subprocess.check_output.assert_called_with(cmd)
 
     def test_migrate_neutron_database(self):
         nutils.migrate_neutron_database()