Merge lp:~therve/landscape-client/cloud-init-startup into lp:~landscape/landscape-client/trunk

[Thomas Herve]

The changes are in 2 parts:
 * Add the option to the configuration, and make it sufficient to configure the client
 * Use it in the registration process

[lp:~therve/landscape-client/cloud-init-startup]

304. By Thomas Herve on 2011-01-12

Don't restart if otp is specified

[Kevin McDermott (bigkevmcd)]

Simple changes, +1

review: Approve

[Frank Wierzbicki (fwierzbicki)]

Looks good to me! +1

Trivial grammar point:

s/there is not need/there is no need/

review: Approve

[lp:~therve/landscape-client/cloud-init-startup]

305. By Thomas Herve on 2011-01-12

Typo

=== modified file 'landscape/broker/config.py'
--- landscape/broker/config.py	2010-04-30 10:40:11 +0000
+++ landscape/broker/config.py	2011-01-12 21:27:14 +0000
@@ -38,6 +38,7 @@
               - C{http_proxy}
               - C{https_proxy}
               - C{cloud}
+              - C{otp}
         """
         parser = super(BrokerConfiguration, self).make_parser()
 
@@ -70,6 +71,8 @@
                           help="The URL of the HTTPS proxy, if one is needed.")
         parser.add_option("--cloud", action="store_true",
                           help="Set this if your computer is in an EC2 cloud.")
+        parser.add_option("--otp",
+                          help="The OTP to use in cloud configuration.")
         parser.add_option("--tags",
                           help="Comma separated list of tag names to be sent "
                                "to the server.")

=== modified file 'landscape/broker/registration.py'
--- landscape/broker/registration.py	2010-12-07 14:32:55 +0000
+++ landscape/broker/registration.py	2011-01-12 21:27:14 +0000
@@ -179,6 +179,9 @@
                 self._ec2_data["launch_index"] = int(
                     self._ec2_data["launch_index"])
 
+                if self._config.otp:
+                    self._otp = self._config.otp
+                    return
                 instance_data = _extract_ec2_instance_data(
                     raw_user_data, int(launch_index))
                 if instance_data is not None:

=== modified file 'landscape/broker/tests/test_registration.py'
--- landscape/broker/tests/test_registration.py	2010-09-09 16:10:07 +0000
+++ landscape/broker/tests/test_registration.py	2011-01-12 21:27:14 +0000
@@ -563,6 +563,28 @@
             self.transport.payloads[0]["messages"],
             [self.get_expected_cloud_message(tags=u"server,london")])
 
+    def test_cloud_registration_with_otp(self):
+        """
+        If the OTP is present in the configuration, it's used to trigger the
+        registration instead of using the user data.
+        """
+        self.config.otp = "otp1"
+        self.prepare_query_results(user_data=None)
+
+        self.prepare_cloud_registration()
+
+        # metadata is fetched and stored at reactor startup:
+        self.reactor.fire("run")
+
+        # Okay! Exchange should cause the registration to happen.
+        self.exchanger.exchange()
+        # This *should* be asynchronous, but I think a billion tests are
+        # written like this
+        self.assertEqual(len(self.transport.payloads), 1)
+        self.assertMessages(
+            self.transport.payloads[0]["messages"],
+            [self.get_expected_cloud_message()])
+
     def test_cloud_registration_with_invalid_tags(self):
         """
         Invalid tags in the configuration should result in the tags not being

=== modified file 'landscape/configuration.py'
--- landscape/configuration.py	2010-08-04 09:36:55 +0000
+++ landscape/configuration.py	2011-01-12 21:27:14 +0000
@@ -440,7 +440,8 @@
         config.https_proxy = os.environ["https_proxy"]
 
     if config.silent:
-        if not config.get("account_name") or not config.get("computer_title"):
+        if not config.get("otp") and (not config.get("account_name") or not
+                                          config.get("computer_title")):
             raise ConfigurationError("An account name and computer title are "
                                      "required.")
         if config.get("script_users"):
@@ -463,7 +464,7 @@
 
     config.write()
     # Restart the client to ensure that it's using the new configuration.
-    if not config.no_start:
+    if not config.no_start and not config.otp:
         try:
             sysvconfig.restart_landscape()
         except ProcessError:

=== modified file 'landscape/tests/test_configuration.py'
--- landscape/tests/test_configuration.py	2010-08-23 11:53:32 +0000
+++ landscape/tests/test_configuration.py	2011-01-12 21:27:14 +0000
@@ -738,6 +738,20 @@
         config = self.get_config(["--silent", "-t", "rex"])
         self.assertRaises(ConfigurationError, setup, config)
 
+    def test_silent_setup_with_otp(self):
+        """
+        If the OTP is specified, there is no need to pass the account name and
+        the computer title.
+        """
+        sysvconfig_mock = self.mocker.patch(SysVConfig)
+        sysvconfig_mock.set_start_on_boot(True)
+        self.mocker.replay()
+
+        config = self.get_config(["--silent", "--otp", "otp1"])
+        setup(config)
+
+        self.assertEqual("otp1", config.otp)
+
     def test_silent_script_users_imply_script_execution_plugin(self):
         """
         If C{--script-users} is specified, without C{ScriptExecution} in the