From 98a1f047d263dca118ac8963028ae9d8e96a7029 Mon Sep 17 00:00:00 2001
From: Ilya Etingof <etingof@gmail.com>
Date: Mon, 18 Feb 2019 09:12:29 +0100
Subject: Fix some of the rebuilt MIBs

Add the missing defaults (pyasn1 fault), add non-existing
'vacmContextStatus' MIB object which is required for table
management.
---
 pysnmp/smi/mibs/SNMP-NOTIFICATION-MIB.py   |  8 ++++----
 pysnmp/smi/mibs/SNMP-VIEW-BASED-ACM-MIB.py | 31 +++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 7 deletions(-)

(limited to 'pysnmp')

diff --git a/pysnmp/smi/mibs/SNMP-NOTIFICATION-MIB.py b/pysnmp/smi/mibs/SNMP-NOTIFICATION-MIB.py
index a0d39a27..844965aa 100644
--- a/pysnmp/smi/mibs/SNMP-NOTIFICATION-MIB.py
+++ b/pysnmp/smi/mibs/SNMP-NOTIFICATION-MIB.py
@@ -232,7 +232,7 @@ _SnmpNotifyType_Type.__name__ = "Integer32"
 _SnmpNotifyType_Object = MibTableColumn
 snmpNotifyType = _SnmpNotifyType_Object(
     (1, 3, 6, 1, 6, 3, 13, 1, 1, 1, 3),
-    _SnmpNotifyType_Type()
+    _SnmpNotifyType_Type().clone('trap')
 )
 snmpNotifyType.setMaxAccess("read-create")
 if mibBuilder.loadTexts:
@@ -258,7 +258,7 @@ class _SnmpNotifyStorageType_Type(StorageType):
 _SnmpNotifyStorageType_Object = MibTableColumn
 snmpNotifyStorageType = _SnmpNotifyStorageType_Object(
     (1, 3, 6, 1, 6, 3, 13, 1, 1, 1, 4),
-    _SnmpNotifyStorageType_Type()
+    _SnmpNotifyStorageType_Type().clone('nonVolatile')
 )
 snmpNotifyStorageType.setMaxAccess("read-create")
 if mibBuilder.loadTexts:
@@ -342,7 +342,7 @@ class _SnmpNotifyFilterProfileStorType_Type(StorageType):
 _SnmpNotifyFilterProfileStorType_Object = MibTableColumn
 snmpNotifyFilterProfileStorType = _SnmpNotifyFilterProfileStorType_Object(
     (1, 3, 6, 1, 6, 3, 13, 1, 2, 1, 2),
-    _SnmpNotifyFilterProfileStorType_Type()
+    _SnmpNotifyFilterProfileStorType_Type().clone('nonVolatile')
 )
 snmpNotifyFilterProfileStorType.setMaxAccess("read-create")
 if mibBuilder.loadTexts:
@@ -486,7 +486,7 @@ _SnmpNotifyFilterType_Type.__name__ = "Integer32"
 _SnmpNotifyFilterType_Object = MibTableColumn
 snmpNotifyFilterType = _SnmpNotifyFilterType_Object(
     (1, 3, 6, 1, 6, 3, 13, 1, 3, 1, 3),
-    _SnmpNotifyFilterType_Type()
+    _SnmpNotifyFilterType_Type().clone('included')
 )
 snmpNotifyFilterType.setMaxAccess("read-create")
 if mibBuilder.loadTexts:
diff --git a/pysnmp/smi/mibs/SNMP-VIEW-BASED-ACM-MIB.py b/pysnmp/smi/mibs/SNMP-VIEW-BASED-ACM-MIB.py
index c978fdad..6deba234 100644
--- a/pysnmp/smi/mibs/SNMP-VIEW-BASED-ACM-MIB.py
+++ b/pysnmp/smi/mibs/SNMP-VIEW-BASED-ACM-MIB.py
@@ -201,6 +201,30 @@ if mibBuilder.loadTexts:
 A human readable name identifying a particular context at a particular SNMP
 entity. The empty contextName (zero length) represents the default context.
 """)
+
+# NOTE: The RowStatus column is not present in the MIB
+
+_VacmContextStatus_Type = RowStatus
+_VacmContextStatus_Object = MibTableColumn
+vacmContextStatus = _VacmContextStatus_Object(
+    (1, 3, 6, 1, 6, 3, 16, 1, 1, 1, 2),
+    _VacmContextStatus_Type()
+)
+vacmContextStatus.setMaxAccess("readcreate")
+if mibBuilder.loadTexts:
+    vacmContextStatus.setStatus('current')
+if mibBuilder.loadTexts:
+    vacmContextStatus.setDescription("""\
+The status of this conceptual row. Until instances of all corresponding columns
+are appropriately configured, the value of the corresponding instance of the
+vacmContextTableStatus column is 'notReady'. In particular, a newly created
+row cannot be made active until a value has been set for vacmContextName. The
+RowStatus TC [RFC2579] requires that this DESCRIPTION clause states under
+which circumstances other objects in this row can be modified: The value of
+this object has no effect on whether other objects in this conceptual row can
+be modified.
+""")
+
 _VacmSecurityToGroupTable_Object = MibTable
 vacmSecurityToGroupTable = _VacmSecurityToGroupTable_Object(
     (1, 3, 6, 1, 6, 3, 16, 1, 2)
@@ -473,7 +497,7 @@ _VacmAccessContextMatch_Type.__name__ = "Integer32"
 _VacmAccessContextMatch_Object = MibTableColumn
 vacmAccessContextMatch = _VacmAccessContextMatch_Object(
     (1, 3, 6, 1, 6, 3, 16, 1, 4, 1, 4),
-    _VacmAccessContextMatch_Type()
+    _VacmAccessContextMatch_Type().clone('exact')
 )
 vacmAccessContextMatch.setMaxAccess("read-create")
 if mibBuilder.loadTexts:
@@ -585,7 +609,7 @@ class _VacmAccessStorageType_Type(StorageType):
 _VacmAccessStorageType_Object = MibTableColumn
 vacmAccessStorageType = _VacmAccessStorageType_Object(
     (1, 3, 6, 1, 6, 3, 16, 1, 4, 1, 8),
-    _VacmAccessStorageType_Type()
+    _VacmAccessStorageType_Type().clone('nonVolatile')
 )
 vacmAccessStorageType.setMaxAccess("read-create")
 if mibBuilder.loadTexts:
@@ -807,7 +831,7 @@ _VacmViewTreeFamilyType_Type.__name__ = "Integer32"
 _VacmViewTreeFamilyType_Object = MibTableColumn
 vacmViewTreeFamilyType = _VacmViewTreeFamilyType_Object(
     (1, 3, 6, 1, 6, 3, 16, 1, 5, 2, 1, 4),
-    _VacmViewTreeFamilyType_Type()
+    _VacmViewTreeFamilyType_Type().clone('included')
 )
 vacmViewTreeFamilyType.setMaxAccess("read-create")
 if mibBuilder.loadTexts:
@@ -914,6 +938,7 @@ mibBuilder.exportSymbols(
        "vacmContextTable": vacmContextTable,
        "vacmContextEntry": vacmContextEntry,
        "vacmContextName": vacmContextName,
+       "vacmContextStatus": vacmContextStatus,
        "vacmSecurityToGroupTable": vacmSecurityToGroupTable,
        "vacmSecurityToGroupEntry": vacmSecurityToGroupEntry,
        "vacmSecurityModel": vacmSecurityModel,
-- 
cgit v1.2.1