Landscape Client

Merge lp:~ericsnowcurrently/landscape-client/message-schemas-package into lp:~landscape/landscape-client/trunk

  1. message-schemas-package
  2. Merge into trunk
Proposed by Eric Snow
Status: Merged
Approved by: Eric Snow
Approved revision: 1006
Merged at revision: 1011
Proposed branch: lp:~ericsnowcurrently/landscape-client/message-schemas-package
Merge into: lp:~landscape/landscape-client/trunk
Diff against target: 65 lines (+25/-1)
4 files modified
landscape/broker/store.py (+1/-1)
landscape/message_schemas/__init__.py (+4/-0)
landscape/message_schemas/server_bound.py (+19/-0)
setup.py (+1/-0)
To merge this branch: bzr merge lp:~ericsnowcurrently/landscape-client/message-schemas-package
Reviewer Review Type Date Requested Status
Simon Poirier (community) Approve
Chad Smith Approve
🤖 Landscape Builder test results Approve
Review via email: mp+322138@code.launchpad.net

Commit message

Move the existing message schemas into l.message_schemas.server_bound.

This is a move of landscape/message_schemas.py into a new l.message_schemas
package. The change maintains backward-compatibility, hence the need
to add __all__.

Description of the change

Move the existing message schemas into l.message_schemas.server_bound.

This is a move of landscape/message_schemas.py into a new l.message_schemas
package. The change maintains backward-compatibility, hence the need
to add __all__.

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make ci-check
Result: Fail
Revno: 1005
Branch: lp:~ericsnowcurrently/landscape-client/message-schemas-package
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3849/

review: Needs Fixing (test results)
lp:~ericsnowcurrently/landscape-client/message-schemas-package updated
1006. By Eric Snow

Add the new package to the setup script.

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make ci-check
Result: Fail
Revno: 1006
Branch: lp:~ericsnowcurrently/landscape-client/message-schemas-package
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3850/

review: Needs Fixing (test results)
Revision history for this message
Simon Poirier (simpoir) wrote :

+1

review: Approve
Revision history for this message
Chad Smith (chad.smith) :
Revision history for this message
Chad Smith (chad.smith) :
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make ci-check
Result: Fail
Revno: 1006
Branch: lp:~ericsnowcurrently/landscape-client/message-schemas-package
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3852/

review: Needs Fixing (test results)
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make ci-check
Result: Fail
Revno: 1006
Branch: lp:~ericsnowcurrently/landscape-client/message-schemas-package
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3853/

review: Needs Fixing (test results)
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make ci-check
Result: Fail
Revno: 1006
Branch: lp:~ericsnowcurrently/landscape-client/message-schemas-package
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3854/

review: Needs Fixing (test results)
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make ci-check
Result: Fail
Revno: 1006
Branch: lp:~ericsnowcurrently/landscape-client/message-schemas-package
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3855/

review: Needs Fixing (test results)
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 1006
Branch: lp:~ericsnowcurrently/landscape-client/message-schemas-package
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3856/

review: Approve (test results)
Revision history for this message
Chad Smith (chad.smith) wrote :

I updated the failing lcy01 xenial-server/0 to get landscape-common3 installed properly.

+1 on this changeset.

review: Approve
Revision history for this message
Simon Poirier (simpoir) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'landscape/broker/store.py'
2--- landscape/broker/store.py 2017-03-21 17:00:34 +0000
3+++ landscape/broker/store.py 2017-04-06 18:50:53 +0000
4@@ -529,7 +529,7 @@
5 """
6 Get a L{MessageStore} object with all Landscape message schemas added.
7 """
8- from landscape. message_schemas import message_schemas
9+ from landscape.message_schemas.server_bound import message_schemas
10 store = MessageStore(*args, **kwargs)
11 for schema in message_schemas:
12 store.add_schema(schema)
13
14=== added directory 'landscape/message_schemas'
15=== added file 'landscape/message_schemas/__init__.py'
16--- landscape/message_schemas/__init__.py 1970-01-01 00:00:00 +0000
17+++ landscape/message_schemas/__init__.py 2017-04-06 18:50:53 +0000
18@@ -0,0 +1,4 @@
19+# Copyright 2017 Canonical Limited. All rights reserved.
20+
21+# This import is here for backward-compatibility.
22+from .server_bound import *
23
24=== renamed file 'landscape/message_schemas.py' => 'landscape/message_schemas/server_bound.py'
25--- landscape/message_schemas.py 2017-03-23 12:26:04 +0000
26+++ landscape/message_schemas/server_bound.py 2017-04-06 18:50:53 +0000
27@@ -1,7 +1,26 @@
28+# Copyright 2017 Canonical Limited. All rights reserved.
29+
30 from landscape.schema import (
31 Message, KeyDict, Dict, List, Tuple,
32 Bool, Int, Float, Bytes, Unicode, Constant, Any)
33
34+
35+__all__ = [
36+ "ACTIVE_PROCESS_INFO", "COMPUTER_UPTIME", "CLIENT_UPTIME",
37+ "OPERATION_RESULT", "COMPUTER_INFO", "DISTRIBUTION_INFO",
38+ "HARDWARE_INVENTORY", "HARDWARE_INFO", "LOAD_AVERAGE", "MEMORY_INFO",
39+ "RESYNCHRONIZE", "MOUNT_ACTIVITY", "MOUNT_INFO", "FREE_SPACE",
40+ "REGISTER", "REGISTER_3_3",
41+ "TEMPERATURE", "PROCESSOR_INFO", "USERS", "PACKAGES", "PACKAGE_LOCKS",
42+ "CHANGE_PACKAGES_RESULT", "UNKNOWN_PACKAGE_HASHES",
43+ "ADD_PACKAGES", "PACKAGE_REPORTER_RESULT", "TEXT_MESSAGE", "TEST",
44+ "CUSTOM_GRAPH", "REBOOT_REQUIRED", "APT_PREFERENCES",
45+ "NETWORK_DEVICE", "NETWORK_ACTIVITY",
46+ "REBOOT_REQUIRED_INFO", "UPDATE_MANAGER_INFO", "CPU_USAGE",
47+ "CEPH_USAGE", "SWIFT_USAGE", "SWIFT_DEVICE_INFO", "KEYSTONE_TOKEN",
48+ "JUJU_UNITS_INFO", "CLOUD_METADATA",
49+ ]
50+
51 # When adding a new schema, which deprecates an older schema, the recommended
52 # naming convention, is to name it SCHEMA_NAME_ and the last API version that
53 # the schema works with.
54
55=== modified file 'setup.py'
56--- setup.py 2017-01-05 11:19:41 +0000
57+++ setup.py 2017-04-06 18:50:53 +0000
58@@ -16,6 +16,7 @@
59 packages=["landscape",
60 "landscape.broker",
61 "landscape.manager",
62+ "landscape.message_schemas",
63 "landscape.monitor",
64 "landscape.package",
65 "landscape.sysinfo",

Subscribers

People subscribed via source and target branches

to all changes: