merging other branches

Author: yash-pal1

jelastic/api/security/__init__.py

@@ -58,24 +58,21 @@ def CreateStatTable(
         self,
         env_id: str,
         checksum: str,
+        ruk: str = None,
     ):
         return self._get(
             "CreateStatTable",
-            params={
-                "envid": env_id,
-                "checksum": checksum,
-            },
+            params={"envid": env_id, "checksum": checksum, "ruk": ruk},
         )
 
     def GetActiveCloudlets(
         self,
         checksum: str,
+        ruk: str = None,
     ):
         return self._get(
             "GetActiveCloudlets",
-            params={
-                "checksum": checksum,
-            },
+            params={"checksum": checksum, "ruk": ruk},
         )
 
     def GetAggStats(
@@ -84,6 +81,7 @@ def GetAggStats(
         env_id: str,
         checksum: str,
         end_time: datetime = None,
+        ruk: str = None,
     ):
         """
         param start_time: start period inclusive date and time in format yyyy-MM-dd HH:mm:ss
@@ -99,12 +97,18 @@ def GetAggStats(
                 "envid": env_id,
                 "checksum": checksum,
                 "endtime": end_time,
+                "ruk": ruk,
             },
             datetime_format="%Y-%m-%d %H:%M:%S",
         )
 
     def GetAllAggSumStatByUid(
-        self, start_time: datetime, env_id: str, checksum: str, end_time: datetime
+        self,
+        start_time: datetime,
+        env_id: str,
+        checksum: str,
+        end_time: datetime,
+        ruk: str = None,
     ):
         return self._get(
             "GetAllAggSumStatByUid",
@@ -113,6 +117,7 @@ def GetAllAggSumStatByUid(
                 "envid": env_id,
                 "checksum": checksum,
                 "endTime": end_time,
+                "ruk": ruk,
             },
             datetime_format="%Y-%m-%d %H:%M:%S",
         )
@@ -123,6 +128,7 @@ def GetAllSumStatByUid(
         duration: int,
         checksum: str,
         end_time: datetime = None,
+        ruk: str = None,
     ):
         return self._get(
             "GetAllSumStatByUid",
@@ -131,28 +137,30 @@ def GetAllSumStatByUid(
                 "duration": duration,
                 "checksum": checksum,
                 "endtime": end_time,
+                "ruk": ruk,
             },
             datetime_format="%Y-%m-%d %H:%M:%S",
         )
 
     def GetCurrentStatisticsForAllContainers(
         self,
         checksum: str,
+        ruk: str = None,
     ):
         return self._get(
             "GetCurrentStatisticsForAllContainers",
-            params={
-                "checksum": checksum,
-            },
+            params={"checksum": checksum, "ruk": ruk},
         )
 
-    def GetLastStats(self, node_group: str = None, node_id: int = None):
+    def GetLastStats(
+        self,
+        node_group: str = None,
+        node_id: int = None,
+        ruk: str = None,
+    ):
         return self._get(
             "GetLastStats",
-            params={
-                "nodeGroup": node_group,
-                "nodeId": node_id,
-            },
+            params={"nodeGroup": node_group, "nodeId": node_id, "ruk": ruk},
         )
 
     def GetStats(
@@ -164,6 +172,7 @@ def GetStats(
         node_id: int = None,
         node_type: str = None,
         node_group: str = None,
+        ruk: str = None,
     ):
         return self._get(
             "GetStats",
@@ -175,33 +184,35 @@ def GetStats(
                 "nodeid": node_id,
                 "nodetype": node_type,
                 "nodeGroup": node_group,
+                "ruk": ruk,
             },
             datetime_format="%Y-%m-%d %H:%M:%S",
         )
 
     def GetStatus(
         self,
         checksum: str,
+        ruk: str = None,
     ):
         return self._get(
             "GetStatus",
-            params={
-                "checksum": checksum,
-            },
+            params={"checksum": checksum, "ruk": ruk},
         )
 
     def GetSumStat(
         self,
         duration: int,
         checksum: str,
         end_time: datetime = None,
+        ruk: str = None,
     ):
         return self._get(
             "GetSumStat",
             params={
                 "duration": duration,
                 "checksum": checksum,
                 "endtime": end_time,
+                "ruk": ruk,
             },
             datetime_format="%Y-%m-%d %H:%M:%S",
         )
@@ -212,6 +223,7 @@ def GetSumStatsByPeriod(
         env_id: str,
         checksum: str,
         end_time: datetime = None,
+        ruk: str = None,
     ):
         """
         param start_time: start period inclusive date and time in format yyyy-MM-dd HH:mm:ss
@@ -227,14 +239,20 @@ def GetSumStatsByPeriod(
                 "envid": env_id,
                 "checksum": checksum,
                 "endtime": end_time,
+                "ruk": ruk,
             },
             datetime_format="%Y-%m-%d %H:%M:%S",
         )
 
