Merge branch 'raimo/snmp/compile-enum-refinement/ERL-325/OTP-14145' into maint

* raimo/snmp/compile-enum-refinement/ERL-325/OTP-14145:
  Bump version
  Do without compilation time in SNMP versions[12]()
  Test enum refinement MIB
  Fix enum refinement in usertype in SYNTAX

7 files changed, 149 insertions, 29 deletions

diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index ca61782639..db09ec3dc5 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -8,6 +8,10 @@
 %% {update, snmpa_local_db, soft, soft_purge, soft_purge, []}
 %% {add_module,  snmpm_net_if_mt}
  [
+  {<<"5\\.2\\.4">>,
+   [{load_module, snmp, soft_purge, soft_purge, []},
+    {load_module, snmpc_lib, soft_purge, soft_purge, []},
+    {load_module, snmpc_mib_gram, soft_purge, soft_purge, []}]},
   {<<"5\\..*">>, [{restart_application, snmp}]},	
   {<<"4\\..*">>, [{restart_application, snmp}]}
  ],
@@ -17,6 +21,10 @@
 %% {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
  
  [
+  {<<"5\\.2\\.4">>,
+   [{load_module, snmp, soft_purge, soft_purge, []},
+    {load_module, snmpc_lib, soft_purge, soft_purge, []},
+    {load_module, snmpc_mib_gram, soft_purge, soft_purge, []}]},
   {<<"5\\..*">>, [{restart_application, snmp}]},	
   {<<"4\\..*">>, [{restart_application, snmp}]}
  ]  	       
diff --git a/lib/snmp/src/app/snmp.erl b/lib/snmp/src/app/snmp.erl
index df3933ea01..8a736f688b 100644
--- a/lib/snmp/src/app/snmp.erl
+++ b/lib/snmp/src/app/snmp.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -573,9 +573,16 @@ print_mod_info(Prefix, {Module, Info}) ->
     CompDate =
         case key1search(compile_time, Info) of
             {value, {Year, Month, Day, Hour, Min, Sec}} ->
-                lists:flatten(
-                  io_lib:format("~w-~2..0w-~2..0w ~2..0w:~2..0w:~2..0w",
-                                [Year, Month, Day, Hour, Min, Sec]));
+                io_lib:format(
+		  "~w-~2..0w-~2..0w ~2..0w:~2..0w:~2..0w",
+		  [Year, Month, Day, Hour, Min, Sec]);
+            _ ->
+                "Not found"
+        end,
+    Digest =
+        case key1search(md5, Info) of
+            {value, MD5} when is_binary(MD5) ->
+		[io_lib:format("~2.16.0b", [Byte]) || <<Byte>> <= MD5];
             _ ->
                 "Not found"
         end,
@@ -583,12 +590,14 @@ print_mod_info(Prefix, {Module, Info}) ->
               "~s      Vsn:          ~s~n"
               "~s      App vsn:      ~s~n"
               "~s      Compiler ver: ~s~n"
-              "~s      Compile time: ~s~n",
+	      "~s      Compile time: ~s~n"
+              "~s      MD5 digest:   ~s~n",
               [Prefix, Module, 
 	       Prefix, Vsn, 
 	       Prefix, AppVsn, 
-	       Prefix, CompVer, 
-	       Prefix, CompDate]),
+	       Prefix, CompVer,
+	       Prefix, CompDate,
+	       Prefix, Digest]),
     ok.
 
 key1search(Key, Vals) ->
@@ -617,7 +626,7 @@ versions1() ->
         Error ->
             Error
     end.
- 
+
 versions2() ->
     case ms2() of
         {ok, Mods} ->
@@ -625,25 +634,56 @@ versions2() ->
         Error ->
             Error
     end.
- 
+
 version_info(Mods) ->
     SysInfo = sys_info(),
     OsInfo  = os_info(),
     ModInfo = [mod_version_info(Mod) || Mod <- Mods],
     [{sys_info, SysInfo}, {os_info, OsInfo}, {mod_info, ModInfo}].
