landscape-client-charm

Merge lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687 into lp:landscape-client-charm

  1. Improve-reporting-lp1800687
  2. Merge into trunk
Proposed by Alexander Litvinov
Status: Needs review
Proposed branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Merge into: lp:landscape-client-charm
Diff against target: 37 lines (+17/-1)
1 file modified
hooks/common.py (+17/-1)
To merge this branch: bzr merge lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Reviewer Review Type Date Requested Status
🤖 Landscape Builder test results Needs Fixing
Landscape Pending
Review via email: mp+367966@code.launchpad.net

Commit message

Fixes to improve error handling during registration process with landscape-server.
For lp:1772064 lp:1800687

Description of the change

Fix landscape-client charm reporting "Successfully registered" when it actually fails during registration.

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

Command: make ci-test
Result: Fail
Revno: 70
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3944/

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

Command: make ci-test
Result: Fail
Revno: 70
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3945/

review: Needs Fixing (test results)
Reply
Revision history for this message
Alexander Litvinov (alitvinov) wrote :

Failing are unit tests, need some adjustment.
Will fix.

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

Command: make ci-test
Result: Fail
Revno: 70
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3946/

review: Needs Fixing (test results)
Reply
lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687 updated
71. By Alexander Litvinov <email address hidden>

Leave old statuses

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

Command: make ci-test
Result: Fail
Revno: 71
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3951/

review: Needs Fixing (test results)
Reply
lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687 updated
72. By Alexander Litvinov <email address hidden>

Fix too long lines

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

Command: make ci-test
Result: Success
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3952/

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

Command: make ci-test
Result: Success
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3957/

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

Command: make ci-test
Result: Success
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3962/

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

Command: make ci-test
Result: Success
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3968/

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

Command: make ci-test
Result: Success
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3971/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3976/

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

Command: make ci-test
Result: Success
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3980/

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

Command: make ci-test
Result: Success
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3985/

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

Command: make ci-test
Result: Success
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3991/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/18/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/20/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/32/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/48/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1320/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1324/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1330/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1337/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1340/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1344/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1346/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1350/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1363/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1367/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1371/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1374/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1382/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1385/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1388/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1391/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1396/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1401/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1405/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1412/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1414/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1417/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1422/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1425/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1430/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1436/

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

Command: make ci-test
Result: Fail
Revno: 72
Branch: lp:~alitvinov/landscape-client-charm/Improve-reporting-lp1800687
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1442/

review: Needs Fixing (test results)
Reply

Unmerged revisions

72. By Alexander Litvinov <email address hidden>

Fix too long lines

71. By Alexander Litvinov <email address hidden>

Leave old statuses

70. By Alexander Litvinov <email address hidden>

Fix string format

69. By Alexander Litvinov <email address hidden>

Improve reporting lp#1800687 lp#1772064

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/common.py'
2--- hooks/common.py 2019-02-03 14:50:36 +0000
3+++ hooks/common.py 2019-05-28 09:45:15 +0000
4@@ -119,6 +119,11 @@
5 exit_code = self.try_to_register()
6 if exit_code == 0:
7 self.status_set("active", "System successfully registered")
8+ log("Client config updated, system successfully registered")
9+ else:
10+ self.status_set("maintenance", "Client registration fails")
11+ log("Client config updated, tried registration but failed")
12+ log("Exit code: %s" % exit_code)
13 else:
14 if not self.config.get("account_name"):
15 self.status_set(
16@@ -179,11 +184,22 @@
17 try:
18 setup(config)
19 except ConfigurationError as error:
20+ log("%s: Configuration error" % self.local_unit)
21 print >> sys.stderr, "Configuration error: %s" % (str(error),)
22 error_handler.flag_error(1)
23 else:
24 log("Registering %s" % self.local_unit)
25- register(config, on_error=error_handler.flag_error)
26+ result = 0
27+ try:
28+ result = register(config, on_error=error_handler.flag_error)
29+ log("Registration result is %s" % str(result))
30+ except SystemExit:
31+ log("Registration unsuccessful, SystemExit() happened")
32+ log("Check broker log or try manual registration")
33+ log(result)
34+ error_handler.flag_error(1)
35+
36+ log("Registration exit_code = %s" % error_handler.exit_code)
37 return error_handler.exit_code
38
39

Subscribers

People subscribed via source and target branches

to all changes: