Merge "Resolve Bug:748 - Remove test resources from netconf-impl."

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 (file)
index aad7239..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked1.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#24
-<rpc message-id="101" xm
-#28
-lns="urn:ietf:params:xml:ns:
-#2
-ne
-#33
-tconf:base:1.0">
-  <my-own-method
-#3
- xm
-#13
-lns="http://e
-#34
-xample.net/me/my-own/1.0">
-    <my
-#8
--first-p
-#21
-arameter>14</my-first
-#26
--parameter>
-    <another-p
-#23
-arameter>fred</another-
-#31
-parameter>
- </my-own-method>
- <
-#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 (file)
index a36a85e..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked2.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-#22
-<rpc message-id="101" 
-#24
-xmlns="urn:ietf:params:x
-#15
-ml:ns:netconf:b
-#54
-ase:1.0">
-  <get-config>
-      <source>
-            <r
-#2
-un
-#9
-ning/>
-  
-#18
-  </source>    <fi
-#33
-lter type="subtree">
-      <top x
-#4
-mlns
-#31
-="http://example.com/schema/1.2
-#15
-/config">
-     
-#19
-   <users>
-        
-#8
-     <us
-#3
-er/
-#5
->
-   
-#77
-     </users>
-           </top>
-               </filter>
-                 </g
-#17
-et-config>
-</rpc>
-##

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 (file)
index d9dc43d..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked3.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#43
-<rpc message-id="101" xmlns="urn:ietf:param
-#14
-s:xml:ns:netco
-#14
-nf:base:1.0">
-
-#26
-<get-config>
-    <source>
-
-#35
-     <running/>
-         </source>
-
-#39
-    <filter type="subtree">
-          <
-#40
-top xmlns="http://example.com/schema/1.2
-#26
-/config">
-        <users>
-
-#36
-     <user>
-                 <name>f
-#56
-red</name>
-          </user>
-                  </users>
-
-#28
-      </top>
-          </fil
-#1
-t
-#28
-er>
-  </get-config>
-  </rpc>
-##

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 (file)
index 0b8a102..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked4.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-
-#17
-<rpc message-id="
-#25
-101" xmlns="urn:ietf:para
-#19
-ms:xml:ns:netconf:b
-#3
-ase
-#19
-:1.0">
-  <get-confi
-#61
-g>
-    <source>
-          <running/>
-              </source>
-
-#43
-  <filter type="subtree">
-        <!-- requ
-#13
-est a text ve
-#22
-rsion of the configura
-#9
-tion -->
-
-#16
-   <config-text 
-#45
-xmlns="http://example.com/text/1.2/config"/>
-
-#22
-    </filter>
-      </
-#18
-get-config>
-</rpc>
-##

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 (file)
index f8f3c4d..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/chunked5.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#43
-<rpc message-id="101" xmlns="urn:ietf:param
-#41
-s:xml:ns:netconf:base:1.0">
-  <edit-confi
-#29
-g>
-    <target>
-          <ru
-#13
-nning/>
-    <
-#4
-/tar
-#18
-get>
-    <config>
-
-#41
-  <top xmlns="http://example.com/schema/1
-#32
-.2/config">
-        <interface>
-
-#29
-        <name>Ethernet0/0</na
-#30
-me>
-          <mtu>1500</mtu>
-
-#61
-</interface>
-      </top>
-          </config>
-            </e
-#9
-dit-confi
-#9
-g>
-</rpc>
-##

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 (file)
index 2ae32ef..0000000
--- 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 (file)
index 2ae705a..0000000
--- 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 (file)
index 6eca609..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_commit.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<rpc message-id="104"
-     xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <commit/>
-</rpc>
\ 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 (file)
index 6a9ed63..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_lock_candidate.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<rpc message-id="102"
-     xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <lock>
-        <target>
-            <candidate/>
-        </target>
-    </lock>
-</rpc>
\ 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 (file)
index 2d66c45..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_lock_running.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<rpc message-id="101"
-     xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <lock>
-        <target>
-            <running/>
-        </target>
-    </lock>
-</rpc>
\ 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 (file)
index ce67845..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_modify_candidate.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<rpc message-id="103"
-     xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <edit-config>
-        <target>
-            <candidate/>
-        </target>
-        <default-operation>none</default-operation>
-        <test-option>test-then-set</test-option>
-        <error-option>stop-on-error</error-option>
-        <nc:config
-                xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"
-                xmlns="uri-for-my-data-model-namespace">
-            <some-existing-node>
-                <my-new-node nc:operation="create">
-                    <my-new-leaf>7</my-new-leaf>
-                </my-new-node>
-            </some-existing-node>
-        </nc:config>
-    </edit-config>
-</rpc>
\ 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 (file)
index dd6fe1b..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_unlock_candidate.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<rpc message-id="105"
-     xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <unlock>
-        <target>
-            <candidate/>
-        </target>
-    </unlock>
-</rpc>
\ 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 (file)
index f94af46..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/org/opendaylight/controller/netconf/impl/notused/client_unlock_running.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<rpc message-id="106"
-     xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <unlock>
-        <target>
-            <running/>
-        </target>
-    </unlock>
-</rpc>
\ 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 (file)
index c70184e..0000000
--- 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-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <rpc-error>
-        <error-type>rpc</error-type>
-        <error-tag>missing-attribute</error-tag>
-        <error-severity>error</error-severity>
-        <error-info>
-            <bad-attribute>message-id</bad-attribute>
-            <bad-element>rpc</bad-element>
-        </error-info>
-    </rpc-error>
-</rpc-reply>

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 (file)
index fcef6b7..0000000
--- 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 (file)
index 09ba714..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/input.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<jmxbean>
-    <mBean>org.opendaylight.controller:type=AppDeployer</mBean>
-    <type>EXEC</type>
-    <operation>lookupConfigBeans</operation>
-    <arguments>abc,bcd.aas</arguments>
-    <arguments>64</arguments>
-</jmxbean>
\ 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 (file)
index 011d472..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputList.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<jmxbean>
-    <mBean>org.opendaylight.controller:type=AppDeployer</mBean>
-    <type>EXEC</type>
-    <operation>lookupConfigBeans</operation>
-    <arguments>
-        <elements>22</elements>
-        <elements>69</elements>
-    </arguments>
-</jmxbean>
\ 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 (file)
index 947335d..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputMap.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<jmxbean>
-    <mBean>org.opendaylight.controller:type=AppDeployer</mBean>
-    <type>EXEC</type>
-    <operation>lookupConfigBeans</operation>
-    <arguments>
-        <map>
-            <topology-registry>single</topology-registry>
-            <bgp-update>mock</bgp-update>
-        </map>
-        <array>2</array>
-        <array>22</array>
-        <anotherArg>arg</anotherArg>
-    </arguments>
-</jmxbean>
\ 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 (file)
index 2ad485f..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputMultiple.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<config>
-    <jmxbean>
-        <mBean>org.opendaylight.controller:type=AppDeployer</mBean>
-        <type>EXEC</type>
-        <operation>lookupConfigBeans</operation>
-        <attribute>abc,bcd.aas</attribute>
-        <attribute>22</attribute>
-    </jmxbean>
-    <jmxbean>
-        <mBean>org.opendaylight.controller:type=AppDeployer</mBean>
-        <type>WRITE</type>
-        <attribute>attribute</attribute>
-        <value>22</value>
-    </jmxbean>
-    <jmxbean>
-        <mBean>org.opendaylight.controller:type=AppDeployer</mBean>
-        <type>EXEC</type>
-        <operation>lookupConfigBeans</operation>
-        <arguments>
-            <map>
-                <topology-registry>single</topology-registry>
-                <bgp-update>mock</bgp-update>
-            </map>
-            <array>2</array>
-            <array>22</array>
-            <anotherArg>arg</anotherArg>
-        </arguments>
-    </jmxbean>
-</config>
\ 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 (file)
index a5882d6..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetter.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<jmxbean>
-    <mBean>org.opendaylight.controller:type=AppDeployer</mBean>
-    <type>WRITE</type>
-    <attribute>attribute</attribute>
-    <value>22</value>
-</jmxbean>
\ 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 (file)
index 24d2171..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetterList.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<jmxbean>
-    <mBean>org.opendaylight.controller:type=AppDeployer</mBean>
-    <type>WRITE</type>
-    <attribute>attribute</attribute>
-    <value>22</value>
-    <value>222</value>
-    <value>223</value>
-</jmxbean>
\ 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 (file)
index 9af105f..0000000
--- a/opendaylight/netconf/netconf-impl/src/test/resources/testConfigs/inputSetterMap.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<jmxbean>
-    <mBean>org.opendaylight.controller:type=AppDeployer</mBean>
-    <type>WRITE</type>
-    <attribute>setAtr</attribute>
-    <value>
-        <abc>1</abc>
-        <bcd>2</bcd>
-    </value>
-</jmxbean>

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 (file)
index d753866..0000000
--- 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