Merge lp:~benji/juju-deployer/add-fetching-configs into lp:~hazmat/juju-deployer/refactor

[Benji York]

This branch adds the ability to specify a configuration file (in a -c option) by URL and have that configuration file loaded over the network, stored in a temp file locally, and used by the deployer.

=== modified file 'README'
--- README	2013-05-14 21:00:33 +0000
+++ README	2013-07-15 21:51:32 +0000
@@ -9,7 +9,7 @@
 Installation
 ------------
 
-  $ virtulenv --system-site-packages deployer
+  $ virtualenv --system-site-packages deployer
   $ ./deployer/bin/easy_install juju-deployer
   $ ./deployer/bin/juju-deployer -h
 

=== modified file 'deployer.py'
--- deployer.py	2013-07-12 13:34:39 +0000
+++ deployer.py	2013-07-15 21:51:32 +0000
@@ -30,6 +30,7 @@
 import tempfile
 import time
 import urllib
+import urlparse
 import zipfile
 
 try:
@@ -357,14 +358,27 @@
         deploy_data = self._resolve_inherited(deploy_data)
         return Deployment(key, deploy_data, self.include_dirs)
 
-    def load(self):
+    def load(self, urlopen=urllib.urlopen):
         data = {}
         include_dirs = []
         for fp in self.config_files:
             if not path_exists(fp):
-                self.log.warning("Config file not found %s", fp)
-                raise ErrorExit()
-            include_dirs.append(dirname(abspath(fp)))
+                # If the config file path is a URL, fetch it and use it.
+                if urlparse.urlparse(fp).scheme:
+                    response = urlopen(fp)
+                    if response.getcode() == 200:
+                        temp = tempfile.NamedTemporaryFile(delete=True)
+                        shutil.copyfileobj(response, temp)
+                        temp.flush()
+                        fp = temp.name
+                    else:
+                        self.log.warning("Could not retrieve %s", fp)
+                        raise ErrorExit()
+                else:
+                    self.log.warning("Config file not found %s", fp)
+                    raise ErrorExit()
+            else:
+                include_dirs.append(dirname(abspath(fp)))
             with open(fp) as fh:
                 try:
                     d = yaml_load(fh.read())
@@ -845,7 +859,7 @@
             os.mkdir(self.series_path)
         for charm in self.get_charms():
             if charm.is_local():
-                if self.charm.exists():
+                if charm.exists():
                     if no_local_mods:
                         if charm.is_modified():
                             self.log.warning(

=== modified file 'test_deployment.py'
--- test_deployment.py	2013-07-11 23:25:17 +0000
+++ test_deployment.py	2013-07-15 21:51:32 +0000
@@ -34,7 +34,7 @@
     Service,
     Charm,
     Deployment,
-    Environment,
+    EnvironmentClient,
     Importer,
     ErrorExit)
 
@@ -169,6 +169,58 @@
         self.assertTrue(deployment)
 
 
+class NetworkConfigFetchingTests(Base):
+    """Configuration files can be specified via URL that is then fetched."""
+
+    def setUp(self):
+        self.output = self.capture_logging(
+            "deployer.config", level=logging.DEBUG)
+
+    def test_urls_are_fetched(self):
+        # If a config file is specified as a URL, that URL is fetched and
+        # placed at a temporary location where it is read and treated as a
+        # regular config file.
+        CONFIG_URL = 'http://site.invalid/config-1'
+        config = ConfigStack([])
+        config.config_files = [CONFIG_URL]
+
+        class FauxResponse(file):
+            def getcode(self):
+                return 200
+
+        def faux_urlopen(url):
+            self.assertEqual(url, CONFIG_URL)
+            return FauxResponse('configs/ostack-testing-sample.cfg')
+
+        config.load(urlopen=faux_urlopen)
+        self.assertEqual(
+            config.keys(),
+            [u'openstack-precise-ec2',
+             u'openstack-precise-ec2-trunk',
+             u'openstack-ubuntu-testing'])
+        self.assertRaises(ErrorExit, config.get, 'zeeland')
+        result = config.get("openstack-precise-ec2")
+        self.assertTrue(isinstance(result, Deployment))
+
+    def test_unfetchable_urls_generate_an_error(self):
+        # If a config file is specified as a URL, that URL is fetched and
+        # placed at a temporary location where it is read and treated as a
+        # regular config file.
+        CONFIG_URL = 'http://site.invalid/config-1'
+        config = ConfigStack([])
+        config.config_files = [CONFIG_URL]
+
+        class FauxResponse(file):
+            def getcode(self):
+                return 400
+
+        def faux_urlopen(url):
+            self.assertEqual(url, CONFIG_URL)
+            return FauxResponse('configs/ostack-testing-sample.cfg')
+
+        self.assertRaises(ErrorExit, config.load, urlopen=faux_urlopen)
+
+
 class ServiceTest(Base):
 
     def test_service(self):