Juju Charms Collection
nova-cloud-controller package

Merge lp://qastaging/~corey.bryant/charms/precise/nova-cloud-controller/havana-db-stamp into lp://qastaging/~openstack-charmers-archive/charms/precise/nova-cloud-controller/trunk

  1. Precise Pangolin (12.04)
  2. havana-db-stamp
  3. Merge into trunk
Proposed by James Page
Status: Merged
Merged at revision: 73
Proposed branch: lp://qastaging/~corey.bryant/charms/precise/nova-cloud-controller/havana-db-stamp
Merge into: lp://qastaging/~openstack-charmers-archive/charms/precise/nova-cloud-controller/trunk
Diff against target: 24 lines (+2/-1)
2 files modified
hooks/nova_cc_utils.py (+1/-0)
unit_tests/test_nova_cc_utils.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~corey.bryant/charms/precise/nova-cloud-controller/havana-db-stamp
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Review via email: mp+216153@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

Corey

I think this looks good - please can you update the failing unit test as well:

======================================================================
FAIL: Simulate a call to do_openstack_upgrade() for grizzly->icehouse
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1210, in patched
    return func(*args, **keywargs)
  File "/home/jamespage/src/charms/landing/nova-cloud-controller/unit_tests/test_nova_cc_utils.py", line 502, in test_upgrade_grizzly_icehouse
    self.assertEquals(self.neutron_db_manage.call_args_list, expected)
AssertionError: [call(['stamp', 'grizzly']),
 call(['upgrade', 'head']),
 call(['stamp', 'havana']),
 call(['upgrade', 'head'])] != [call(['stamp', 'grizzly']), call(['upgrade', 'head']), call(['upgrade', 'head'])]

review: Needs Fixing
lp://qastaging/~corey.bryant/charms/precise/nova-cloud-controller/havana-db-stamp updated
72. By James Page

[trivial] Fixup broken unit test for ssh key management

73. By Corey Bryant

Stamp neutron database before upgrade from non-grizzly releases

Revision history for this message
Corey Bryant (corey.bryant) wrote :

Hi James,

I've updated my branch to fix the test. Thanks.

Corey

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches