Merge lp://qastaging/~springfield-team/charms/trusty/vem/next into lp://qastaging/charms/vem

Proposed by Shiv Prasad Rao
Status: Merged
Merged at revision: 5
Proposed branch: lp://qastaging/~springfield-team/charms/trusty/vem/next
Merge into: lp://qastaging/charms/vem
Diff against target: 1447 lines (+705/-441)
25 files modified
Makefile (+20/-0)
config.yaml (+8/-4)
data.yaml.orig (+0/-12)
hooks/charmhelpers/contrib/openstack/utils.py (+2/-2)
hooks/common.py (+41/-138)
hooks/config-changed (+0/-50)
hooks/config_changed.py (+57/-0)
hooks/dvs-relation-departed (+5/-4)
hooks/dvs-relation-joined (+12/-2)
hooks/install (+0/-80)
hooks/install.py (+92/-0)
hooks/start (+2/-0)
hooks/upgrade-charm (+1/-1)
revision (+1/-1)
templates/data.yaml.orig (+12/-0)
templates/n1kv.conf.tmpl (+108/-59)
templates/n1kv.conf.tmpl.orig (+0/-88)
test_requirements.txt (+6/-0)
tests/00_setup.sh (+14/-0)
tests/10_deploy_test.py (+46/-0)
unit_tests/__init__.py (+3/-0)
unit_tests/test_common.py (+43/-0)
unit_tests/test_config_changed.py (+57/-0)
unit_tests/test_install.py (+54/-0)
unit_tests/test_utils.py (+121/-0)
To merge this branch: bzr merge lp://qastaging/~springfield-team/charms/trusty/vem/next
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Jorge Niedbalski (community) Approve
Review via email: mp+232472@code.qastaging.launchpad.net

Description of the change

Bug Fix
Adding UT and amulet tests

To post a comment you must log in.
Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

Hello,

Thanks for your submission. Please don't ignore E401 and E501 errors from flake8.

Please add something like this, on your Makefile:

flake8 --exclude hooks/charmhelpers --ignore=E125,F401 hooks/

Please fix the following lint errors:

hooks/common.py:4:12: E401 multiple imports on one line
hooks/common.py:5:12: E401 multiple imports on one line
hooks/common.py:150:80: E501 line too long (103 > 79 characters)
hooks/common.py:151:80: E501 line too long (131 > 79 characters)
hooks/common.py:152:80: E501 line too long (115 > 79 characters)
hooks/common.py:153:80: E501 line too long (115 > 79 characters)
hooks/common.py:154:80: E501 line too long (103 > 79 characters)
hooks/common.py:155:80: E501 line too long (95 > 79 characters)
hooks/common.py:156:80: E501 line too long (135 > 79 characters)
hooks/common.py:172:80: E501 line too long (95 > 79 characters)
hooks/common.py:173:80: E501 line too long (134 > 79 characters)
hooks/common.py:174:80: E501 line too long (84 > 79 characters)
hooks/common.py:175:80: E501 line too long (98 > 79 characters)
hooks/common.py:176:80: E501 line too long (85 > 79 characters)
hooks/common.py:178:80: E501 line too long (130 > 79 characters)
hooks/common.py:206:80: E501 line too long (80 > 79 characters)
hooks/common.py:251:80: E501 line too long (82 > 79 characters)
hooks/common.py:282:80: E501 line too long (80 > 79 characters)
hooks/config_changed.py:2:80: E501 line too long (81 > 79 characters)
hooks/config_changed.py:19:80: E501 line too long (156 > 79 characters)
hooks/config_changed.py:24:80: E501 line too long (81 > 79 characters)
hooks/config_changed.py:25:80: E501 line too long (95 > 79 characters)
hooks/config_changed.py:26:80: E501 line too long (83 > 79 characters)
hooks/config_changed.py:27:80: E501 line too long (83 > 79 characters)
hooks/config_changed.py:29:80: E501 line too long (93 > 79 characters)
hooks/config_changed.py:31:80: E501 line too long (81 > 79 characters)
hooks/config_changed.py:38:80: E501 line too long (252 > 79 characters)
hooks/install.py:3:80: E501 line too long (81 > 79 characters)
hooks/install.py:7:14: E401 multiple imports on one line
hooks/install.py:41:80: E501 line too long (124 > 79 characters)
hooks/install.py:42:80: E501 line too long (113 > 79 characters)
hooks/install.py:64:80: E501 line too long (92 > 79 characters)
hooks/install.py:65:80: E501 line too long (88 > 79 characters)
hooks/install.py:66:80: E501 line too long (90 > 79 characters)
hooks/install.py:68:80: E501 line too long (88 > 79 characters)

Also, please review the inline comments.

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

Please remove the file 'data.yaml.orig' from the charm's root.

Please clarify me, Why those 'relation_get', 'config_get', 'juju_log' methods on hooks/common.py are required?

All those functions are available on the charmhelpers library, Why are you copying this into a different file?

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

Added a couple of comments inline.

7. By Shiv Prasad Rao

Addressing review comments

8. By Shiv Prasad Rao

Addressing review comments

9. By Shiv Prasad Rao

Addressing review comments

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

@shiv,

Thanks for fixing. Your overall changes looks as a pretty good improvement on the charm.

LGTM +1

Subscribing the charmers for review/merge.

review: Approve
10. By Shiv Prasad Rao

adding logs

11. By Shiv Prasad Rao

revision modified

Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM, however it took quite a while to get the test running because of little or no documentation on how to run the tests. Adding this information to the README would be crucial in the next merge request. Furthermore, the Makefile has several dead targets (build, sync-charm-helpers) which should be removed.

LGTM otherwise.

review: Approve

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