publish

software/simpleran/buildout.hash.cfg

@@ -60,11 +60,11 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 7ef17898bf93d93a81e58408361d5294
+md5sum = 7acb9c7ef737973f9614add20ab0d02e
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = 63ad79a9393ed8cd653dcdda2b75f59f
+md5sum = 235780a4961d5d581a1cbbb28e680235
 
 [template-ors-ue]
 _update_hash_filename_ = instance-ors-ue.jinja2.cfg
@@ -72,7 +72,7 @@ md5sum = 82449c34a4632191931ce8aa88ce72e6
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
-md5sum = 9fd9b28ee9341d025fbdab23e1650093
+md5sum = d595197b0997e034b9f2856cf5844642
 
 [template-ue]
 _update_hash_filename_ = instance-ue.jinja2.cfg

software/simpleran/instance-core-network.jinja2.cfg

@@ -393,19 +393,19 @@ password = {{ slapparameter_dict['monitor-password'] | string }}
 [publish-connection-information]
 <= monitor-publish
 recipe = slapos.cookbook:publish.serialised
-core-network-ipv6 = {{ my_ipv6 }}
-core-network-ipv4 = {{ lan_ipv4 }}
-core-network-mac = {{ mac }}
+core-network.ipv6 = {{ my_ipv6 }}
+core-network.ipv4 = {{ lan_ipv4 }}
+core-network.mac = {{ mac }}
 {%- if slapparameter_dict.get("iperf3", 0) %}
-iperf3-server-ipv4 = ${iperf-service-0:ip}
+iperf3.server-ipv4 = ${iperf-service-0:ip}
 {%- endif %}
 {%- for i in range(1, slapparameter_dict.get("iperf3", 0) + 1) %}
-iperf3-server-{{ i - 1 }}-port = ${iperf-service-{{ i - 1 }}:port}
+iperf3.server-{{ i - 1 }}-port = ${iperf-service-{{ i - 1 }}:port}
 {%- endfor %}
-amarisoft-version = {{ amarisoft['version']}}
-amarisoft-host-id = {{ amarisoft['lteenb_host_id'] }}
-amarisoft-available-versions = {{ amarisoft['version_installed'] }}
-license-expiration = {{ amarisoft['ltemme_expiration'] }}
+amarisoft.version = {{ amarisoft['version']}}
+amarisoft.host-id = {{ amarisoft['lteenb_host_id'] }}
+amarisoft.available-versions = {{ amarisoft['version_installed'] }}
+amarisoft.license-expiration = {{ amarisoft['ltemme_expiration'] }}
 monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
 sim-list = {{ imsi_list | join(', ') }}
 

software/simpleran/instance-enb.jinja2.cfg

@@ -341,16 +341,16 @@ ipeercell_dict = {{ dumps(ipeercell_dict) }}
 [publish-connection-information]
 <= monitor-publish
 recipe = slapos.cookbook:publish.serialised
-websocket-hostname = ${frontend-urlparse:hostname}
-websocket-port = ${frontend-urlparse:port}
-websocket-password = ${websocket-password:passwd}
-enb-ipv6 = {{ my_ipv6 }}
-enb-ipv4 = {{ lan_ipv4 }}
-enb-mac = {{ mac }}
+websocket.hostname = ${frontend-urlparse:hostname}
+websocket.port = ${frontend-urlparse:port}
+websocket.password = ${websocket-password:passwd}
+enb.ipv6 = {{ my_ipv6 }}
+enb.ipv4 = {{ lan_ipv4 }}
+enb.mac = {{ mac }}
 amarisoft.version = {{ amarisoft['version'] }}
-amarisoft-Host-ID = {{ amarisoft['lteenb_host_id'] }}
-amarisoft-Available-Versions = {{ amarisoft['version_installed'] }}
-amarisoft-License-Expiration = {{ amarisoft['lteenb_expiration'] }}
+amarisoft.host-id = {{ amarisoft['lteenb_host_id'] }}
+amarisoft.available-versions = {{ amarisoft['version_installed'] }}
+amarisoft.license-expiration = {{ amarisoft['lteenb_expiration'] }}
 monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
 ru-list   = {{ dumps(rulib.iru_dict.keys()   | sort) }}
 cell-list = {{ dumps(rulib.icell_dict.keys() | sort) }}

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

