Juju Charms Collection
nova-compute package

Merge lp://staging/~gnuoy/charms/trusty/nova-compute/neutron-refactor into lp://staging/~openstack-charmers-archive/charms/trusty/nova-compute/next

  1. Trusty Tahr (14.04)
  2. neutron-refactor
  3. Merge into next
Proposed by Liam Young
Status: Merged
Merged at revision: 68
Proposed branch: lp://staging/~gnuoy/charms/trusty/nova-compute/neutron-refactor
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 134 lines (+31/-10)
5 files modified
hooks/nova_compute_hooks.py (+7/-8)
hooks/nova_compute_utils.py (+3/-2)
metadata.yaml (+3/-0)
unit_tests/test_nova_compute_hooks.py (+8/-0)
unit_tests/test_nova_compute_utils.py (+10/-0)
To merge this branch: bzr merge lp://staging/~gnuoy/charms/trusty/nova-compute/neutron-refactor
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Liam Young (community) Needs Resubmitting
Review via email: mp+224069@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

Merge to add support for splitting neutron plugins into seperate subordinate charms

Revision history for this message
James Page (james-page) :
review: Needs Fixing
lp://staging/~gnuoy/charms/trusty/nova-compute/neutron-refactor updated
71. By Liam Young

Fixed 'is_relation_made' imported but unused

72. By Liam Young

Don't try and write neutron config if plugin is managing it

Revision history for this message
Liam Young (gnuoy) wrote :

Updated branch with updates suggested to mp. Only thing I've not done is to change determine_packages as neutron_plugin_attribute does not return a list, it returns a list of lists

Revision history for this message
Liam Young (gnuoy) :
review: Needs Resubmitting
Revision history for this message
James Page (james-page) wrote :

......S....F......................................SSSS
======================================================================
FAIL: test_amqp_changed_with_data_and_quantum (unit_tests.test_nova_compute_hooks.NovaComputeRelationsTests)
----------------------------------------------------------------------
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/neutron-refactor/nova-compute/unit_tests/test_nova_compute_hooks.py", line 179, in test_amqp_changed_with_data_and_quantum
    configs.write.call_args_list)
AssertionError: [call('/etc/nova/nova.conf'), call('/etc/quantum/quantum.conf')] != [call('/etc/nova/nova.conf')]

review: Needs Fixing
lp://staging/~gnuoy/charms/trusty/nova-compute/neutron-refactor updated
73. By Liam Young

Fix test_amqp_changed_with_data_and_quantum to take into account the neutron-api relation check and add additional test to check neutron conf isn't written when relation is present

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