NMS-19621: Integrate get/upload/update rest endpoint for trapd config

features/config/upgrade/src/main/resources/changelog-cm/36.0.0/changelog-cm.xml

@@ -12,10 +12,10 @@
         <cm:importConfig schemaId="snmp-config" filePath="snmp-config.xml"/>
     </changeSet>
 
-    <changeSet author="cpape" id="register-schema-snmp-config">
-        <cm:registerSchema id="snmp-config"/>
-        <cm:importSchemaFromXsd id="snmp-config" xsdFileName="snmp-config.xsd" xsdFileHash="5a894df89fa3afd7e48d885802384b54e9cc92ba88573374dd6b35fd9d0ab517" rootElement="snmp-config"/>
-        <cm:importConfig schemaId="snmp-config" filePath="snmp-config.xml"/>
+    <changeSet author="cpape" id="register-schema-trapd-configuration">
+        <cm:registerSchema id="trapd-config"/>
+        <cm:importSchemaFromXsd id="trapd-config" xsdFileName="trapd-configuration.xsd" xsdFileHash="ad97a001cd7ebb8a8b1a45574ba4e681e204ecf8592bf264764d4d7f52efc7a1" rootElement="trapd-configuration"/>
+        <cm:importConfig schemaId="trapd-config" filePath="trapd-configuration.xml"/>
     </changeSet>
 
 </databaseChangeLog>

opennms-webapp-rest/pom.xml

@@ -618,5 +618,11 @@
       <artifactId>org.opennms.features.notifications.api</artifactId>
       <scope>${onmsLibScope}</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms.features.config.dao</groupId>
+      <artifactId>org.opennms.features.config.dao.api</artifactId>
+      <version>${project.version}</version>
+      <scope>${onmsLibScope}</scope>
+    </dependency>
   </dependencies>
 </project>

opennms-webapp-rest/src/main/java/org/opennms/web/rest/v2/TrapdRestService.java

@@ -151,11 +151,13 @@ private String validateTrapdConfigRequest(final TrapdConfigDto configDto) {
         }
 
         if (configDto.getSnmpv3User() != null) {
+            int index = 0;
             for (Snmpv3UserDto user : configDto.getSnmpv3User()) {
                 String userValidation = validateSnmpv3UserPayload(user);
                 if (userValidation != null) {
-                    return "Invalid SNMPv3 user: " + user.getSecurityName() + ". " + userValidation;
+                    return "Invalid SNMPv3 user at index " + index + ": " + userValidation;
                 }
+                index++;
             }
         }
         return null;
@@ -175,6 +177,10 @@ private String validateTrapdConfigRequest(final TrapdConfigDto configDto) {
      * @return an error message string, or {@code null} if the user is valid.
      */
     private String validateSnmpv3UserPayload(final Snmpv3UserDto user) {
+        if (user == null) {
+            return "entry must not be null.";
+        }
+
         if (StringUtils.isBlank(user.getSecurityName())) {
             return "securityName is required.";
         }

opennms-webapp-rest/src/main/java/org/opennms/web/rest/v2/api/TrapdRestApi.java

@@ -22,11 +22,9 @@
 package org.opennms.web.rest.v2.api;
 
 import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.PUT;
 import javax.ws.rs.core.Context;
@@ -41,7 +39,6 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.opennms.web.rest.v2.model.Snmpv3UserDto;
 import org.opennms.web.rest.v2.model.TrapdConfigDto;
 
 @Path("trapd")

opennms-webapp-rest/src/main/webapp/WEB-INF/menu/menu-template-default.json

@@ -454,8 +454,8 @@
           "roles": ["ROLE_ADMIN", "ROLE_PROVISION"]
         },
         {
-          "id": "trapdConfiguration",
-          "name": "Trapd Configuration",
+          "id": "trapListenerConfiguration",
+          "name": "Trap Listener Configuration",
           "url": "ui/index.html#/trapd-config",
           "locationMatch": "",
           "roles": null

opennms-webapp-rest/src/main/webapp/WEB-INF/menu/menu-template.json

@@ -454,8 +454,8 @@
           "roles": ["ROLE_ADMIN", "ROLE_PROVISION"]
         },
         {
-          "id": "trapdConfiguration",
-          "name": "Trapd Configuration",
+          "id": "trapListenerConfiguration",
+          "name": "Trap Listener Configuration",
           "url": "ui/index.html#/trapd-config",
           "locationMatch": "",
           "roles": null