software/ors-amarisoft: download gadget and publish url

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 8a6e6e065e3eeffc3d5d4d8bb68f4a43
+md5sum = 21c657e4396217f383a41f54c3012498
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py
@@ -113,3 +113,19 @@ md5sum = 979a5a3a1eb9d0b081fa014baeef706f
 [interface-up-promise]
 _update_hash_filename_ = promise/check_interface_up.py
 md5sum = 44ae5693f62b7a4dbc98f700f68d8600
+
+[software.cfg.html]
+_update_hash_filename_ = gadget/software.cfg.html
+md5sum = 61a2f783fbf683a34aed3d13e00baca2
+[promise.gadget.js]
+_update_hash_filename_ = gadget/promise.gadget.js
+md5sum = 1a06b21b8bc3401ccc73b449faedce8b
+[renderjs.js]
+_update_hash_filename_ = gadget/renderjs.js
+md5sum = 054c0f4caa1055a2d27924619dc86798
+[rsvp.js]
+_update_hash_filename_ = gadget/rsvp.js
+md5sum = 2b0f2d52857b17fdfb8a5c2ea451a5ad
+[g-chart.line.js]
+_update_hash_filename_ = gadget/g-chart.line.js
+md5sum = 12dba5984c96a71457c1671f321acb6c

software/ors-amarisoft/instance.cfg

@@ -6,6 +6,32 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
+[monitor-with-gadget]
+recipe = slapos.recipe.template
+output = $${buildout:directory}/common.cfg
+inline =
+  [buildout]
+  extends = ${monitor2-template:output}
+
+  [monitor-publish]
+  monitor-gadget-url = $$$${custom-gadget:url}
+
+  [custom-gadget]
+  url = $$$${monitor-publish-parameters:monitor-gadget-url}/ors-gadget
+  depends = $$$${copy-gadget-to-monitor:recipe}
+
+  [copy-gadget-to-monitor]
+  recipe = slapos.recipe.build
+  source = ${gadget-directory:location}
+  location = $$$${monitor-directory:gadget}/ors-gadget
+  install =
+    import shutil,os
+    if self.options["source"]:
+      self.copyTree(self.options["source"], location)
+    else:
+      os.makedirs(location)
+
+
 [slap-configuration]
 recipe = slapos.cookbook:slapconfiguration.serialised
 computer = $${slap-connection:computer-id}
@@ -73,7 +99,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}
 
@@ -83,7 +109,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}
 
@@ -93,7 +119,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}
 
@@ -103,7 +129,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}
@@ -132,7 +158,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}
@@ -162,7 +188,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}
@@ -179,7 +205,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
@@ -204,7 +230,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

software/ors-amarisoft/software.cfg

@@ -21,8 +21,15 @@ parts +=
   ue-lte.jinja2.cfg
   ue-nr.jinja2.cfg
   sib23.asn
+# copy all gadget file
+  g-chart.line.js
+  promise.gadget.js
+  renderjs.js
+  rsvp.js
+  software.cfg.html
   iperf3
   eggs
+
 # unimplemented parts - the http monitor and better log handling using logrotate
 #  apache-php
 #  logrotate
@@ -85,6 +92,18 @@ url     = ${:_profile_base_location_}/${:_buildout_section_name_}
 recipe  = slapos.recipe.build:download
 url     = ${:_profile_base_location_}/config/${:_buildout_section_name_}
 
+[gadget-directory]
+recipe = slapos.recipe.build
+location = ${buildout:directory}/gadget
+install =
+  import os
+  os.mkdir(location)
+
+[copy-gadget-to-software]
+recipe      = slapos.recipe.build:download
+url         = ${:_profile_base_location_}/gadget/${:_buildout_section_name_}
+destination = ${gadget-directory:location}/${:_buildout_section_name_}
+
 [enb.jinja2.cfg]
 <= copy-config-to-instance
 filename = enb.jinja2.cfg
@@ -113,6 +132,18 @@ filename = ue-lte.jinja2.cfg
 <= copy-config-to-instance
 filename = ue-nr.jinja2.cfg
 
+# Download gadget files
+[software.cfg.html]
+<= copy-gadget-to-software
+[promise.gadget.js]
+<= copy-gadget-to-software
+[renderjs.js]
+<= copy-gadget-to-software
+[rsvp.js]
+<= copy-gadget-to-software
+[g-chart.line.js]
+<= copy-gadget-to-software
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =