Merge lp:~jsing/juju-deployer/resources-support into lp:juju-deployer

[Joel Sing]

[Tim Van Steenburgh (tvansteenburgh)]

This LGTM but I hit one error in the tests:

======================================================================
ERROR: test_importer_with_resources (deployer.tests.test_importer.ImporterTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/tvansteenburgh/src/juju-deployer/.tox/py35/lib/python3.5/site-packages/mock/mock.py", line 1305, in patched
    return func(*args, **keywargs)
  File "/home/tvansteenburgh/src/juju-deployer/deployer/tests/test_importer.py", line 74, in test_importer_with_resources
    os.path.join(self.test_data_dir, 'wiki-resources.yaml')])
  File "/home/tvansteenburgh/src/juju-deployer/deployer/config.py", line 34, in __init__
    self.load()
  File "/home/tvansteenburgh/src/juju-deployer/deployer/config.py", line 92, in load
    for fp in self._resolve_included():
  File "/home/tvansteenburgh/src/juju-deployer/deployer/config.py", line 141, in _resolve_included
    [files.extend(self._includes(cf)) for cf in self.config_files]
  File "/home/tvansteenburgh/src/juju-deployer/deployer/config.py", line 141, in <listcomp>
    [files.extend(self._includes(cf)) for cf in self.config_files]
  File "/home/tvansteenburgh/src/juju-deployer/deployer/config.py", line 123, in _includes
    d = self._yaml_load(config_file)
  File "/home/tvansteenburgh/src/juju-deployer/deployer/config.py", line 51, in _yaml_load
    with open(config_file) as fh:
FileNotFoundError: [Errno 2] No such file or directory: '/home/tvansteenburgh/src/juju-deployer/deployer/tests/test_data/wiki-resources.yaml'

Is there a wiki-resources.yaml file that didn't get included in the commit?

review: Needs Fixing

[lp:~jsing/juju-deployer/resources-support]

209. By Joel Sing on 2017-02-28

[jsing] Add support for deploying resources with juju.

[Joel Sing (jsing)]

Yup, appears to have been a bzr add fail... fixed.

PTAL

[Tim Van Steenburgh (tvansteenburgh)]

Thanks, LGTM.

review: Approve

=== modified file 'deployer/action/importer.py'
--- deployer/action/importer.py	2016-12-22 22:25:54 +0000
+++ deployer/action/importer.py	2017-03-01 03:31:40 +0000
@@ -201,6 +201,7 @@
                 charm.repo_path or self.deployment.repo_path,
                 svc.config,
                 svc.constraints,
+                svc.resources,
                 svc.storage,
                 num_units,
                 placement.get(0),

=== modified file 'deployer/env/base.py'
--- deployer/env/base.py	2016-12-24 14:25:49 +0000
+++ deployer/env/base.py	2017-03-01 03:31:40 +0000
@@ -68,8 +68,8 @@
         self.get_cli_status()
         self.log.info(" Bootstrap complete")
 
-    def deploy(self, name, charm_url, repo=None, config=None,
-               constraints=None, storage=None, num_units=1, force_machine=None,
+    def deploy(self, name, charm_url, repo=None, config=None, constraints=None,
+               resources=None, storage=None, num_units=1, force_machine=None,
                series=None):
         params = self._named_env(["juju", "deploy"])
         with temp_file() as fh:
@@ -85,6 +85,13 @@
                         '{}={}'.format(k, v) for k, v in constraints.items()
                     ])
                 params.extend(['--constraints', constraints])
+            if resources:
+                if not isinstance(resources, dict):
+                    raise DeploymentError(
+                        "resources must be specified as a dictionary")
+                for key, value in resources.items():
+                    params.append("--resource")
+                    params.append("{}={}".format(key, value))
             if storage:
                 if not isinstance(storage, dict):
                     raise DeploymentError(

=== modified file 'deployer/service.py'
--- deployer/service.py	2016-12-22 22:25:54 +0000
+++ deployer/service.py	2017-03-01 03:31:40 +0000
@@ -55,6 +55,10 @@
         return int(self.svc_data.get('num_units', 1))
 
     @property
+    def resources(self):
+        return self.svc_data.get('resources', None)
+
+    @property
     def storage(self):
         return self.svc_data.get('storage', None)
 

=== added file 'deployer/tests/test_data/wiki-resources.yaml'
--- deployer/tests/test_data/wiki-resources.yaml	1970-01-01 00:00:00 +0000
+++ deployer/tests/test_data/wiki-resources.yaml	2017-03-01 03:31:40 +0000
@@ -0,0 +1,14 @@
+wiki:
+  series: precise
+  services:
+    wiki:
+      charm: cs:precise/mediawiki
+      options:
+        name: $hi_world _are_you_there? {guess_who}
+      resources:
+        config: ./docs/cfg.xml
+        tarball: /some/file.tgz
+    db:
+      charm: cs:precise/mysql
+  relations:
+    - [wiki, db]

=== modified file 'deployer/tests/test_guiserver.py'
--- deployer/tests/test_guiserver.py	2016-12-22 22:52:22 +0000
+++ deployer/tests/test_guiserver.py	2017-03-01 03:31:40 +0000
@@ -283,14 +283,14 @@
             mock.call.status(),
             mock.call.deploy(
                 'mysql', 'cs:precise/mysql-28', '', None,
-                {'arch': 'i386', 'cpu-cores': 4, 'mem': '4G'}, None, 2, None,
-                'precise'),
+                {'arch': 'i386', 'cpu-cores': 4, 'mem': '4G'},
+                None, None, 2, None, 'precise'),
             mock.call.set_annotation(
                 'mysql', {'gui-y': '164.547', 'gui-x': '494.347'}),
             mock.call.deploy(
                 'wordpress', 'cs:precise/wordpress-20', '',
                 {'debug': 'no', 'engine': 'nginx', 'tuning': 'single'},
-                None, None, 1, None, 'precise'),
+                None, None, None, 1, None, 'precise'),
             mock.call.set_annotation(
                 'wordpress', {'gui-y': '414.547', 'gui-x': '425.347'}),
             mock.call.add_units('mysql', 2),