-     
+
 mod_version_info(Mod) ->
     Info = Mod:module_info(),
-    {value, {attributes, Attr}}   = lists:keysearch(attributes, 1, Info),
-    {value, {vsn,        [Vsn]}}  = lists:keysearch(vsn,        1, Attr),
-    {value, {app_vsn,    AppVsn}} = lists:keysearch(app_vsn,    1, Attr),
-    {value, {compile,    Comp}}   = lists:keysearch(compile,    1, Info),
-    {value, {version,    Ver}}    = lists:keysearch(version,    1, Comp),
-    {value, {time,       Time}}   = lists:keysearch(time,       1, Comp),
-    {Mod, [{vsn,              Vsn},
-           {app_vsn,          AppVsn},
-           {compiler_version, Ver},
-           {compile_time,     Time}]}.
+    {Mod,
+     case key1search(attributes, Info) of
+	 {value, Attr} ->
+	     case key1search(vsn, Attr) of
+		 {value, [Vsn]} ->
+		     [{vsn, Vsn}];
+		 not_found ->
+		     []
+	     end ++
+		 case key1search(app_vsn, Attr) of
+		     {value, AppVsn} ->
+			 [{app_vsn, AppVsn}];
+		     not_found ->
+			 []
+		 end;
+	 not_found ->
+	     []
+     end ++
+	 case key1search(compile, Info) of
+	     {value, Comp} ->
+		 case key1search(version, Comp) of
+		     {value, Ver} ->
+			 [{compiler_version, Ver}];
+		     not_found ->
+			 []
+		 end ++
+		     case key1search(time, Comp) of
+			 {value, Ver} ->
+			     [{compile_time, Ver}];
+			 not_found ->
+			     []
+		     end;
+	     not_found ->
+		 []
+	 end ++
+	 case key1search(md5, Info) of
+	     {value, Bin} ->
+		 [{md5, Bin}];
+	     not_found ->
+		 []
+	 end}.
 
 sys_info() ->
     SysArch = string:strip(erlang:system_info(system_architecture),right,$\n),
diff --git a/lib/snmp/src/compile/snmpc_lib.erl b/lib/snmp/src/compile/snmpc_lib.erl
index 51690b6e7e..33ddd78308 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -99,7 +99,7 @@ make_ASN1type({{type_with_size,Type,{range,Lo,Hi}},Line}) ->
 	    print_error("Undefined type '~w'",[Type],Line),
 	    guess_string_type()
     end;
-make_ASN1type({{integer_with_enum,Type,Enums},Line}) ->
+make_ASN1type({{type_with_enum,Type,Enums},Line}) ->
     case lookup_vartype(Type) of
         {value,ASN1type} ->  ASN1type#asn1_type{assocList = [{enums, Enums}]};
 	false ->
diff --git a/lib/snmp/src/compile/snmpc_mib_gram.yrl b/lib/snmp/src/compile/snmpc_mib_gram.yrl
index 743c3a6550..14a668127e 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -387,10 +387,12 @@ syntax -> type : {{type, cat('$1')},line_of('$1')}.
 syntax -> type size : {{type_with_size, cat('$1'), '$2'},line_of('$1')}.
 syntax -> usertype size : {{type_with_size,val('$1'), '$2'},line_of('$1')}.
 syntax -> 'INTEGER' '{' namedbits '}' : 
-          {{integer_with_enum, 'INTEGER', '$3'}, line_of('$1')}.
+          {{type_with_enum, 'INTEGER', '$3'}, line_of('$1')}.
 syntax -> 'BITS' '{' namedbits '}' : 
           ensure_ver(2,'$1'), 
           {{bits, '$3'}, line_of('$1')}.
+syntax -> usertype '{' namedbits '}' :
+          {{type_with_enum, 'INTEGER', '$3'}, line_of('$1')}.
 syntax -> 'SEQUENCE' 'OF' usertype : 
           {{sequence_of,val('$3')},line_of('$1')}.
 
diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index 2c8851c2a7..9b3c2bfd2c 100644
--- a/lib/snmp/test/snmp_compiler_test.erl
+++ b/lib/snmp/test/snmp_compiler_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -56,7 +56,8 @@
 	 otp_8574/1, 
 	 otp_8595/1, 
 	 otp_10799/1, 
-	 otp_10808/1
+	 otp_10808/1,
+	 otp_14145/1
 
 	]).
 
@@ -135,7 +136,8 @@ all() ->
     ].
 
 groups() -> 
-    [{tickets, [], [otp_6150, otp_8574, otp_8595, otp_10799, otp_10808]}].
+    [{tickets, [],
+      [otp_6150, otp_8574, otp_8595, otp_10799, otp_10808, otp_14145]}].
 
 init_per_group(_GroupName, Config) ->
     Config.
@@ -431,6 +433,30 @@ otp_10808(Config) when is_list(Config) ->
 
 %%======================================================================
 
+otp_14145(suite) ->
+    [];
+otp_14145(Config) when is_list(Config) ->
+    put(tname, otp10808),
+    p("starting with Config: ~p~n", [Config]),
+
+    Dir     = ?config(case_top_dir, Config),
+    MibDir  = ?config(mib_dir,      Config),
+    MibName = "OTP14145-MIB",
+    MibFile = join(MibDir, MibName++".mib"),
+    ?line {ok, MibBin} =
+	snmpc:compile(MibFile, [{outdir, Dir},
+				{verbosity, trace},
+				{group_check, false},
+				module_compliance]),
+    p("Mib: ~n~p~n", [MibBin]),
+    MIB = read_mib(MibBin),
+    Oid = [1,3,6,1,2,1,67,4],
+    check_mib(MIB#mib.mes, Oid, undefined),
+    ok.
+
+
+%%======================================================================
+
 augments_extra_info(suite) ->
     [];
 augments_extra_info(Config) when is_list(Config) ->
diff --git a/lib/snmp/test/snmp_test_data/OTP14145-MIB.mib b/lib/snmp/test/snmp_test_data/OTP14145-MIB.mib
new file mode 100644
index 0000000000..f29c65c4c2
--- /dev/null
+++ b/lib/snmp/test/snmp_test_data/OTP14145-MIB.mib
@@ -0,0 +1,44 @@
+OTP14145-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+       MODULE-IDENTITY, OBJECT-TYPE,
+       mib-2      FROM SNMPv2-SMI
+       InetAddressType, InetAddress     FROM INET-ADDRESS-MIB
+       MODULE-COMPLIANCE, OBJECT-GROUP  FROM SNMPv2-CONF;
+
+testMibId MODULE-IDENTITY
+       LAST-UPDATED "200608210000Z"  -- 21 August 2006
+       ORGANIZATION "a"
+       CONTACT-INFO "a"
+       DESCRIPTION "a"
+       REVISION "200608210000Z"  -- 21 August 2006
+       DESCRIPTION "a"
+       ::= { mib-2 67 }
+
+testObj OBJECT-TYPE
+       SYNTAX InetAddressType
+       -- SYNTAX InetAddress
+       MAX-ACCESS read-only
+       STATUS current
+       DESCRIPTION "a"
+       ::= { testMibId 2 }
+
+testObjId OBJECT IDENTIFIER ::= { testMibId 3 }
+
+testMibCompliance MODULE-COMPLIANCE
+            STATUS  current
+            DESCRIPTION "a"
+            MODULE
+            OBJECT testObj
+            SYNTAX InetAddressType { ipv4(1), ipv6(2) }
+            -- SYNTAX InetAddress ( SIZE(4|16) )
+            DESCRIPTION "a"
+            ::= { testMibId 4 }
+
+testObjGroup OBJECT-GROUP
+  OBJECTS { testObj }
+  STATUS current
+  DESCRIPTION "a"
+  ::= { testObjId 1 }
+
+END
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 28eba0d0d6..30b8ee1124 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
+# Copyright Ericsson AB 1997-2017. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.2.4
+SNMP_VSN    = 5.2.5
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"