Merge branch 'bmk/snmp/add_compiler_support_agent_capabilities/OTP-8966' into bmk/snmp/snmpc/OTP-9004

Conflicts:
	lib/snmp/doc/src/notes.xml
	lib/snmp/vsn.mk

1 files changed, 89 insertions, 3 deletions

diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index ad77b01362..592b3efee2 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-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2011. 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
@@ -44,6 +44,8 @@
 	 oid_conflicts/1,
 	 imports/1,
 	 module_identity/1,
+	 agent_capabilities/1,
+	 module_compliance/1, 
 
 	 tickets/1,
 	 otp_6150/1,
@@ -78,10 +80,10 @@ init_per_testcase(_Case, Config) when is_list(Config) ->
     MibDir = join(lists:reverse(["snmp_test_data"|RL])),
     CompDir = join(Dir, "comp_dir/"),
     ?line ok = file:make_dir(CompDir),
-    [{comp_dir, CompDir},{mib_dir, MibDir}|Config].
+    [{comp_dir, CompDir}, {mib_dir, MibDir} | Config].
 
 fin_per_testcase(_Case, Config) when is_list(Config) ->
-    CompDir = ?config(comp_dir, Config),
+    CompDir  = ?config(comp_dir, Config),
     ?line ok = ?DEL_DIR(CompDir),
     lists:keydelete(comp_dir, 1, Config).
 
@@ -96,6 +98,8 @@ all(suite) ->
      oid_conflicts,
      imports,
      module_identity,
+     agent_capabilities,
+     module_compliance,
      tickets
     ].
 
@@ -169,6 +173,88 @@ module_identity(Config) when is_list(Config) ->
     ?SKIP(not_yet_implemented).
 
 
+agent_capabilities(suite) ->
+    [];
+agent_capabilities(Config) when is_list(Config) ->
+    put(tname,agent_capabilities),
+    p("starting with Config: ~p~n", [Config]),
+
+    SnmpPrivDir    = code:priv_dir(snmp),
+    SnmpMibsDir    = join(SnmpPrivDir, "mibs"), 
+    OtpMibsPrivDir = code:priv_dir(otp_mibs),
+    OtpMibsMibsDir = join(OtpMibsPrivDir, "mibs"), 
+    Dir   = ?config(mib_dir, Config),
+    AcMib = join(Dir,"AC-TEST-MIB.mib"),
+    ?line {ok, MibFile1} = snmpc:compile(AcMib, [options,
+						 version,
+						 {i,         [SnmpMibsDir, OtpMibsMibsDir]}, 
+						 {outdir,    Dir}, 
+						 {verbosity, trace}]),
+    ?line {ok, Mib1} = snmp_misc:read_mib(MibFile1), 
+    ?line {ok, MibFile2} = snmpc:compile(AcMib, [options,
+						 version,
+						 agent_capabilities,
+						 {i,         [SnmpMibsDir, OtpMibsMibsDir]}, 
+						 {outdir,    Dir}, 
+						 {verbosity, trace}]),
+    ?line {ok, Mib2} = snmp_misc:read_mib(MibFile2), 
+    MEDiff = Mib2#mib.mes -- Mib1#mib.mes,
+    %% This is a rather pathetic test, but it is somthing...
+    io:format("agent_capabilities -> "
+	      "~n   MEDiff: ~p"
+	      "~n   Mib1:   ~p"
+	      "~n   Mib2:   ~p"
+	      "~n", [MEDiff, Mib1, Mib2]),
+    case length(MEDiff) of
+	2 ->
+	    ok;
+	_BadLen ->
+	    exit({unexpected_mes, MEDiff})
+    end,
+    ok.
+
+
+module_compliance(suite) ->
+    [];
+module_compliance(Config) when is_list(Config) ->
+    put(tname,module_compliance),
+    p("starting with Config: ~p~n", [Config]),
+
+    SnmpPrivDir    = code:priv_dir(snmp),
+    SnmpMibsDir    = join(SnmpPrivDir, "mibs"), 
+    OtpMibsPrivDir = code:priv_dir(otp_mibs),
+    OtpMibsMibsDir = join(OtpMibsPrivDir, "mibs"), 
+    Dir   = ?config(mib_dir, Config),
+    AcMib = join(Dir,"MC-TEST-MIB.mib"),
+    ?line {ok, MibFile1} = snmpc:compile(AcMib, [options,
+						 version,
+						 {i,           [SnmpMibsDir, OtpMibsMibsDir]}, 
+						 {outdir,      Dir}, 
+						 {verbosity,   trace}]),
+    ?line {ok, Mib1} = snmp_misc:read_mib(MibFile1), 
+    ?line {ok, MibFile2} = snmpc:compile(AcMib, [options,
+						 version,
+						 module_compliance,
+						 {i,           [SnmpMibsDir, OtpMibsMibsDir]}, 
+						 {outdir,      Dir}, 
+						 {verbosity,   trace}]),
+    ?line {ok, Mib2} = snmp_misc:read_mib(MibFile2), 
+    MEDiff = Mib2#mib.mes -- Mib1#mib.mes,
+    %% This is a rather pathetic test, but it is somthing...
+    io:format("agent_capabilities -> "
+	      "~n   MEDiff: ~p"
+	      "~n   Mib1:   ~p"
+	      "~n   Mib2:   ~p"
+	      "~n", [MEDiff, Mib1, Mib2]),
+    case length(MEDiff) of
+	1 ->
+	    ok;
+	_BadLen ->
+	    exit({unexpected_mes, MEDiff})
+    end,
+    ok.
+
+
 otp_6150(suite) ->
     [];
 otp_6150(Config) when is_list(Config) ->