From 2d344caf1e2bb69ae470942fc825796905954d65 Mon Sep 17 00:00:00 2001 From: Tomas Olvecky Date: Tue, 15 Apr 2014 14:15:48 +0200 Subject: [PATCH] Resolve Bug:748 - Remove test resources from netconf-impl. Remove old testing resources that are not required in tests. Change-Id: Idba3be129aa177fa2eb362032719c79fb30331ba Signed-off-by: Tomas Olvecky --- .../controller/netconf/impl/chunked1.txt | 35 ----- .../controller/netconf/impl/chunked2.txt | 48 ------- .../controller/netconf/impl/chunked3.txt | 43 ------ .../controller/netconf/impl/chunked4.txt | 40 ------ .../controller/netconf/impl/chunked5.txt | 42 ------ .../jolokia_config_bean_response.txt | 18 --- .../jolokia_lookupConfigBeans.txt | 18 --- .../netconf/impl/notused/client_commit.xml | 4 - .../impl/notused/client_lock_candidate.xml | 8 -- .../impl/notused/client_lock_running.xml | 8 -- .../impl/notused/client_modify_candidate.xml | 20 --- .../impl/notused/client_unlock_candidate.xml | 8 -- .../impl/notused/client_unlock_running.xml | 8 -- .../server_error_missing_attribute.xml | 11 -- .../src/test/resources/testConfigs/input.json | 10 -- .../src/test/resources/testConfigs/input.xml | 7 - .../test/resources/testConfigs/inputList.xml | 9 -- .../test/resources/testConfigs/inputMap.xml | 14 -- .../resources/testConfigs/inputMultiple.xml | 29 ---- .../resources/testConfigs/inputSetter.xml | 6 - .../resources/testConfigs/inputSetterList.xml | 8 -- .../resources/testConfigs/inputSetterMap.xml | 9 -- .../src/test/resources/testConfigs/map.json | 134 ------------------ 23 files changed, 537 deletions(-) delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked1.txt delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked2.txt delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked3.txt delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked4.txt delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked5.txt delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/listener/databaseinteractions/jolokia_config_bean_response.txt delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/listener/databaseinteractions/jolokia_lookupConfigBeans.txt delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_commit.xml delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_lock_candidate.xml delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_lock_running.xml delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_modify_candidate.xml delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_unlock_candidate.xml delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_unlock_running.xml delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/server_error_missing_attribute.xml delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/input.json delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/input.xml delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputList.xml delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputMap.xml delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputMultiple.xml delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetter.xml delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetterList.xml delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetterMap.xml delete mode 100644 opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/map.json diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked1.txt b/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked1.txt deleted file mode 100644 index aad72393cb..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked1.txt +++ /dev/null @@ -1,35 +0,0 @@ - -#24 - - - 14 - fred - - < -#2 -/r -#3 -pc> -## diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked2.txt b/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked2.txt deleted file mode 100644 index a36a85ea1f..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked2.txt +++ /dev/null @@ -1,48 +0,0 @@ - -#22 - - - - - -#18 - - - -#19 - - -#8 - - -#77 - - - - - -## diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked3.txt b/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked3.txt deleted file mode 100644 index d9dc43d620..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked3.txt +++ /dev/null @@ -1,43 +0,0 @@ - -#43 - - -#26 - - - -#35 - - - -#39 - - < -#40 -top xmlns="http://example.com/schema/1.2 -#26 -/config"> - - -#36 - - f -#56 -red - - - -#28 - - - - -## diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked4.txt b/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked4.txt deleted file mode 100644 index 0b8a102dff..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked4.txt +++ /dev/null @@ -1,40 +0,0 @@ - -#17 - - - - - - -#43 - - - -#16 - - -#22 - - - -## diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked5.txt b/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked5.txt deleted file mode 100644 index f8f3c4d7c2..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked5.txt +++ /dev/null @@ -1,42 +0,0 @@ - -#43 - - - - - < -#4 -/tar -#18 -get> - - -#41 - - - -#29 - Ethernet0/0 - 1500 - -#61 - - - - - -## diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/listener/databaseinteractions/jolokia_config_bean_response.txt b/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/listener/databaseinteractions/jolokia_config_bean_response.txt deleted file mode 100644 index 2ae32efb65..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/listener/databaseinteractions/jolokia_config_bean_response.txt +++ /dev/null @@ -1,18 +0,0 @@ -curl http://localhost:17777/jolokia/read/org.opendaylight.controller:instanceName=fixed1,type=ConfigBean,interfaceName=testing-threadpool | jsonpp -{ - "request": { - "mbean": "org.opendaylight.controller:instanceName=fixed1,interfaceName=testing-threadpool,type=ConfigBean", - "type": "read" - }, - "status": 200, - "timestamp": 1362416252, - "value": { - "ExportedInterfaces": [ - "testing-threadpool", - "modifiable-threadpool" - ], - "ImplementationName": "fixed", - "ThreadCount": 10, - "TriggerNewInstanceCreation": false - } -} \ No newline at end of file diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/listener/databaseinteractions/jolokia_lookupConfigBeans.txt b/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/listener/databaseinteractions/jolokia_lookupConfigBeans.txt deleted file mode 100644 index 2ae705a54f..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/listener/databaseinteractions/jolokia_lookupConfigBeans.txt +++ /dev/null @@ -1,18 +0,0 @@ -$ curl 'http://localhost:17777/jolokia/exec/org.opendaylight.controller:type=ConfigRegistry/lookupConfigBeans()' | jsonpp -{ - "request": { - "mbean": "org.opendaylight.controller:type=ConfigRegistry", - "operation": "lookupConfigBeans()", - "type": "exec" - }, - "status": 200, - "timestamp": 1362417043, - "value": [ - { - "objectName": "org.opendaylight.controller:instanceName=fixed1,interfaceName=modifiable-threadpool,type=ConfigBean" - }, - { - "objectName": "org.opendaylight.controller:instanceName=fixed1,interfaceName=testing-threadpool,type=ConfigBean" - } - ] -} diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_commit.xml b/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_commit.xml deleted file mode 100644 index 6eca609b6c..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_commit.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - \ No newline at end of file diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_lock_candidate.xml b/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_lock_candidate.xml deleted file mode 100644 index 6a9ed639d8..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_lock_candidate.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_lock_running.xml b/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_lock_running.xml deleted file mode 100644 index 2d66c45906..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_lock_running.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_modify_candidate.xml b/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_modify_candidate.xml deleted file mode 100644 index ce67845de1..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_modify_candidate.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - none - test-then-set - stop-on-error - - - - 7 - - - - - \ No newline at end of file diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_unlock_candidate.xml b/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_unlock_candidate.xml deleted file mode 100644 index dd6fe1ba1e..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_unlock_candidate.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_unlock_running.xml b/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_unlock_running.xml deleted file mode 100644 index f94af4698d..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_unlock_running.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/server_error_missing_attribute.xml b/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/server_error_missing_attribute.xml deleted file mode 100644 index c70184e2b4..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/server_error_missing_attribute.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - rpc - missing-attribute - error - - message-id - rpc - - - diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/input.json b/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/input.json deleted file mode 100644 index fcef6b730c..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/input.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "value":null, - "status":200, - "request": { - "type":"exec", - "mbean":"java.util.logging:type=Logging", - "operation":"setLoggerLevel", - "arguments":["global","INFO"] - } -} \ No newline at end of file diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/input.xml b/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/input.xml deleted file mode 100644 index 09ba714ea9..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/input.xml +++ /dev/null @@ -1,7 +0,0 @@ - - org.opendaylight.controller:type=AppDeployer - EXEC - lookupConfigBeans - abc,bcd.aas - 64 - \ No newline at end of file diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputList.xml b/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputList.xml deleted file mode 100644 index 011d472634..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputList.xml +++ /dev/null @@ -1,9 +0,0 @@ - - org.opendaylight.controller:type=AppDeployer - EXEC - lookupConfigBeans - - 22 - 69 - - \ No newline at end of file diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputMap.xml b/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputMap.xml deleted file mode 100644 index 947335d215..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputMap.xml +++ /dev/null @@ -1,14 +0,0 @@ - - org.opendaylight.controller:type=AppDeployer - EXEC - lookupConfigBeans - - - single - mock - - 2 - 22 - arg - - \ No newline at end of file diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputMultiple.xml b/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputMultiple.xml deleted file mode 100644 index 2ad485f6c5..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputMultiple.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - org.opendaylight.controller:type=AppDeployer - EXEC - lookupConfigBeans - abc,bcd.aas - 22 - - - org.opendaylight.controller:type=AppDeployer - WRITE - attribute - 22 - - - org.opendaylight.controller:type=AppDeployer - EXEC - lookupConfigBeans - - - single - mock - - 2 - 22 - arg - - - \ No newline at end of file diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetter.xml b/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetter.xml deleted file mode 100644 index a5882d6ded..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetter.xml +++ /dev/null @@ -1,6 +0,0 @@ - - org.opendaylight.controller:type=AppDeployer - WRITE - attribute - 22 - \ No newline at end of file diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetterList.xml b/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetterList.xml deleted file mode 100644 index 24d2171fe4..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetterList.xml +++ /dev/null @@ -1,8 +0,0 @@ - - org.opendaylight.controller:type=AppDeployer - WRITE - attribute - 22 - 222 - 223 - \ No newline at end of file diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetterMap.xml b/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetterMap.xml deleted file mode 100644 index 9af105fe58..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetterMap.xml +++ /dev/null @@ -1,9 +0,0 @@ - - org.opendaylight.controller:type=AppDeployer - WRITE - setAtr - - 1 - 2 - - diff --git a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/map.json b/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/map.json deleted file mode 100644 index d7538663e3..0000000000 --- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/map.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "timestamp":1362488209, - "status":200, - "request":{ - "mbean":"org.opendaylight.controller:type=ConfigRegistry", - "attribute":"AvailableInterfacesAndImplementations", - "type":"read" - }, - "value":{ - "topology-registry":[ - "single" - ], - "bgp-update":[ - "mock", - "bgp-impl" - ], - "positioning-service":[ - "combine", - "onehop", - "ondemand", - "pxe", - "precompute" - ], - "serializer":[ - "serializer-impl" - ], - "network-topology-factory":[ - "mock-xml", - "bgp-network-topology-factory", - "transient" - ], - "dwe-topology":[ - "ebgp", - "defaultmetric", - "igp", - "network" - ], - "thread-factory":[ - "naming-thread-factory" - ], - "bgp-parser":[ - "parser" - ], - "pcep-dispatcher":[ - "dispatcher" - ], - "threadpool":[ - "flexible", - "fixed", - "scheduled" - ], - "scheduled-threadpool":[ - "scheduled" - ], - "positioning-onehop":[ - "onehop" - ], - "bgp-dispatcher":[ - "bgp-dispatcher-impl" - ], - "cost-combiner":[ - "pxe" - ], - "apsp-provider":[ - "jgrapht", - "parallel", - "single-threaded" - ], - "topology":[ - "ebgp", - "defaultmetric", - "igp", - "network" - ], - "soap-resource":[ - "positioning-adaptor-pxe" - ], - "database-provider-factory":[ - "transient" - ], - "bgp-proposal-checker":[ - "bgp-proposal-checker-impl" - ], - "bgp-proposal":[ - "bgp-proposal-impl" - ], - "listenable-network-topology-factory":[ - "transient" - ], - "event-bus":[ - "sync", - "async" - ], - "topology-registry-provider":[ - "single" - ], - "topology-provider-factory":[ - "transient" - ], - "rest-resource":[ - "topology-resource-holder", - "alto-resource-holder", - "topology-visual-holder", - "network-resource-holder", - "path-resource-holder" - ], - "listenable-database-provider-factory":[ - "transient" - ], - "topology-validator":[ - "accept-all", - "threshold" - ], - "replicator":[ - "replicator-impl" - ], - "server":[ - "soap", - "rest" - ], - "combiner-pxe":[ - "pxe" - ], - "rest":[ - "rest" - ], - "soap":[ - "soap" - ], - "path-service":[ - "cariden" - ] - } -} \ No newline at end of file -- 2.36.6