26 files changed, 36 insertions, 55 deletions
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata1.json b/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata1.json
deleted file mode 100644
index aa3a1ccb4..000000000
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata1.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"performance-data": {
-		"measurement": [
-			{
-				"pm-key": "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.openroadm.pm.types.rev200413.OpticalPowerInputOSCMin",
-				"pm-value": "64"
-			},
-			{
-				"pm-key": "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.openroadm.pm.types.rev200413.BIPErrorCounter",
-				"pm-value": "65"
-			}
-		]
-	},
-	"uuid-interface": "device",
-	"granularity-period": "Period15Min",
-	"time-stamp": "2020-11-24T14:57:29.6Z",
-	"node-name": "NTS_RDM2"
-}
-\ No newline at end of file
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata2.json b/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata2.json
deleted file mode 100644
index d784cf056..000000000
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata2.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"performance-data": {
-		"measurement": [
-			{
-				"pm-key": "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.openroadm.pm.types.rev200413.CodeViolations",
-				"pm-value": "11298624220985537708"
-			}
-		]
-	},
-	"uuid-interface": "device",
-	"granularity-period": "Period15Min",
-	"time-stamp": "2020-11-24T14:57:29.6Z",
-	"node-name": "NTS_RDM2"
-}
-\ No newline at end of file
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata3.json b/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata3.json
deleted file mode 100644
index 0747e3171..000000000
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata3.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"performance-data": {
-		"measurement": [
-			{
-				"pm-key": "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.openroadm.pm.types.rev200413.DelayTCM2Up",
-				"pm-value": "11298624220985537708"
-			}
-		]
-	},
-	"uuid-interface": "shared-risk-group",
-	"granularity-period": "Period15Min",
-	"time-stamp": "2020-10-24T08:17:02.5Z",
-	"node-name": "openroadm1"
-}
-\ No newline at end of file
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/log4j.properties b/sdnr/wt/data-provider/provider/src/test/resources/log4j.properties
deleted file mode 100644
index e4fcb0130..000000000
--- a/sdnr/wt/data-provider/provider/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=DEBUG, A1
-
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-\ No newline at end of file
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/simplelogger.properties b/sdnr/wt/data-provider/provider/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..85525bf4b
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/test/resources/simplelogger.properties
@@ -0,0 +1,36 @@
+#
+# ============LICENSE_START=======================================================
+# ONAP : ccsdk features
+# ================================================================================
+# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=======================================================
+#
+#
+# SLF4J's SimpleLogger configuration file
+# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
+
+# Default logging detail level for all instances of SimpleLogger.
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, defaults to "info".
+org.slf4j.simpleLogger.defaultLogLevel=debug
+org.slf4j.simpleLogger.showDateTime=true
+
+org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
+org.slf4j.simpleLogger.showThreadName=true
+org.slf4j.simpleLogger.showLogName=true
+org.slf4j.simpleLogger.showShortLogName=false
+org.slf4j.simpleLogger.org.onap.ccsdk.features.sdnr.wt.dataprovider=DEBUG
+org.slf4j.simpleLogger.org.onap.ccsdk.features.sdnr.wt.common=DEBUG
+
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/1.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/1.json
index bcf5e1d0a..bcf5e1d0a 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/1.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/1.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/10.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/10.json
index 6eed5d6a8..6eed5d6a8 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/10.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/10.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/11.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/11.json
index 46a4d0650..46a4d0650 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/11.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/11.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/12.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/12.json
index 02d592e56..02d592e56 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/12.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/12.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/13.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/13.json
index 85c3723b7..85c3723b7 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/13.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/13.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/14.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/14.json
index 1fa236e10..1fa236e10 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/14.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/14.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/15.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/15.json
index ff40c4e8b..ff40c4e8b 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/15.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/15.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/16.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/16.json
index fbd62e04d..fbd62e04d 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/16.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/16.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/17.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/17.json
index 1704468f3..1704468f3 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/17.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/17.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/18.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/18.json
index eaec335b4..eaec335b4 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/18.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/18.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/19.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/19.json
index 9a7eb62a7..9a7eb62a7 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/19.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/19.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/2.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/2.json
index ff352653a..ff352653a 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/2.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/2.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/20.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/20.json
index 179794027..179794027 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/20.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/20.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/21.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/21.json
index c76d6715e..c76d6715e 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/21.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/21.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/3.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/3.json
index 1dc6dfce2..1dc6dfce2 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/3.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/3.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/4.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/4.json
index ab1132692..ab1132692 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/4.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/4.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/5.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/5.json
index e54173fe6..e54173fe6 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/5.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/5.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/6.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/6.json
index 8486033b0..8486033b0 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/6.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/6.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/7.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/7.json
index 5c583bec7..5c583bec7 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/7.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/7.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/8.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/8.json
index a86819a7d..a86819a7d 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/8.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/8.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/9.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/9.json
index 914033bb4..914033bb4 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/9.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/9.json