Merge pull request #43 from SpiNNakerManchester/ignore_version

Ignore version
SpiNNakerManchester · Jan 31, 2020 · 2e13446 · 2e13446
2 parents acdec43 + c3704d0
commit 2e13446
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/spalloc/config.py b/spalloc/config.py
@@ -110,7 +110,8 @@
     "min_ratio": "0.333",
     "max_dead_boards": "0",
     "max_dead_links": "None",
-    "require_torus": "False"}
+    "require_torus": "False",
+    "ignore_version": "False"}
 
 
 def _read_none_or_float(parser, option):
@@ -182,7 +183,8 @@ def read_config(filenames=None):
         "min_ratio":       parser.getfloat(SECTION, "min_ratio"),
         "max_dead_boards": _read_none_or_int(parser, "max_dead_boards"),
         "max_dead_links":  _read_none_or_int(parser, "max_dead_links"),
-        "require_torus":   parser.getboolean(SECTION, "require_torus")}
+        "require_torus":   parser.getboolean(SECTION, "require_torus"),
+        "ignore_version":  parser.getboolean(SECTION, "ignore_version")}
 
     tags = _read_none_or_str(parser, "tags")
     cfg["tags"] = None if tags is None else list(

diff --git a/spalloc/scripts/support.py b/spalloc/scripts/support.py
@@ -20,7 +20,7 @@
 
 # The acceptable range of server version numbers
 VERSION_RANGE_START = (0, 1, 0)
-VERSION_RANGE_STOP = (2, 0, 0)
+VERSION_RANGE_STOP = (5, 0, 1)
 
 
 class Terminate(Exception):
@@ -79,6 +79,10 @@ def build_server_arg_group(self, server_args, cfg):
             "--timeout", default=cfg["timeout"], type=float, metavar="SECONDS",
             help="seconds to wait for a response from the server (default: "
             "%(default)s)")
+        server_args.add_argument(
+            "--ignore_version", default=cfg["ignore_version"], type=bool,
+            help="Ignore the server version (WARNING: could result in errors) "
+                 "default: %(default)s)")
 
     def __call__(self, argv=None):
         cfg = config.read_config()
@@ -94,7 +98,8 @@ def __call__(self, argv=None):
 
         try:
             with self.client_factory(args.hostname, args.port) as client:
-                version_verify(client, args.timeout)
+                if not args.ignore_version:
+                    version_verify(client, args.timeout)
                 self.body(client, args)
                 return 0
         except (IOError, OSError, ProtocolError, ProtocolTimeoutError) as e: