[ONOS-6615] Configuration service doesn't add rest and netconf devices together

Change-Id: I40daa2800109e2ed7e42b4cc6507a200b4d440a8
diff --git a/tools/test/configs/bmv2-cfg.json b/tools/test/configs/bmv2-cfg.json
index 20f4010..dc71153 100644
--- a/tools/test/configs/bmv2-cfg.json
+++ b/tools/test/configs/bmv2-cfg.json
@@ -1,7 +1,7 @@
 {
   "apps":{
     "org.onosproject.bmv2":{
-      "devices":[{
+      "bmv2_devices":[{
         "ip":"192.168.57.100",
         "port":9090
       }]
diff --git a/tools/test/configs/netconf-cfg-old.json b/tools/test/configs/netconf-cfg-old.json
index e9910b4..e80aa50 100644
--- a/tools/test/configs/netconf-cfg-old.json
+++ b/tools/test/configs/netconf-cfg-old.json
@@ -8,7 +8,7 @@
   },
   "apps":{
     "org.onosproject.netconf":{
-      "devices":[{
+      "netconf_devices":[{
         "username":"mininet",
         "password":"mininet",
         "ip":"192.168.56.104",
diff --git a/tools/test/configs/restSB-cfg-old.json b/tools/test/configs/restSB-cfg-old.json
index f7aa152..9d1181e 100644
--- a/tools/test/configs/restSB-cfg-old.json
+++ b/tools/test/configs/restSB-cfg-old.json
@@ -8,7 +8,7 @@
   },
   "apps": {
     "org.onosproject.restsb": {
-      "devices": [{
+      "rest_devices": [{
         "username": "dev",
         "password": "",
         "ip": "127.0.0.1",