Commit d1dd05d6 authored by Lu Xu's avatar Lu Xu 👀

software/ors-amarisoft: software update

parent 1f5bb9a0
...@@ -67,7 +67,7 @@ if __name__ == '__main__': ...@@ -67,7 +67,7 @@ if __name__ == '__main__':
nc = LopcommNetconfClient() nc = LopcommNetconfClient()
while True: while True:
try: try:
nc.connect("192.168.0.210", 830, "oranuser", "oranpassword") nc.connect("{{ netaddr.IPAddress(slap_configuration.get('tap-ipv6-gateway', '')) }}", 830, "oranuser", "oranpassword")
nc.edit_config(["{{ CreateProcessingEle_template }}", "{{ cu_config_template }}"]) nc.edit_config(["{{ CreateProcessingEle_template }}", "{{ cu_config_template }}"])
break break
except Exception as e: except Exception as e:
......
...@@ -95,7 +95,7 @@ if __name__ == '__main__': ...@@ -95,7 +95,7 @@ if __name__ == '__main__':
nc = LopcommNetconfClient() nc = LopcommNetconfClient()
while True: while True:
try: try:
nc.connect("192.168.0.210", 830, "oranuser", "oranpassword") nc.connect("{{ netaddr.IPAddress(slap_configuration.get('tap-ipv6-gateway', '')) }}", 830, "oranuser", "oranpassword")
nc.subscribe() nc.subscribe()
while True: while True:
nc.get_notification() nc.get_notification()
......
...@@ -84,6 +84,18 @@ rf_mode_context_list = [ ...@@ -84,6 +84,18 @@ rf_mode_context_list = [
'default_ssb_nr_arfcn' : 0, 'default_ssb_nr_arfcn' : 0,
'min_frequency' : 0, 'min_frequency' : 0,
'max_frequency' : 0, 'max_frequency' : 0,
}, {
'rf_mode' : 'fdd',
'default_dl_earfcn' : 0,
'default_lte_dl_freq' : 0.0,
'default_lte_band' : 0,
'default_dl_nr_arfcn' : 0,
'default_nr_band' : 0,
'default_nr_dl_freq' : 0.0,
'default_nr_ssb_pos_bitmap' : "10000000",
'default_ssb_nr_arfcn' : 0,
'min_frequency' : 0,
'max_frequency' : 0,
} }
] ]
......
...@@ -41,6 +41,7 @@ parts += ...@@ -41,6 +41,7 @@ parts +=
dnsmasq dnsmasq
eggs eggs
xamari xamari
setcap
# unimplemented parts - the http monitor and better log handling using logrotate # unimplemented parts - the http monitor and better log handling using logrotate
# apache-php # apache-php
# logrotate # logrotate
...@@ -203,6 +204,11 @@ recipe = zc.recipe.egg ...@@ -203,6 +204,11 @@ recipe = zc.recipe.egg
eggs = ${xlte:egg} eggs = ${xlte:egg}
scripts = xamari scripts = xamari
[setcap]
recipe = plone.recipe.command
command = sudo -n /opt/amarisoft/setcap ${dnsmasq:location}/sbin/dnsmasq || true
update-command = ${:command}
[versions] [versions]
websocket-client = 1.4.2 websocket-client = 1.4.2
ncclient = 0.6.13 ncclient = 0.6.13
......
...@@ -30,3 +30,8 @@ min-frequency = 0 ...@@ -30,3 +30,8 @@ min-frequency = 0
max-frequency = 0 max-frequency = 0
default-n-antenna-dl =2 default-n-antenna-dl =2
default-n-antenna-ul =2 default-n-antenna-ul =2
[rf-mode]
rf-mode = tdd
...@@ -30,3 +30,8 @@ min-frequency = 1880.0 ...@@ -30,3 +30,8 @@ min-frequency = 1880.0
max-frequency = 1920 max-frequency = 1920
default-n-antenna-dl =2 default-n-antenna-dl =2
default-n-antenna-ul =2 default-n-antenna-ul =2
[rf-mode]
rf-mode = tdd
...@@ -30,3 +30,8 @@ min-frequency = 2570 ...@@ -30,3 +30,8 @@ min-frequency = 2570
max-frequency = 2620 max-frequency = 2620
default-n-antenna-dl =2 default-n-antenna-dl =2
default-n-antenna-ul =2 default-n-antenna-ul =2
[rf-mode]
rf-mode = tdd
...@@ -30,3 +30,8 @@ min-frequency = 3400 ...@@ -30,3 +30,8 @@ min-frequency = 3400
max-frequency = 3600 max-frequency = 3600
default-n-antenna-dl =2 default-n-antenna-dl =2
default-n-antenna-ul =2 default-n-antenna-ul =2
[rf-mode]
rf-mode = tdd
...@@ -30,3 +30,8 @@ min-frequency = 3600 ...@@ -30,3 +30,8 @@ min-frequency = 3600
max-frequency = 3800 max-frequency = 3800
default-n-antenna-dl =2 default-n-antenna-dl =2
default-n-antenna-ul =2 default-n-antenna-ul =2
[rf-mode]
rf-mode = tdd
...@@ -30,3 +30,10 @@ min-frequency = {{ min_frequency }} ...@@ -30,3 +30,10 @@ min-frequency = {{ min_frequency }}
max-frequency = {{ max_frequency }} max-frequency = {{ max_frequency }}
default-n-antenna-dl ={{ default_n_antenna_dl }} default-n-antenna-dl ={{ default_n_antenna_dl }}
default-n-antenna-ul ={{ default_n_antenna_ul }} default-n-antenna-ul ={{ default_n_antenna_ul }}
[rf-mode]
{% if 'tdd' in rf_mode %}
rf-mode = tdd
{% else %}
rf-mode = fdd
{% endif %}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment