Merge branch 'bmk/snmp/snmp4221_integration2' into maint

1 files changed, 142 insertions, 34 deletions

diff --git a/lib/snmp/test/snmp_pdus_test.erl b/lib/snmp/test/snmp_pdus_test.erl
index 07b6d6b657..0d78749bcb 100644
--- a/lib/snmp/test/snmp_pdus_test.erl
+++ b/lib/snmp/test/snmp_pdus_test.erl
@@ -39,6 +39,7 @@
 	 otp7575/1,
 	 otp8563/1, 
 	 otp9022/1, 
+	 otp10132/1, 
 
          init_per_testcase/2, end_per_testcase/2
 	]).
@@ -74,16 +75,16 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 %% Test case definitions
 %%======================================================================
 all() -> 
-[{group, tickets}].
+    [{group, tickets}].
 
 groups() -> 
-    [{tickets, [], [otp7575, otp8563, otp9022]}].
+    [{tickets, [], [otp7575, otp8563, otp9022, otp10132]}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 
@@ -94,7 +95,7 @@ end_per_group(_GroupName, Config) ->
 %%======================================================================
 
 otp7575(suite) -> [];
-otp7575(doc) -> ["OTP-7575"];
+otp7575(doc) -> ["OTP-7575 - Message version"];
 otp7575(Config) when is_list(Config) ->
     io:format("attempt to decode message with valid version~n", []),
     MsgWithOkVersion = <<48,39,2,1,0,4,6,112,117,98,108,105,99,160,26,2,2,1,49,2,1,0,2,1,0,48,14,48,12,6,8,43,6,1,2,1,1,5,0,5,0>>,
@@ -127,48 +128,55 @@ otp7575(Config) when is_list(Config) ->
 
 
 otp8563(suite) -> [];
-otp8563(doc) -> ["OTP-8563"];
+otp8563(doc) -> ["OTP-8563 - Counter64"];
 otp8563(Config) when is_list(Config) ->
     Val1 = 16#7fffffffffffffff,
-    io:format("try encode and decode ~w~n", [Val1]),
+    io:format("try encode and decode value 1: ~w (0x~.16b)~n", [Val1, Val1]),
     Enc1 = snmp_pdus:enc_value('Counter64', Val1), 
+    io:format("  => ~w~n", [Enc1]),
     {{'Counter64', Val1}, []} = snmp_pdus:dec_value(Enc1), 
 
     Val2 = Val1 + 1,
-    io:format("try encode and decode ~w~n", [Val2]),
+    io:format("try encode and decode value 2: ~w (0x~.16b)~n", [Val2, Val2]),
     Enc2 = snmp_pdus:enc_value('Counter64', Val2), 
+    io:format("  => ~w~n", [Enc2]),
     {{'Counter64', Val2}, []} = snmp_pdus:dec_value(Enc2), 
 
     Val3 = Val2 + 1,
-    io:format("try encode and decode ~w~n", [Val3]),
+    io:format("try encode and decode valule 3: ~w (0x~.16b)~n", [Val3, Val3]),
     Enc3 = snmp_pdus:enc_value('Counter64', Val3), 
+    io:format("  => ~w~n", [Enc3]),
     {{'Counter64', Val3}, []} = snmp_pdus:dec_value(Enc3), 
 
     Val4 = 16#fffffffffffffffe,
-    io:format("try encode and decode ~w~n", [Val4]),
+    io:format("try encode and decode value 4: ~w (0x~.16b)~n", [Val4, Val4]),
     Enc4 = snmp_pdus:enc_value('Counter64', Val4), 
+    io:format("  => ~w~n", [Enc4]),
     {{'Counter64', Val4}, []} = snmp_pdus:dec_value(Enc4), 
 
     Val5 = Val4 + 1,
-    io:format("try encode and decode ~w~n", [Val5]),
+    io:format("try encode and decode value 5: ~w (0x~.16b)~n", [Val5, Val5]),
     Enc5 = snmp_pdus:enc_value('Counter64', Val5), 
+    io:format("  => ~w~n", [Enc5]),
     {{'Counter64', Val5}, []} = snmp_pdus:dec_value(Enc5), 
 
     Val6 = 16#ffffffffffffffff + 1, 
-    io:format("try and fail to encode ~w~n", [Val6]),
+    io:format("try and fail to encode value 6: ~w (0x~.16b)~n", [Val6, Val6]),
     case (catch snmp_pdus:enc_value('Counter64', Val6)) of
 	{'EXIT', {error, {bad_counter64, Val6}}} ->
 	    ok;
 	Unexpected6 ->
+	    io:format("  => ~w~n", [Unexpected6]),
 	    exit({unexpected_encode_result, Unexpected6, Val6})
     end,
 
     Val7 = -1, 
-    io:format("try and fail to encode ~w~n", [Val7]),
+    io:format("try and fail to encode value 7: ~w~n", [Val7]),
     case (catch snmp_pdus:enc_value('Counter64', Val7)) of
 	{'EXIT', {error, {bad_counter64, Val7}}} ->
 	    ok;
 	Unexpected7 ->
+	    io:format("  => ~w~n", [Unexpected7]),
 	    exit({unexpected_encode_result, Unexpected7, Val7})
     end,
 
@@ -176,51 +184,151 @@ otp8563(Config) when is_list(Config) ->
 
 
 otp9022(suite) -> [];
-otp9022(doc) -> ["OTP-9022"];
+otp9022(doc) -> ["OTP-9022 - Counter32"];
 otp9022(Config) when is_list(Config) ->
-    Val1 = 16#7fffffff,
-    io:format("try encode and decode ~w~n", [Val1]),
+    Val0 = 2908389204, 
+    io:format("try encode and decode value 0: ~w (0x~.16b)~n", [Val0, Val0]),
+    Enc0 = snmp_pdus:enc_value('Counter32', Val0), 
+    io:format("  => ~w~n", [Enc0]),
+    {{'Counter32', Val0}, []} = snmp_pdus:dec_value(Enc0), 
+
+    Val1 = 0, 
+    io:format("try encode and decode value 1: ~w (0x~.16b)~n", [Val1, Val1]),
     Enc1 = snmp_pdus:enc_value('Counter32', Val1), 
+    io:format("  => ~w~n", [Enc1]),
     {{'Counter32', Val1}, []} = snmp_pdus:dec_value(Enc1), 
 
     Val2 = Val1 + 1,
-    io:format("try encode and decode ~w~n", [Val2]),
+    io:format("try encode and decode value 2: ~w (0x~.16b)~n", [Val2, Val2]),
     Enc2 = snmp_pdus:enc_value('Counter32', Val2), 
+    io:format("  => ~w~n", [Enc2]),
     {{'Counter32', Val2}, []} = snmp_pdus:dec_value(Enc2), 
 
-    Val3 = Val2 + 1,
-    io:format("try encode and decode ~w~n", [Val3]),
+    Val3 = 16#7ffffffe,
+    io:format("try encode and decode value 3: ~w (0x~.16b)~n", [Val3, Val3]),
     Enc3 = snmp_pdus:enc_value('Counter32', Val3), 
+    io:format("  => ~w~n", [Enc3]),
     {{'Counter32', Val3}, []} = snmp_pdus:dec_value(Enc3), 
 
-    Val4 = 16#fffffffe,
-    io:format("try encode and decode ~w~n", [Val4]),
+    Val4 = Val3 + 1,
+    io:format("try encode and decode value 4: ~w (0x~.16b)~n", [Val4, Val4]),
     Enc4 = snmp_pdus:enc_value('Counter32', Val4), 
+    io:format("  => ~w~n", [Enc4]),
     {{'Counter32', Val4}, []} = snmp_pdus:dec_value(Enc4), 
 
     Val5 = Val4 + 1,
-    io:format("try encode and decode ~w~n", [Val5]),
+    io:format("try encode and decode value 5: ~w (0x~.16b)~n", [Val5, Val5]),
     Enc5 = snmp_pdus:enc_value('Counter32', Val5), 
+    io:format("  => ~w~n", [Enc5]),
     {{'Counter32', Val5}, []} = snmp_pdus:dec_value(Enc5), 
 
-    Val6 = 16#ffffffff + 1, 
-    io:format("try and fail to encode ~w~n", [Val6]),
-    case (catch snmp_pdus:enc_value('Counter32', Val6)) of
-	{'EXIT', {error, {bad_counter32, Val6}}} ->
+    Val6 = 16#fffffffe,
+    io:format("try encode and decode value 6: ~w (0x~.16b)~n", [Val6, Val6]),
+    Enc6 = snmp_pdus:enc_value('Counter32', Val6), 
+    io:format("  => ~w~n", [Enc6]),
+    {{'Counter32', Val6}, []} = snmp_pdus:dec_value(Enc6), 
+
+    Val7 = Val6 + 1,
+    io:format("try encode and decode value 7: ~w (0x~.16b)~n", [Val7, Val7]),
+    Enc7 = snmp_pdus:enc_value('Counter32', Val7), 
+    io:format("  => ~w~n", [Enc7]),
+    {{'Counter32', Val7}, []} = snmp_pdus:dec_value(Enc7), 
+
+    Val8 = 16#ffffffff + 1, 
+    io:format("try and fail to encode value 8: ~w (0x~.16b)~n", [Val8, Val8]),
+    case (catch snmp_pdus:enc_value('Counter32', Val8)) of
+	{'EXIT', {error, {bad_counter32, Val8}}} ->
 	    ok;
-	Unexpected6 ->
-	    exit({unexpected_encode_result, Unexpected6, Val6})
+	Unexpected8 ->
+	    io:format("  => ~w~n", [Unexpected8]),
+	    exit({unexpected_encode_result, Unexpected8, Val8})
     end,
 
-    Val7 = -1, 
-    io:format("try and fail to encode ~w~n", [Val7]),
-    case (catch snmp_pdus:enc_value('Counter32', Val7)) of
-	{'EXIT', {error, {bad_counter32, Val7}}} ->
+    Val9 = -1, 
+    io:format("try and fail to encode value 9: ~w~n", [Val9]),
+    case (catch snmp_pdus:enc_value('Counter32', Val9)) of
+	{'EXIT', {error, {bad_counter32, Val9}}} ->
 	    ok;
-	Unexpected7 ->
-	    exit({unexpected_encode_result, Unexpected7, Val7})
+	Unexpected9 ->
+	    io:format("  => ~w~n", [Unexpected9]),
+	    exit({unexpected_encode_result, Unexpected9, Val9})
+    end,
+
+    ok.
+
+
+otp10132(suite) -> [];
+otp10132(doc) -> ["OTP-10132 - TimeTicks"];
+otp10132(Config) when is_list(Config) ->
+    Val0 = 2159001034, 
+    io:format("try encode and decode value 0: ~w (0x~.16b)~n", [Val0, Val0]),
+    Enc0 = snmp_pdus:enc_value('TimeTicks', Val0), 
+    io:format("  => ~w~n", [Enc0]),
+    {{'TimeTicks', Val0}, []} = snmp_pdus:dec_value(Enc0), 
+
+    Val1 = 0, 
+    io:format("try encode and decode value 1: ~w (0x~.16b)~n", [Val1, Val1]),
+    Enc1 = snmp_pdus:enc_value('TimeTicks', Val1), 
+    io:format("  => ~w~n", [Enc1]),
+    {{'TimeTicks', Val1}, []} = snmp_pdus:dec_value(Enc1), 
+
+    Val2 = Val1 + 1, 
+    io:format("try encode and decode value 2: ~w (0x~.16b)~n", [Val2, Val2]),
+    Enc2 = snmp_pdus:enc_value('TimeTicks', Val2), 
+    io:format("  => ~w~n", [Enc2]),
+    {{'TimeTicks', Val2}, []} = snmp_pdus:dec_value(Enc2), 
+
+    Val3 = 16#7ffffffe,
+    io:format("try encode and decode value 3: ~w (0x~.16b)~n", [Val3, Val3]),
+    Enc3 = snmp_pdus:enc_value('TimeTicks', Val3), 
+    io:format("  => ~w~n", [Enc3]),
+    {{'TimeTicks', Val3}, []} = snmp_pdus:dec_value(Enc3), 
+
+    Val4 = Val3 + 1,
+    io:format("try encode and decode value 4: ~w (0x~.16b)~n", [Val4, Val4]),
+    Enc4 = snmp_pdus:enc_value('TimeTicks', Val4), 
+    io:format("  => ~w~n", [Enc4]),
+    {{'TimeTicks', Val4}, []} = snmp_pdus:dec_value(Enc4), 
+
+    Val5 = Val4 + 1,
+    io:format("try encode and decode value 5: ~w (0x~.16b)~n", [Val5, Val5]),
+    Enc5 = snmp_pdus:enc_value('TimeTicks', Val5), 
+    io:format("  => ~w~n", [Enc5]),
+    {{'TimeTicks', Val5}, []} = snmp_pdus:dec_value(Enc5), 
+
+    Val6 = 16#fffffffe,
+    io:format("try encode and decode value 6: ~w (0x~.16b)~n", [Val6, Val6]),
+    Enc6 = snmp_pdus:enc_value('TimeTicks', Val6), 
+    io:format("  => ~w~n", [Enc6]),
+    {{'TimeTicks', Val6}, []} = snmp_pdus:dec_value(Enc6), 
+
+    Val7 = Val6 + 1,
+    io:format("try encode and decode value 7: ~w (0x~.16b)~n", [Val7, Val7]),
+    Enc7 = snmp_pdus:enc_value('TimeTicks', Val7), 
+    io:format("  => ~w~n", [Enc7]),
+    {{'TimeTicks', Val7}, []} = snmp_pdus:dec_value(Enc7), 
+
+    Val8 = Val7 + 1, 
+    io:format("try and fail to encode value 8: ~w (0x~.16b)~n", [Val8, Val8]),
+    case (catch snmp_pdus:enc_value('TimeTicks', Val8)) of
+	{'EXIT', {error, {bad_timeticks, Val8}}} ->
+	    ok;
+	Unexpected8 ->
+	    io:format("  => ~w~n", [Unexpected8]),
+	    exit({unexpected_encode_result, Unexpected8, Val8})
     end,
 
+    Val9 = -1, 
+    io:format("try and fail to encode value 9: ~w~n", [Val9]),
+    case (catch snmp_pdus:enc_value('TimeTicks', Val9)) of
+	{'EXIT', {error, {bad_timeticks, Val9}}} ->
+	    ok;
+	Unexpected9 ->
+	    io:format("  => ~w~n", [Unexpected9]),
+	    exit({unexpected_encode_result, Unexpected9, Val9})
+    end,
+
+    io:format("done~n", []),
     ok.