Merge lp:~tribaal/landscape-client/rename-metadata-annotations into lp:~landscape/landscape-client/trunk
Proposed by
Chris Glass
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Chris Glass | ||||
Approved revision: | 732 | ||||
Merged at revision: | 725 | ||||
Proposed branch: | lp:~tribaal/landscape-client/rename-metadata-annotations | ||||
Merge into: | lp:~landscape/landscape-client/trunk | ||||
Diff against target: |
310 lines (+64/-53) 8 files modified
landscape/configuration.py (+3/-2) landscape/deployment.py (+3/-3) landscape/message_schemas.py (+2/-4) landscape/monitor/computerinfo.py (+13/-11) landscape/monitor/tests/test_computerinfo.py (+27/-19) landscape/tests/test_configuration.py (+5/-5) landscape/tests/test_deployment.py (+5/-5) landscape/user/management.py (+6/-4) |
||||
To merge this branch: | bzr merge lp:~tribaal/landscape-client/rename-metadata-annotations | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Free Ekanayaka (community) | Approve | ||
Alberto Donato (community) | Approve | ||
Review via email: mp+185990@code.launchpad.net |
Commit message
This branch renames the meta-data.d/ directory to annotations.d/
Description of the change
This branch renames the meta-data.d/ directory to annotations.d/
One small non-related change too, where the log for the User credential were referring to "metadata" while it is in fact not meta data.
I would like to get an initial review on this, but I may have to retarget the branch depending on the release strategy we want to adopt (should we release the whole trunk since last release or just backport changes).
To post a comment you must log in.
Great! +1
#1: config. meta_data_ path config. annotations_ path
os.mkdir( meta_data_ dir)
create_ file(os. path.join( meta_data_ dir, "juju-env-uuid"), "uuid1")
create_ file(os. path.join( meta_data_ dir, "juju-unit-name"), "unit/0")
- meta_data_dir = self.monitor.
+ meta_data_dir = self.monitor.
I'd s/test_ meta_data/ test_annotation s/ for those tests, and s/meta_ data_dir/ annotations_ dir/.
Also it'd be nice to use generic key/values, not juju info specifically, as we're going to push them in a different message.