Release v1.1.0

Author: aiantsen

.github/scripts/compatibility_api_test_5.py

@@ -9,7 +9,7 @@
 import unittest
 
 sys.path.append('.')
-from zabbix_utils.getter import Getter
+from zabbix_utils.getter import Getter, AgentResponse
 from zabbix_utils.api import ZabbixAPI, APIVersion
 from zabbix_utils.sender import ItemValue, Sender, TrapperResponse
 from zabbix_utils.exceptions import APIRequestError, APINotSupported
@@ -160,13 +160,18 @@ def test_send_values(self):
             ItemValue(self.hostname, self.itemkey, 0, 1695713666, 100),
             ItemValue(self.hostname, self.itemkey, 5.5, 1695713666)
         ]
-        resp = list(self.sender.send(items).values())[0]
-
+        resp = self.sender.send(items)
         self.assertEqual(type(resp), TrapperResponse, "Sending item values was going wrong")
         self.assertEqual(resp.total, len(items), "Total number of the sent values is unexpected")
         self.assertEqual(resp.processed, 4, "Number of the processed values is unexpected")
         self.assertEqual(resp.failed, (resp.total - resp.processed), "Number of the failed values is unexpected")
 
+        first_chunk = list(resp.details.values())[0][0]
+        self.assertEqual(type(first_chunk), TrapperResponse, "Sending item values was going wrong")
+        self.assertEqual(first_chunk.total, len(items), "Total number of the sent values is unexpected")
+        self.assertEqual(first_chunk.processed, 4, "Number of the processed values is unexpected")
+        self.assertEqual(first_chunk.failed, (first_chunk.total - first_chunk.processed), "Number of the failed values is unexpected")
+
 
 class CompatibilityGetTest(unittest.TestCase):
     """Compatibility test with Zabbix get version 5.0"""
@@ -185,7 +190,8 @@ def test_get_values(self):
         resp = self.agent.get('system.uname')
 
         self.assertIsNotNone(resp, "Getting item values was going wrong")
-        self.assertEqual(type(resp), str, "Got value is unexpected")
+        self.assertEqual(type(resp), AgentResponse, "Got value is unexpected")
+        self.assertEqual(type(resp.value), str, "Got value is unexpected")
 
 
 if __name__ == '__main__':

.github/scripts/compatibility_api_test_6.py

@@ -9,7 +9,7 @@
 import unittest
 
 sys.path.append('.')
-from zabbix_utils.getter import Getter
+from zabbix_utils.getter import Getter, AgentResponse
 from zabbix_utils.exceptions import APIRequestError
 from zabbix_utils.api import ZabbixAPI, APIVersion
 from zabbix_utils.sender import ItemValue, Sender, TrapperResponse
@@ -192,13 +192,18 @@ def test_send_values(self):
             ItemValue(self.hostname, self.itemkey, 0, 1695713666, 100),
             ItemValue(self.hostname, self.itemkey, 5.5, 1695713666)
         ]
-        resp = list(self.sender.send(items).values())[0]
-
+        resp = self.sender.send(items)
         self.assertEqual(type(resp), TrapperResponse, "Sending item values was going wrong")
         self.assertEqual(resp.total, len(items), "Total number of the sent values is unexpected")
         self.assertEqual(resp.processed, 4, "Number of the processed values is unexpected")
         self.assertEqual(resp.failed, (resp.total - resp.processed), "Number of the failed values is unexpected")
 
+        first_chunk = list(resp.details.values())[0][0]
+        self.assertEqual(type(first_chunk), TrapperResponse, "Sending item values was going wrong")
+        self.assertEqual(first_chunk.total, len(items), "Total number of the sent values is unexpected")
+        self.assertEqual(first_chunk.processed, 4, "Number of the processed values is unexpected")
+        self.assertEqual(first_chunk.failed, (first_chunk.total - first_chunk.processed), "Number of the failed values is unexpected")
+
 
 class CompatibilityGetTest(unittest.TestCase):
     """Compatibility test with Zabbix get version 6.0"""
@@ -217,7 +222,8 @@ def test_get_values(self):
         resp = self.agent.get('system.uname')
 
         self.assertIsNotNone(resp, "Getting item values was going wrong")
-        self.assertEqual(type(resp), str, "Got value is unexpected")
+        self.assertEqual(type(resp), AgentResponse, "Got value is unexpected")
+        self.assertEqual(type(resp.value), str, "Got value is unexpected")
 
 
 if __name__ == '__main__':

.github/scripts/compatibility_api_test_latest.py

@@ -9,7 +9,7 @@
 import unittest
 
 sys.path.append('.')
-from zabbix_utils.getter import Getter
+from zabbix_utils.getter import Getter, AgentResponse
 from zabbix_utils.exceptions import APIRequestError
 from zabbix_utils.api import ZabbixAPI, APIVersion
 from zabbix_utils.sender import ItemValue, Sender, TrapperResponse
@@ -204,13 +204,18 @@ def test_send_values(self):
             ItemValue(self.hostname, self.itemkey, 0, 1695713666, 100),
             ItemValue(self.hostname, self.itemkey, 5.5, 1695713666)
         ]