-    def SearchNodes(self, checksum: str, search: str = None):
+    def SearchNodes(
+        self,
+        checksum: str,
+        search: str = None,
+        ruk: str = None,
+    ):
         return self._get(
             "SearchNodes",
-            params={"checksum": checksum, "search": search},
+            params={"checksum": checksum, "search": search, "ruk": ruk},
         )
 
 
@@ -251,6 +269,7 @@ def GenerateStatistics(
         node_id: int,
         stat_json: str,
         checksum: str,
+        ruk: str = None,
     ):
         return self._get(
             "GenerateStatistics",
@@ -259,6 +278,7 @@ def GenerateStatistics(
                 "nodeId": node_id,
                 "statJSON": stat_json,
                 "checksum": checksum,
+                "ruk": ruk,
             },
         )
 
@@ -274,73 +294,81 @@ def Event(
         self,
         topic: str,
         publish_local: bool = None,
+        ruk: str = None,
     ):
         return self._get(
             "Event",
-            params={
-                "topic": topic,
-                "publishLocal": publish_local,
-            },
+            params={"topic": topic, "publishLocal": publish_local, "ruk": ruk},
         )
 
     def GetAPIDescriptions(
         self,
         is_public_only: bool = None,
         is_token: bool = None,
+        ruk: str = None,
     ):
         return self._get(
             "GetAPIDescriptions",
-            params={
-                "isPublicOnly": is_public_only,
-                "isToken": is_token,
-            },
+            params={"isPublicOnly": is_public_only, "isToken": is_token, "ruk": ruk},
         )
 
     def GetCacheStatus(
         self,
+        ruk: str = None,
     ):
         return self._get(
             "GetCacheStatus",
-            params={},
+            params={"ruk": ruk},
         )
 
     def GetInstanceCacheStatus(
         self,
+        ruk: str = None,
     ):
         return self._get(
             "GetInstanceCacheStatus",
-            params={},
+            params={"ruk": ruk},
         )
 
     def GetVersion(
         self,
+        ruk: str = None,
     ):
         return self._get(
             "GetVersion",
-            params={},
+            params={"ruk": ruk},
         )
 
     def RefreshEmailTemplates(
         self,
+        ruk: str = None,
     ):
         return self._get(
             "RefreshEmailTemplates",
-            params={},
+            params={"ruk": ruk},
         )
 
-    def RefreshUser(self, language: str = None):
+    def RefreshUser(
+        self,
+        language: str = None,
+        ruk: str = None,
+    ):
         return self._get(
             "RefreshUser",
-            params={"language": language},
+            params={"language": language, "ruk": ruk},
         )
 
     def ReloadConfiguration(
-        self, reseller_id: int = None, changed_place_holders: str = None
+        self,
+        reseller_id: int = None,
+        changed_place_holders: str = None,
+        ruk: str = None,
     ):
         return self._get(
             "ReloadConfiguration",
             params={
                 "resellerId": reseller_id,
                 "changedPlaceholders": changed_place_holders,
+                "ruk": ruk,
             },
         )