1From 460d3a5ef450c30b34a663a073ee53329441ef6e Mon Sep 17 00:00:00 2001 2From: Jackie Huang <jackie.huang@windriver.com> 3Date: Tue, 23 Feb 2016 16:34:38 +0800 4Subject: [PATCH] libsmi: fix the test dump files 5 6These test dump files were generated by smidump 0.4.5 7which would not match with the ones generated by 0.4.8, 8so update them with the ones for 0.4.8. 9 10Upstream-Status: Pending 11 12Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 13--- 14 test/dumps/cm/MAU-MIB | 8 ++++---- 15 test/dumps/cm/RMON2-MIB | 6 +++--- 16 test/dumps/sming/IF-MIB | 22 +++++++++++++--------- 17 test/dumps/sming/MAU-MIB | 19 +++++++++++-------- 18 test/dumps/sming/RMON2-MIB | 40 ++++++++++++++++++++++++---------------- 19 test/dumps/sming/SNMPv2-MIB | 11 +++++++---- 20 6 files changed, 62 insertions(+), 44 deletions(-) 21 22diff --git a/test/dumps/cm/MAU-MIB b/test/dumps/cm/MAU-MIB 23index 0d97284..0cfd4e1 100644 24--- a/test/dumps/cm/MAU-MIB 25+++ b/test/dumps/cm/MAU-MIB 26@@ -53,7 +53,7 @@ 27 <attribute name="text"> 28 <composite type="text"> 29 <attribute name="string"> 30- <string>#Conceptual model of MAU-MIB - generated by smidump 0.4.5#</string> 31+ <string>#Conceptual model of MAU-MIB - generated by smidump 0.4.8#</string> 32 </attribute> 33 <attribute name="font"> 34 <font name="Courier"/> 35@@ -1294,7 +1294,7 @@ 36 <point val="29.52,49.18"/> 37 </attribute> 38 <attribute name="obj_bb"> 39- <rectangle val="28.67,32.93;30.37,34.63"/> 40+ <rectangle val="28.67,32.93;30.37,34.62"/> 41 </attribute> 42 <attribute name="orth_points"> 43 <point val="29.52,49.18"/> 44@@ -1678,7 +1678,7 @@ 45 <point val="37.68,49.18"/> 46 </attribute> 47 <attribute name="obj_bb"> 48- <rectangle val="28.67,32.93;30.37,34.63"/> 49+ <rectangle val="28.67,32.93;30.37,34.62"/> 50 </attribute> 51 <attribute name="orth_points"> 52 <point val="37.68,49.18"/> 53@@ -1737,7 +1737,7 @@ 54 <point val="29.52,35.78"/> 55 </attribute> 56 <attribute name="obj_bb"> 57- <rectangle val="28.67,32.93;30.37,34.63"/> 58+ <rectangle val="28.67,32.93;30.37,34.62"/> 59 </attribute> 60 <attribute name="orth_points"> 61 <point val="29.52,35.78"/> 62diff --git a/test/dumps/cm/RMON2-MIB b/test/dumps/cm/RMON2-MIB 63index 30ae8dd..1b9d268 100644 64--- a/test/dumps/cm/RMON2-MIB 65+++ b/test/dumps/cm/RMON2-MIB 66@@ -53,7 +53,7 @@ 67 <attribute name="text"> 68 <composite type="text"> 69 <attribute name="string"> 70- <string>#Conceptual model of RMON2-MIB - generated by smidump 0.4.5#</string> 71+ <string>#Conceptual model of RMON2-MIB - generated by smidump 0.4.8#</string> 72 </attribute> 73 <attribute name="font"> 74 <font name="Courier"/> 75@@ -2841,8 +2841,8 @@ 76 </attribute> 77 <attribute name="orth_points"> 78 <point val="18.80,55.45"/> 79- <point val="18.80,68.63"/> 80- <point val="22.80,68.63"/> 81+ <point val="18.80,68.62"/> 82+ <point val="22.80,68.62"/> 83 <point val="22.80,81.80"/> 84 </attribute> 85 <attribute name="orth_orient"> 86diff --git a/test/dumps/sming/IF-MIB b/test/dumps/sming/IF-MIB 87index 21432cb..c2ffc06 100644 88--- a/test/dumps/sming/IF-MIB 89+++ b/test/dumps/sming/IF-MIB 90@@ -1,16 +1,18 @@ 91 // 92-// This module has been generated by smidump 0.4.5. Do not edit. 93+// This module has been generated by smidump 0.4.8. Do not edit. 94 // 95 module IF-MIB { 96 97- import IANAifType-MIB (IANAifType); 98- import IRTF-NMRG-SMING (Counter32, Counter64, 99- DisplayString255, Gauge32, 100- PhysAddress, TimeStamp, TimeTicks, 101- TruthValue); 102- import IRTF-NMRG-SMING-SNMP (AutonomousType, RowStatus, 103- TestAndIncr, mib-2); 104- import SNMPv2-MIB (snmpTraps); 105+ import SNMPv2-SMI (MODULE-IDENTITY, OBJECT-TYPE, Counter32, 106+ Gauge32, Counter64, Integer32, TimeTicks, 107+ mib-2, NOTIFICATION-TYPE); 108+ import SNMPv2-TC (TEXTUAL-CONVENTION, DisplayString, 109+ PhysAddress, TruthValue, RowStatus, 110+ TimeStamp, AutonomousType, TestAndIncr); 111+ import SNMPv2-CONF (MODULE-COMPLIANCE, OBJECT-GROUP, 112+ NOTIFICATION-GROUP); 113+ import SNMPv2-MIB (snmpTraps); 114+ import IANAifType-MIB (IANAifType); 115 116 // 117 // MODULE META INFORMATION 118@@ -79,6 +81,7 @@ module IF-MIB { 119 typedef InterfaceIndex { 120 type Integer32 (1..2147483647); 121 format "d"; 122+ status current; 123 description 124 "A unique value, greater than zero, for each interface or 125 interface sub-layer in the managed system. It is 126@@ -91,6 +94,7 @@ module IF-MIB { 127 typedef InterfaceIndexOrZero { 128 type Integer32 (0..2147483647); 129 format "d"; 130+ status current; 131 description 132 "This textual convention is an extension of the 133 InterfaceIndex convention. The latter defines a greater 134diff --git a/test/dumps/sming/MAU-MIB b/test/dumps/sming/MAU-MIB 135index 2cffd99..64cf714 100644 136--- a/test/dumps/sming/MAU-MIB 137+++ b/test/dumps/sming/MAU-MIB 138@@ -1,15 +1,18 @@ 139 // 140-// This module has been generated by smidump 0.4.5. Do not edit. 141+// This module has been generated by smidump 0.4.8. Do not edit. 142 // 143 module MAU-MIB { 144 145- import IANA-MAU-MIB (IANAifJackType, 146- IANAifMauAutoNegCapBits, 147- IANAifMauMediaAvailable, 148- IANAifMauTypeListBits); 149- import IF-MIB (InterfaceIndex); 150- import IRTF-NMRG-SMING (Counter32, Counter64, TruthValue); 151- import IRTF-NMRG-SMING-SNMP (AutonomousType, mib-2); 152+ import SNMPv2-SMI (Counter32, Integer32, Counter64, OBJECT-TYPE, 153+ MODULE-IDENTITY, NOTIFICATION-TYPE, mib-2); 154+ import SNMPv2-TC (TruthValue, AutonomousType, 155+ TEXTUAL-CONVENTION); 156+ import SNMPv2-CONF (OBJECT-GROUP, MODULE-COMPLIANCE, 157+ NOTIFICATION-GROUP); 158+ import IF-MIB (InterfaceIndex); 159+ import IANA-MAU-MIB (IANAifMauTypeListBits, 160+ IANAifMauMediaAvailable, 161+ IANAifMauAutoNegCapBits, IANAifJackType); 162 163 // 164 // MODULE META INFORMATION 165diff --git a/test/dumps/sming/RMON2-MIB b/test/dumps/sming/RMON2-MIB 166index 423b9bc..04763e5 100644 167--- a/test/dumps/sming/RMON2-MIB 168+++ b/test/dumps/sming/RMON2-MIB 169@@ -1,23 +1,26 @@ 170 // 171-// This module has been generated by smidump 0.4.5. Do not edit. 172+// This module has been generated by smidump 0.4.8. Do not edit. 173 // 174 module RMON2-MIB { 175 176- import IF-MIB (ifIndex); 177- import IRTF-NMRG-SMING (Counter32, DisplayString255, 178- Gauge32, IpAddress, TimeStamp, 179- TimeTicks); 180- import IRTF-NMRG-SMING-SNMP (RowStatus, mib-2); 181- import RMON-MIB (OwnerString, channelEntry, 182- etherStatsEntry, filter, 183- filterEntry, history, 184- historyControlEntry, 185- hostControlEntry, hosts, matrix, 186- matrixControlEntry, statistics); 187- import TOKEN-RING-RMON-MIB (ringStationControlEntry, 188- sourceRoutingStatsEntry, 189- tokenRing, tokenRingMLStatsEntry, 190- tokenRingPStatsEntry); 191+ import SNMPv2-SMI (MODULE-IDENTITY, OBJECT-TYPE, 192+ Counter32, Integer32, Gauge32, 193+ IpAddress, TimeTicks, mib-2); 194+ import SNMPv2-TC (TEXTUAL-CONVENTION, RowStatus, 195+ DisplayString, TimeStamp); 196+ import SNMPv2-CONF (MODULE-COMPLIANCE, OBJECT-GROUP); 197+ import IF-MIB (ifIndex); 198+ import RMON-MIB (OwnerString, statistics, history, 199+ hosts, matrix, filter, 200+ etherStatsEntry, 201+ historyControlEntry, 202+ hostControlEntry, 203+ matrixControlEntry, filterEntry, 204+ channelEntry); 205+ import TOKEN-RING-RMON-MIB (tokenRing, tokenRingMLStatsEntry, 206+ tokenRingPStatsEntry, 207+ ringStationControlEntry, 208+ sourceRoutingStatsEntry); 209 210 // 211 // MODULE META INFORMATION 212@@ -167,6 +170,7 @@ module RMON2-MIB { 213 214 typedef ZeroBasedCounter32 { 215 type Gauge32; 216+ status current; 217 description 218 "This TC describes an object that counts events with the 219 following semantics: objects of this type will be set to 220@@ -188,6 +192,7 @@ module RMON2-MIB { 221 222 typedef LastCreateTime { 223 type TimeTicks; 224+ status current; 225 description 226 "This TC describes an object that stores the value of the 227 sysUpTime object at the last time its entry was created. 228@@ -208,6 +213,7 @@ module RMON2-MIB { 229 230 typedef TimeFilter { 231 type TimeTicks; 232+ status current; 233 description 234 "To be used for the index to a table. Allows an application 235 to download only those rows changed since a particular time. 236@@ -424,6 +430,7 @@ module RMON2-MIB { 237 238 typedef DataSource { 239 type ObjectIdentifier; 240+ status current; 241 description 242 "Identifies the source of the data that the associated 243 function is configured to analyze. This source can be any 244@@ -439,6 +446,7 @@ module RMON2-MIB { 245 246 typedef ControlString { 247 type OctetString (0..255); 248+ status current; 249 description 250 "This data type is used to communicate with a modem or a 251 252diff --git a/test/dumps/sming/SNMPv2-MIB b/test/dumps/sming/SNMPv2-MIB 253index ca355c8..0c88939 100644 254--- a/test/dumps/sming/SNMPv2-MIB 255+++ b/test/dumps/sming/SNMPv2-MIB 256@@ -1,11 +1,14 @@ 257 // 258-// This module has been generated by smidump 0.4.5. Do not edit. 259+// This module has been generated by smidump 0.4.8. Do not edit. 260 // 261 module SNMPv2-MIB { 262 263- import IRTF-NMRG-SMING (Counter32, DisplayString255, 264- TimeStamp, TimeTicks, snmpModules); 265- import IRTF-NMRG-SMING-SNMP (TestAndIncr, mib-2); 266+ import SNMPv2-SMI (MODULE-IDENTITY, OBJECT-TYPE, 267+ NOTIFICATION-TYPE, TimeTicks, Counter32, 268+ snmpModules, mib-2); 269+ import SNMPv2-TC (DisplayString, TestAndIncr, TimeStamp); 270+ import SNMPv2-CONF (MODULE-COMPLIANCE, OBJECT-GROUP, 271+ NOTIFICATION-GROUP); 272 273 // 274 // MODULE META INFORMATION 275-- 2761.9.1 277 278