.

software/ors-amarisoft/amari/slap.jinja2

@@ -163,7 +163,7 @@
 {#-   verify that there is no dangling cell->ru references #}
 {#-   XXX also verify that there is no dangling cell -> cell refs in ruincell_ref #}
 {%-   for _, icell in icell_dict|dictsort                             %}
-{%-     set ru_ref = J(jcell_ru_ref(icell))                           %}
+{%-     set ru_ref = J(jcell_ru_ref(icell, icell_dict))               %}
 {%-     if ru_ref not in iru_dict                                     %}
 {%-       do error(icell, "referred RU %s does not exist" % ru_ref)   %}
 {%-     endif                                                         %}
@@ -172,29 +172,29 @@
 
 {#- jcell_ru_ref returns RU reference linked from a cell.
     if the cell embeds RU definition, its reference comes as `_<cell_ref>_ru`. #}
-{%- macro jcell_ru_ref(icell)                                         %}
-{{-   _jcell_ru_ref(icell, [])                                        }}
-{%- endmacro                                                          %}
-{%- macro _jcell_ru_ref(icell, seen)                                  %}
-{%-   set cell_ref = J(jref_of_shared(icell))                         %}
-{%-   if cell_ref in seen                                             %}
-{%-     for x in seen                                                 %}
-{%-       do error(x, "%s form a cycle via RU references" % seen)     %}
-{%-     endfor                                                        %}
-{#-     XXX what to return ?                                          #}
-{%-   else                                                            %}
-{%-     do seen.append(cell_ref)                                      %}
-{%-     set ru = icell['_']['ru']                                     %}
-{%-     if ru.ru_type == 'ru_ref'                                     %}
-{{-       ru.ru_ref | tojson                                          }}
-{%-     elif ru.ru_type == 'ruincell_ref'                             %}
+{%- macro jcell_ru_ref(icell, icell_dict)                               %}
+{{-   _jcell_ru_ref(icell, icell_dict, [])                              }}
+{%- endmacro                                                            %}
+{%- macro _jcell_ru_ref(icell, icell_dict, seen)                        %}
+{%-   set cell_ref = J(jref_of_shared(icell))                           %}
+{%-   if cell_ref in seen                                               %}
+{%-     for x in seen                                                   %}
+{%-       do error(x, "%s form a cycle via RU references" % seen)       %}
+{%-     endfor                                                          %}
+{#-     XXX what to return ?                                            #}
+{%-   else                                                              %}
+{%-     do seen.append(cell_ref)                                        %}
+{%-     set ru = icell['_']['ru']                                       %}
+{%-     if ru.ru_type == 'ru_ref'                                       %}
+{{-       ru.ru_ref | tojson                                            }}
+{%-     elif ru.ru_type == 'ruincell_ref'                               %}
 {#-       XXX first check referred cell exist ? #}
-{{-       _jcell_ru_ref(icell_dict[ru.ruincell_ref], seen)            }}
-{%-     else                                                          %}
-{#-       ru definition is embedded into cell                         #}
-{{-       ('_%s_ru' % J(jref_of_shared(icell))) | tojson              }}
-{%-     endif                                                         %}
-{%-   endif                                                           %}
+{{-       _jcell_ru_ref(icell_dict[ru.ruincell_ref], icell_dict, seen)  }}
+{%-     else                                                            %}
+{#-       ru definition is embedded into cell                           #}
+{{-       ('_%s_ru' % J(jref_of_shared(icell))) | tojson                }}
+{%-     endif                                                           %}
+{%-   endif                                                             %}
 {%- endmacro %}
 
 {#- jref_of_shared returns original reference used to request shared instance.

software/ors-amarisoft/buildout.hash.cfg

@@ -24,11 +24,11 @@ md5sum = 60bb7b7f3fd9a16cf7fb9c9c0f88bb06
 
 [amari_slap.jinja2]
 _update_hash_filename_ = amari/slap.jinja2
-md5sum = 5fa2db5a98457f4ff9a4df18c2258b76
+md5sum = ed7bf60b082e5e142cb19a86205e016c
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = b6974fe597e98d1c8e7c6f6d6e3996c5
+md5sum = 741163a8e9379e45fc378b9b68c22a7b
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py
@@ -112,7 +112,7 @@ md5sum = 36281b03597252cf75169417d02fc28c
 
 [ue.jinja2.cfg]
 filename = config/ue.jinja2.cfg
-md5sum = 16b02d96a137d1684e25be1fd07c735d
+md5sum = e9ad082178924315360d7b48882a8606
 
 [CreateProcessingEle.jinja2.xml]
 filename = netconf/CreateProcessingEle.jinja2.xml

software/ors-amarisoft/ru/libinstance.jinja2.cfg

 {#- XXX need to be already loaded {%- import 'amari_slap.jinja2'  as lte     with context %}  #}
 
-{%- set icell_dict = {}                                                   %}
-{%- set iru_dict   = {}                                                   %}
-{%- do slaplte.load_iru_and_icell(iru_dict, icell_dict, kind=icell_kind)  %}
+{#- icell_kind should be set from outside XXX #}
+{%- set icell_dict = {}                                              %}
+{%- set iru_dict   = {}                                              %}
+{%- do slaplte.load_iru_and_icell(iru_dict, icell_dict, icell_kind)  %}