-        resp = list(self.sender.send(items).values())[0]
-
+        resp = self.sender.send(items)
         self.assertEqual(type(resp), TrapperResponse, "Sending item values was going wrong")
         self.assertEqual(resp.total, len(items), "Total number of the sent values is unexpected")
         self.assertEqual(resp.processed, 4, "Number of the processed values is unexpected")
         self.assertEqual(resp.failed, (resp.total - resp.processed), "Number of the failed values is unexpected")
 
+        first_chunk = list(resp.details.values())[0][0]
+        self.assertEqual(type(first_chunk), TrapperResponse, "Sending item values was going wrong")
+        self.assertEqual(first_chunk.total, len(items), "Total number of the sent values is unexpected")
+        self.assertEqual(first_chunk.processed, 4, "Number of the processed values is unexpected")
+        self.assertEqual(first_chunk.failed, (first_chunk.total - first_chunk.processed), "Number of the failed values is unexpected")
+
 
 class CompatibilityGetTest(unittest.TestCase):
     """Compatibility test with the latest Zabbix get version"""
@@ -229,7 +234,8 @@ def test_get_values(self):
         resp = self.agent.get('system.uname')
 
         self.assertIsNotNone(resp, "Getting item values was going wrong")
-        self.assertEqual(type(resp), str, "Got value is unexpected")
+        self.assertEqual(type(resp), AgentResponse, "Got value is unexpected")
+        self.assertEqual(type(resp.value), str, "Got value is unexpected")
 
 
 if __name__ == '__main__':

.github/scripts/integration_get_test.py

@@ -30,7 +30,7 @@ def test_get(self):
 
         self.assertIsNotNone(resp, "Getting item values was going wrong")
         try:
-            resp_list = json.loads(resp)
+            resp_list = json.loads(resp.value)
         except json.decoder.JSONDecodeError:
             self.fail(f"raised unexpected Exception while parsing response: {resp}")
 

.github/scripts/integration_sender_test.py

@@ -34,17 +34,18 @@ def test_send(self):
             ItemValue('host3', 'item.key1', '{"msg":"test message"}'),
             ItemValue('host2', 'item.key1', 0, 1695713666, 100)
         ]
-        responses = self.sender.send(items)
+        response = self.sender.send(items)
 
-        self.assertEqual(type(responses), dict, "Sending item values was going wrong")
-        for node, resp in responses.items():
+        self.assertEqual(type(response.details), dict, "Sending item values was going wrong")
+        for node, resp in response.details.items():
             self.assertEqual(type(node), Node, "Sending item values was going wrong")
-            self.assertEqual(type(resp), TrapperResponse, "Sending item values was going wrong")
-            for key in ('processed', 'failed', 'total', 'time', 'chunk'):
-                try:
-                    self.assertIsNotNone(getattr(resp, key), f"There aren't expected '{key}' value")
-                except AttributeError:
-                    self.fail(f"raised unexpected Exception for attribute: {key}")
+            for item in resp:
+                self.assertEqual(type(item), TrapperResponse, "Sending item values was going wrong")
+                for key in ('processed', 'failed', 'total', 'time', 'chunk'):
+                    try:
+                        self.assertIsNotNone(getattr(item, key), f"There aren't expected '{key}' value")
+                    except AttributeError:
+                        self.fail(f"raised unexpected Exception for attribute: {key}")
 
 
 if __name__ == '__main__':

.github/workflows/build.yaml

@@ -2,10 +2,10 @@ name: coverage
 run-name: Check test coverage
 
 on:
-  #push:
-  #  branches: [main]
-  #pull_request:
-  #  branches: [main]
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
   workflow_dispatch:
 
 jobs:

.github/workflows/coverage.yaml

@@ -2,10 +2,14 @@ name: api
 run-name: Run Zabbix API integration test
 
 on:
-  #push:
-  #  branches: [main]
-  #pull_request:
-  #  branches: [main]
+  push:
+    branches: [main]
+    paths:
+      - '**api.py'
+  pull_request:
+    branches: [main]
+    paths:
+      - '**api.py'
   workflow_dispatch:
 
 env:

.github/workflows/integration_api.yaml

@@ -2,10 +2,14 @@ name: get
 run-name: Run Zabbix get integration test
 
 on:
-  #push:
-  #  branches: [main]
-  #pull_request:
-  #  branches: [main]
+  push:
+    branches: [main]
+    paths:
+      - '**get.py'
+  pull_request:
+    branches: [main]
+    paths:
+      - '**get.py'
   workflow_dispatch:
 
 env:

.github/workflows/integration_get.yaml

@@ -2,10 +2,14 @@ name: sender
 run-name: Run Zabbix sender integration test
 
 on:
-  #push:
-  #  branches: [main]
-  #pull_request:
-  #  branches: [main]
+  push:
+    branches: [main]
+    paths:
+      - '**sender.py'
+  pull_request:
+    branches: [main]
+    paths:
+      - '**sender.py'
   workflow_dispatch:
 
 env: