Merge lp:~viswesn/juju-ci-tools/juju-ci-sync-metadata-source into lp:juju-ci-tools

[viswesuwara nathan]

jujupy sync_tool now support stream argument.

Update juju-ci-sync-metadata-source code to make use of stream as part of sync_tool.

[lp:~viswesn/juju-ci-tools/juju-ci-sync-metadata-source]

1832. By viswesuwara nathan on 2017-01-10

Review comments addressed

Unmerged revisions

1832. By viswesuwara nathan on 2017-01-10

Review comments addressed

1831. By viswesuwara nathan on 2017-01-09

sync_tool added

=== modified file 'assess_bootstrap.py'
--- assess_bootstrap.py	2016-10-30 15:02:38 +0000
+++ assess_bootstrap.py	2017-01-10 16:27:10 +0000
@@ -43,19 +43,20 @@
         log.info('Environment successfully bootstrapped.')
 
 
-def prepare_metadata(client, local_dir):
+def prepare_metadata(client, local_dir, agent_stream=None, source=None):
     """Fill the given directory with metadata using sync_tools."""
-    client.sync_tools(local_dir)
+    client.sync_tools(local_dir, agent_stream, source)
 
 
 @contextmanager
-def prepare_temp_metadata(client, source_dir=None):
+def prepare_temp_metadata(client, source_dir=None, agent_stream=None,
+                          source=None):
     """Fill a temporary directory with metadata using sync_tools."""
     if source_dir is not None:
         yield source_dir
     else:
         with temp_dir() as md_dir:
-            prepare_metadata(client, md_dir)
+            prepare_metadata(client, md_dir, agent_stream, source)
             yield md_dir
 
 

=== added file 'assess_sync_agent_metadata.py'
--- assess_sync_agent_metadata.py	1970-01-01 00:00:00 +0000
+++ assess_sync_agent_metadata.py	2017-01-10 16:27:10 +0000
@@ -0,0 +1,130 @@
+#!/usr/bin/env python
+"""
+   Do juju bootstrap with agent-metadata-url option by doing sync-tools first.
+   On doing bootstrap of controller then deploy dummy charm.
+   Validation will be done to verify right agent-metadata-url is used during
+   bootstrap and then deployed dummy charm made use of the controller agent.
+
+   Usage: python assess_sync_agent_metadata.py
+"""
+
+from __future__ import print_function
+
+import argparse
+import logging
+import sys
+import json
+
+from assess_agent_metadata import (
+    verify_deployed_tool,
+    get_controller_url_and_sha256,
+)
+
+from assess_bootstrap import (
+    prepare_temp_metadata,
+    )
+
+from deploy_stack import (
+    BootstrapManager,
+    )
+
+from remote import (
+    remote_from_unit,
+    )
+
+from utility import (
+    add_basic_testing_arguments,
+    configure_logging,
+    JujuAssertionError,
+    )
+from jujucharm import (
+    local_charm_path,
+)
+
+__metaclass__ = type
+
+
+log = logging.getLogger("assess_sync_agent_metadata")
+
+
+def verify_deployed_charm(charm_app, client):
+    """
+    Verify the deployed charm, to make sure it used the same
+    juju tool of the controller by verifying the sha256 sum
+    :param charm_app: The app name that need to be verified
+    :param client: Juju client
+    """
+    remote = remote_from_unit(client, "{0}/0".format(charm_app))
+    output = remote.cat(
+        "/var/lib/juju/tools/machine-0/downloaded-tools.txt")
+
+    deserialized_output = json.loads(output)
+    _, controller_sha256 = get_controller_url_and_sha256(client)
+
+    if deserialized_output['sha256'] != controller_sha256:
+        raise JujuAssertionError(
+            'agent-metadata-url mismatch. Expected: {} Got: {}'.format(
+                controller_sha256, deserialized_output))
+
+    log.info("Charm verification done successfully")
+
+
+def deploy_charm_and_verify(client):
+    """
+    Deploy dummy charm from local repository and
+    verify it uses the specified agent-metadata-url option
+    :param client: Juju client
+    """
+    charm_app = "dummy-sink"
+    charm_source = local_charm_path(
+        charm=charm_app, juju_ver=client.version)
+    client.deploy(charm_source)
+    client.wait_for_started()
+    verify_deployed_charm(charm_app, client)
+
+
+def assess_sync_bootstrap(args, agent_stream):
+    """
+    Do sync-tool and then perform juju bootstrap with
+    metadata_source.
+    :param args: Parsed command line arguments
+    :param agent_stream: choice of release or develop
+    """
+    bs_manager = BootstrapManager.from_args(args)
+    client = bs_manager.client
+    source = client.env.get_option('tools-metadata-url')
+
+    with prepare_temp_metadata(
+            client, args.agent_dir, agent_stream, source) as agent_dir:
+        client.env.update_config({'agent-stream:': agent_stream})
+        log.info('Metadata written to: {}'.format(agent_dir))
+
+        with bs_manager.booted_context(args.upload_tools,
+                                       metadata_source=agent_dir):
+            log.info('Metadata bootstrap successful.')
+            verify_deployed_tool(agent_dir, client, agent_stream)
+            deploy_charm_and_verify(client)
+
+
+def parse_args(argv):
+    """Parse all arguments."""
+    parser = argparse.ArgumentParser(
+        description="Test metadata-source on sync-tool")
+    parser.add_argument('--agent-dir',
+                        action='store', default=None,
+                        help='tool dir to be used during bootstrap.')
+    add_basic_testing_arguments(parser)
+
+    return parser.parse_args(argv)
+
+
+def main(argv=None):
+    args = parse_args(argv)
+    configure_logging(args.verbose)
+
+    assess_sync_bootstrap(args, agent_stream="devel")
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())

