Merge lp:~zyga/lava-dashboard-tool/rework-pull-ui into lp:lava-dashboard-tool/linaro-11.05

Proposed by Zygmunt Krynicki
Status: Merged
Merged at revision: 138
Proposed branch: lp:~zyga/lava-dashboard-tool/rework-pull-ui
Merge into: lp:lava-dashboard-tool/linaro-11.05
Diff against target: 41 lines (+17/-4)
1 file modified
launch_control_tool/commands/dashboard.py (+17/-4)
To merge this branch: bzr merge lp:~zyga/lava-dashboard-tool/rework-pull-ui
Reviewer Review Type Date Requested Status
Zygmunt Krynicki Pending
Review via email: mp+59503@code.launchpad.net

Description of the change

Rework pull user interface so that the remote dashboard URL is easier to provide.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launch_control_tool/commands/dashboard.py'
2--- launch_control_tool/commands/dashboard.py 2011-04-29 00:20:42 +0000
3+++ launch_control_tool/commands/dashboard.py 2011-04-29 12:41:01 +0000
4@@ -694,20 +694,33 @@
5
6 class pull(ExperimentalCommandMixIn, XMLRPCCommand):
7 """
8- Pull bundles and bundle streams from one REMOTE DASHBOARD to DASHBOARD
9+ Copy bundles and bundle streams from one dashboard to another.
10+
11
12+ This command checks for two environment varialbes:
13+ The value of DASHBOARD_URL is used as a replacement for --dashbard-url.
14+ The value of REMOTE_DASHBOARD_URL as a replacement for FROM.
15+ Their presence automatically makes the corresponding argument optional.
16 """
17
18 def __init__(self, parser, args):
19 super(pull, self).__init__(parser, args)
20- remote_xml_rpc_url = self._construct_xml_rpc_url(self.args.remote_dashboard_url)
21+ remote_xml_rpc_url = self._construct_xml_rpc_url(self.args.FROM)
22 self.remote_server = xmlrpclib.ServerProxy(remote_xml_rpc_url, use_datetime=True,
23 allow_none=True, verbose=args.verbose_xml_rpc)
24
25 @classmethod
26 def register_arguments(cls, parser):
27 group = super(pull, cls).register_arguments(parser)
28- group.add_argument("--remote-dashboard-url", required=True,
29- metavar="URL", help="URL of the remote validation dashboard")
30+ default_remote_dashboard_url = os.getenv("REMOTE_DASHBOARD_URL")
31+ if default_remote_dashboard_url:
32+ group.add_argument(
33+ "FROM", nargs="?",
34+ help="URL of the remote validation dashboard (currently %(default)s)",
35+ default=default_remote_dashboard_url)
36+ else:
37+ group.add_argument(
38+ "FROM",
39+ help="URL of the remote validation dashboard)")
40 group.add_argument("STREAM", nargs="*", help="Streams to pull from (all by default)")
41
42 @staticmethod

Subscribers

People subscribed via source and target branches

to all changes: