Juju Charms Collection
nova-compute package

Merge lp://qastaging/~springfield-team/charms/trusty/nova-compute/n1kv into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

  1. Trusty Tahr (14.04)
  2. n1kv
  3. Merge into next
Proposed by Shiv Prasad Rao
Status: Superseded
Proposed branch: lp://qastaging/~springfield-team/charms/trusty/nova-compute/n1kv
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 363 lines (+180/-8)
9 files modified
hooks/charmhelpers/contrib/openstack/neutron.py (+17/-2)
hooks/nova_compute_context.py (+18/-0)
hooks/nova_compute_hooks.py (+4/-0)
hooks/nova_compute_utils.py (+43/-4)
templates/grizzly/nova.conf (+6/-0)
templates/havana/cisco_plugins.ini (+45/-0)
templates/havana/nova.conf (+5/-0)
templates/icehouse/ml2_conf.ini (+2/-1)
unit_tests/test_nova_compute_utils.py (+40/-1)
To merge this branch: bzr merge lp://qastaging/~springfield-team/charms/trusty/nova-compute/n1kv
Reviewer Review Type Date Requested Status
Jorge Niedbalski (community) Approve
Billy Olsen Needs Fixing
Shiv Prasad Rao (community) Needs Resubmitting
OpenStack Charmers Pending
Review via email: mp+230909@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2014-09-18.

Description of the change

On a compute node, Cisco N1KV virtual switch is one of the choices to provide L2 switching service for VMs.
This proposal is for facilitating the integration of N1KV on a compute node

Most of the changes are going in par with nvp and ovs serving an additional choice of L2 swtiches

--
Note:
Charm-helper changes have already been synced with lp:charm-helpers. So can be ignored.

-----
Please look at the old merge proposal:
https://code.launchpad.net/~springfield-team/charms/precise/nova-compute/trunk/+merge/227725

To post a comment you must log in.
lp://qastaging/~springfield-team/charms/trusty/nova-compute/n1kv updated
74. By Shiv Prasad Rao

updating diff

Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

Hello,

Please fix the following 'make lint' errors:

hooks/nova_compute_context.py:322:17: E126 continuation line over-indented for hanging indent
hooks/nova_compute_context.py:324:17: E126 continuation line over-indented for hanging indent
hooks/nova_compute_context.py:326:17: E126 continuation line over-indented for hanging indent
hooks/nova_compute_utils.py:176:80: E501 line too long (86 > 79 characters)
hooks/nova_compute_utils.py:177:80: E501 line too long (107 > 79 characters)
hooks/nova_compute_utils.py:474:80: E501 line too long (96 > 79 characters)
unit_tests/test_nova_compute_utils.py:372:80: E501 line too long (90 > 79 characters)
unit_tests/test_nova_compute_utils.py:378:80: E501 line too long (111 > 79 characters)
unit_tests/test_nova_compute_utils.py:382:80: E501 line too long (93 > 79 characters)

Also , Please remove the commented modules from tests, if you aren't using them.

After having this fixed, LGTM.

review: Needs Fixing
lp://qastaging/~springfield-team/charms/trusty/nova-compute/n1kv updated
75. By Shiv Prasad Rao

fixing flake8 issues

Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

Overall looks good, thanks. LGTM +1.

Subscribing to openstack-charmers for review.

review: Approve
Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

@shiv,

Please review the inline code comments. Apparently i lost this comments after your rebase.

review: Needs Fixing
Revision history for this message
Billy Olsen (billy-olsen) wrote :

There's a few issues that need to be addressed. Some error conditions aren't adequately addressed and a merge conflict was not adequately resolved.

review: Needs Fixing
lp://qastaging/~springfield-team/charms/trusty/nova-compute/n1kv updated
76. By Shiv Prasad Rao

addressing review comments

Revision history for this message
Shiv Prasad Rao (shivrao) wrote :

Thanks for the review. I have addressed all comments (replied to a few of the concerns).

Please let me know if any issues.

review: Needs Resubmitting
Revision history for this message
Billy Olsen (billy-olsen) wrote :

Thanks for making the changes. I didn't see your replies inline (not sure why). A couple of additional minor changes noted inline.

review: Needs Fixing
lp://qastaging/~springfield-team/charms/trusty/nova-compute/n1kv updated
77. By Shiv Prasad Rao

addressing review comments

Revision history for this message
Shiv Prasad Rao (shivrao) wrote :

Thanks for the comments. I will not "resubmit" my review this time so I think you should be able to see my comments inline.
I have made the required changes.

Revision history for this message
Jorge Niedbalski (niedbalski) :
review: Approve
lp://qastaging/~springfield-team/charms/trusty/nova-compute/n1kv updated
78. By Shiv Prasad Rao

Sync revision 86

79. By Jorge Niedbalski

[all] resync with /next && charm helpers "make sync"

80. By Edward Hope-Morley

[hopem] synced /next

81. By Edward Hope-Morley

fixed lint issues

82. By Edward Hope-Morley

tidyup

83. By Shiv Prasad Rao

Addressing review comments

84. By Shiv Prasad Rao

Addressing review comments

Unmerged revisions

84. By Shiv Prasad Rao

Addressing review comments

83. By Shiv Prasad Rao

Addressing review comments

82. By Edward Hope-Morley

tidyup

81. By Edward Hope-Morley

fixed lint issues

80. By Edward Hope-Morley

[hopem] synced /next

79. By Jorge Niedbalski

[all] resync with /next && charm helpers "make sync"

78. By Shiv Prasad Rao

Sync revision 86

77. By Shiv Prasad Rao

addressing review comments

76. By Shiv Prasad Rao

addressing review comments

75. By Shiv Prasad Rao

fixing flake8 issues

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