Merge ~paride/curtin:fix-dasd-device_id-range into curtin:master

[Paride Legovini]

dasd: fix off-by-one device_id devno range check

devno can be in the 0-0xffff range, inclusive.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:cb897830cd18c4b62d7c4f5c923e09ee1666156c
https://jenkins.ubuntu.com/server/job/curtin-ci/172/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/172/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/172/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/172/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/172/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/172//rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

The code change is correct, the Commit message above is not, we accept 0 -> 0xffff (inclusive)

The < 65535 failed for value of 0xffff (65535).

review: Needs Fixing

[Ryan Harper (raharper)]

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:a375dd80bacf90caee50b360cf4e0d63d12be9fa
https://jenkins.ubuntu.com/server/job/curtin-ci/173/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/173/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/173/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/173/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/173/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/173//rebuild

review: Approve (continuous-integration)

diff --git a/curtin/block/dasd.py b/curtin/block/dasd.py
index 682f9d3..b7008f6 100644
--- a/curtin/block/dasd.py
+++ b/curtin/block/dasd.py
@@ -269,9 +269,9 @@ def _valid_device_id(device_id):
     if not (0 <= int(dsn, 16) < 256):
         raise ValueError("device_id invalid: dsn not in 0-255: '%s'" % dsn)
 
-    if not (0 <= int(dev.lower(), 16) < 65535):
+    if not (0 <= int(dev.lower(), 16) <= 65535):
         raise ValueError(
-            "device_id invalid: devno not in 0-0x10000: '%s'" % dev)
+            "device_id invalid: devno not in 0-0xffff: '%s'" % dev)
 
     return True