diff --git a/doc/Core.xml b/doc/Core.xml index f164ee249..e8fc79364 100644 --- a/doc/Core.xml +++ b/doc/Core.xml @@ -5372,28 +5372,22 @@ onvif://www.onvif.org/name/ARV-453
- SNMP Configuration (Optional) - - This section defines an optional extension to the Device Management Service for supporting Simple Network Management Protocol version 3 (SNMPv3) as specified in [RFC 3410] and related standards. Devices supporting this extension shall indicate this capability via the SNMP flag in the DeviceServiceCapabilities (see Section ). - - - Only SNMPv3 is within the scope of this extension. - + SNMP Configuration + This section defines a feature extension to the Device Management Service for supporting + Simple Network Management Protocol as specified in [RFC 3410] and related standards. Devices + supporting this extension shall indicate their capability via the SNMP flag in the + DeviceServiceCapabilities. (see Section ). + Only SNMPv3 is within the scope of this extension.
SNMP Service Control - - Devices supporting this extension shall provide the following operations for managing the SNMP service itself. - - - The SNMP service shall be disabled by default unless explicitly enabled by a Client. When disabled, the Device should not listen on the SNMP port, and attempts to query via SNMP should fail. - + The SNMP service shall be disabled by default. When enabled, the Device shall start to + listen for commands and queries on the configured SNMP port.
GetSNMPConfiguration - - This operation is used by a Client to retrieve the current SNMP service status and global configuration parameters from a Device. - A Device supporting the SNMP extension shall implement this command. - + This operation allows the client to retrieve the current SNMP service status along + with its configuration parameters. A device that signals support for SNMP via the SNMP + capability shall implement this command. request @@ -5427,10 +5421,10 @@ onvif://www.onvif.org/name/ARV-453 EngineID xs:hexBinary - - The SNMP Engine ID of the Device, as defined in [RFC 3411]. This value is typically read-only after initial configuration or discovery by the SNMP engine itself. - The Device should persist this EngineID across reboots. - + The SNMP Engine ID of the Device, as defined in [RFC 3411]. This value + is typically read-only after initial configuration or discovery by the + SNMP engine itself. The Device should persist this EngineID across + reboots. ListeningPort @@ -5459,18 +5453,18 @@ onvif://www.onvif.org/name/ARV-453
SetSNMPConfiguration - - This operation is used by a Client to enable or disable the SNMP service and to configure its global parameters. - Additionally, this operation can optionally create an initial SNMP user during service setup (only SNMPv3 users are supported). - A Device supporting the SNMP extension shall implement this command. - - - Some parameters, like the EngineID, may not be settable by a Client after initial determination by the Device, or may only be settable under specific conditions (e.g., when the service is disabled). If an attempt is made to set a non-settable EngineID, the Device shall return a ter:SNMPEngineIDNotSettable fault. - If an optional parameter is not present in the request, the Device shall not change the current value of that parameter. - - - For initial user creation: If InitialUserName is provided, then SecurityLevel must also be provided. Depending on the SecurityLevel, additional authentication and privacy parameters may be required as specified in the parameter descriptions. The Device shall validate that all required parameters for the chosen security level are provided and return appropriate fault codes if the configuration is incomplete or invalid. - + This operation allows the client to enable or disable the SNMP service and to + configure its parameters. This operation can optionally create an initial SNMP user + during service setup (only SNMPv3 users are supported). A device that signals support + for SNMP via the SNMP capability shall implement this command. + Some parameters, like the EngineID may only allowed to be set when the service is + disabled, while returning an error otherwise. If an optional parameter is missing in the + request, the device shall retain the current value of that parameter. + The operation request may include SecurityLevel along with InitialUserName for initial + user creation. Depending on the type of SecurityLevel input, additional authentication + and privacy parameters shall be required as specified in the parameter descriptions. The + device shall validate required parameters for the chosen security level and returns + appropriate fault codes if the configuration is incomplete or invalid. request @@ -5496,31 +5490,30 @@ onvif://www.onvif.org/name/ARV-453 Enabled xs:boolean optional - Enables or disables the SNMP service. If not provided, the current enabled state is maintained. + Enables or disables the SNMP service. If not provided, the current + state is maintained. EngineID xs:hexBinary optional - - The SNMP Engine ID. The ability to set this may be restricted by the Device. - If not provided, the current EngineID is maintained. - + The SNMP Engine ID. The ability to set this may be restricted by the Device. If not provided, the + current EngineID is maintained. ListeningPort xs:unsignedInt optional - - The UDP port number for the SNMP agent. If not provided, the current port is maintained. - Valid port range is typically 1-65535. - + The UDP port number for the SNMP agent. If not provided, the current + port is maintained. Valid port range is typically 1-65535. InitialUserName xs:string optional - Username for the initial SNMP user. If provided, SecurityLevel must also be specified. Max length 32 octets per USM requirements. + Username for the initial SNMP user. If provided, SecurityLevel shall + also be included. Max length 32 octets per USM requirements. SecurityLevel @@ -5567,11 +5560,15 @@ onvif://www.onvif.org/name/ARV-453 faults env:Sender - ter:InvalidArgVal - ter:InvalidSNMPPort - The provided ListeningPort is outside the valid range or is otherwise unusable. + The provided ListeningPort is outside the valid range or is + otherwise unusable. env:Sender - ter:InvalidArgVal - ter:InvalidSNMPEngineID - The provided EngineID is malformed or invalid according to [RFC 3411]. - env:Receiver - ter:ActionNotSupported - ter:SNMPEngineIDNotSettable - The Device does not allow the EngineID to be set via this command, or under the current conditions. + The provided EngineID is malformed or invalid according to [RFC + 3411]. + env:Receiver - ter:OperationProhibited - + ter:SNMPEngineIDNotSettable + The Device does not allow the EngineID to be set via this command + under the current conditions. env:Sender - ter:InvalidArgVal - ter:SNMPInitialUserIncomplete Initial user configuration is incomplete (missing required fields for specified SecurityLevel). env:Sender - ter:InvalidArgVal - ter:SNMPInvalidInitialUser diff --git a/wsdl/ver10/device/wsdl/devicemgmt.wsdl b/wsdl/ver10/device/wsdl/devicemgmt.wsdl index ca4a94428..23123fbec 100644 --- a/wsdl/ver10/device/wsdl/devicemgmt.wsdl +++ b/wsdl/ver10/device/wsdl/devicemgmt.wsdl @@ -2428,7 +2428,7 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO - + @@ -2437,28 +2437,14 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO - - - - - - + - - - - - - - - - - + @@ -2467,6 +2453,53 @@ IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wsdl/ver10/schema/onvif.xsd b/wsdl/ver10/schema/onvif.xsd index 9472a197a..697a1f181 100755 --- a/wsdl/ver10/schema/onvif.xsd +++ b/wsdl/ver10/schema/onvif.xsd @@ -9218,55 +9218,4 @@ If RectangleOnly is not set to true, this parameter is required. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -