.

software/ors-amarisoft/buildout.hash.cfg

@@ -20,7 +20,7 @@ md5sum = e8a155d8cbae5b31b9821b986cf0068d
 
 [template-ors]
 filename = instance-ors.cfg
-md5sum = 9bf65d96be0ef59a701cae69df130d95
+md5sum = 0547ba3414e0a8f2cf98e64b295caa07
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
@@ -88,7 +88,7 @@ md5sum = 27e765b00d7ed13a75f87101922a53ea
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = ba7b3c9c54f490482b50f33bc32c5eec
+md5sum = 549dca9fa126876281d2f47b92570609
 
 [template-ors-gnb]
 _update_hash_filename_ = instance-ors-gnb.jinja2.cfg

software/ors-amarisoft/instance-ors-enb.jinja2.cfg

 [buildout]
 extends =
-  instance-enb.cfg
+  {{ dynamic_template_enb_base_output }}
 
 # XXX config-base +=
 # XXX reenable/rethink

software/ors-amarisoft/instance-ors.cfg

 [buildout]
 extends =
-  $${template-base:output}
+  ${template:output}
 
 [switch-softwaretype]
 enb = dynamic-template-ors-enb:output
@@ -20,27 +20,31 @@ extensions = jinja2.ext.do
 extra-context =
     key slave_instance_list slap-configuration:slave-instance-list
 
-# XXX adapt to ors
-[dynamic-template-ors-gnb]
+# ORS-specific enb and gnb
+# they translate ORS schema to generic enb with only one RU and CELL
+[dynamic-template-enb]
+filename = instance-enb-base.cfg
+[dynamic-template-ors-enb]
 < = jinja2-template-base
-url = ${template-ors-gnb:target}
-filename = instance-gnb.cfg
+url = ${template-ors-enb:target}
+filename = instance-enb.cfg
 extensions = jinja2.ext.do
 extra-context =
-    raw monitor_template ${monitor2-template:output}
+    raw dynamic_template_enb_base_output $${dynamic-template-enb:output}
+#   raw monitor_template ${monitor2-template:output}
     section ors_version ors-version
-    section comp_id comp-id
-    key lte_version amarisoft:lte-version
-    key lte_expiration amarisoft:lte-expiration
-    key enb amarisoft:enb
-    key sdr amarisoft:sdr
+#   section comp_id comp-id
+#   key lte_version amarisoft:lte-version
+#   key lte_expiration amarisoft:lte-expiration
+#   key enb amarisoft:enb
+#   key sdr amarisoft:sdr
 #   raw gnb_template   X{gnb.jinja2.cfg:target}
-    raw amarisoft_stats_template   ${amarisoft-stats.jinja2.py:target}
-    raw amarisoft_rf_info_template   ${amarisoft-rf-info.jinja2.py:target}
-    raw openssl_location ${openssl:location}
-    raw default_nr_inactivity_timer ${default-params:default-nr-inactivity-timer}
-    raw python_path ${python3:location}
-    raw fluent_bit_location ${fluent-bit:location}
+#   raw amarisoft_stats_template   ${amarisoft-stats.jinja2.py:target}
+#   raw amarisoft_rf_info_template   ${amarisoft-rf-info.jinja2.py:target}
+#   raw openssl_location ${openssl:location}
+#   raw default_nr_inactivity_timer ${default-params:default-nr-inactivity-timer}
+#   raw python_path ${python3:location}
+#   raw fluent_bit_location ${fluent-bit:location}
 
 
 [ors-version]