Merge lp:~ack/landscape-client/landscape-config-no-reregister-by-default into lp:~landscape/landscape-client/trunk

[Alberto Donato]

Default to "N" as answer to "request registration now" at the end of landscape-config runs if a prvevious registration has been sent.

Default to "N" as answer to "request registration now" at the end of landscape-config runs if a prvevious registration has been sent.

Testing instructions:

- run landscape-config a first time, request a registration
- run landscape-config again, see that by default "N" is selected at the registration question.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Fail
Revno: 947
Branch: lp:~ack/landscape-client/landscape-config-no-reregister-by-default
Jenkins: https://ci.lscape.net/job/latch-test-precise/889/

review: Needs Fixing (test results)

[Eric Snow (ericsnowcurrently)]

LGTM

review: Approve

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Fail
Revno: 947
Branch: lp:~ack/landscape-client/landscape-config-no-reregister-by-default
Jenkins: https://ci.lscape.net/job/latch-test-precise/890/

review: Needs Fixing (test results)

[lp:~ack/landscape-client/landscape-config-no-reregister-by-default]

948. By Alberto Donato on 2017-03-07

Fix tests.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 948
Branch: lp:~ack/landscape-client/landscape-config-no-reregister-by-default
Jenkins: https://ci.lscape.net/job/latch-test-precise/891/

review: Approve (test results)

[Free Ekanayaka (free.ekanayaka)]

+1

review: Approve

=== modified file 'landscape/configuration.py'
--- landscape/configuration.py	2017-03-03 12:36:55 +0000
+++ landscape/configuration.py	2017-03-07 16:47:31 +0000
@@ -741,6 +741,15 @@
         return 2  # An error happened
 
 
+def is_registered(config):
+    """Return whether the client is already registered."""
+    persist_filename = os.path.join(
+        config.data_path, "{}.bpickle".format(BrokerService.service_name))
+    persist = Persist(filename=persist_filename)
+    identity = Identity(config, persist)
+    return bool(identity.secure_id)
+
+
 def main(args, print=print):
     """Interact with the user and the server to set up client configuration."""
 
@@ -779,8 +788,10 @@
         report_registration_outcome(result, print=print)
         sys.exit(determine_exit_code(result))
     else:
+        default_answer = not is_registered(config)
         answer = prompt_yes_no(
-            "\nRequest a new registration for this computer now?")
+            "\nRequest a new registration for this computer now?",
+            default=default_answer)
         if answer:
             result = register(config, reactor)
             report_registration_outcome(result, print=print)

=== modified file 'landscape/tests/test_configuration.py'
--- landscape/tests/test_configuration.py	2017-03-03 12:35:28 +0000
+++ landscape/tests/test_configuration.py	2017-03-07 16:47:31 +0000
@@ -11,7 +11,8 @@
 from twisted.internet.defer import succeed, fail, Deferred
 
 from landscape.broker.registration import RegistrationError
-from landscape.broker.tests.helpers import RemoteBrokerHelper
+from landscape.broker.tests.helpers import (
+    RemoteBrokerHelper, BrokerConfigurationHelper)
 from landscape.configuration import (
     print_text, LandscapeSetupScript, LandscapeSetupConfiguration,
     register, setup, main, setup_init_script_and_start_client,
@@ -19,9 +20,10 @@
     ImportOptionError, store_public_key_data,
     bootstrap_tree, got_connection, success, failure, exchange_failure,
     handle_registration_errors, done, got_error, report_registration_outcome,
-    determine_exit_code)
+    determine_exit_code, is_registered)
 from landscape.lib.amp import MethodCallError
 from landscape.lib.fetch import HTTPCodeError, PyCurlError
+from landscape.lib.persist import Persist
 from landscape.sysvconfig import ProcessError
 from landscape.tests.helpers import FakeBrokerServiceHelper
 from landscape.tests.helpers import LandscapeTest, EnvironSaverHelper
@@ -1239,13 +1241,15 @@
             printed)
 
     def make_working_config(self):
+        data_path = self.makeFile()
         return self.makeFile("[client]\n"
                              "computer_title = Old Title\n"
                              "account_name = Old Name\n"
                              "registration_key = Old Password\n"
                              "http_proxy = http://old.proxy\n"
                              "https_proxy = https://old.proxy\n"
-                             "url = http://url\n")
+                             "data_path = {}\n"
+                             "url = http://url\n".format(data_path))
 
     @mock.patch("__builtin__.raw_input", return_value="")
     @mock.patch("landscape.configuration.register")
@@ -2170,3 +2174,27 @@
         for code in failure_codes:
             result = determine_exit_code(code)
             self.assertEqual(2, result)
+
+
+class IsRegisteredTest(LandscapeTest):
+
+    helpers = [BrokerConfigurationHelper]
+
+    def setUp(self):
+        super(IsRegisteredTest, self).setUp()
+        persist_file = os.path.join(self.config.data_path, "broker.bpickle")
+        self.persist = Persist(filename=persist_file)
+
+    def test_is_registered_false(self):
+        """
+        If the client hasn't previouly registered, is_registered returns False.
+        """
+        self.assertFalse(is_registered(self.config))
+
+    def test_is_registered_true(self):
+        """
+        If the client has previouly registered, is_registered returns True.
+        """
+        self.persist.set("registration.secure-id", "super-secure")
+        self.persist.save()
+        self.assertTrue(is_registered(self.config))