Process augments in pass after definitions

3 files changed, 80 insertions, 20 deletions

diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index db09ec3dc5..bde637744c 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -8,8 +8,17 @@
 %% {update, snmpa_local_db, soft, soft_purge, soft_purge, []}
 %% {add_module,  snmpm_net_if_mt}
  [
+  {<<"5\\.2\\.6">>,
+   [{load_module, snmpc, soft_purge, soft_purge, []},
+    {load_module, snmpc_lib, soft_purge, soft_purge, []}]},
+  {<<"5\\.2\\.5">>,
+   [{load_module, snmpc, soft_purge, soft_purge, []},
+    {load_module, snmpc_lib, soft_purge, soft_purge, []},
+    {load_module, snmp_generic, soft_purge, soft_purge, []}]},
   {<<"5\\.2\\.4">>,
-   [{load_module, snmp, soft_purge, soft_purge, []},
+   [{load_module, snmpc, soft_purge, soft_purge, []},
+    {load_module, snmp_generic, soft_purge, soft_purge, []},
+    {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}]},	
@@ -21,8 +30,17 @@
 %% {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
  
  [
+  {<<"5\\.2\\.6">>,
+   [{load_module, snmpc, soft_purge, soft_purge, []},
+    {load_module, snmpc_lib, soft_purge, soft_purge, []}]},
+  {<<"5\\.2\\.5">>,
+   [{load_module, snmpc, soft_purge, soft_purge, []},
+    {load_module, snmpc_lib, soft_purge, soft_purge, []},
+    {load_module, snmp_generic, soft_purge, soft_purge, []}]},
   {<<"5\\.2\\.4">>,
-   [{load_module, snmp, soft_purge, soft_purge, []},
+   [{load_module, snmpc, soft_purge, soft_purge, []},
+    {load_module, snmp_generic, soft_purge, soft_purge, []},
+    {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}]},	
diff --git a/lib/snmp/src/compile/snmpc.erl b/lib/snmp/src/compile/snmpc.erl
index 416353508e..4416626a4c 100644
--- a/lib/snmp/src/compile/snmpc.erl
+++ b/lib/snmp/src/compile/snmpc.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.
@@ -455,7 +455,8 @@ compile_parsed_data(#pdata{mib_name = MibName,
     Deprecated = get_deprecated(Opts),
     RelChk = get_relaxed_row_name_assign_check(Opts),
     Data = #dldata{deprecated                    = Deprecated,
-		   relaxed_row_name_assign_check = RelChk}, 
+		   relaxed_row_name_assign_check = RelChk},
+    put(augmentations, false),
     definitions_loop(Definitions, Data),
     MibName.
 
@@ -1211,7 +1212,39 @@ definitions_loop([{Obj,Line}|T], Data) ->
 
 definitions_loop([], _Data) ->
     ?vlog("defloop -> done", []),
-    ok.
+    case get(augmentations) of
+        true ->
+            CData = get(cdata),
+            put(cdata, CData#cdata{mes = augmentations(CData#cdata.mes)}),
+            ok;
+        false ->
+            ok
+    end.
+
+augmentations(
+  [#me{
+      aliasname = AliasName,
+      assocList =
+          [{table_info,
+            #table_info{
+               index_types =
+                   {augments, SrcTableEntry, Line}} = TableInfo}|Ref]} = Me
+   |Mes]) ->
+    ?vlog("augmentations(~w) ->"
+          "~n   NameOfTable:  ~p"
+          "~n   IndexingInfo: ~p"
+          "~n   Sline:        ~p",
+          [?LINE, AliasName, {augments, SrcTableEntry}, Line]),
+    NewTableInfo = snmpc_lib:fix_table_info_augmentation(TableInfo),
+    [Me#me{assocList = [{table_info,NewTableInfo}|Ref]}
+     |augmentations(Mes)];
+augmentations([Me | Mes]) ->
+     [Me|augmentations(Mes)];
+augmentations([]) ->
+    ?vlog("augmentations -> done", []),
+    [].
+
+
 
 safe_elem(N,T) ->
     case catch(element(N,T)) of
diff --git a/lib/snmp/src/compile/snmpc_lib.erl b/lib/snmp/src/compile/snmpc_lib.erl
index 33ddd78308..19a6bc8851 100644
--- a/lib/snmp/src/compile/snmpc_lib.erl
+++ b/lib/snmp/src/compile/snmpc_lib.erl
@@ -26,7 +26,7 @@
 -export([test_father/4, make_ASN1type/1, import/1, makeInternalNode2/2,
 	 is_consistent/1, resolve_defval/1, make_variable_info/1,
 	 check_trap_name/3, make_table_info/5, get_final_mib/2, set_dir/2,
-	 look_at/1, add_cdata/2,
+         fix_table_info_augmentation/1, look_at/1, add_cdata/2,
 	 check_object_group/4, check_notification_group/4, 
 	 check_notification/3, 
 	 register_oid/4,
@@ -710,25 +710,34 @@ check_trap_name(EnterpriseName, Line, MEs) ->
 %% functions for tables.
 %%----------------------------------------------------------------------
 
+fix_table_info_augmentation(
+  #table_info{index_types = {augments, SrcTableEntry, Line}} = TableInfo) ->
+    MEs = (get(cdata))#cdata.mes,
+    Aug =
+        case lookup(SrcTableEntry, MEs) of
+            false ->
+                print_error(
+                  "Cannot AUGMENT the non-existing table entry ~p",
+                  [SrcTableEntry], Line),
+                {augments, error};
+            {value, ME} ->
+                {augments,
+                 {SrcTableEntry, translate_type(ME#me.asn1_type)}}
+        end,
+    TableInfo#table_info{index_types = Aug}.
+
+
 make_table_info(Line, TableName, {augments, SrcTableEntry}, _, ColumnMEs) ->
     ColMEs = lists:keysort(#me.oid, ColumnMEs),
-    Nbr_of_Cols = length(ColMEs), 
-    MEs = ColMEs ++ (get(cdata))#cdata.mes,
-    Aug = case lookup(SrcTableEntry, MEs) of
-	      false ->
-		  print_error("Cannot AUGMENT the non-existing table entry ~p",
-			      [SrcTableEntry], Line),
-		  {augments, error};
-	      {value, ME} ->
-		  {augments, {SrcTableEntry, translate_type(ME#me.asn1_type)}}
-	  end,
-    FirstNonIdxCol = augments_first_non_index_column(ColMEs), 
+    Nbr_of_Cols = length(ColMEs),
+    put(augmentations, true),
+    FirstNonIdxCol = augments_first_non_index_column(ColMEs),
     NoAccs         = list_not_accessible(FirstNonIdxCol, ColMEs),
     FirstAcc       = first_accessible(TableName, ColMEs),
     #table_info{nbr_of_cols      = Nbr_of_Cols,
-		first_accessible = FirstAcc, 
-		not_accessible   = NoAccs, 
-		index_types      = Aug}; 
+		first_accessible = FirstAcc,
+		not_accessible   = NoAccs,
+		index_types      = {augments, SrcTableEntry, Line}};
 make_table_info(Line, TableName, {indexes, []}, _, _ColumnMEs) ->
     print_error("Table ~w lacks indexes.", [TableName],Line),
     #table_info{};