Merge lp:~fwereade/pyjuju/spike-catchup into lp:pyjuju

[William Reade]

This just brings provider.get_serialization_data in line with the spiked version. (The prereq includes all the orchestra get_machine/get_machines stuff which was otherwise missing)

[Jim Baker (jimbaker)]

+1, looks good to me!

review: Approve

[lp:~fwereade/pyjuju/spike-catchup]

315. By William Reade on 2011-08-12

merge parent

316. By William Reade on 2011-08-12

merge parent

317. By William Reade on 2011-08-15

merge parent

318. By William Reade on 2011-08-16

merge parent

[Gustavo Niemeyer (niemeyer)]

Looks good!

review: Approve

[Kapil Thangavelu (hazmat)]

Looks good, +1

review: Approve

[lp:~fwereade/pyjuju/spike-catchup]

319. By William Reade on 2011-08-17

merge parent

320. By William Reade on 2011-08-17

null merge trunk

=== modified file 'ensemble/providers/orchestra/__init__.py'
--- ensemble/providers/orchestra/__init__.py	2011-08-12 19:54:54 +0000
+++ ensemble/providers/orchestra/__init__.py	2011-08-17 09:23:53 +0000
@@ -1,10 +1,13 @@
+import copy
 from operator import itemgetter
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 
+from ensemble.environment.errors import EnvironmentsConfigError
 from ensemble.providers.common.bootstrap import Bootstrap
 from ensemble.providers.common.findzookeepers import find_zookeepers
 from ensemble.providers.common.state import SaveState, LoadState
+from ensemble.providers.common.utils import get_user_authorized_keys
 
 from .cobbler import CobblerClient
 from .files import FileStorage
@@ -21,12 +24,21 @@
         self.config = config
         self.cobbler = CobblerClient(config)
 
+        if ("authorized-keys-path" in config and
+            "authorized-keys" in config):
+            raise EnvironmentsConfigError(
+                "Environment config cannot define both authorized-keys "
+                "and authorized-keys-path. Pick one!")
+
     def get_serialization_data(self):
         """Return a dictionary serialization of the provider configuration.
 
         Additionally this extracts credential information from the environment.
         """
-        raise NotImplementedError()
+        data = copy.deepcopy(self.config)
+        data["authorized-keys"] = get_user_authorized_keys(data)
+        data.pop("authorized-keys-path", None)
+        return data
 
     def connect(self, share=False):
         """

=== modified file 'ensemble/providers/orchestra/tests/test_provider.py'
--- ensemble/providers/orchestra/tests/test_provider.py	2011-08-12 19:54:54 +0000
+++ ensemble/providers/orchestra/tests/test_provider.py	2011-08-17 09:23:53 +0000
@@ -1,3 +1,4 @@
+from ensemble.environment.errors import EnvironmentsConfigError
 from ensemble.lib.testing import TestCase
 from ensemble.providers.orchestra import MachineProvider
 
@@ -15,3 +16,39 @@
             "tetrascape", CONFIG)
         self.assertEquals(provider.environment_name, "tetrascape")
         self.assertEquals(provider.config, CONFIG)
+
+    def test_config_serialization(self):
+        """
+        The provider configuration can be serialized to yaml.
+        """
+        keys_path = self.makeFile("my-keys")
+
+        config = {"orchestra-user": "chaosmonkey",
+                  "orchestra-pass": "crash",
+                  "acquired-mgmt-class": "madeup-1",
+                  "available-mgmt-class": "madeup-2",
+                  "orchestra-server": "127.0.0.01",
+                  "authorized-keys-path": keys_path}
+
+        expected = {"orchestra-user": "chaosmonkey",
+                  "orchestra-pass": "crash",
+                  "acquired-mgmt-class": "madeup-1",
+                  "available-mgmt-class": "madeup-2",
+                  "orchestra-server": "127.0.0.01",
+                  "authorized-keys": "my-keys"}
+
+        provider = MachineProvider("tetrascape", config)
+        serialized = provider.get_serialization_data()
+        self.assertEqual(serialized, expected)
+
+    def test_conflicting_authorized_keys_options(self):
+        """
+        We can't handle two different authorized keys options, so deny
+        constructing an environment that way.
+        """
+        config = CONFIG.copy()
+        config["authorized-keys"] = "File content"
+        config["authorized-keys-path"] = "File path"
+        error = self.assertRaises(EnvironmentsConfigError,
+                                  MachineProvider, "some-env-name", config)
+        self.assertIn("authorized-keys", str(error))