Merge pull request #3912 from hansva/3894

fix snmp integration test, #3894
apache · May 7, 2024 · 42b8a92 · 42b8a92
2 parents 892648c + 54d523d
commit 42b8a92
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/docker/integration-tests/integration-tests-snmp.yaml b/docker/integration-tests/integration-tests-snmp.yaml
@@ -25,17 +25,20 @@ services:
         condition: service_healthy
     links:
       - snmp
+    volumes:
+      - content:/tmp/snmptraps
   snmp:
     image: 'zabbix/zabbix-snmptraps:latest'
     ports:
       - "1162/udp"
     volumes:
-      - type: bind
-        source: ./../../integration-tests/snmp/files
-        target: /var/lib/zabbix/snmptraps
+      - content:/var/lib/zabbix/snmptraps
     healthcheck:
       test: [ "CMD-SHELL", "true" ]
       start_period: 2s
       retries: 5
       interval: 3s
-      timeout: 15s
+      timeout: 15s
+
+volumes:
+  content:
diff --git a/integration-tests/snmp/001-check-log.hpl b/integration-tests/snmp/001-check-log.hpl
@@ -113,7 +113,7 @@ limitations under the License.
     <length>Characters</length>
     <add_to_result_filenames>Y</add_to_result_filenames>
     <file>
-      <name>${PROJECT_HOME}/files/snmptraps.log</name>
+      <name>/tmp/snmptraps/snmptraps.log</name>
       <filemask/>
       <exclude_filemask/>
       <file_required>Y</file_required>
@@ -149,6 +149,7 @@ limitations under the License.
     <error_count_field/>
     <error_fields_field/>
     <error_text_field/>
+    <schema_definition/>
     <bad_line_files_destination_directory/>
     <bad_line_files_extension>warning</bad_line_files_extension>
     <error_line_files_destination_directory/>
@@ -193,7 +194,6 @@ limitations under the License.
         <value>
           <isnull>N</isnull>
           <length>-1</length>
-          <mask/>
           <name>constant</name>
           <precision>-1</precision>
           <text>SNMPv2-TM::snmpUDPDomain.0 = "Trap received"</text>

diff --git a/integration-tests/snmp/main-001-snmp-trap-test.hwf b/integration-tests/snmp/main-001-snmp-trap-test.hwf
@@ -54,7 +54,6 @@ limitations under the License.
       <type>SNMP_TRAP</type>
       <attributes/>
       <comstring>public</comstring>
-      <engineid/>
       <message>Trap received</message>
       <nrretry>5000</nrretry>
       <oid>1.3.6.1.6.1.1.0</oid>