=== modified file 'jujupy.py'
--- jujupy.py	2017-01-10 16:27:10 +0000
+++ jujupy.py	2017-01-10 16:27:10 +0000
@@ -2846,13 +2846,18 @@
         """Enable a command-set."""
         return self.juju('enable-command', args)
 
-    def sync_tools(self, local_dir=None):
+    def sync_tools(self, local_dir=None, stream=None, source=None):
         """Copy tools into a local directory or model."""
+        args = ()
+        if stream is not None:
+            args += ('--stream', stream)
+        if source is not None:
+            args += ('--source', source)
         if local_dir is None:
-            return self.juju('sync-tools', ())
+            return self.juju('sync-tools', args)
         else:
-            return self.juju('sync-tools', ('--local-dir', local_dir),
-                             include_e=False)
+            args += ('--local-dir', local_dir)
+            return self.juju('sync-tools', args, include_e=False)
 
     def switch(self, model=None, controller=None):
         """Switch between models."""

=== modified file 'tests/test_assess_bootstrap.py'
--- tests/test_assess_bootstrap.py	2016-11-25 15:12:11 +0000
+++ tests/test_assess_bootstrap.py	2017-01-10 16:27:10 +0000
@@ -129,7 +129,28 @@
         with patch.object(client, 'sync_tools') as sync_mock:
             with temp_dir() as metadata_dir:
                 prepare_metadata(client, metadata_dir)
-        sync_mock.assert_called_once_with(metadata_dir)
+        sync_mock.assert_called_once_with(metadata_dir, None, None)
+
+    def test_prepare_metadata_with_stream(self):
+        client = fake_juju_client()
+        with patch.object(client, 'sync_tools') as sync_mock:
+            with temp_dir() as metadata_dir:
+                prepare_metadata(client, metadata_dir, "testing")
+        sync_mock.assert_called_once_with(metadata_dir, "testing", None)
+
+    def test_prepare_metadata_with_source(self):
+        client = fake_juju_client()
+        with patch.object(client, 'sync_tools') as sync_mock:
+            with temp_dir() as metadata_dir:
+                prepare_metadata(client, metadata_dir, None, "foo")
+        sync_mock.assert_called_once_with(metadata_dir, None, "foo")
+
+    def test_prepare_metadata_with_all_args(self):
+        client = fake_juju_client()
+        with patch.object(client, 'sync_tools') as sync_mock:
+            with temp_dir() as metadata_dir:
+                prepare_metadata(client, metadata_dir, "bar", "foo")
+        sync_mock.assert_called_once_with(metadata_dir, "bar", "foo")
 
     def test_prepare_temp_metadata(self):
         client = fake_juju_client()
@@ -137,7 +158,7 @@
                    autospec=True) as prepare_mock:
             with prepare_temp_metadata(client) as metadata_dir:
                 pass
-        prepare_mock.assert_called_once_with(client, metadata_dir)
+        prepare_mock.assert_called_once_with(client, metadata_dir, None, None)
 
     def test_prepare_temp_metadata_source(self):
         client = fake_juju_client()

=== modified file 'tests/test_jujupy.py'
--- tests/test_jujupy.py	2017-01-10 16:27:10 +0000
+++ tests/test_jujupy.py	2017-01-10 16:27:10 +0000
@@ -3700,6 +3700,14 @@
         self.assertRaises(ValueError, client.switch)
 
 =======
+    def test_sync_tools_stream(self):
+        client = EnvJujuClient(JujuData('foo'), None, None)
+        with patch.object(client, 'juju', autospec=True) as mock:
+            client.sync_tools('/agents', "testing")
+        mock.assert_called_once_with(
+            'sync-tools', ('--stream', 'testing', '--local-dir', '/agents'),
+            include_e=False)
+
     def test_generate_tool(self):
         client = EnvJujuClient(JujuData('foo'), None, None)
         with patch.object(client, 'juju', autospec=True) as mock: