Commit 1ad3cf35 authored by Michael Corcoran's avatar Michael Corcoran Committed by Michal Privoznik

Replace placeholder org OID with libvirt OID

An OID of 36957 was assigned to libvirt by IANA, but the placeholder OID
of 12345 was never replaced.

IANA lists the libvirt registration as:
36957
  libvirt
    Daniel Veillard
      daniel&veillard.com

https://www.iana.org/assignments/enterprise-numbers/enterprise-numbersSigned-off-by: Michael Corcoran's avatarMichael Corcoran <tracer@outlook.co.nz>
parent 5ec94099
......@@ -14,7 +14,7 @@ IMPORTS
libvirtMIB MODULE-IDENTITY
LAST-UPDATED "201012020000Z"
LAST-UPDATED "201803200000Z"
ORGANIZATION "www.libvirt.org"
CONTACT-INFO
"email: libvirt-users@redhat.com
......@@ -22,10 +22,11 @@ libvirtMIB MODULE-IDENTITY
DESCRIPTION
"First draft, for experimental purposes only!
Not to be used in real deployment!"
REVISION "201803200000Z"
DESCRIPTION "Updated OID"
REVISION "201012020000Z"
DESCRIPTION "Initial version."
::= { enterprises 12345 }
-- TODO: user real libvirt OID here ^
::= { enterprises 36957 }
-- structure advised by RFC 4181:
......
......@@ -587,14 +587,14 @@ Table / column details
/*
* LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects.
* Its status is Current.
* OID: .1.3.6.1.4.1.12345.1.1, length: 9
* OID: .1.3.6.1.4.1.36957.1.1, length: 9
*/
/*---------------------------------------------------------------------
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestUUID
* libvirtGuestUUID is subid 1 of libvirtGuestEntry.
* Its status is Current, and its access level is NoAccess.
* OID: .1.3.6.1.4.1.12345.1.1.1.1
* OID: .1.3.6.1.4.1.36957.1.1.1.1
* Description:
The UUID of the virtual guest.
*
......@@ -620,7 +620,7 @@ The UUID of the virtual guest.
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestName
* libvirtGuestName is subid 2 of libvirtGuestEntry.
* Its status is Current, and its access level is ReadOnly.
* OID: .1.3.6.1.4.1.12345.1.1.1.2
* OID: .1.3.6.1.4.1.36957.1.1.1.2
* Description:
Name of active virtual guest.
*
......@@ -638,7 +638,7 @@ Name of active virtual guest.
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestState
* libvirtGuestState is subid 3 of libvirtGuestEntry.
* Its status is Current, and its access level is Create.
* OID: .1.3.6.1.4.1.12345.1.1.1.3
* OID: .1.3.6.1.4.1.36957.1.1.1.3
* Description:
Current state of the active guest.
*
......@@ -656,7 +656,7 @@ Current state of the active guest.
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuCount
* libvirtGuestCpuCount is subid 4 of libvirtGuestEntry.
* Its status is Current, and its access level is ReadOnly.
* OID: .1.3.6.1.4.1.12345.1.1.1.4
* OID: .1.3.6.1.4.1.36957.1.1.1.4
* Description:
Number of virtual CPUs the virtual guest uses.
*
......@@ -674,7 +674,7 @@ Number of virtual CPUs the virtual guest uses.
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryCurrent
* libvirtGuestMemoryCurrent is subid 5 of libvirtGuestEntry.
* Its status is Current, and its access level is ReadOnly.
* OID: .1.3.6.1.4.1.12345.1.1.1.5
* OID: .1.3.6.1.4.1.36957.1.1.1.5
* Description:
Current amount of memory (in MiB) used by the virtual guest.
*
......@@ -692,7 +692,7 @@ Current amount of memory (in MiB) used by the virtual guest.
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryLimit
* libvirtGuestMemoryLimit is subid 6 of libvirtGuestEntry.
* Its status is Current, and its access level is ReadOnly.
* OID: .1.3.6.1.4.1.12345.1.1.1.6
* OID: .1.3.6.1.4.1.36957.1.1.1.6
* Description:
The maximum amount of memory (in MiB) that can be used by the virtual
guest.
......@@ -711,7 +711,7 @@ The maximum amount of memory (in MiB) that can be used by the virtual
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuTime
* libvirtGuestCpuTime is subid 7 of libvirtGuestEntry.
* Its status is Current, and its access level is ReadOnly.
* OID: .1.3.6.1.4.1.12345.1.1.1.7
* OID: .1.3.6.1.4.1.36957.1.1.1.7
* Description:
The CPU time used by the virtual guest, in nanoseconds.
*
......@@ -728,7 +728,7 @@ The CPU time used by the virtual guest, in nanoseconds.
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestRowStatus
* libvirtGuestRowStatus is subid 9 of libvirtGuestEntry.
* Its status is Current, and its access level is Create.
* OID: .1.3.6.1.4.1.12345.1.1.1.9
* OID: .1.3.6.1.4.1.36957.1.1.1.9
* Description:
Status of the virtual guest.
......
......@@ -68,7 +68,7 @@ void shutdown_libvirtGuestTable(void);
/*
* LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects.
* Its status is Current.
* OID: .1.3.6.1.4.1.12345.1.1, length: 9
* OID: .1.3.6.1.4.1.36957.1.1, length: 9
*/
/* *********************************************************************
* When you register your mib, you get to provide a generic
......
......@@ -51,7 +51,7 @@
/*
* LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects.
* Its status is Current.
* OID: .1.3.6.1.4.1.12345.1.1, length: 9
* OID: .1.3.6.1.4.1.36957.1.1, length: 9
*/
/**
......@@ -291,7 +291,7 @@ libvirtGuestTable_row_prep( libvirtGuestTable_rowreq_ctx *rowreq_ctx)
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestUUID
* libvirtGuestUUID is subid 1 of libvirtGuestEntry.
* Its status is Current, and its access level is NoAccess.
* OID: .1.3.6.1.4.1.12345.1.1.1.1
* OID: .1.3.6.1.4.1.36957.1.1.1.1
* Description:
The UUID of the virtual guest.
*
......
......@@ -45,7 +45,7 @@ extern "C" {
/*
* LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects.
* Its status is Current.
* OID: .1.3.6.1.4.1.12345.1.1, length: 9
* OID: .1.3.6.1.4.1.36957.1.1, length: 9
*/
......
......@@ -50,7 +50,7 @@
/*
* LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects.
* Its status is Current.
* OID: .1.3.6.1.4.1.12345.1.1, length: 9
* OID: .1.3.6.1.4.1.36957.1.1, length: 9
*/
/* ---------------------------------------------------------------------
......@@ -134,7 +134,7 @@ libvirtGuestTable_indexes_set(libvirtGuestTable_rowreq_ctx *rowreq_ctx, char *li
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestName
* libvirtGuestName is subid 2 of libvirtGuestEntry.
* Its status is Current, and its access level is ReadOnly.
* OID: .1.3.6.1.4.1.12345.1.1.1.2
* OID: .1.3.6.1.4.1.36957.1.1.1.2
* Description:
Name of active virtual guest.
*
......@@ -222,7 +222,7 @@ libvirtGuestName_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, char **libvirtGu
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestState
* libvirtGuestState is subid 3 of libvirtGuestEntry.
* Its status is Current, and its access level is Create.
* OID: .1.3.6.1.4.1.12345.1.1.1.3
* OID: .1.3.6.1.4.1.36957.1.1.1.3
* Description:
Current state of the active guest.
*
......@@ -274,7 +274,7 @@ libvirtGuestState_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * libvir
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuCount
* libvirtGuestCpuCount is subid 4 of libvirtGuestEntry.
* Its status is Current, and its access level is ReadOnly.
* OID: .1.3.6.1.4.1.12345.1.1.1.4
* OID: .1.3.6.1.4.1.36957.1.1.1.4
* Description:
Number of virtual CPUs the virtual guest uses.
*
......@@ -326,7 +326,7 @@ libvirtGuestCpuCount_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * lib
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryCurrent
* libvirtGuestMemoryCurrent is subid 5 of libvirtGuestEntry.
* Its status is Current, and its access level is ReadOnly.
* OID: .1.3.6.1.4.1.12345.1.1.1.5
* OID: .1.3.6.1.4.1.36957.1.1.1.5
* Description:
Current amount of memory (in MiB) used by the virtual guest.
*
......@@ -378,7 +378,7 @@ libvirtGuestMemoryCurrent_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryLimit
* libvirtGuestMemoryLimit is subid 6 of libvirtGuestEntry.
* Its status is Current, and its access level is ReadOnly.
* OID: .1.3.6.1.4.1.12345.1.1.1.6
* OID: .1.3.6.1.4.1.36957.1.1.1.6
* Description:
The maximum amount of memory (in MiB) that can be used by the virtual
guest.
......@@ -431,7 +431,7 @@ libvirtGuestMemoryLimit_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long *
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuTime
* libvirtGuestCpuTime is subid 7 of libvirtGuestEntry.
* Its status is Current, and its access level is ReadOnly.
* OID: .1.3.6.1.4.1.12345.1.1.1.7
* OID: .1.3.6.1.4.1.36957.1.1.1.7
* Description:
The CPU time used by the virtual guest, in nanoseconds.
*
......@@ -479,7 +479,7 @@ libvirtGuestCpuTime_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, struct counte
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestRowStatus
* libvirtGuestRowStatus is subid 9 of libvirtGuestEntry.
* Its status is Current, and its access level is Create.
* OID: .1.3.6.1.4.1.12345.1.1.1.9
* OID: .1.3.6.1.4.1.36957.1.1.1.9
* Description:
Status of the virtual guest.
......
......@@ -44,7 +44,7 @@ extern "C" {
/*
* LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects.
* Its status is Current.
* OID: .1.3.6.1.4.1.12345.1.1, length: 9
* OID: .1.3.6.1.4.1.36957.1.1, length: 9
*/
/*
* indexes
......
......@@ -46,7 +46,7 @@
/*
* LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects.
* Its status is Current.
* OID: .1.3.6.1.4.1.12345.1.1, length: 9
* OID: .1.3.6.1.4.1.36957.1.1, length: 9
*/
/*
* NOTE: if you update this chart, please update the versions in
......@@ -407,7 +407,7 @@ libvirtGuestTable_undo_commit( libvirtGuestTable_rowreq_ctx *rowreq_ctx)
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestState
* libvirtGuestState is subid 3 of libvirtGuestEntry.
* Its status is Current, and its access level is Create.
* OID: .1.3.6.1.4.1.12345.1.1.1.3
* OID: .1.3.6.1.4.1.36957.1.1.1.3
* Description:
Current state of the active guest.
*
......@@ -586,7 +586,7 @@ libvirtGuestState_undo( libvirtGuestTable_rowreq_ctx *rowreq_ctx)
* LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestRowStatus
* libvirtGuestRowStatus is subid 9 of libvirtGuestEntry.
* Its status is Current, and its access level is Create.
* OID: .1.3.6.1.4.1.12345.1.1.1.9
* OID: .1.3.6.1.4.1.36957.1.1.1.9
* Description:
Status of the virtual guest.
......
......@@ -44,7 +44,7 @@ extern "C" {
/*
* LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects.
* Its status is Current.
* OID: .1.3.6.1.4.1.12345.1.1, length: 9
* OID: .1.3.6.1.4.1.36957.1.1, length: 9
*/
......
......@@ -68,7 +68,7 @@
/*
* LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects.
* Its status is Current.
* OID: .1.3.6.1.4.1.12345.1.1, length: 9
* OID: .1.3.6.1.4.1.36957.1.1, length: 9
*/
typedef struct libvirtGuestTable_interface_ctx_s {
......
......@@ -29,7 +29,7 @@ extern "C" {
/* column number definitions for table libvirtGuestTable */
#define LIBVIRTGUESTTABLE_OID 1,3,6,1,4,1,12345,1,1
#define LIBVIRTGUESTTABLE_OID 1,3,6,1,4,1,36957,1,1
#define COLUMN_LIBVIRTGUESTUUID 1
......
......@@ -34,15 +34,15 @@ int
send_libvirtGuestNotif_trap(virDomainPtr dom)
{
netsnmp_variable_list *var_list = NULL;
const oid libvirtGuestNotif_oid[] = { 1, 3, 6, 1, 4, 1, 12345, 0, 1 };
const oid libvirtGuestNotif_oid[] = { 1, 3, 6, 1, 4, 1, 36957, 0, 1 };
const oid libvirtGuestName_oid[] =
{ 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 2, 0 };
{ 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 2, 0 };
const oid libvirtGuestUUID_oid[] =
{ 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 1, 1 };
{ 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 1, 1 };
const oid libvirtGuestState_oid[] =
{ 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 3, 2 };
{ 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 3, 2 };
const oid libvirtGuestRowStatus_oid[] =
{ 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 9, 3 };
{ 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 9, 3 };
const char *domName = virDomainGetName(dom);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment