software/ors-amarisoft: fix json syntax

c0a770b5 · Joanne Hugé · 2ca64ff1 · c0a770b5 · c0a770b5 · c0a770b5
Commit c0a770b5 authored Dec 14, 2021 by Joanne Hugé
27 changed files
--- a/software/ors-amarisoft/buildout.hash.cfg
+++ b/software/ors-amarisoft/buildout.hash.cfg
@@ -36,7 +36,7 @@ md5sum = 9ac219ea7c331bfc0e5ed3fd4c9991e2

 [template-lte-epc]
 _update_hash_filename_ = instance-epc.jinja2.cfg
-md5sum = ed7b80f6a613aea76cb60e6b66cc5bf6
+md5sum = af285212bf8e15402416b58a65d103f8

 [ue_db.jinja2.cfg]
 filename = config/ue_db.jinja2.cfg

--- a/software/ors-amarisoft/instance-enb-input-schema.jinja2.json
+++ b/software/ors-amarisoft/instance-enb-input-schema.jinja2.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": {{ default_lte_tx_gain }}
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": {{ default_lte_rx_gain }}
-        },
-        "dl_earfcn": {
-            "title": "DL EARFCN",
-            "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": {{ default_dl_earfcn }}
-        },
-        "n_rb_dl": {
-            "title": "DL RB",
-            "description": "number of DL resource blocks",
-            "type": "number",
-            "default": {{ default_lte_n_rb_dl }}
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": {{ default_lte_tx_gain }}
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": {{ default_lte_rx_gain }}
+    },
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": {{ default_dl_earfcn }}
+    },
+    "n_rb_dl": {
+      "title": "DL RB",
+      "description": "number of DL resource blocks",
+      "type": "number",
+      "default": {{ default_lte_n_rb_dl }}
    }
+  }
 }
--- a/software/ors-amarisoft/instance-epc-input-schema.json
+++ b/software/ors-amarisoft/instance-epc-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "EPC Input Parameters",
-    "properties": {
-    }
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "EPC Input Parameters",
+  "type": "object",
+  "properties": {}
 }
--- a/software/ors-amarisoft/instance-epc-slave-input-schema.json
+++ b/software/ors-amarisoft/instance-epc-slave-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-    "title": "EPC SIM Card Parameters",
-    "required": [
-      "sim_algo",
-      "imsi",
-      "opc",
-      "amf",
-      "sqn",
-      "k",
-      "impu",
-      "impi"
-    ],
-    "properties": {
-        "sim_algo": {
-            "title": "Sim Algorithm",
-            "description": "xor, milenage or tuak. Set the USIM authentication algorithm.",
-            "type": "string",
-            "default": "milenage"
-        },
-        "imsi": {
-            "title": "IMSI",
-            "description": "IMSI",
-            "type": "string",
-            "default": ""
-        },
-        "opc": {
-            "title": "OPC",
-            "description": "Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, opc must be set.",
-            "type": "string",
-            "default": ""
-        },
-        "amf": {
-            "title": "AMF",
-            "description": "Range: 0 to 65535. Set the Authentication Management Field.",
-            "type": "string",
-            "default": "0x9001"
-        },
-        "sqn": {
-            "title": "SQN",
-            "description": "Optional String (6 byte hexadecimal string). Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
-            "type": "string",
-            "default": "000000000000"
-        },
-        "k": {
-            "title": "K",
-            "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
-            "type": "string",
-            "default": ""
-        },
-        "impu": {
-            "title": "IMPU",
-            "description": "sip URI or a telephone number. Note that sip URI must not include hostname. If IMPU does not start by a scheme, it is assumed to be a sip URI.",
-            "type": "string",
-            "default": ""
-        },
-        "impi": {
-            "title": "IMPI",
-            "description": "Defines user IMPI. Must be fully filled with hostname if necessary.",
-            "type": "string",
-            "default": ""
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "EPC SIM Card Parameters",
+  "required": [
+    "sim_algo",
+    "imsi",
+    "opc",
+    "amf",
+    "sqn",
+    "k",
+    "impu",
+    "impi"
+  ],
+  "properties": {
+    "sim_algo": {
+      "title": "Sim Algorithm",
+      "description": "xor, milenage or tuak. Set the USIM authentication algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "imsi": {
+      "title": "IMSI",
+      "description": "IMSI",
+      "type": "string",
+      "default": ""
+    },
+    "opc": {
+      "title": "OPC",
+      "description": "Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, opc must be set.",
+      "type": "string",
+      "default": ""
+    },
+    "amf": {
+      "title": "AMF",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "SQN",
+      "description": "Optional String (6 byte hexadecimal string). Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "k": {
+      "title": "K",
+      "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
+      "type": "string",
+      "default": ""
+    },
+    "impu": {
+      "title": "IMPU",
+      "description": "sip URI or a telephone number. Note that sip URI must not include hostname. If IMPU does not start by a scheme, it is assumed to be a sip URI.",
+      "type": "string",
+      "default": ""
+    },
+    "impi": {
+      "title": "IMPI",
+      "description": "Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
    }
+  }
 }
--- a/software/ors-amarisoft/instance-epc.jinja2.cfg
+++ b/software/ors-amarisoft/instance-epc.jinja2.cfg
-{{ generated_file_message }}
 [buildout]
 parts =
  directory

--- a/software/ors-amarisoft/instance-gnb-input-schema.jinja2.json
+++ b/software/ors-amarisoft/instance-gnb-input-schema.jinja2.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": {{ default_nr_tx_gain }}
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": {{ default_nr_rx_gain }}
-        },
-        "dl_nr_arfcn": {
-            "title": "DL NR ARFCN",
-            "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": {{ default_dl_nr_arfcn }}
-        },
-        "nr_band": {
-            "title": "NR band",
-            "description": "NR band number",
-            "type": "number",
-            "default": {{ default_nr_band }}
-        },
-        "nr_bandwidth": {
-            "title": "Bandwidth",
-            "description": "Downlink Bandwidth (in MHz)",
-            "type": "number",
-            "default": {{ default_nr_bandwidth }}
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": {{ default_nr_tx_gain }}
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": {{ default_nr_rx_gain }}
+    },
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": {{ default_dl_nr_arfcn }}
+    },
+    "nr_band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "number",
+      "default": {{ default_nr_band }}
+    },
+    "nr_bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth (in MHz)",
+      "type": "number",
+      "default": {{ default_nr_bandwidth }}
    }
+  }
 }
--- a/software/ors-amarisoft/instance-tdd1900-enb-epc-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd1900-enb-epc-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 30
-        },
-        "dl_earfcn": {
-            "title": "DL EARFCN",
-            "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 38350
-        },
-        "n_rb_dl": {
-            "title": "DL RB",
-            "description": "number of DL resource blocks",
-            "type": "number",
-            "default": 100
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 30
+    },
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 38350
+    },
+    "n_rb_dl": {
+      "title": "DL RB",
+      "description": "number of DL resource blocks",
+      "type": "number",
+      "default": 100
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd1900-enb-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd1900-enb-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 30
-        },
-        "dl_earfcn": {
-            "title": "DL EARFCN",
-            "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 38350
-        },
-        "n_rb_dl": {
-            "title": "DL RB",
-            "description": "number of DL resource blocks",
-            "type": "number",
-            "default": 100
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 30
+    },
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 38350
+    },
+    "n_rb_dl": {
+      "title": "DL RB",
+      "description": "number of DL resource blocks",
+      "type": "number",
+      "default": 100
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd1900-gnb-epc-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd1900-gnb-epc-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 50
-        },
-        "dl_nr_arfcn": {
-            "title": "DL NR ARFCN",
-            "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 378000
-        },
-        "nr_band": {
-            "title": "NR band",
-            "description": "NR band number",
-            "type": "number",
-            "default": 39
-        },
-        "nr_bandwidth": {
-            "title": "Bandwidth",
-            "description": "Downlink Bandwidth (in MHz)",
-            "type": "number",
-            "default": 40
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 50
+    },
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 378000
+    },
+    "nr_band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "number",
+      "default": 39
+    },
+    "nr_bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth (in MHz)",
+      "type": "number",
+      "default": 40
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 50
-        },
-        "dl_nr_arfcn": {
-            "title": "DL NR ARFCN",
-            "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 378000
-        },
-        "nr_band": {
-            "title": "NR band",
-            "description": "NR band number",
-            "type": "number",
-            "default": 39
-        },
-        "nr_bandwidth": {
-            "title": "Bandwidth",
-            "description": "Downlink Bandwidth (in MHz)",
-            "type": "number",
-            "default": 40
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 50
+    },
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 378000
+    },
+    "nr_band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "number",
+      "default": 39
+    },
+    "nr_bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth (in MHz)",
+      "type": "number",
+      "default": 40
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd2600-enb-epc-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd2600-enb-epc-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 30
-        },
-        "dl_earfcn": {
-            "title": "DL EARFCN",
-            "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 38050
-        },
-        "n_rb_dl": {
-            "title": "DL RB",
-            "description": "number of DL resource blocks",
-            "type": "number",
-            "default": 100
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 30
+    },
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 38050
+    },
+    "n_rb_dl": {
+      "title": "DL RB",
+      "description": "number of DL resource blocks",
+      "type": "number",
+      "default": 100
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd2600-enb-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd2600-enb-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 30
-        },
-        "dl_earfcn": {
-            "title": "DL EARFCN",
-            "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 38050
-        },
-        "n_rb_dl": {
-            "title": "DL RB",
-            "description": "number of DL resource blocks",
-            "type": "number",
-            "default": 100
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 30
+    },
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 38050
+    },
+    "n_rb_dl": {
+      "title": "DL RB",
+      "description": "number of DL resource blocks",
+      "type": "number",
+      "default": 100
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd2600-gnb-epc-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd2600-gnb-epc-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 50
-        },
-        "dl_nr_arfcn": {
-            "title": "DL NR ARFCN",
-            "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 520000
-        },
-        "nr_band": {
-            "title": "NR band",
-            "description": "NR band number",
-            "type": "number",
-            "default": 38
-        },
-        "nr_bandwidth": {
-            "title": "Bandwidth",
-            "description": "Downlink Bandwidth (in MHz)",
-            "type": "number",
-            "default": 40
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 50
+    },
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 520000
+    },
+    "nr_band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "number",
+      "default": 38
+    },
+    "nr_bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth (in MHz)",
+      "type": "number",
+      "default": 40
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 50
-        },
-        "dl_nr_arfcn": {
-            "title": "DL NR ARFCN",
-            "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 520000
-        },
-        "nr_band": {
-            "title": "NR band",
-            "description": "NR band number",
-            "type": "number",
-            "default": 38
-        },
-        "nr_bandwidth": {
-            "title": "Bandwidth",
-            "description": "Downlink Bandwidth (in MHz)",
-            "type": "number",
-            "default": 40
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 50
+    },
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 520000
+    },
+    "nr_band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "number",
+      "default": 38
+    },
+    "nr_bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth (in MHz)",
+      "type": "number",
+      "default": 40
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd3500-enb-epc-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd3500-enb-epc-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 30
-        },
-        "dl_earfcn": {
-            "title": "DL EARFCN",
-            "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 42590
-        },
-        "n_rb_dl": {
-            "title": "DL RB",
-            "description": "number of DL resource blocks",
-            "type": "number",
-            "default": 100
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 30
+    },
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 42590
+    },
+    "n_rb_dl": {
+      "title": "DL RB",
+      "description": "number of DL resource blocks",
+      "type": "number",
+      "default": 100
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd3500-enb-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd3500-enb-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 30
-        },
-        "dl_earfcn": {
-            "title": "DL EARFCN",
-            "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 42590
-        },
-        "n_rb_dl": {
-            "title": "DL RB",
-            "description": "number of DL resource blocks",
-            "type": "number",
-            "default": 100
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 30
+    },
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 42590
+    },
+    "n_rb_dl": {
+      "title": "DL RB",
+      "description": "number of DL resource blocks",
+      "type": "number",
+      "default": 100
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd3500-gnb-epc-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd3500-gnb-epc-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 50
-        },
-        "dl_nr_arfcn": {
-            "title": "DL NR ARFCN",
-            "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 632628
-        },
-        "nr_band": {
-            "title": "NR band",
-            "description": "NR band number",
-            "type": "number",
-            "default": 78
-        },
-        "nr_bandwidth": {
-            "title": "Bandwidth",
-            "description": "Downlink Bandwidth (in MHz)",
-            "type": "number",
-            "default": 40
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 50
+    },
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 632628
+    },
+    "nr_band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "number",
+      "default": 78
+    },
+    "nr_bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth (in MHz)",
+      "type": "number",
+      "default": 40
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 50
-        },
-        "dl_nr_arfcn": {
-            "title": "DL NR ARFCN",
-            "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 632628
-        },
-        "nr_band": {
-            "title": "NR band",
-            "description": "NR band number",
-            "type": "number",
-            "default": 78
-        },
-        "nr_bandwidth": {
-            "title": "Bandwidth",
-            "description": "Downlink Bandwidth (in MHz)",
-            "type": "number",
-            "default": 40
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 50
+    },
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 632628
+    },
+    "nr_band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "number",
+      "default": 78
+    },
+    "nr_bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth (in MHz)",
+      "type": "number",
+      "default": 40
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd3700-enb-epc-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd3700-enb-epc-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 30
-        },
-        "dl_earfcn": {
-            "title": "DL EARFCN",
-            "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 44590
-        },
-        "n_rb_dl": {
-            "title": "DL RB",
-            "description": "number of DL resource blocks",
-            "type": "number",
-            "default": 100
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 30
+    },
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 44590
+    },
+    "n_rb_dl": {
+      "title": "DL RB",
+      "description": "number of DL resource blocks",
+      "type": "number",
+      "default": 100
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd3700-enb-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd3700-enb-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 30
-        },
-        "dl_earfcn": {
-            "title": "DL EARFCN",
-            "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 44590
-        },
-        "n_rb_dl": {
-            "title": "DL RB",
-            "description": "number of DL resource blocks",
-            "type": "number",
-            "default": 100
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 30
+    },
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 44590
+    },
+    "n_rb_dl": {
+      "title": "DL RB",
+      "description": "number of DL resource blocks",
+      "type": "number",
+      "default": 100
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd3700-gnb-epc-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd3700-gnb-epc-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 50
-        },
-        "dl_nr_arfcn": {
-            "title": "DL NR ARFCN",
-            "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 646666
-        },
-        "nr_band": {
-            "title": "NR band",
-            "description": "NR band number",
-            "type": "number",
-            "default": 78
-        },
-        "nr_bandwidth": {
-            "title": "Bandwidth",
-            "description": "Downlink Bandwidth (in MHz)",
-            "type": "number",
-            "default": 40
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 50
+    },
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 646666
+    },
+    "nr_band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "number",
+      "default": 78
+    },
+    "nr_bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth (in MHz)",
+      "type": "number",
+      "default": 40
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json
+++ b/software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json
 {
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-
-    "title": "Input Parameters",
-    "properties": {
-        "tx_gain": {
-            "title": "Tx gain",
-            "description": "Tx gain (in dB)",
-            "type": "number",
-            "default": 70
-        },
-        "rx_gain": {
-            "title": "Rx gain",
-            "description": "Rx gain (in dB)",
-            "type": "number",
-            "default": 50
-        },
-        "dl_nr_arfcn": {
-            "title": "DL NR ARFCN",
-            "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
-            "type": "number",
-            "default": 646666
-        },
-        "nr_band": {
-            "title": "NR band",
-            "description": "NR band number",
-            "type": "number",
-            "default": 78
-        },
-        "nr_bandwidth": {
-            "title": "Bandwidth",
-            "description": "Downlink Bandwidth (in MHz)",
-            "type": "number",
-            "default": 40
-        }
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "tx_gain": {
+      "title": "Tx gain",
+      "description": "Tx gain (in dB)",
+      "type": "number",
+      "default": 70
+    },
+    "rx_gain": {
+      "title": "Rx gain",
+      "description": "Rx gain (in dB)",
+      "type": "number",
+      "default": 50
+    },
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "number",
+      "default": 646666
+    },
+    "nr_band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "number",
+      "default": 78
+    },
+    "nr_bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth (in MHz)",
+      "type": "number",
+      "default": 40
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/software-tdd1900.cfg.json
+++ b/software/ors-amarisoft/software-tdd1900.cfg.json
 {
-    "name": "ORS Amarisoft",
-    "description": "4G and 5G amarisoft stack for ORS",
-    "serialisation": "xml",
-    "software-type": {
-        "enb": {
-             "title": "eNB",
-             "software-type": "enb",
-             "description": "eNodeB Configuration",
-             "request": "instance-tdd1900-enb-input-schema.json",
-             "response": "instance-tdd1900-enb-schema.json",
-             "index": 0
-         },
-        "enb-epc": {
-             "title": "eNB and EPC",
-             "software-type": "enb-epc",
-             "description": "eNodeB and EPC Configuration",
-             "request": "instance-tdd1900-enb-epc-input-schema.json",
-             "response": "instance-tdd1900-enb-epc-schema.json",
-             "index": 1
-         },
-        "gnb": {
-             "title": "gNB",
-             "software-type": "gnb",
-             "description": "gNodeB Configuration",
-             "request": "instance-tdd1900-gnb-input-schema.json",
-             "response": "instance-tdd1900-gnb-schema.json",
-             "index": 2
-         },
-        "gnb-epc": {
-             "title": "gNB and EPC",
-             "software-type": "gnb-epc",
-             "description": "gNodeB and EPC Configuration",
-             "request": "instance-tdd1900-gnb-epc-input-schema.json",
-             "response": "instance-tdd1900-gnb-epc-schema.json",
-             "index": 3
-         },
-        "epc": {
-             "title": "EPC",
-             "software-type": "epc",
-             "description": "EPC Configuration",
-             "request": "instance-epc-input-schema.json",
-             "response": "instance-epc-schema.json",
-             "index": 4
-         },
-        "epc-slave": {
-             "title": "Sim Card",
-             "description": "EPC Configuration",
-             "software-type": "epc",
-             "request": "instance-epc-slave-input-schema.json",
-             "response": "instance-epc-slave-schema.json",
-             "shared": true,
-             "index": 5
-         }
+  "name": "ORS Amarisoft",
+  "description": "4G and 5G amarisoft stack for ORS",
+  "serialisation": "xml",
+  "software-type": {
+    "enb": {
+      "title": "eNB",
+      "software-type": "enb",
+      "description": "eNodeB Configuration",
+      "request": "instance-tdd1900-enb-input-schema.json",
+      "response": "instance-tdd1900-enb-schema.json",
+      "index": 0
+    },
+    "enb-epc": {
+      "title": "eNB and EPC",
+      "software-type": "enb-epc",
+      "description": "eNodeB and EPC Configuration",
+      "request": "instance-tdd1900-enb-epc-input-schema.json",
+      "response": "instance-tdd1900-enb-epc-schema.json",
+      "index": 1
+    },
+    "gnb": {
+      "title": "gNB",
+      "software-type": "gnb",
+      "description": "gNodeB Configuration",
+      "request": "instance-tdd1900-gnb-input-schema.json",
+      "response": "instance-tdd1900-gnb-schema.json",
+      "index": 2
+    },
+    "gnb-epc": {
+      "title": "gNB and EPC",
+      "software-type": "gnb-epc",
+      "description": "gNodeB and EPC Configuration",
+      "request": "instance-tdd1900-gnb-epc-input-schema.json",
+      "response": "instance-tdd1900-gnb-epc-schema.json",
+      "index": 3
+    },
+    "epc": {
+      "title": "EPC",
+      "software-type": "epc",
+      "description": "EPC Configuration",
+      "request": "instance-epc-input-schema.json",
+      "response": "instance-epc-schema.json",
+      "index": 4
+    },
+    "epc-slave": {
+      "title": "Sim Card",
+      "description": "EPC Configuration",
+      "software-type": "epc",
+      "request": "instance-epc-slave-input-schema.json",
+      "response": "instance-epc-slave-schema.json",
+      "shared": true,
+      "index": 5
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/software-tdd2600.cfg.json
+++ b/software/ors-amarisoft/software-tdd2600.cfg.json
 {
-    "name": "ORS Amarisoft",
-    "description": "4G and 5G amarisoft stack for ORS",
-    "serialisation": "xml",
-    "software-type": {
-        "enb": {
-             "title": "eNB",
-             "software-type": "enb",
-             "description": "eNodeB Configuration",
-             "request": "instance-tdd2600-enb-input-schema.json",
-             "response": "instance-tdd2600-enb-schema.json",
-             "index": 0
-         },
-        "enb-epc": {
-             "title": "eNB and EPC",
-             "software-type": "enb-epc",
-             "description": "eNodeB and EPC Configuration",
-             "request": "instance-tdd2600-enb-epc-input-schema.json",
-             "response": "instance-tdd2600-enb-epc-schema.json",
-             "index": 1
-         },
-        "gnb": {
-             "title": "gNB",
-             "software-type": "gnb",
-             "description": "gNodeB Configuration",
-             "request": "instance-tdd2600-gnb-input-schema.json",
-             "response": "instance-tdd2600-gnb-schema.json",
-             "index": 2
-         },
-        "gnb-epc": {
-             "title": "gNB and EPC",
-             "software-type": "gnb-epc",
-             "description": "gNodeB and EPC Configuration",
-             "request": "instance-tdd2600-gnb-epc-input-schema.json",
-             "response": "instance-tdd2600-gnb-epc-schema.json",
-             "index": 3
-         },
-        "epc": {
-             "title": "EPC",
-             "software-type": "epc",
-             "description": "EPC Configuration",
-             "request": "instance-epc-input-schema.json",
-             "response": "instance-epc-schema.json",
-             "index": 4
-         },
-        "epc-slave": {
-             "title": "Sim Card",
-             "description": "EPC Configuration",
-             "software-type": "epc",
-             "request": "instance-epc-slave-input-schema.json",
-             "response": "instance-epc-slave-schema.json",
-             "shared": true,
-             "index": 5
-         }
+  "name": "ORS Amarisoft",
+  "description": "4G and 5G amarisoft stack for ORS",
+  "serialisation": "xml",
+  "software-type": {
+    "enb": {
+      "title": "eNB",
+      "software-type": "enb",
+      "description": "eNodeB Configuration",
+      "request": "instance-tdd2600-enb-input-schema.json",
+      "response": "instance-tdd2600-enb-schema.json",
+      "index": 0
+    },
+    "enb-epc": {
+      "title": "eNB and EPC",
+      "software-type": "enb-epc",
+      "description": "eNodeB and EPC Configuration",
+      "request": "instance-tdd2600-enb-epc-input-schema.json",
+      "response": "instance-tdd2600-enb-epc-schema.json",
+      "index": 1
+    },
+    "gnb": {
+      "title": "gNB",
+      "software-type": "gnb",
+      "description": "gNodeB Configuration",
+      "request": "instance-tdd2600-gnb-input-schema.json",
+      "response": "instance-tdd2600-gnb-schema.json",
+      "index": 2
+    },
+    "gnb-epc": {
+      "title": "gNB and EPC",
+      "software-type": "gnb-epc",
+      "description": "gNodeB and EPC Configuration",
+      "request": "instance-tdd2600-gnb-epc-input-schema.json",
+      "response": "instance-tdd2600-gnb-epc-schema.json",
+      "index": 3
+    },
+    "epc": {
+      "title": "EPC",
+      "software-type": "epc",
+      "description": "EPC Configuration",
+      "request": "instance-epc-input-schema.json",
+      "response": "instance-epc-schema.json",
+      "index": 4
+    },
+    "epc-slave": {
+      "title": "Sim Card",
+      "description": "EPC Configuration",
+      "software-type": "epc",
+      "request": "instance-epc-slave-input-schema.json",
+      "response": "instance-epc-slave-schema.json",
+      "shared": true,
+      "index": 5
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/software-tdd3500.cfg.json
+++ b/software/ors-amarisoft/software-tdd3500.cfg.json
 {
-    "name": "ORS Amarisoft",
-    "description": "4G and 5G amarisoft stack for ORS",
-    "serialisation": "xml",
-    "software-type": {
-        "enb": {
-             "title": "eNB",
-             "software-type": "enb",
-             "description": "eNodeB Configuration",
-             "request": "instance-tdd3500-enb-input-schema.json",
-             "response": "instance-tdd3500-enb-schema.json",
-             "index": 0
-         },
-        "enb-epc": {
-             "title": "eNB and EPC",
-             "software-type": "enb-epc",
-             "description": "eNodeB and EPC Configuration",
-             "request": "instance-tdd3500-enb-epc-input-schema.json",
-             "response": "instance-tdd3500-enb-epc-schema.json",
-             "index": 1
-         },
-        "gnb": {
-             "title": "gNB",
-             "software-type": "gnb",
-             "description": "gNodeB Configuration",
-             "request": "instance-tdd3500-gnb-input-schema.json",
-             "response": "instance-tdd3500-gnb-schema.json",
-             "index": 2
-         },
-        "gnb-epc": {
-             "title": "gNB and EPC",
-             "software-type": "gnb-epc",
-             "description": "gNodeB and EPC Configuration",
-             "request": "instance-tdd3500-gnb-epc-input-schema.json",
-             "response": "instance-tdd3500-gnb-epc-schema.json",
-             "index": 3
-         },
-        "epc": {
-             "title": "EPC",
-             "software-type": "epc",
-             "description": "EPC Configuration",
-             "request": "instance-epc-input-schema.json",
-             "response": "instance-epc-schema.json",
-             "index": 4
-         },
-        "epc-slave": {
-             "title": "Sim Card",
-             "description": "EPC Configuration",
-             "software-type": "epc",
-             "request": "instance-epc-slave-input-schema.json",
-             "response": "instance-epc-slave-schema.json",
-             "shared": true,
-             "index": 5
-         }
+  "name": "ORS Amarisoft",
+  "description": "4G and 5G amarisoft stack for ORS",
+  "serialisation": "xml",
+  "software-type": {
+    "enb": {
+      "title": "eNB",
+      "software-type": "enb",
+      "description": "eNodeB Configuration",
+      "request": "instance-tdd3500-enb-input-schema.json",
+      "response": "instance-tdd3500-enb-schema.json",
+      "index": 0
+    },
+    "enb-epc": {
+      "title": "eNB and EPC",
+      "software-type": "enb-epc",
+      "description": "eNodeB and EPC Configuration",
+      "request": "instance-tdd3500-enb-epc-input-schema.json",
+      "response": "instance-tdd3500-enb-epc-schema.json",
+      "index": 1
+    },
+    "gnb": {
+      "title": "gNB",
+      "software-type": "gnb",
+      "description": "gNodeB Configuration",
+      "request": "instance-tdd3500-gnb-input-schema.json",
+      "response": "instance-tdd3500-gnb-schema.json",
+      "index": 2
+    },
+    "gnb-epc": {
+      "title": "gNB and EPC",
+      "software-type": "gnb-epc",
+      "description": "gNodeB and EPC Configuration",
+      "request": "instance-tdd3500-gnb-epc-input-schema.json",
+      "response": "instance-tdd3500-gnb-epc-schema.json",
+      "index": 3
+    },
+    "epc": {
+      "title": "EPC",
+      "software-type": "epc",
+      "description": "EPC Configuration",
+      "request": "instance-epc-input-schema.json",
+      "response": "instance-epc-schema.json",
+      "index": 4
+    },
+    "epc-slave": {
+      "title": "Sim Card",
+      "description": "EPC Configuration",
+      "software-type": "epc",
+      "request": "instance-epc-slave-input-schema.json",
+      "response": "instance-epc-slave-schema.json",
+      "shared": true,
+      "index": 5
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/software-tdd3700.cfg.json
+++ b/software/ors-amarisoft/software-tdd3700.cfg.json
 {
-    "name": "ORS Amarisoft",
-    "description": "4G and 5G amarisoft stack for ORS",
-    "serialisation": "xml",
-    "software-type": {
-        "enb": {
-             "title": "eNB",
-             "software-type": "enb",
-             "description": "eNodeB Configuration",
-             "request": "instance-tdd3700-enb-input-schema.json",
-             "response": "instance-tdd3700-enb-schema.json",
-             "index": 0
-         },
-        "enb-epc": {
-             "title": "eNB and EPC",
-             "software-type": "enb-epc",
-             "description": "eNodeB and EPC Configuration",
-             "request": "instance-tdd3700-enb-epc-input-schema.json",
-             "response": "instance-tdd3700-enb-epc-schema.json",
-             "index": 1
-         },
-        "gnb": {
-             "title": "gNB",
-             "software-type": "gnb",
-             "description": "gNodeB Configuration",
-             "request": "instance-tdd3700-gnb-input-schema.json",
-             "response": "instance-tdd3700-gnb-schema.json",
-             "index": 2
-         },
-        "gnb-epc": {
-             "title": "gNB and EPC",
-             "software-type": "gnb-epc",
-             "description": "gNodeB and EPC Configuration",
-             "request": "instance-tdd3700-gnb-epc-input-schema.json",
-             "response": "instance-tdd3700-gnb-epc-schema.json",
-             "index": 3
-         },
-        "epc": {
-             "title": "EPC",
-             "software-type": "epc",
-             "description": "EPC Configuration",
-             "request": "instance-epc-input-schema.json",
-             "response": "instance-epc-schema.json",
-             "index": 4
-         },
-        "epc-slave": {
-             "title": "Sim Card",
-             "description": "EPC Configuration",
-             "software-type": "epc",
-             "request": "instance-epc-slave-input-schema.json",
-             "response": "instance-epc-slave-schema.json",
-             "shared": true,
-             "index": 5
-         }
+  "name": "ORS Amarisoft",
+  "description": "4G and 5G amarisoft stack for ORS",
+  "serialisation": "xml",
+  "software-type": {
+    "enb": {
+      "title": "eNB",
+      "software-type": "enb",
+      "description": "eNodeB Configuration",
+      "request": "instance-tdd3700-enb-input-schema.json",
+      "response": "instance-tdd3700-enb-schema.json",
+      "index": 0
+    },
+    "enb-epc": {
+      "title": "eNB and EPC",
+      "software-type": "enb-epc",
+      "description": "eNodeB and EPC Configuration",
+      "request": "instance-tdd3700-enb-epc-input-schema.json",
+      "response": "instance-tdd3700-enb-epc-schema.json",
+      "index": 1
+    },
+    "gnb": {
+      "title": "gNB",
+      "software-type": "gnb",
+      "description": "gNodeB Configuration",
+      "request": "instance-tdd3700-gnb-input-schema.json",
+      "response": "instance-tdd3700-gnb-schema.json",
+      "index": 2
+    },
+    "gnb-epc": {
+      "title": "gNB and EPC",
+      "software-type": "gnb-epc",
+      "description": "gNodeB and EPC Configuration",
+      "request": "instance-tdd3700-gnb-epc-input-schema.json",
+      "response": "instance-tdd3700-gnb-epc-schema.json",
+      "index": 3
+    },
+    "epc": {
+      "title": "EPC",
+      "software-type": "epc",
+      "description": "EPC Configuration",
+      "request": "instance-epc-input-schema.json",
+      "response": "instance-epc-schema.json",
+      "index": 4
+    },
+    "epc-slave": {
+      "title": "Sim Card",
+      "description": "EPC Configuration",
+      "software-type": "epc",
+      "request": "instance-epc-slave-input-schema.json",
+      "response": "instance-epc-slave-schema.json",
+      "shared": true,
+      "index": 5
    }
+  }
 }
\ No newline at end of file
--- a/software/ors-amarisoft/software.cfg.jinja2.json
+++ b/software/ors-amarisoft/software.cfg.jinja2.json
 {
-    "name": "ORS Amarisoft",
-    "description": "4G and 5G amarisoft stack for ORS",
-    "serialisation": "xml",
-    "software-type": {
-        "enb": {
-             "title": "eNB",
-             "software-type": "enb",
-             "description": "eNodeB Configuration",
-             "request": "instance-{{ rf_mode }}-enb-input-schema.json",
-             "response": "instance-{{ rf_mode }}-enb-schema.json",
-             "index": 0
-         },
-        "enb-epc": {
-             "title": "eNB and EPC",
-             "software-type": "enb-epc",
-             "description": "eNodeB and EPC Configuration",
-             "request": "instance-{{ rf_mode }}-enb-epc-input-schema.json",
-             "response": "instance-{{ rf_mode }}-enb-epc-schema.json",
-             "index": 1
-         },
-        "gnb": {
-             "title": "gNB",
-             "software-type": "gnb",
-             "description": "gNodeB Configuration",
-             "request": "instance-{{ rf_mode }}-gnb-input-schema.json",
-             "response": "instance-{{ rf_mode }}-gnb-schema.json",
-             "index": 2
-         },
-        "gnb-epc": {
-             "title": "gNB and EPC",
-             "software-type": "gnb-epc",
-             "description": "gNodeB and EPC Configuration",
-             "request": "instance-{{ rf_mode }}-gnb-epc-input-schema.json",
-             "response": "instance-{{ rf_mode }}-gnb-epc-schema.json",
-             "index": 3
-         },
-        "epc": {
-             "title": "EPC",
-             "software-type": "epc",
-             "description": "EPC Configuration",
-             "request": "instance-epc-input-schema.json",
-             "response": "instance-epc-schema.json",
-             "index": 4
-         },
-        "epc-slave": {
-             "title": "Sim Card",
-             "description": "EPC Configuration",
-             "software-type": "epc",
-             "request": "instance-epc-slave-input-schema.json",
-             "response": "instance-epc-slave-schema.json",
-             "shared": true,
-             "index": 5
-         }
+  "name": "ORS Amarisoft",
+  "description": "4G and 5G amarisoft stack for ORS",
+  "serialisation": "xml",
+  "software-type": {
+    "enb": {
+      "title": "eNB",
+      "software-type": "enb",
+      "description": "eNodeB Configuration",
+      "request": "instance-{{ rf_mode }}-enb-input-schema.json",
+      "response": "instance-{{ rf_mode }}-enb-schema.json",
+      "index": 0
+    },
+    "enb-epc": {
+      "title": "eNB and EPC",
+      "software-type": "enb-epc",
+      "description": "eNodeB and EPC Configuration",
+      "request": "instance-{{ rf_mode }}-enb-epc-input-schema.json",
+      "response": "instance-{{ rf_mode }}-enb-epc-schema.json",
+      "index": 1
+    },
+    "gnb": {
+      "title": "gNB",
+      "software-type": "gnb",
+      "description": "gNodeB Configuration",
+      "request": "instance-{{ rf_mode }}-gnb-input-schema.json",
+      "response": "instance-{{ rf_mode }}-gnb-schema.json",
+      "index": 2
+    },
+    "gnb-epc": {
+      "title": "gNB and EPC",
+      "software-type": "gnb-epc",
+      "description": "gNodeB and EPC Configuration",
+      "request": "instance-{{ rf_mode }}-gnb-epc-input-schema.json",
+      "response": "instance-{{ rf_mode }}-gnb-epc-schema.json",
+      "index": 3
+    },
+    "epc": {
+      "title": "EPC",
+      "software-type": "epc",
+      "description": "EPC Configuration",
+      "request": "instance-epc-input-schema.json",
+      "response": "instance-epc-schema.json",
+      "index": 4
+    },
+    "epc-slave": {
+      "title": "Sim Card",
+      "description": "EPC Configuration",
+      "software-type": "epc",
+      "request": "instance-epc-slave-input-schema.json",
+      "response": "instance-epc-slave-schema.json",
+      "shared": true,
+      "index": 5
    }
+  }
 }