@@ -215,33 +215,33 @@ ors = {{ dumps(ors_version) }}
 
 # add ORS-specific bits to published information
 [publish-connection-information]
-ors-hardware-Version = {{ ors_version['ors-version'] }}
-ors-hardware-Frequency-Range-Rating = {{ ors_version['range'] }}
-ors-power-TX-Power = {{ ors_version['tx-power'] }}
-ors-power-RX-Gain = {{ ors_version['rx-gain'] }}
-ors-root-sequence-index = {{ slapparameter_dict['root_sequence_index'] }}
-ors-id-Cell-ID = {{ slapparameter_dict['cell_id'] }}
-ors-id-Physical-Cell-ID = {{ slapparameter_dict['pci'] }}
+ors-hardware.version = {{ ors_version['ors-version'] }}
+ors-hardware.frequency-range-rating = {{ ors_version['range'] }}
+ors-power.tx-power = {{ ors_version['tx-power'] }}
+ors-power.rx-gain = {{ ors_version['rx-gain'] }}
+ors.root-sequence-index = {{ slapparameter_dict['root_sequence_index'] }}
+ors-id.cell-id = {{ slapparameter_dict['cell_id'] }}
+ors-id.physical-cell-id = {{ slapparameter_dict['pci'] }}
 {%- if enb_mode == "enb" %}
-ors-id-eNB-ID = {{ slapparameter_dict['enb_id'] }}
-ors-id-EUTRA-Cell-ID = {{ ors_id['eutra_cell_id'] }}
+ors-id.enb-id = {{ slapparameter_dict['enb_id'] }}
+ors-id.eutra-cell-id = {{ ors_id['eutra_cell_id'] }}
 {%- else %}
-ors-id-gNB-ID = {{ slapparameter_dict['gnb_id'] }}
-ors-id-NR-Cell-ID = {{ ors_id['nr_cell_id'] }}
+ors-id.gnb-id = {{ slapparameter_dict['gnb_id'] }}
+ors-id.nr-cell-id = {{ ors_id['nr_cell_id'] }}
 {%- endif %}
 {%- if enb_mode == 'enb'  %}
-ors-Frequency  = {{ xearfcn_module.frequency(ors_version['earfcn']) }} MHz
-ors-Band  = {{ xearfcn_module.band(ors_version['earfcn'])[0]["band"] }}
-ors-DL-EARFCN  = {{ ors_version['earfcn'] }}
+ors.frequency  = {{ xearfcn_module.frequency(ors_version['earfcn']) }} MHz
+ors.band  = {{ xearfcn_module.band(ors_version['earfcn'])[0]["band"] }}
+ors.dl-earfcn  = {{ ors_version['earfcn'] }}
 {%- elif enb_mode == 'gnb' %}
-ors-Frequency  = {{ xnrarfcn_module.frequency(ors_version['nr-arfcn']) }} MHz
-ors-NR-Band = {{ ors_version['nr-band'] }}
-ors-DL-NR-ARFCN = {{ ors_version['nr-arfcn'] }}
+ors.frequency  = {{ xnrarfcn_module.frequency(ors_version['nr-arfcn']) }} MHz
+ors.nr-band = {{ ors_version['nr-band'] }}
+ors.dl-nr-arfcn = {{ ors_version['nr-arfcn'] }}
 {%-   if slapparameter_dict.get('ssb_nr_arfcn', False) %}
-ors-SSB-NR-ARFCN = {{ slapparameter_dict['ssb_nr_arfcn'] }}
+ors.ssb-nr-arfcn = {{ slapparameter_dict['ssb_nr_arfcn'] }}
 {%-   else %}
 {%-   set ssb_nr_arfcn, max_ssb_scs_khz = xnrarfcn_module.dl2ssb(ors_version['nr-arfcn'], ors_version['nr-band']) %}
-ors-SSB-NR-ARFCN = {{ ssb_nr_arfcn | tojson }}
+ors.ssb-nr-arfcn = {{ ssb_nr_arfcn | tojson }}
 {%-   endif %}
 {%- endif %}