Search environment for crossbar

labgrid/remote/client.py

@@ -807,7 +807,7 @@ def main():
         '--crossbar',
         metavar='URL',
         type=str,
-        default="ws://127.0.0.1:20408/ws",
+        default=os.environ.get("LG_CROSSBAR", "ws://127.0.0.1:20408/ws"),
         help="crossbar websocket URL"
     )
     parser.add_argument(
@@ -1004,7 +1004,8 @@ def main():
     }
 
     if args.command and args.command != 'help':
-        session = start_session(args.crossbar, "realm1", extra)
+        session = start_session(args.crossbar,
+            os.environ.get("LG_CROSSBAR_REALM", "realm1"), extra)
         exitcode = 0
         try:
             if asyncio.iscoroutinefunction(args.func):

labgrid/remote/exporter.py

@@ -4,6 +4,7 @@
 import asyncio
 import logging
 import sys
+import os
 import traceback
 import subprocess
 from socket import gethostname, socket, AF_INET, SOCK_STREAM
@@ -381,7 +382,7 @@ def main():
         '--crossbar',
         metavar='URL',
         type=str,
-        default="ws://127.0.0.1:20408/ws",
+        default=os.environ.get("LG_CROSSBAR", "ws://127.0.0.1:20408/ws"),
         help="crossbar websocket URL"
     )
     parser.add_argument(
@@ -417,7 +418,7 @@ def main():
 
     extra['loop'] = loop = asyncio.get_event_loop()
     #loop.set_debug(True)
-    runner = ApplicationRunner(url=args.crossbar, realm="realm1", extra=extra)
+    runner = ApplicationRunner(url=args.crossbar, realm=os.environ.get("LG_CROSSBAR_REALM", "realm1"), extra=extra)
     runner.run(ExporterSession, log_level=level)
     if reexec:
         exit(100)

labgrid/resource/remote.py

@@ -1,5 +1,6 @@
 import logging
 import attr
+import os
 
 from ..factory import target_factory
 from .common import Resource, NetworkResource, ManagedResource, ResourceManager
@@ -35,8 +36,10 @@ def on_resource_added(self, resource):
         if not self.session:
             self.env = remote_place.target.env
             config = self.env.config
-            self.url = config.get_option('crossbar_url', "ws://127.0.0.1:20408/ws")
-            self.realm = config.get_option('crossbar_realm', "realm1")
+            self.url = config.get_option('crossbar_url',
+                os.environ.get("LG_CROSSBAR", "ws://127.0.0.1:20408/ws"))
+            self.realm = config.get_option('crossbar_realm',
+                os.environ.get("LG_CROSSBAR_REALM", "realm1"))
             self._start()
         place = self.session.get_place(remote_place.name)
         resource_entries = self.session.get_target_resources(place)

man/Makefile

@@ -2,7 +2,8 @@ PAGES := labgrid-client.1 labgrid-exporter.1 labgrid-device-config.1 labgrid-pyt
 COMPRESSED := labgrid-client.1.gz labgrid-exporter.1.gz labgrid-device-config.1.gz labgrid-pytest.1.gz
 
 %.1: %.rst
-	rst2man.py $< > $@
+	rst2man.py $< >$@.tmp
+	mv -f $@.tmp $@
 
 %.1.gz : %.1
 	gzip $<

man/labgrid-client.1

@@ -78,6 +78,14 @@ This variable can be used to specify a place without using the \fB\-p\fP option,
 This variable can be used to specify a state which the device transitions into
 before executing a command. Requires a configuration file and a Strategy
 specified for the device.
+.SS LG_CROSSBAR
+.sp
+This variable can be used to set the default crossbar URL (instead of using the
+\fB\-x\fP option).
+.SS LG_CROSSBAR_REALM
+.sp
+This variable can be used to set the default crossbar realm to use instead of
+\fBrealm1\fP\&.
 .SH MATCHES
 .sp
 Match patterns are used to assign a resource to a specific place. The format is:

man/labgrid-client.rst

@@ -66,6 +66,16 @@ This variable can be used to specify a state which the device transitions into
 before executing a command. Requires a configuration file and a Strategy
 specified for the device.
 
+LG_CROSSBAR
+~~~~~~~~~~~
+This variable can be used to set the default crossbar URL (instead of using the
+``-x`` option).
+
+LG_CROSSBAR_REALM
+~~~~~~~~~~~~~~~~~
+This variable can be used to set the default crossbar realm to use instead of
+``realm1``.
+
 MATCHES
 -------
 Match patterns are used to assign a resource to a specific place. The format is:

man/labgrid-exporter.1

@@ -40,7 +40,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 Labgrid is a scalable infrastructure and test architecture for embedded (linux) systems.
 .sp
 This is the man page for the exporter, supporting the export of serial ports,
-usb tools and various other controllers.
+USB devices and various other controllers.
 .SH OPTIONS
 .INDENT 0.0
 .TP
@@ -59,6 +59,17 @@ The exporter uses a YAML configuration file which defines groups of releated
 resources.
 Furthermore the exporter can start helper binaries such as \fBser2net\fP to
 export local serial ports over the network.
+.SH ENVIRONMENT VARIABLES
+.sp
+The following environment variable can be used to configure labgrid\-exporter.
+.SS LG_CROSSBAR
+.sp
+This variable can be used to set the default crossbar URL (instead of using the
+\fB\-x\fP option).
+.SS LG_CROSSBAR_REALM
+.sp
+This variable can be used to set the default crossbar realm to use instead of
+\fBrealm1\fP\&.
 .SH EXAMPLES
 .sp
 Start the exporter with the configuration file \fImy\-config.yaml\fP:

man/labgrid-exporter.rst

@@ -32,7 +32,7 @@ DESCRIPTION
 Labgrid is a scalable infrastructure and test architecture for embedded (linux) systems.
 
 This is the man page for the exporter, supporting the export of serial ports,
-usb tools and various other controllers.
+USB devices and various other controllers.
 
 OPTIONS
 -------
@@ -50,6 +50,20 @@ resources.
 Furthermore the exporter can start helper binaries such as ``ser2net`` to
 export local serial ports over the network.
 
+ENVIRONMENT VARIABLES
+---------------------
+The following environment variable can be used to configure labgrid-exporter.
+
+LG_CROSSBAR
+~~~~~~~~~~~
+This variable can be used to set the default crossbar URL (instead of using the
+``-x`` option).
+
+LG_CROSSBAR_REALM
+~~~~~~~~~~~~~~~~~
+This variable can be used to set the default crossbar realm to use instead of
+``realm1``.
+
 EXAMPLES
 --------