ors-amarisoft: drop ru_type and ru_link_type

  Use key/object structure instead const, since it provides better struture whenever render the form.

  It is required to still update instance for follow up the change

software/ors-amarisoft/ru/common.json

@@ -5,8 +5,6 @@
   "type": "object",
 
   "required": [
-    "ru_type",
-    "ru_link_type",
     "n_antenna_dl",
     "n_antenna_ul",
     "tx_gain",
@@ -14,15 +12,6 @@
   ],
 
   "properties": {
-    "ru_type": {
-      "type": "string",
-      "options":  { "hidden": true }
-    },
-    "ru_link_type": {
-      "type": "string",
-      "options":  { "hidden": true }
-    },
-
     "n_antenna_dl": {
       "title": "Number of DL antennas",
       "type": "integer"

software/ors-amarisoft/ru/input-schema.json

@@ -3,7 +3,7 @@
 
   "title": "Radio Unit",
   "type": "object",
-  "oneOf": [
+  "anyOf": [
     { "$ref": "sdr/input-schema.json" },
     { "$ref": "lopcomm/input-schema.json" },
     { "$ref": "sunwave/input-schema.json" }

software/ors-amarisoft/ru/lopcomm/input-schema.json

 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-
   "title": "Lopcomm ORAN",
   "type": "object",
-
+  "properties": {
+    "loopcomm": {
+      "title": "Lopcomm ORAN",
+      "properties": {
+        "cpri": {
+          "title": "CPRI Link Type",
           "required": [
-    "ru_type",
-    "ru_link_type",
             "n_antenna_dl",
             "n_antenna_ul",
             "tx_gain",
             "rx_gain",
-
             "cpri_link",
             "mac_addr"
           ],
-
           "properties": {
             "$ref": "../../ru/common.json#/properties",
-
-    "ru_type": {
-      "$ref": "#/properties/ru_type",
-      "const":    "lopcomm",
-      "template": "lopcomm"
-    },
-    "ru_link_type": {
-      "$ref": "#/properties/ru_link_type",
-      "const":    "cpri",
-      "template": "cpri"
-    },
-
             "n_antenna_dl": {
               "$ref": "#/properties/n_antenna_dl",
               "default": 2
@@ -62,11 +50,17 @@
                 }
               }
             },
-
             "reset_schedule": {
               "title": "Cron schedule for RRH reset",
               "description": "Refer https://crontab.guru/ to make a reset schedule for RRH, for example, '0 1 * * *' means the RRH will reset every day at 1 am",
               "type": "string"
             }
           }
+        },
+        "type": "object"
+      },
+      "type": "object"
+    },
+    "type": "object"
+  }
 }

software/ors-amarisoft/ru/sdr/input-schema.json

@@ -5,31 +5,26 @@
   "description": "Radio Unit constituted of several SDR boards",
   "type": "object",
 
+  "properties": {
+    "sdr": {
+      "title": "SDR transiver",
+      "properties": {
+        "sdr": {
+          "title": "SDR Link Type",
           "required": [
-    "ru_type",
-    "ru_link_type",
             "n_antenna_dl",
             "n_antenna_ul",
             "tx_gain",
             "rx_gain",
-
             "sdr_dev_list"
           ],
-
           "properties": {
             "$ref": "../../ru/common.json#/properties",
-
-    "ru_type": {
-      "$ref": "#/properties/ru_type",
-      "const":    "sdr",
-      "template": "sdr"
-    },
             "ru_link_type": {
               "$ref": "#/properties/ru_link_type",
               "const":    "sdr",
-      "template": "sdr"
+              "default": "sdr"
             },
-
             "sdr_dev_list": {
               "title": "SDR boards",
               "description": "Which SDR boards to use as combined RF port",
@@ -42,4 +37,11 @@
               "uniqueItems": true
             }
           }
+        },
+        "type": "object"
+      },
+      "type": "object"
+    },
+    "type": "object"
+  }
 }

software/ors-amarisoft/ru/sunwave/input-schema.json

@@ -4,32 +4,23 @@
   "title": "Sunwave M2RU",
   "type": "object",
 
+  "properties": {
+    "sunwave": {
+      "title": "Sunwave M2RU",
+      "properties": {
+        "cpri": {
+          "title": "CPRI Link Type",
           "required": [
-    "ru_type",
-    "ru_link_type",
             "n_antenna_dl",
             "n_antenna_ul",
             "tx_gain",
             "rx_gain",
-
             "cpri_link",
             "mac_addr"
           ],
         
           "properties": {
             "$ref": "../../ru/common.json#/properties",
-
-    "ru_type": {
-      "$ref": "#/properties/ru_type",
-      "const":    "sunwave",
-      "template": "sunwave"
-    },
-    "ru_link_type": {
-      "$ref": "#/properties/ru_link_type",
-      "const":    "cpri",
-      "template": "cpri"
-    },
-
             "n_antenna_dl": {
               "$ref": "#/properties/n_antenna_dl",
               "default": 2
@@ -59,4 +50,11 @@
               }
             }
   	  }
+        }.
+        "type": "object"
+      },
+      "type": "object"
+    },
+    "type": "object"
+  }
 }