Skip to content

Commit 0114bf9

Browse files
snowchsnowch
committed
run black formmating
1 parent 21e8008 commit 0114bf9

File tree

4 files changed

+147
-73
lines changed

4 files changed

+147
-73
lines changed

‎bin/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ def wait_for_status(
487487
def statuses(self,):
488488
"""Return a list of valid statuses"""
489489
print([s.name for s in K8sClusterStatus])
490-
490+
491491
def k8s_supported_versions(self):
492492
"""
493493
Print a list of supported k8s versions

‎hpecp/k8s_cluster.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ def delete(self, k8scluster_id):
262262
)
263263

264264
def k8s_supported_versions(self):
265-
#"""Not yet implemented - see https://github.com/hpe-container-platform-community/hpecp-python-library/issues/3"""
266-
#raise NotImplementedError()
265+
# """Not yet implemented - see https://github.com/hpe-container-platform-community/hpecp-python-library/issues/3"""
266+
# raise NotImplementedError()
267267
"""Retrieve list of K8S Supported Versions.
268268
Returns:
269269
List of K8s Supported Versions

‎tests/cli/k8s_cluster_test.py

Lines changed: 81 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -9,75 +9,119 @@
99
import requests
1010
from requests.exceptions import RequestException
1111

12-
sys.path.insert(0, os.path.abspath('../../'))
12+
sys.path.insert(0, os.path.abspath("../../"))
1313
from bin import cli
1414

15+
1516
class MockResponse:
16-
def __init__(self, json_data, status_code, headers, raise_for_status_flag=False, text_data='', ):
17+
def __init__(
18+
self,
19+
json_data,
20+
status_code,
21+
headers,
22+
raise_for_status_flag=False,
23+
text_data="",
24+
):
1725
self.json_data = json_data
1826
self.text = text_data
1927
self.status_code = status_code
2028
self.raise_for_status_flag = raise_for_status_flag
2129
self.headers = headers
30+
2231
def raise_for_status(self):
2332
if self.raise_for_status_flag:
24-
self.text = 'some error occurred'
33+
self.text = "some error occurred"
2534
raise requests.exceptions.HTTPError()
2635
else:
2736
return
37+
2838
def json(self):
2939
return self.json_data
3040

41+
3142
class TestCLI(TestCase):
3243

33-
# pylint: disable=no-method-argument
44+
# pylint: disable=no-method-argument
3445
def mocked_requests_post(*args, **kwargs):
35-
if args[0] == 'https://127.0.0.1:8080/api/v1/login':
36-
return MockResponse (
37-
json_data = { },
38-
status_code = 200,
39-
headers = { "location": "/api/v1/session/df1bfacb-xxxx-xxxx-xxxx-c8f57d8f3c71" }
40-
)
41-
raise RuntimeError("Unhandle POST request: " + args[0])
42-
43-
# pylint: disable=no-method-argument
44-
def mocked_requests_get(*args, **kwargs ):
45-
if args[0] == 'https://127.0.0.1:8080/api/v2/k8smanifest':
46-
return MockResponse (
47-
json_data = {
48-
"_version":"1.0",
49-
"supported_versions":[
50-
"1.14.10","1.15.7","1.16.4","1.17.0","1.18.0"
51-
],
52-
"version_info":{
53-
"1.14.10":{"_version":"1.0","min_upgrade_version":"1.13.0","relnote_url":"https://v1-14.docs.kubernetes.io/docs/setup/release/notes/","hpecsi":"1.14"},
54-
"1.15.7":{"_version":"1.0","min_upgrade_version":"1.14.0","relnote_url":"https://v1-15.docs.kubernetes.io/docs/setup/release/notes/","hpecsi":"1.15"},
55-
"1.16.4":{"_version":"1.0","min_upgrade_version":"1.15.0","relnote_url":"https://v1-16.docs.kubernetes.io/docs/setup/release/notes/","hpecsi":"1.16"},
56-
"1.17.0":{"_version":"1.0","min_upgrade_version":"1.16.0","relnote_url":"https://v1-17.docs.kubernetes.io/docs/setup/release/notes/","hpecsi":"1.17"},
57-
"1.18.0":{"_version":"1.0","min_upgrade_version":"1.17.0","relnote_url":"https://kubernetes.io/docs/setup/release/notes/","hpecsi":"1.18"}
58-
}
46+
if args[0] == "https://127.0.0.1:8080/api/v1/login":
47+
return MockResponse(
48+
json_data={},
49+
status_code=200,
50+
headers={
51+
"location": "/api/v1/session/df1bfacb-xxxx-xxxx-xxxx-c8f57d8f3c71"
52+
},
53+
)
54+
raise RuntimeError("Unhandle POST request: " + args[0])
55+
56+
# pylint: disable=no-method-argument
57+
def mocked_requests_get(*args, **kwargs):
58+
if args[0] == "https://127.0.0.1:8080/api/v2/k8smanifest":
59+
return MockResponse(
60+
json_data={
61+
"_version": "1.0",
62+
"supported_versions": [
63+
"1.14.10",
64+
"1.15.7",
65+
"1.16.4",
66+
"1.17.0",
67+
"1.18.0",
68+
],
69+
"version_info": {
70+
"1.14.10": {
71+
"_version": "1.0",
72+
"min_upgrade_version": "1.13.0",
73+
"relnote_url": "https://v1-14.docs.kubernetes.io/docs/setup/release/notes/",
74+
"hpecsi": "1.14",
75+
},
76+
"1.15.7": {
77+
"_version": "1.0",
78+
"min_upgrade_version": "1.14.0",
79+
"relnote_url": "https://v1-15.docs.kubernetes.io/docs/setup/release/notes/",
80+
"hpecsi": "1.15",
81+
},
82+
"1.16.4": {
83+
"_version": "1.0",
84+
"min_upgrade_version": "1.15.0",
85+
"relnote_url": "https://v1-16.docs.kubernetes.io/docs/setup/release/notes/",
86+
"hpecsi": "1.16",
87+
},
88+
"1.17.0": {
89+
"_version": "1.0",
90+
"min_upgrade_version": "1.16.0",
91+
"relnote_url": "https://v1-17.docs.kubernetes.io/docs/setup/release/notes/",
92+
"hpecsi": "1.17",
93+
},
94+
"1.18.0": {
95+
"_version": "1.0",
96+
"min_upgrade_version": "1.17.0",
97+
"relnote_url": "https://kubernetes.io/docs/setup/release/notes/",
98+
"hpecsi": "1.18",
99+
},
59100
},
60-
status_code = 200,
61-
headers = { }
101+
},
102+
status_code=200,
103+
headers={},
62104
)
63-
raise RuntimeError("Unhandle GET request: " + args[0])
105+
raise RuntimeError("Unhandle GET request: " + args[0])
64106

65-
@patch('requests.post', side_effect=mocked_requests_post)
66-
@patch('requests.get', side_effect=mocked_requests_get)
107+
@patch("requests.post", side_effect=mocked_requests_post)
108+
@patch("requests.get", side_effect=mocked_requests_get)
67109
def test_k8s_supported_versions(self, mock_post, mock_get):
68-
69-
file_data = dedent("""[default]
110+
111+
file_data = dedent(
112+
"""[default]
70113
api_host = 127.0.0.1
71114
api_port = 8080
72115
use_ssl = True
73116
verify_ssl = False
74117
warn_ssl = True
75118
username = admin
76-
password = admin123""")
119+
password = admin123"""
120+
)
77121

78122
tmp = tempfile.NamedTemporaryFile(delete=True)
79123
try:
80-
tmp.write(file_data.encode('utf-8'))
124+
tmp.write(file_data.encode("utf-8"))
81125
tmp.flush()
82126

83127
cli.HPECP_CONFIG_FILE = tmp.name
@@ -89,4 +133,3 @@ def test_k8s_supported_versions(self, mock_post, mock_get):
89133

90134
finally:
91135
tmp.close()
92-

‎tests/library/k8s_cluster_test.py

Lines changed: 63 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -618,47 +618,78 @@ def test_delete_k8scluster(self, mock_get, mock_post):
618618
k8scluster_id="/api/v2/k8scluster/999"
619619
)
620620

621-
get_client().k8s_cluster.delete(k8scluster_id='/api/v2/k8scluster/123')
621+
get_client().k8s_cluster.delete(k8scluster_id="/api/v2/k8scluster/123")
622+
622623

623624
class TestK8sSupportVersions(TestCase):
624625

625-
# pylint: disable=no-method-argument
626-
def mocked_requests_get(*args, **kwargs ):
627-
if args[0] == 'https://127.0.0.1:8080/api/v2/k8smanifest':
628-
return MockResponse (
629-
json_data = {
630-
"_version":"1.0",
631-
"supported_versions":[
632-
"1.14.10","1.15.7","1.16.4","1.17.0","1.18.0"
633-
],
634-
"version_info":{
635-
"1.14.10":{"_version":"1.0","min_upgrade_version":"1.13.0","relnote_url":"https://v1-14.docs.kubernetes.io/docs/setup/release/notes/","hpecsi":"1.14"},
636-
"1.15.7":{"_version":"1.0","min_upgrade_version":"1.14.0","relnote_url":"https://v1-15.docs.kubernetes.io/docs/setup/release/notes/","hpecsi":"1.15"},
637-
"1.16.4":{"_version":"1.0","min_upgrade_version":"1.15.0","relnote_url":"https://v1-16.docs.kubernetes.io/docs/setup/release/notes/","hpecsi":"1.16"},
638-
"1.17.0":{"_version":"1.0","min_upgrade_version":"1.16.0","relnote_url":"https://v1-17.docs.kubernetes.io/docs/setup/release/notes/","hpecsi":"1.17"},
639-
"1.18.0":{"_version":"1.0","min_upgrade_version":"1.17.0","relnote_url":"https://kubernetes.io/docs/setup/release/notes/","hpecsi":"1.18"}
640-
}
626+
# pylint: disable=no-method-argument
627+
def mocked_requests_get(*args, **kwargs):
628+
if args[0] == "https://127.0.0.1:8080/api/v2/k8smanifest":
629+
return MockResponse(
630+
json_data={
631+
"_version": "1.0",
632+
"supported_versions": [
633+
"1.14.10",
634+
"1.15.7",
635+
"1.16.4",
636+
"1.17.0",
637+
"1.18.0",
638+
],
639+
"version_info": {
640+
"1.14.10": {
641+
"_version": "1.0",
642+
"min_upgrade_version": "1.13.0",
643+
"relnote_url": "https://v1-14.docs.kubernetes.io/docs/setup/release/notes/",
644+
"hpecsi": "1.14",
645+
},
646+
"1.15.7": {
647+
"_version": "1.0",
648+
"min_upgrade_version": "1.14.0",
649+
"relnote_url": "https://v1-15.docs.kubernetes.io/docs/setup/release/notes/",
650+
"hpecsi": "1.15",
651+
},
652+
"1.16.4": {
653+
"_version": "1.0",
654+
"min_upgrade_version": "1.15.0",
655+
"relnote_url": "https://v1-16.docs.kubernetes.io/docs/setup/release/notes/",
656+
"hpecsi": "1.16",
657+
},
658+
"1.17.0": {
659+
"_version": "1.0",
660+
"min_upgrade_version": "1.16.0",
661+
"relnote_url": "https://v1-17.docs.kubernetes.io/docs/setup/release/notes/",
662+
"hpecsi": "1.17",
663+
},
664+
"1.18.0": {
665+
"_version": "1.0",
666+
"min_upgrade_version": "1.17.0",
667+
"relnote_url": "https://kubernetes.io/docs/setup/release/notes/",
668+
"hpecsi": "1.18",
669+
},
641670
},
642-
status_code = 200,
643-
headers = { }
671+
},
672+
status_code=200,
673+
headers={},
644674
)
645-
raise RuntimeError("Unhandle GET request: " + args[0])
675+
raise RuntimeError("Unhandle GET request: " + args[0])
646676

647677
def mocked_requests_post(*args, **kwargs):
648-
if args[0] == 'https://127.0.0.1:8080/api/v1/login':
649-
return MockResponse (
650-
json_data = { },
651-
status_code = 200,
652-
headers = { "location": "/api/v1/session/df1bfacb-xxxx-xxxx-xxxx-c8f57d8f3c71" }
653-
)
654-
raise RuntimeError("Unhandle POST request: " + args[0])
655-
656-
@patch('requests.get', side_effect=mocked_requests_get)
657-
@patch('requests.post', side_effect=mocked_requests_post)
678+
if args[0] == "https://127.0.0.1:8080/api/v1/login":
679+
return MockResponse(
680+
json_data={},
681+
status_code=200,
682+
headers={
683+
"location": "/api/v1/session/df1bfacb-xxxx-xxxx-xxxx-c8f57d8f3c71"
684+
},
685+
)
686+
raise RuntimeError("Unhandle POST request: " + args[0])
687+
688+
@patch("requests.get", side_effect=mocked_requests_get)
689+
@patch("requests.post", side_effect=mocked_requests_post)
658690
def test_k8s_supported_versions(self, mock_get, mock_post):
659691

660692
self.assertEquals(
661693
get_client().k8s_cluster.k8s_supported_versions(),
662-
[ "1.14.10","1.15.7","1.16.4","1.17.0","1.18.0"]
694+
["1.14.10", "1.15.7", "1.16.4", "1.17.0", "1.18.0"],
663695
)
664-

0 commit comments

Comments
 (0)