reduce discovery code to single loop

web/hadiscover1.json

@@ -5,12 +5,13 @@
     "obj_id" : "%s",
     "unit_of_meas" : "%s",
     "val_tpl" : "{{value_json['%s']}}",
+    "dev_cla" : "%s",
     "dev" : {
-        "ids" : [ "%s" ],
-        "name" : "%s",
-        "mdl" : "%s",
-        "sw" : "%s",
-        "mf" : "%s",
-        "cu" : "%s"
+      "ids" : [ "%s" ],
+      "name" : "%s",
+      "mdl" : "%s",
+      "sw" : "%s",
+      "mf" : "%s",
+      "cu" : "%s"
     }
 }

web/hadiscover2.json

@@ -6,8 +6,13 @@
     "unit_of_meas" : "%s",
     "val_tpl" : "{{value_json['%s']}}",
     "dev_cla" : "%s",
-    "stat_cla" : "%s",
     "dev" : {
-      "ids" : [ "%s" ]
-    }
+      "ids" : [ "%s" ],
+      "name" : "%s",
+      "mdl" : "%s",
+      "sw" : "%s",
+      "mf" : "%s",
+      "cu" : "%s"
+    },
+    "stat_cla" : "%s"
 }

web/hadiscover3.json

@@ -1,12 +0,0 @@
-{
-    "name" : "%s",
-    "stat_t" : "%s",
-    "uniq_id" : "%s",
-    "obj_id" : "%s",
-    "unit_of_meas" : "%s",
-    "val_tpl" : "{{value_json['%s']}}",
-    "dev_cla" : "%s",
-    "dev" : {
-      "ids" : [ "%s" ]
-    }
-}