core-image-watcher

Merge lp://staging/~psivaa/core-image-watcher/image-info-from-constants into lp://staging/core-image-watcher/vivid-edge-core-image-watcher

image-info-from-constants
Merge into 15.04-edge-core-image-watcher

Proposed by Para Siva on 2015-06-02

Status:	Merged
Approved by:	Para Siva on 2015-06-02
Approved revision:	20
Merged at revision:	17
Proposed branch:	lp://staging/~psivaa/core-image-watcher/image-info-from-constants
Merge into:	lp://staging/core-image-watcher/vivid-edge-core-image-watcher
Diff against target:	241 lines (+43/-48) 5 files modified README.rst (+1/-1) core-service.conf (+0/-6) core_image_watcher/__init__.py (+15/-10) core_image_watcher/constants.py (+16/-25) core_image_watcher/tests/test_image_watcher.py (+11/-6)
To merge this branch:	bzr merge lp://staging/~psivaa/core-image-watcher/image-info-from-constants
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Francis Ginther		2015-06-02	Approve on 2015-06-02
Review via email: mp+260846@code.staging.launchpad.net

Commit message

Obtain image specific information from constants.py.

Description of the change

Obtain image specific information from constants.py. It was agreed that separate worker will be spun for different image channels.

The relevant worker log:

2015-06-02 16:22:26,381 core_image_watcher INFO: Triggering request: {'channel': 'ubuntu-core/15.04/edge', 'device': 'generic_amd64', 'request_id': '44c52bb7-deb8-42ac-974e-7377a7259647', 'image_name': '74'}

As discussed, the output rabbitmq channel will be the same as one used for rolling_edge. (channel name will be `core-image-v1`)

Revision history for this message

Francis Ginther (fginther) wrote on 2015-06-02:

This looks like the right change. You probably also want to move the rabbit queue name(s) to the constants file, but that doesn't need to be done here.

review: Approve

Revision history for this message

Francis Ginther (fginther) wrote on 2015-06-02:

Ooops. I missed something.

The format u-d-f uses channels changed a few weeks back. As a result, the core-image-publisher was modified to hardcode the names for the channel and release. The problem is that the u-d-f query operations still use the "ubuntu-core/15.04/edge" format, but when actually downloading an image, all three components of this have to be specified separately. For the snappy-proposed-selftest-agent, we took the approach of specifying "RELEASE" and "CHANNEL" as independent constants and then letting the code organize them into the right usage. We should do the same thing here. But again, this could be done as a follow on MP.

lp://staging/~psivaa/core-image-watcher/image-info-from-constants updated on 2015-06-02

19. By Para Siva on 2015-06-02: Seperate channel and release from old channel

Revision history for this message

Para Siva (psivaa) wrote on 2015-06-02:

Thanks for the comment, I've now introduced RELEASE here and constructed the 'channel' for u-d-f query from them.
This is the output now:

2015-06-02 17:29:17,356 core_image_watcher INFO: Triggering request: {'channel': 'edge', 'request_id': '9200b538-0019-47df-96f2-f15b80f50343', 'release': '15.04', 'image_name': '74', 'device': 'generic_amd64'}

Revision history for this message

Francis Ginther (fginther) wrote on 2015-06-02:

This looks good, thanks for splitting channel and release.

review: Approve

lp://staging/~psivaa/core-image-watcher/image-info-from-constants updated on 2015-06-02