software/ors-amarisoft: software update

software/ors-amarisoft/lopcomm-rrh-config.jinja2.py

@@ -67,7 +67,7 @@ if __name__ == '__main__':
     nc = LopcommNetconfClient()
     while True:
         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 }}"])
             break
         except Exception as e:

software/ors-amarisoft/lopcomm-rrh-stats.jinja2.py

@@ -95,7 +95,7 @@ if __name__ == '__main__':
     nc = LopcommNetconfClient()
     while True:
       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()
           while True:
             nc.get_notification()

software/ors-amarisoft/render-templates

@@ -84,6 +84,18 @@ rf_mode_context_list = [
             'default_ssb_nr_arfcn'         : 0,
             'min_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,
         }
 ]
 

software/ors-amarisoft/software-base.cfg

@@ -41,6 +41,7 @@ parts +=
   dnsmasq
   eggs
   xamari
+  setcap
 # unimplemented parts - the http monitor and better log handling using logrotate
 #  apache-php
 #  logrotate
@@ -203,6 +204,11 @@ recipe = zc.recipe.egg
 eggs = ${xlte:egg}
 scripts = xamari
 
+[setcap]
+recipe = plone.recipe.command
+command = sudo -n /opt/amarisoft/setcap ${dnsmasq:location}/sbin/dnsmasq || true
+update-command = ${:command}
+
 [versions]
 websocket-client = 1.4.2
 ncclient = 0.6.13

software/ors-amarisoft/software-tdd.cfg

@@ -30,3 +30,8 @@ min-frequency = 0
 max-frequency = 0
 default-n-antenna-dl =2
 default-n-antenna-ul =2
+
+[rf-mode]
+
+rf-mode = tdd
+

software/ors-amarisoft/software-tdd1900.cfg

@@ -30,3 +30,8 @@ min-frequency = 1880.0
 max-frequency = 1920
 default-n-antenna-dl =2
 default-n-antenna-ul =2
+
+[rf-mode]
+
+rf-mode = tdd
+

software/ors-amarisoft/software-tdd2600.cfg

@@ -30,3 +30,8 @@ min-frequency = 2570
 max-frequency = 2620
 default-n-antenna-dl =2
 default-n-antenna-ul =2
+
+[rf-mode]
+
+rf-mode = tdd
+

software/ors-amarisoft/software-tdd3500.cfg

@@ -30,3 +30,8 @@ min-frequency = 3400
 max-frequency = 3600
 default-n-antenna-dl =2
 default-n-antenna-ul =2
+
+[rf-mode]
+
+rf-mode = tdd
+

software/ors-amarisoft/software-tdd3700.cfg

@@ -30,3 +30,8 @@ min-frequency = 3600
 max-frequency = 3800
 default-n-antenna-dl =2
 default-n-antenna-ul =2
+
+[rf-mode]
+
+rf-mode = tdd
+

software/ors-amarisoft/software.jinja2.cfg

@@ -30,3 +30,10 @@ min-frequency = {{ min_frequency }}
 max-frequency = {{ max_frequency }}
 default-n-antenna-dl ={{ default_n_antenna_dl }}
 default-n-antenna-ul ={{ default_n_antenna_ul }}
+
+[rf-mode]
+{% if 'tdd' in rf_mode %}
+rf-mode = tdd
+{% else %}
+rf-mode = fdd
+{% endif %}