=== modified file 'deployer/tests/test_importer.py'
--- deployer/tests/test_importer.py	2016-12-24 14:25:49 +0000
+++ deployer/tests/test_importer.py	2017-03-01 03:31:40 +0000
@@ -63,9 +63,31 @@
             env.method_calls[3], mock.call.deploy(
                 'wiki', 'cs:precise/mediawiki',
                 os.environ.get("JUJU_REPOSITORY", ""),
-                config, None, None, 1, None, 'precise'))
-        env.add_relation.assert_called_once_with('wiki', 'db')
-
+                config, None, None, None, 1, None, 'precise'))
+        env.add_relation.assert_called_once_with('wiki', 'db')
+
+    @skip_if_offline
+    @mock.patch('deployer.action.importer.time')
+    def test_importer_with_resources(self, mock_time):
+        mock_time.time.return_value = 0
+        stack = ConfigStack([
+            os.path.join(self.test_data_dir, 'wiki-resources.yaml')])
+        deploy = stack.get('wiki')
+        env = mock.MagicMock()
+        importer = Importer(env, deploy, self.options)
+        importer.run()
+
+        config = {'name': '$hi_world _are_you_there? {guess_who}'}
+        self.assertEqual(
+            env.method_calls[3], mock.call.deploy(
+                'wiki', 'cs:precise/mediawiki',
+                os.environ.get("JUJU_REPOSITORY", ""),
+                config, None,
+                {"config": "./docs/cfg.xml", "tarball": "/some/file.tgz"},
+                None, 1, None, 'precise'))
+        env.add_relation.assert_called_once_with('wiki', 'db')
+
+    @skip_if_offline
     @skip_if_offline
     @mock.patch('deployer.action.importer.time')
     def test_importer_with_storage(self, mock_time):
@@ -82,7 +104,7 @@
             env.method_calls[3], mock.call.deploy(
                 'wiki', 'cs:precise/mediawiki',
                 os.environ.get("JUJU_REPOSITORY", ""),
-                config, None, {"web-data": "cinder,10G,1"},
+                config, None, None, {"web-data": "cinder,10G,1"},
                 1, None, 'precise'))
         env.add_relation.assert_called_once_with('wiki', 'db')
 

=== modified file 'deployer/tests/test_service.py'
--- deployer/tests/test_service.py	2016-12-22 22:25:54 +0000
+++ deployer/tests/test_service.py	2017-03-01 03:31:40 +0000
@@ -21,6 +21,7 @@
             'constraints': "instance-type=m1.small",
             'options': {"services": "include-file://stack-include.yaml"},
             'num_units': 10,
+            'resources': {"config": "./docs/cfg.xml"},
             'storage': {"data": "ebs,10G,1"}}
         s = Service('db', data)
         self.assertEquals(s.num_units, 10)
@@ -28,4 +29,5 @@
         self.assertEquals(
             s.config,
             {"services": "include-file://stack-include.yaml"})
+        self.assertEquals(s.resources, {"config": "./docs/cfg.xml"})
         self.assertEquals(s.storage, {"data": "ebs,10G,1"})

=== modified file 'doc/config.rst'
--- doc/config.rst	2016-12-23 16:54:49 +0000
+++ doc/config.rst	2017-03-01 03:31:40 +0000
@@ -36,6 +36,8 @@
                 tuning: optimized
                 engine: apache
                 icon: include-base64://file.ico
+            resources:
+                config: ./doc/cfg.xml
             storage:
             	data-block: "ebs,1024G,3"
  
@@ -54,12 +56,20 @@
 include-base64://path-to-file. Relative paths are resolved
 relative to the config file.
 
+Service resources are specified as a dictionary with keys as the label
+and the value being the path of the file containing the resource that
+is to be be passed to Juju. This matches the Juju cli syntax,
+`juju deploy <charm> --resource <label>=<file>`. NOTE: resources
+status is not displayed in the diff command as it is not in the Juju
+status data. For this same reason resources are only specified for new
+services and are not added to already existing services.
+
 Service storage is specified as a dictionary with keys as the label
-and the value being the pool,size,count string that should be passed
+and the value being the pool,size,count string that is to be passed
 to Juju. This matches the Juju cli syntax,
 `juju deploy <charm> --storage <label>=<pool>,<size>,<count>`. Also
 like the cli, size and count are optional parameters. NOTE: storage
-status is not displayed in the diff command as isn't in the the Juju
+status is not displayed in the diff command as it is not in the Juju
 status data. For this same reason storage is only specified for new
 services and is not added to already existing services.