Merge branch 'bmk/snmp/compiler/handling_import_of_BITS_in_mibs/r15/OTP-10799' into bmk/snmp/snmp4222_integration/r15

10 files changed, 214 insertions, 26 deletions

diff --git a/lib/snmp/.gitignore b/lib/snmp/.gitignore
new file mode 100644
index 0000000000..b82d23e7bd
--- /dev/null
+++ b/lib/snmp/.gitignore
@@ -0,0 +1,4 @@
+# Match at any level.
+
+*.BKP
+
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 442837d57d..7fe6425f52 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1996</year><year>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -34,6 +34,62 @@
 
 
   <section>
+    <title>SNMP Development Toolkit 4.22.2</title>
+    <p>Version 4.22.2 supports code replacement in runtime from/to
+    version 4.22.1, 4.22, 
+    4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 4.21. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[agent] Errors in <c>vacmAccessTable</c> RowStatus handling.
+	  There are problems with the handling of vacmAccessTableStatus 
+	  that cause some SNMP test suites to report errors.
+	  Most notably, erroneous set operations frequently cause "genErr" 
+	  errors to be returned. These "genErr" errors are usually caused 
+	  by badmatch exceptions coming from 
+	  <c>{ok, Row} = snmpa_vacm:get_row(RowIndex)</c> 
+	  if the row does not exist. </p>
+	  <p>The semantics of the RowStatus handling in that table has 
+	  been adjusted to be compliant with the RowStatus
+	  textual description of SNPMv2-TC MIB. </p>
+	  <p>Stefan Zegenhagen</p>
+	  <p>Own Id: OTP-10164</p>
+        </item>
+      </list>
+-->
+
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[compiler] Now handles MIBs importing the pesudotype BITS. </p>
+          <p>Own Id: OTP-10799</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+
+  </section> <!-- 4.22.2 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.22.1</title>
     <p>Version 4.22.1 supports code replacement in runtime from/to
     version 4.22, 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 593ddd82bd..39e154d463 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,6 +22,10 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.22.1", 
+   [
+   ]
+  }, 
   {"4.22", 
    [
     {load_module, snmpm,                   soft_purge, soft_purge, []}, 
@@ -312,6 +316,10 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.22.1", 
+   [
+   ]
+  }, 
   {"4.22", 
    [
     {load_module, snmpm,                   soft_purge, soft_purge, []}, 
diff --git a/lib/snmp/src/compile/snmpc_lib.erl b/lib/snmp/src/compile/snmpc_lib.erl
index c7eae307e8..3652054298 100644
--- a/lib/snmp/src/compile/snmpc_lib.erl
+++ b/lib/snmp/src/compile/snmpc_lib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -240,7 +240,10 @@ import_mib({{'SNMPv2-SMI', ImportsFromMib},Line}) ->
 			aliasname = 'Opaque'},
 	     #asn1_type{bertype   = 'Counter64', 
 			aliasname = 'Counter64',
-			lo = 0, hi = 18446744073709551615}],
+			lo = 0, hi = 18446744073709551615},
+	     #asn1_type{bertype   = 'BITS', 
+			aliasname = 'BITS'}
+	    ],
     Macros = ['MODULE-IDENTITY','OBJECT-IDENTITY','OBJECT-TYPE',
 	      'NOTIFICATION-TYPE'],
     import_built_in_loop(ImportsFromMib,Nodes,Types,Macros,'SNMPv2-SMI',Line);
diff --git a/lib/snmp/src/compile/snmpc_mib_gram.yrl b/lib/snmp/src/compile/snmpc_mib_gram.yrl
index 74b9ddaa25..4fd504e34b 100644
--- a/lib/snmp/src/compile/snmpc_mib_gram.yrl
+++ b/lib/snmp/src/compile/snmpc_mib_gram.yrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -244,16 +244,36 @@ listofdefinitions -> definition : ['$1'] .
 listofdefinitions -> listofdefinitions definition : ['$2' | '$1'].
 
 import -> '$empty' : [].
