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

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.

Overall looks good, thanks. LGTM +1.

Subscribing to openstack-charmers for review.

@shiv,

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

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.

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

Please let me know if any issues.

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

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.

just one question

Replied inline.

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

#463 nova-compute-next for shivrao mp235184
charm_unit_test

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

MP URL:
https://code.launchpad.net/~springfield-team/charms/trusty/nova-compute/next/+merge/235184

Proposed branch:
lp:~springfield-team/charms/trusty/nova-compute/next

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.463:
Starting unit tests...
......S...............................................SSSSS
Name Stmts Miss Cover Missing
----------------------------------------------------
nova_compute_context 216 81 63% 34-37, 42-43, 61, 65-66, 71, 97, 101, 104, 113, 119-131, 172, 203, 227-229, 241, 256-259, 263-266, 269-272, 293, 320-328, 331-349, 357, 361, 365, 368-370, 376-385, 391-403
nova_compute_hooks 129 12 91% 90-91, 118, 205, 243, 248-249, 255, 259-262
nova_compute_utils 243 115 53% 151-213, 221, 226-229, 264-266, 273, 277-280, 288-296, 300, 309-318, 331-350, 376-377, 381-382, 401-422, 439-448, 462-463, 472-476, 484, 486
----------------------------------------------------
TOTAL 588 208 65%
----------------------------------------------------------------------
Ran 59 tests in 3.689s

OK (SKIP=6)

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/

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

#657 nova-compute-next for shivrao mp235184
charm_lint_check

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

MP URL:
https://code.launchpad.net/~springfield-team/charms/trusty/nova-compute/next/+merge/235184

Proposed branch:
lp:~springfield-team/charms/trusty/nova-compute/next

Results summary:
    LINT FAIL: lint-check failed

LINT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.657:
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
make: *** [lint] Error 1

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/

$ make lint
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
make: *** [lint] Error 1

Hi Edward,

These error were not introduced in my merge. I remember fixing it but was told to keep it as it is for legibility.

Thanks for the review.

UOSCI bot says:
charm_lint_check #1140 nova-compute-next for shivrao mp242290
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option instances-path has no default value
  W: config.yaml: option disable-neutron-security-groups has no default value
  I: config.yaml: option migration-auth-type has no default value

Full lint test output: http://paste.ubuntu.com/9109462/
Build: http://10.98.191.181:8080/job/charm_lint_check/1140/

UOSCI bot says:
charm_unit_test #974 nova-compute-next for shivrao mp242290
    UNIT OK: passed

UNIT Results (max last 5 lines):
  nova_compute_hooks 134 14 90% 80, 98-99, 126, 192, 215, 253, 258-259, 265, 269-272
  nova_compute_utils 248 118 52% 167-229, 237, 242-245, 280-282, 289, 293-296, 304-312, 316, 325-334, 347-366, 392-393, 397-398, 417-438, 455-465, 479-480, 485-486, 496-500, 508, 510
  TOTAL 598 213 64%
  Ran 59 tests in 3.958s
  OK (SKIP=6)

Full unit test output: http://paste.ubuntu.com/9109463/
Build: http://10.98.191.181:8080/job/charm_unit_test/974/

UOSCI bot says:
charm_amulet_test #482 nova-compute-next for shivrao mp242290
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  ERROR waited for 10m0s without being able to connect: ssh: connect to host 10.217.3.160 port 22: No route to host
  juju-test.conductor WARNING : Could not bootstrap osci-sv07, got Bootstrap returned with an exit > 0. Skipping
  juju-test INFO : Results: 0 passed, 0 failed, 3 errored
  ERROR subprocess encountered error code 124
  make: *** [test] Error 124

Full amulet test output: http://paste.ubuntu.com/9110086/
Build: http://10.98.191.181:8080/job/charm_amulet_test/482/

UOSCI bot says:
charm_lint_check #1152 nova-compute-next for shivrao mp242290
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option instances-path has no default value
  W: config.yaml: option disable-neutron-security-groups has no default value
  I: config.yaml: option migration-auth-type has no default value

Full lint test output: http://paste.ubuntu.com/9125400/
Build: http://10.98.191.181:8080/job/charm_lint_check/1152/

UOSCI bot says:
charm_unit_test #986 nova-compute-next for shivrao mp242290
    UNIT OK: passed

UNIT Results (max last 5 lines):
  nova_compute_hooks 134 14 90% 80, 98-99, 126, 192, 215, 253, 258-259, 265, 269-272
  nova_compute_utils 248 118 52% 167-229, 237, 242-245, 280-282, 289, 293-296, 304-312, 316, 325-334, 347-366, 392-393, 397-398, 417-438, 455-465, 479-480, 485-486, 496-500, 508, 510
  TOTAL 598 213 64%
  Ran 59 tests in 3.368s
  OK (SKIP=6)

Full unit test output: http://paste.ubuntu.com/9125401/
Build: http://10.98.191.181:8080/job/charm_unit_test/986/

UOSCI bot says:
charm_amulet_test #494 nova-compute-next for shivrao mp242290
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  ERROR waited for 10m0s without being able to connect: ssh: connect to host 10.215.3.166 port 22: No route to host
  juju-test.conductor WARNING : Could not bootstrap osci-sv05, got Bootstrap returned with an exit > 0. Skipping
  juju-test INFO : Results: 0 passed, 1 failed, 2 errored
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/9126114/
Build: http://10.98.191.181:8080/job/charm_amulet_test/494/

UOSCI bot says:
charm_lint_check #1170 nova-compute-next for niedbalski mp242500
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option instances-path has no default value
  W: config.yaml: option disable-neutron-security-groups has no default value
  I: config.yaml: option migration-auth-type has no default value

Full lint test output: http://paste.ubuntu.com/9151042/
Build: http://10.98.191.181:8080/job/charm_lint_check/1170/

UOSCI bot says:
charm_unit_test #1004 nova-compute-next for niedbalski mp242500
    UNIT OK: passed

UNIT Results (max last 5 lines):
  nova_compute_hooks 134 14 90% 80, 98-99, 126, 192, 215, 253, 258-259, 265, 269-272
  nova_compute_utils 248 118 52% 167-229, 237, 242-245, 280-282, 289, 293-296, 304-312, 316, 325-334, 347-366, 392-393, 397-398, 417-438, 455-465, 479-480, 485-486, 496-500, 508, 510
  TOTAL 598 213 64%
  Ran 59 tests in 3.218s
  OK (SKIP=6)

Full unit test output: http://paste.ubuntu.com/9151046/
Build: http://10.98.191.181:8080/job/charm_unit_test/1004/

UOSCI bot says:
charm_amulet_test #512 nova-compute-next for niedbalski mp242500
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  juju-test.conductor DEBUG : Tearing down osci-sv11 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv11"
  WARNING cannot delete security group "juju-osci-sv11-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet test output: http://paste.ubuntu.com/9151415/
Build: http://10.98.191.181:8080/job/charm_amulet_test/512/

Please see inline comments

Addressed review comments

charm_lint_check #205 nova-compute-next for shivrao mp244920
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/205/

charm_unit_test #234 nova-compute-next for shivrao mp244920
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/234/

charm_amulet_test #253 nova-compute-next for shivrao mp244920
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/9544431/
Build: http://10.245.162.77:8080/job/charm_amulet_test/253/

Shiv, see my inline comment.