Skip to content

Commit 8b6c2ea

Browse files
authored
Merge pull request #76 from tucked/sdk-8-2-1
Add isi_sdk_8_2_1
2 parents 4101257 + 4fddcbe commit 8b6c2ea

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
'isi-sdk-8-1-0 ~= 0.2.7',
3333
'isi-sdk-8-1-1 ~= 0.2.7',
3434
'isi-sdk-8-2-0 ~= 0.2.7',
35+
'isi-sdk-8-2-1 ~= 0.2.7',
3536
'requests >= 2.20.0',
3637
'setuptools >= 41.0.0',
3738
],

src/isilon_hadoop_tools/onefs.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -521,15 +521,15 @@ def sdk_for_revision(revision, strict=False):
521521
import isi_sdk_8_2_0
522522
return isi_sdk_8_2_0
523523
if ONEFS_RELEASES['8.2.1.0'] <= revision < ONEFS_RELEASES['8.2.2.0']:
524-
import isi_sdk_8_2_0
525-
return isi_sdk_8_2_0
524+
import isi_sdk_8_2_1
525+
return isi_sdk_8_2_1
526526
# At this point, either the cluster is too old or too new;
527527
# however, new clusters still support old SDKs,
528528
# so, unless the caller asks to fail here, we'll fall back to the newest supported SDK.
529529
if strict:
530530
raise UnsupportedVersion('There is no SDK for OneFS revision {0}!'.format(hex(revision)))
531-
import isi_sdk_8_2_0
532-
return isi_sdk_8_2_0 # The latest SDK available.
531+
import isi_sdk_8_2_1
532+
return isi_sdk_8_2_1 # The latest SDK available.
533533

534534

535535
def accesses_onefs(func):

tests/test_onefs.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import isi_sdk_8_1_0
2222
import isi_sdk_8_1_1
2323
import isi_sdk_8_2_0
24+
import isi_sdk_8_2_1
2425
import pytest
2526

2627
from isilon_hadoop_tools import IsilonHadoopToolError, onefs
@@ -67,7 +68,7 @@ def test_api_error_str(api_error):
6768
@pytest.mark.parametrize(
6869
'revision, expected_sdk',
6970
[
70-
(0, isi_sdk_8_2_0),
71+
(0, isi_sdk_8_2_1),
7172
(onefs.ONEFS_RELEASES['7.2.0.0'], isi_sdk_7_2),
7273
(onefs.ONEFS_RELEASES['8.0.0.0'], isi_sdk_8_0),
7374
(onefs.ONEFS_RELEASES['8.0.0.4'], isi_sdk_8_0),
@@ -77,9 +78,9 @@ def test_api_error_str(api_error):
7778
(onefs.ONEFS_RELEASES['8.1.1.0'], isi_sdk_8_1_1),
7879
(onefs.ONEFS_RELEASES['8.1.2.0'], isi_sdk_8_1_1),
7980
(onefs.ONEFS_RELEASES['8.2.0.0'], isi_sdk_8_2_0),
80-
(onefs.ONEFS_RELEASES['8.2.1.0'], isi_sdk_8_2_0),
81-
(onefs.ONEFS_RELEASES['8.2.2.0'], isi_sdk_8_2_0),
82-
(float('inf'), isi_sdk_8_2_0),
81+
(onefs.ONEFS_RELEASES['8.2.1.0'], isi_sdk_8_2_1),
82+
(onefs.ONEFS_RELEASES['8.2.2.0'], isi_sdk_8_2_1),
83+
(float('inf'), isi_sdk_8_2_1),
8384
],
8485
)
8586
def test_sdk_for_revision(revision, expected_sdk):

0 commit comments

Comments
 (0)