-import -> 'IMPORTS' imports ';' : '$2'.
-
-imports -> imports_from_one_mib : ['$1'].
-imports -> imports_from_one_mib imports : ['$1' | '$2'].
+import -> 'IMPORTS' imports ';' : 
+%%           i("import ->"
+%% 	    "~n   imports: ~p", ['$2']), 
+          '$2'.
+
+imports -> imports_from_one_mib : 
+%%            i("imports ->"
+%%              "~n   imports_from_one_mib: ~p", ['$1']), 
+           ['$1'].
+imports -> imports_from_one_mib imports : 
+%%            i("imports ->"
+%%              "~n   imports_from_one_mib: ~p"
+%%              "~n   imports:              ~p", ['$1', '$2']), 
+           ['$1' | '$2'].
 
 imports_from_one_mib -> listofimports 'FROM' variable :
+%%                         i("imports_from_one_mib ->"
+%%                           "~n   listofimports: ~p"
+%%                           "~n   variable:      ~p", ['$1', '$3']), 
                         {{val('$3'), lreverse(imports_from_one_mib, '$1')}, line_of('$2')}.
 
-listofimports -> import_stuff : ['$1'].
-listofimports -> listofimports ',' import_stuff : ['$3' | '$1'].
+listofimports -> import_stuff : 
+%%                  i("listofimports ->"
+%%                    "~n   import_stuff: ~p", ['$1']), 
+                 ['$1'].
+listofimports -> listofimports ',' import_stuff : 
+%%                  i("listofimports ->"
+%%                    "~n   listofimports: ~p"
+%%                    "~n   import_stuff:  ~p", ['$1', '$3']), 
+                 ['$3' | '$1'].
 
 import_stuff -> 'OBJECT-TYPE' : {builtin, 'OBJECT-TYPE'}.
 import_stuff -> 'TRAP-TYPE' : {builtin, 'TRAP-TYPE'}.
@@ -314,6 +334,8 @@ import_stuff -> 'TDomain'
        : ensure_ver(2,'$1'), {builtin, 'TDomain'}.
 import_stuff -> 'TAddress' 
        : ensure_ver(2,'$1'), {builtin, 'TAddress'}.
+import_stuff -> 'BITS' 
+       : ensure_ver(2,'$1'), {builtin, 'BITS'}.
 
 traptype -> objectname 'TRAP-TYPE' 'ENTERPRISE' objectname varpart
 	    description referpart implies integer :
@@ -748,7 +770,7 @@ statusv1(Tok) ->
         obsolete -> obsolete;
         deprecated -> deprecated;
         Else -> return_error(line_of(Tok),
-                             "syntax error before: " ++ atom_to_list(Else))
+                             "(statusv1) syntax error before: " ++ atom_to_list(Else))
     end.
 
 statusv2(Tok) ->
@@ -757,7 +779,7 @@ statusv2(Tok) ->
         deprecated -> deprecated;
         obsolete -> obsolete;
         Else -> return_error(line_of(Tok),
-                             "syntax error before: " ++ atom_to_list(Else))
+                             "(statusv2) syntax error before: " ++ atom_to_list(Else))
     end.
 
 ac_status(Tok) ->
@@ -765,7 +787,7 @@ ac_status(Tok) ->
         current -> current;
         obsolete -> obsolete;
         Else -> return_error(line_of(Tok),
-                             "syntax error before: " ++ atom_to_list(Else))
+                             "(ac_status) syntax error before: " ++ atom_to_list(Else))
     end.
 
 accessv1(Tok) ->
@@ -775,7 +797,7 @@ accessv1(Tok) ->
         'write-only' -> 'write-only';
         'not-accessible' -> 'not-accessible';
         Else -> return_error(line_of(Tok),
-                             "syntax error before: " ++ atom_to_list(Else))
+                             "(accessv1) syntax error before: " ++ atom_to_list(Else))
     end.
 
 accessv2(Tok) ->
@@ -786,7 +808,7 @@ accessv2(Tok) ->
         'read-write' -> 'read-write';
         'read-create' -> 'read-create';
         Else -> return_error(line_of(Tok),
-                             "syntax error before: " ++ atom_to_list(Else))
+                             "(accessv2) syntax error before: " ++ atom_to_list(Else))
     end.
 
 ac_access(Tok) ->
