File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -72,12 +72,20 @@ def getClusterVersion(dynClient: DynamicClient) -> str:
7272 clusterVersion = clusterVersionAPI .get (name = "version" )
7373 for record in clusterVersion .status .history :
7474 if record .state == "Completed" :
75- return record .state . version
75+ return record .version
7676 except NotFoundError :
7777 logger .debug ("Unable to retrieve ClusterVersion" )
7878 return None
7979
8080
81+ def isClusterVersionInRange (version : str , releases : list [str ]) -> bool :
82+ if releases is not None :
83+ for release in releases :
84+ if version .startswith (f"{ release } ." ):
85+ return True
86+ return False
87+
88+
8189def getNamespace (dynClient : DynamicClient , namespace : str ) -> dict :
8290 """
8391 Get a namespace
Original file line number Diff line number Diff line change 1515from mas .devops import ocp
1616
1717
18+ def test_is_cluster_in_range ():
19+ assert ocp .isClusterVersionInRange ("4.1.6" , None ) is False
20+ assert ocp .isClusterVersionInRange ("4.1.6" , []) is False
21+ assert ocp .isClusterVersionInRange ("4.1.6" , ["4.16" , "4.17" , "4.18" ]) is False
22+ assert ocp .isClusterVersionInRange ("4.12.6" , ["4.16" , "4.17" , "4.18" ]) is False
23+ assert ocp .isClusterVersionInRange ("4.15.6" , ["4.16" , "4.17" , "4.18" ]) is False
24+ assert ocp .isClusterVersionInRange ("4.16.0" , ["4.16" , "4.17" , "4.18" ]) is True
25+ assert ocp .isClusterVersionInRange ("4.18.1" , ["4.16" , "4.17" , "4.18" ]) is True
26+ assert ocp .isClusterVersionInRange ("5.0.0" , ["4.16" , "4.17" , "4.18" ]) is False
27+
28+
1829def test_execInPod_success (mocker ):
1930
2031 mock_CoreV1Api = mocker .patch ('kubernetes.client.CoreV1Api' )
You can’t perform that action at this time.
0 commit comments