Merge remote-tracking branch 'upstream/master' into zope4py2

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 61e9685d6aa973ae0c45c45ca357458a
+md5sum = ed72fb7c36b0bc046df177e4d6f3bf12
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py
@@ -28,7 +28,7 @@ md5sum = 833667743c693b8d5f78a2527b275a9e
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = afd8867c4dec5c5c68a4005dec502ebb
+md5sum = c4584b338d26f57d5c9384956be36677
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
@@ -40,7 +40,7 @@ md5sum = 99c05a34678adb5a70aa64ecf2ee4e35
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = cd0527037b7cb0ae53f2f822fcf551ac
+md5sum = 954dd1409b0256874f9524a40b880e47
 
 [template-lte-mme]
 _update_hash_filename_ = instance-mme.jinja2.cfg
@@ -60,7 +60,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 1c9909f691b5bb00d3fc30d41613e26a
+md5sum = 68ac87c7e3d2d3fb0e0601f83f949915
 
 [sib23.asn]
 filename = config/sib23.asn
@@ -68,7 +68,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = 16698f0b4ea3e6cf40e9f070af2439e5
+md5sum = 374a1943e400a908e1aee8e123683f6f
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh

software/ors-amarisoft/instance-enb-input-schema.json.jinja2

@@ -161,6 +161,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": {{ default_n_antenna_dl }}
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": {{ default_n_antenna_ul }}
     }
   }
 }

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

@@ -45,6 +45,8 @@ configuration.default_lte_n_rb_dl = {{ default_lte_n_rb_dl }}
 configuration.default_lte_tx_gain = {{ default_lte_tx_gain }}
 configuration.default_lte_rx_gain = {{ default_lte_rx_gain }}
 configuration.default_lte_inactivity_timer = {{ default_lte_inactivity_timer }}
+configuration.default_n_antenna_dl = {{ default_n_antenna_dl }}
+configuration.default_n_antenna_ul = {{ default_n_antenna_ul }}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory

software/ors-amarisoft/instance-gnb-input-schema.json.jinja2

@@ -213,6 +213,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": {{ default_n_antenna_dl }}
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": {{ default_n_antenna_ul }}
     }
   }
 }

software/ors-amarisoft/instance-gnb.jinja2.cfg

@@ -45,6 +45,8 @@ configuration.default_nr_tx_gain = {{ default_nr_tx_gain }}
 configuration.default_nr_inactivity_timer = {{ default_nr_inactivity_timer }}
 configuration.default_nr_rx_gain = {{ default_nr_rx_gain }}
 configuration.default_nr_ssb_pos_bitmap = {{ default_nr_ssb_pos_bitmap }}
+configuration.default_n_antenna_dl = {{ default_n_antenna_dl }}
+configuration.default_n_antenna_ul = {{ default_n_antenna_ul }}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory

software/ors-amarisoft/instance-tdd1900-enb-epc-input-schema.json

@@ -159,6 +159,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd1900-enb-input-schema.json

@@ -141,6 +141,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd1900-gnb-epc-input-schema.json

@@ -211,6 +211,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json

@@ -193,6 +193,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd2600-enb-epc-input-schema.json

@@ -159,6 +159,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd2600-enb-input-schema.json

@@ -141,6 +141,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd2600-gnb-epc-input-schema.json

@@ -211,6 +211,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json

@@ -193,6 +193,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd3500-enb-epc-input-schema.json

@@ -159,6 +159,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd3500-enb-input-schema.json

@@ -141,6 +141,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd3500-gnb-epc-input-schema.json

@@ -211,6 +211,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json

@@ -193,6 +193,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd3700-enb-epc-input-schema.json

@@ -159,6 +159,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd3700-enb-input-schema.json

@@ -141,6 +141,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd3700-gnb-epc-input-schema.json

@@ -211,6 +211,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json

@@ -193,6 +193,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance.cfg

@@ -124,6 +124,8 @@ extra-context =
     raw default_lte_tx_gain ${default-params:default-lte-tx-gain}
     raw default_lte_rx_gain ${default-params:default-lte-rx-gain}
     raw default_lte_inactivity_timer ${default-params:default-lte-inactivity-timer}
+    raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
+    raw default_n_antenna_ul ${default-params:default-n-antenna-ul}
     raw min_frequency ${default-params:min-frequency}
     raw max_frequency ${default-params:max-frequency}
 
@@ -154,6 +156,8 @@ extra-context =
     raw default_nr_rx_gain ${default-params:default-nr-rx-gain}
     raw default_nr_ssb_pos_bitmap ${default-params:default-nr-ssb-pos-bitmap}
     raw default_nr_inactivity_timer ${default-params:default-nr-inactivity-timer}
+    raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
+    raw default_n_antenna_ul ${default-params:default-n-antenna-ul}
     raw min_frequency ${default-params:min-frequency}
     raw max_frequency ${default-params:max-frequency}
     raw python_path ${python3:location}