@@ -798,7 +820,7 @@ ac_access(Tok) ->
         'read-create' -> 'read-create';
         'write-only' -> 'write-only'; % for backward-compatibility only
         Else -> return_error(line_of(Tok),
-                             "syntax error before: " ++ atom_to_list(Else))
+                             "(ac_access) syntax error before: " ++ atom_to_list(Else))
     end.
 
 %% ---------------------------------------------------------------------
diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index 257fc47952..4c5a945984 100644
--- a/lib/snmp/test/snmp_compiler_test.erl
+++ b/lib/snmp/test/snmp_compiler_test.erl
@@ -53,7 +53,8 @@
 
 	 otp_6150/1,
 	 otp_8574/1, 
-	 otp_8595/1
+	 otp_8595/1, 
+	 otp_10799/1
 
 	]).
 
@@ -132,7 +133,7 @@ all() ->
     ].
 
 groups() -> 
-    [{tickets, [], [otp_6150, otp_8574, otp_8595]}].
+    [{tickets, [], [otp_6150, otp_8574, otp_8595, otp_10799]}].
 
 init_per_group(_GroupName, Config) ->
     Config.
@@ -326,13 +327,14 @@ warnings_as_errors(Config) when is_list(Config) ->
 otp_6150(suite) ->
     [];
 otp_6150(Config) when is_list(Config) ->
-    put(tname,otp_6150),
+    put(tname, otp6150),
     p("starting with Config: ~p~n", [Config]),
 
     Dir     = ?config(case_top_dir, Config),
     MibDir  = ?config(mib_dir,  Config),
     MibFile = join(MibDir, "ERICSSON-TOP-MIB.mib"),
-    ?line {ok, Mib} = snmpc:compile(MibFile, [{outdir, Dir}, {verbosity, trace}]),
+    ?line {ok, Mib} = 
+	snmpc:compile(MibFile, [{outdir, Dir}, {verbosity, trace}]),
     io:format("otp_6150 -> Mib: ~n~p~n", [Mib]),
     ok.
 
@@ -342,7 +344,7 @@ otp_6150(Config) when is_list(Config) ->
 otp_8574(suite) ->
     [];
 otp_8574(Config) when is_list(Config) ->
-    put(tname,otp_8574),
+    put(tname, otp8574),
     p("starting with Config: ~p~n", [Config]),
 
     Dir     = ?config(case_top_dir, Config),
@@ -375,7 +377,7 @@ otp_8574(Config) when is_list(Config) ->
 otp_8595(suite) ->
     [];
 otp_8595(Config) when is_list(Config) ->
-    put(tname,otp_8595),
+    put(tname, otp8595),
     p("starting with Config: ~p~n", [Config]),
 
     Dir     = ?config(case_top_dir, Config),
@@ -391,6 +393,23 @@ otp_8595(Config) when is_list(Config) ->
 
 %%======================================================================
 
+otp_10799(suite) ->
+    [];
+otp_10799(Config) when is_list(Config) ->
+    put(tname, otp10799),
+    p("starting with Config: ~p~n", [Config]),
+
+    Dir     = ?config(case_top_dir, Config),
+    MibDir  = ?config(mib_dir,      Config),
+    MibFile = join(MibDir, "OTP10799-MIB.mib"),
+    ?line {ok, Mib} = 
+	snmpc:compile(MibFile, [{outdir, Dir}, {verbosity, trace}]),
+    p("Mib: ~n~p~n", [Mib]),
+    ok.
+
+
+%%======================================================================
+
 augments_extra_info(suite) ->
     [];
 augments_extra_info(Config) when is_list(Config) ->
diff --git a/lib/snmp/test/snmp_test_data/OTP10799-MIB.mib b/lib/snmp/test/snmp_test_data/OTP10799-MIB.mib
new file mode 100644
index 0000000000..f47bcfd7da
--- /dev/null
+++ b/lib/snmp/test/snmp_test_data/OTP10799-MIB.mib
@@ -0,0 +1,75 @@
+OTP10799-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY, OBJECT-TYPE, snmpModules, mib-2, BITS 
+        FROM SNMPv2-SMI
+    MODULE-COMPLIANCE, OBJECT-GROUP
+        FROM SNMPv2-CONF
+    ;
+
+otp10799MIB MODULE-IDENTITY
+    LAST-UPDATED "1004210000Z"
+    ORGANIZATION ""
+    CONTACT-INFO
+	""
+    DESCRIPTION
+            "Test mib for OTP-10799"
+    ::= { snmpModules 1 }
+
+
+-- Administrative assignments ****************************************
+
+otp10799MIBObjects     OBJECT IDENTIFIER ::= { otp10799MIB 1 }
+otp10799MIBConformance OBJECT IDENTIFIER ::= { otp10799MIB 2 }
+
+--
+
+test   OBJECT IDENTIFIER ::= { mib-2 16 }
+
+bits1 OBJECT-TYPE
+    SYNTAX      BITS { 
+      b0(0), 
+      b1(1), 
+      b2(2),
+      b3(3),
+      b4(4),
+      b5(5),
+      b6(6),
+      b7(7)
+    }
+    MAX-ACCESS  read-write
+    STATUS      current
+    DESCRIPTION
+	""
+    ::= { test 1 }
+
+-- Conformance Information *******************************************
+
+otp10799MIBCompliances OBJECT IDENTIFIER
+                            ::= { otp10799MIBConformance 1 }
+otp10799MIBGroups      OBJECT IDENTIFIER
+                            ::= { otp10799MIBConformance 2 }
+
+-- Compliance statements
+
+otp10799MIBCompliance MODULE-COMPLIANCE
+    STATUS       current
+    DESCRIPTION
+        "The compliance statement for SNMP engines which
+         implement the SNMP-COMMUNITY-MIB."
+
+    MODULE       -- this module
+        MANDATORY-GROUPS { otp10799Group }
+
+    ::= { otp10799Compliances 1 }
+
+otp10799Group OBJECT-GROUP
+    OBJECTS {
+        bits1
+    }
+    STATUS       current
+    DESCRIPTION
+        "A group."
+    ::= { otp10799MIBGroups 1 }
+
+END
diff --git a/lib/snmp/test/test-mibs/RFC1271-MIB.mib b/lib/snmp/test/test-mibs/RFC1271-MIB.mib
index 25778dede8..b1b3367667 100644
--- a/lib/snmp/test/test-mibs/RFC1271-MIB.mib
+++ b/lib/snmp/test/test-mibs/RFC1271-MIB.mib
@@ -3,7 +3,8 @@
               IMPORTS
                   Counter                              FROM RFC1155-SMI
                   mib-2,DisplayString                  FROM RFC1213-MIB
-                  OBJECT-TYPE                          FROM RFC-1212;
+                  OBJECT-TYPE                          FROM RFC-1212
+		  TimeTicks                            FROM SNMPv2-SMI;
  
           --  This MIB module uses the extended OBJECT-TYPE macro as
           --  defined in [9].
diff --git a/lib/snmp/test/test-mibs/RMON2-MIB.mib b/lib/snmp/test/test-mibs/RMON2-MIB.mib
index 827bb38ff9..50c7e6657a 100644
--- a/lib/snmp/test/test-mibs/RMON2-MIB.mib
+++ b/lib/snmp/test/test-mibs/RMON2-MIB.mib
@@ -1,7 +1,7 @@
 RMON2-MIB DEFINITIONS ::= BEGIN
 IMPORTS
     MODULE-IDENTITY, OBJECT-TYPE, Counter32, Integer32,
-        Gauge32, IpAddress, TimeTicks            FROM SNMPv2-SMI
+        Gauge32, IpAddress, TimeTicks, BITS            FROM SNMPv2-SMI
     TEXTUAL-CONVENTION, RowStatus, DisplayString, TimeStamp
                                                  FROM SNMPv2-TC
     MODULE-COMPLIANCE, OBJECT-GROUP FROM SNMPv2-CONF
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index b90dbe4eef..5d3c393bcc 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2012. All Rights Reserved.
+# Copyright Ericsson AB 1997-2013. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -18,6 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 4.22.1
+SNMP_VSN    = 4.22.2
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"