WIP

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 97abed7b766acb0664ab5fd030df290b
+md5sum = c3fb19b7f4b84aacdbeaf8d217a3d252
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py

software/ors-amarisoft/instance.cfg

 [buildout]
-extends =
-  ${monitor2-template:output}
 parts =
   switch-softwaretype
   copy-gadget-to-monitor
@@ -76,7 +74,7 @@ url = ${template-lte-enb-epc:target}
 filename = instance-lte-enb-epc.cfg
 extensions = jinja2.ext.do
 extra-context =
-    raw monitor_template ${monitor2-template:output}
+    raw monitor_template ${monitor-with-gadget:output}
     key slave_instance_list slap-configuration:slave-instance-list
     raw cpu_temperature_promise   ${cpu-temperature-promise:target}
 
@@ -86,7 +84,7 @@ url = ${template-lte-gnb-epc:target}
 filename = instance-lte-gnb-epc.cfg
 extensions = jinja2.ext.do
 extra-context =
-    raw monitor_template ${monitor2-template:output}
+    raw monitor_template ${monitor-with-gadget:output}
     key slave_instance_list slap-configuration:slave-instance-list
     raw cpu_temperature_promise   ${cpu-temperature-promise:target}
 
@@ -96,7 +94,7 @@ url = ${template-lte-epc:target}
 filename = instance-lte-epc.cfg
 extensions = jinja2.ext.do
 extra-context =
-    raw monitor_template ${monitor2-template:output}
+    raw monitor_template ${monitor-with-gadget:output}
     key slave_instance_list slap-configuration:slave-instance-list
     raw cpu_temperature_promise   ${cpu-temperature-promise:target}
 
@@ -106,7 +104,7 @@ url = ${template-lte-enb:target}
 filename = instance-lte-enb.cfg
 extensions = jinja2.ext.do
 extra-context =
-    raw monitor_template ${monitor2-template:output}
+    raw monitor_template ${monitor-with-gadget:output}
     key enb amarisoft:enb
     key sdr amarisoft:sdr
     raw enb_template   ${enb.jinja2.cfg:target}
@@ -135,7 +133,7 @@ url = ${template-lte-gnb:target}
 filename = instance-lte-gnb.cfg
 extensions = jinja2.ext.do
 extra-context =
-    raw monitor_template ${monitor2-template:output}
+    raw monitor_template ${monitor-with-gadget:output}
     key enb amarisoft:enb
     key sdr amarisoft:sdr
     raw gnb_template   ${gnb.jinja2.cfg:target}
@@ -165,7 +163,7 @@ url = ${template-lte-mme:target}
 filename = instance-lte-mme.cfg
 extensions = jinja2.ext.do
 extra-context =
-    raw monitor_template ${monitor2-template:output}
+    raw monitor_template ${monitor-with-gadget:output}
     raw interface_up_promise   ${interface-up-promise:target}
     key mme amarisoft:mme
     raw mme_template   ${mme.jinja2.cfg:target}
@@ -182,7 +180,7 @@ url = ${template-lte-ue-lte:target}
 filename = instance-lte-ue-lte.cfg
 extensions = jinja2.ext.do
 extra-context =
-    raw monitor_template ${monitor2-template:output}
+    raw monitor_template ${monitor-with-gadget:output}
     raw interface_up_promise   ${interface-up-promise:target}
     key ue amarisoft:ue
     key sdr amarisoft:sdr
@@ -207,7 +205,7 @@ url = ${template-lte-ue-nr:target}
 filename = instance-lte-ue-nr.cfg
 extensions = jinja2.ext.do
 extra-context =
-    raw monitor_template ${monitor2-template:output}
+    raw monitor_template ${monitor-with-gadget:output}
     raw interface_up_promise   ${interface-up-promise:target}
     key ue amarisoft:ue
     key sdr amarisoft:sdr
@@ -243,3 +241,8 @@ source = ${gadget-directory:location}
 location = $${monitor-directory:gadget}/ors-gadget
 install =
   self.copyTree(options['source'], location)
+
+[monitor-with-gadget]
+extends =
+  ${monitor-with-gadget:output}
+monitor-gadget-url=${copy-gadget-to-monitor:location}