Juju Charms Collection
neutron-api package

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

  1. Trusty Tahr (14.04)
  2. n1kv
  3. Merge into next
Proposed by Shiv Prasad Rao
Status: Needs review
Proposed branch: lp://qastaging/~springfield-team/charms/trusty/neutron-api/n1kv
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 103 lines (+73/-0) (has conflicts)
3 files modified
config.yaml (+29/-0)
templates/icehouse/cisco_plugins.ini (+41/-0)
templates/icehouse/neutron.conf (+3/-0)
Text conflict in config.yaml
To merge this branch: bzr merge lp://qastaging/~springfield-team/charms/trusty/neutron-api/n1kv
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Edward Hope-Morley Pending
Shiv Prasad Rao Pending
Review via email: mp+247358@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-12-08.

Description of the change

Please sync the charmhelpers branch before merge.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_amulet_test #507 neutron-api-next for shivrao mp242446
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_lint_check #1165 neutron-api-next for shivrao mp242446
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-admin-network has no default value
  W: config.yaml: option n1kv-vsm-ip does not have the keys: default
  I: config.yaml: option nsx-l3-uuid has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_unit_test #999 neutron-api-next for shivrao mp242446
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/neutron_api_hooks 174 14 92% 115-116, 161, 224, 268, 287-298, 373-374
  hooks/neutron_api_utils 90 7 92% 215-227
  TOTAL 344 27 92%
  Ran 49 tests in 3.291s
  OK

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_amulet_test #509 neutron-api-next for shivrao mp242446
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_lint_check #1167 neutron-api-next for shivrao mp242446
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-admin-network has no default value
  W: config.yaml: option n1kv-vsm-ip does not have the keys: default
  I: config.yaml: option nsx-l3-uuid has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_unit_test #1001 neutron-api-next for shivrao mp242446
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/neutron_api_hooks 174 14 92% 115-116, 161, 224, 268, 287-298, 373-374
  hooks/neutron_api_utils 90 7 92% 215-227
  TOTAL 344 27 92%
  Ran 49 tests in 2.976s
  OK

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_amulet_test #513 neutron-api-next for niedbalski mp242502
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_unit_test #1005 neutron-api-next for niedbalski mp242502
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/neutron_api_hooks 174 14 92% 115-116, 161, 224, 268, 287-298, 373-374
  hooks/neutron_api_utils 90 7 92% 215-227
  TOTAL 344 27 92%
  Ran 49 tests in 3.181s
  OK

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_lint_check #1171 neutron-api-next for niedbalski mp242502
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-admin-network has no default value
  W: config.yaml: option n1kv-vsm-ip does not have the keys: default
  I: config.yaml: option nsx-l3-uuid has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value

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

Revision history for this message
Edward Hope-Morley (hopem) wrote : Posted in a previous version of this proposal

This is looking much better. I have pointed out a few things that needs fixing inline.

review: Needs Fixing
Revision history for this message
Shiv Prasad Rao (shivrao) wrote : Posted in a previous version of this proposal

Addressed Review comments

review: Needs Resubmitting
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_lint_check #103 neutron-api-next for shivrao mp243935
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-admin-network has no default value
  W: config.yaml: option n1kv-vsm-ip does not have the keys: default
  I: config.yaml: option nsx-l3-uuid has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value

Full lint test output: pastebin not avail., cmd error
Build: http://10.230.18.80:8080/job/charm_lint_check/103/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

UOSCI bot says:
charm_unit_test #103 neutron-api-next for shivrao mp243935
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/neutron_api_hooks 174 14 92% 115-116, 161, 224, 268, 287-298, 373-374
  hooks/neutron_api_utils 90 7 92% 215-227
  TOTAL 344 27 92%
  Ran 49 tests in 3.564s
  OK

Full unit test output: pastebin not avail., cmd error
Build: http://10.230.18.80:8080/job/charm_unit_test/103/

Revision history for this message
Shiv Prasad Rao (shivrao) : Posted in a previous version of this proposal
review: Needs Resubmitting
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #1039 neutron-api-next for shivrao mp247358
    LINT OK: passed

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

Reply
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #1031 neutron-api-next for shivrao mp247358
    UNIT OK: passed

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

Reply
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #1219 neutron-api-next for shivrao mp247358
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

Reply
Revision history for this message
James Page (james-page) wrote :

Only some minor niggles - nearly there!

review: Needs Fixing
Reply

Unmerged revisions

70. By Edward Hope-Morley

[hopem] synced /next

69. By Shiv Prasad Rao

Addressing review comments.

68. By Jorge Niedbalski

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

67. By Edward Hope-Morley

synced charm-helpers

66. By Edward Hope-Morley

synced /next

65. By Shiv Prasad Rao

syncing n1kv charmhelper changer from lp:charm-helpers

64. By Shiv Prasad Rao

fix for 1394778

63. By Shiv Prasad Rao

Cisco Nexus 1000V changes

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