From f933f62e1f0d948bfe38e4d371b4788e9222f84a Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Fri, 17 Jan 2014 14:04:15 +0100 Subject: [PATCH] Switch testing configuration for md-sal tests to xml. + Fix bug regarding leading/tailing whitespace in capability string unmarshalled from xml. Change-Id: Ia0de5cbef33f521c5e99d6ffd91c9631b0192b53 Signed-off-by: Maros Marsalek --- .../file/xml/model/ConfigSnapshot.java | 4 + .../file/xml/model/StringTrimAdapter.java | 26 +++ .../src/test/resources/controller.config | 23 -- .../src/test/resources/controller.xml | 46 ++++ opendaylight/md-sal/sal-binding-it/pom.xml | 22 +- .../test/sal/binding/it/TestHelper.java | 8 +- .../test/sal/binding/it/AbstractTest.java | 11 +- .../src/test/resources/controller.config | 123 ----------- .../src/test/resources/controller.xml | 200 ++++++++++++++++++ .../src/test/resources/controller.config | 123 ----------- .../test-it/src/test/resources/controller.xml | 197 +++++++++++++++++ .../md-sal/src/test/resources/controller.xml | 0 .../NetconfClientSessionNegotiator.java | 3 +- 13 files changed, 504 insertions(+), 282 deletions(-) create mode 100644 opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/StringTrimAdapter.java delete mode 100644 opendaylight/md-sal/clustered-data-store/integrationtest/src/test/resources/controller.config create mode 100644 opendaylight/md-sal/clustered-data-store/integrationtest/src/test/resources/controller.xml delete mode 100644 opendaylight/md-sal/sal-binding-it/src/test/resources/controller.config create mode 100644 opendaylight/md-sal/sal-binding-it/src/test/resources/controller.xml delete mode 100644 opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/resources/controller.config create mode 100644 opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/resources/controller.xml create mode 100644 opendaylight/md-sal/src/test/resources/controller.xml diff --git a/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/ConfigSnapshot.java b/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/ConfigSnapshot.java index cfc70858c3..d13052a7e2 100644 --- a/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/ConfigSnapshot.java +++ b/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/ConfigSnapshot.java @@ -13,6 +13,7 @@ import javax.xml.bind.annotation.XmlAnyElement; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.SortedSet; @XmlRootElement(name = ConfigSnapshot.SNAPSHOT_ROOT_ELEMENT_NAME) @@ -46,6 +47,7 @@ public class ConfigSnapshot { @XmlElement(name = "capability") @XmlElementWrapper(name = "required-capabilities") + @XmlJavaTypeAdapter(value=StringTrimAdapter.class) public SortedSet getCapabilities() { return capabilities; } @@ -62,4 +64,6 @@ public class ConfigSnapshot { sb.append('}'); return sb.toString(); } + } + diff --git a/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/StringTrimAdapter.java b/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/StringTrimAdapter.java new file mode 100644 index 0000000000..3c544d4e49 --- /dev/null +++ b/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/StringTrimAdapter.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.config.persist.storage.file.xml.model; + +import javax.xml.bind.annotation.adapters.XmlAdapter; + +final class StringTrimAdapter extends XmlAdapter { + @Override + public String unmarshal(String v) throws Exception { + if (v == null) + return null; + return v.trim(); + } + + @Override + public String marshal(String v) throws Exception { + if (v == null) + return null; + return v.trim(); + } +} diff --git a/opendaylight/md-sal/clustered-data-store/integrationtest/src/test/resources/controller.config b/opendaylight/md-sal/clustered-data-store/integrationtest/src/test/resources/controller.config deleted file mode 100644 index e49ba67ced..0000000000 --- a/opendaylight/md-sal/clustered-data-store/integrationtest/src/test/resources/controller.config +++ /dev/null @@ -1,23 +0,0 @@ -//START OF CONFIG-LAST - - - - prefix:dom-clustered-store-impl - cluster-data-store - - - - - -//END OF SNAPSHOT -urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:cluster:store?module=odl-sal-dom-clustered-store-cfg&revision=2013-10-28 -urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom?module=opendaylight-md-sal-dom&revision=2013-10-28 -urn:opendaylight:params:xml:ns:yang:controller:config?module=config&revision=2013-04-05 -urn:ietf:params:netconf:capability:candidate:1.0 -urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring?module=ietf-netconf-monitoring&revision=2010-10-04 -urn:ietf:params:xml:ns:yang:rpc-context?module=rpc-context&revision=2013-06-17 -urn:ietf:params:xml:ns:yang:ietf-inet-types?module=ietf-inet-types&revision=2010-09-24 -urn:ietf:params:netconf:capability:rollback-on-error:1.0 -urn:ietf:params:xml:ns:yang:ietf-yang-types?module=ietf-yang-types&revision=2010-09-24 -urn:opendaylight:params:xml:ns:yang:controller:md:sal:common?module=opendaylight-md-sal-common&revision=2013-10-28 -//END OF CONFIG diff --git a/opendaylight/md-sal/clustered-data-store/integrationtest/src/test/resources/controller.xml b/opendaylight/md-sal/clustered-data-store/integrationtest/src/test/resources/controller.xml new file mode 100644 index 0000000000..96cf639cba --- /dev/null +++ b/opendaylight/md-sal/clustered-data-store/integrationtest/src/test/resources/controller.xml @@ -0,0 +1,46 @@ + + + + + + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:cluster:store?module=odl-sal-dom-clustered-store-cfg&revision=2013-10-28 + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom?module=opendaylight-md-sal-dom&revision=2013-10-28 + + urn:opendaylight:params:xml:ns:yang:controller:config?module=config&revision=2013-04-05 + + urn:ietf:params:netconf:capability:candidate:1.0 + urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring?module=ietf-netconf-monitoring&revision=2010-10-04 + urn:ietf:params:xml:ns:yang:rpc-context?module=rpc-context&revision=2013-06-17 + + urn:ietf:params:xml:ns:yang:ietf-inet-types?module=ietf-inet-types&revision=2010-09-24 + + urn:ietf:params:netconf:capability:rollback-on-error:1.0 + urn:ietf:params:xml:ns:yang:ietf-yang-types?module=ietf-yang-types&revision=2010-09-24 + + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:common?module=opendaylight-md-sal-common&revision=2013-10-28 + + + + + + + + + prefix:dom-clustered-store-impl + + cluster-data-store + + + + + + + + + + + + diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml index 235e6ac51e..8b2c89a343 100644 --- a/opendaylight/md-sal/sal-binding-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-it/pom.xml @@ -21,6 +21,7 @@ ../sal-binding-broker/target/jacoco-it.exec 0.2.3-SNAPSHOT 0.2.3-SNAPSHOT + 2.5.0 @@ -63,7 +64,7 @@ - org.eclipse.m2e @@ -126,6 +127,7 @@ + org.opendaylight.yangtools.thirdparty xtend-lib-osgi @@ -173,10 +175,20 @@ org.opendaylight.controller - config-persister-file-adapter + config-persister-file-xml-adapter ${config.version} - + + org.eclipse.persistence + org.eclipse.persistence.moxy + ${moxy.controller.version} + + + org.eclipse.persistence + org.eclipse.persistence.core + ${moxy.controller.version} + + org.opendaylight.controller netconf-impl ${netconf.version} @@ -195,8 +207,8 @@ org.ops4j.pax.exam pax-exam ${exam.version} - compile diff --git a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java index c943226cca..2e2d770872 100644 --- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java +++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java @@ -78,7 +78,9 @@ public class TestHelper { mavenBundle(CONTROLLER, "config-netconf-connector").versionAsInProject(), // mavenBundle(CONTROLLER, "netconf-impl").versionAsInProject(), // - mavenBundle(CONTROLLER, "config-persister-file-adapter").versionAsInProject().noStart()); + mavenBundle(CONTROLLER, "config-persister-file-xml-adapter").versionAsInProject().noStart(), + mavenBundle("org.eclipse.persistence", "org.eclipse.persistence.moxy").versionAsInProject(), + mavenBundle("org.eclipse.persistence", "org.eclipse.persistence.core").versionAsInProject()); } @@ -119,9 +121,9 @@ public class TestHelper { systemProperty("netconf.tcp.client.port").value("18383"), // systemProperty("netconf.config.persister.active").value("1"), // systemProperty("netconf.config.persister.1.storageAdapterClass").value( - "org.opendaylight.controller.config.persist.storage.file.FileStorageAdapter"), // + "org.opendaylight.controller.config.persist.storage.file.xml.XmlFileStorageAdapter"), // systemProperty("netconf.config.persister.1.properties.fileStorage") - .value(PathUtils.getBaseDir() + "/src/test/resources/controller.config"), // + .value(PathUtils.getBaseDir() + "/src/test/resources/controller.xml"), // systemProperty("netconf.config.persister.1.properties.numberOfBackups").value("1") // //systemProperty("yangstore.blacklist").value(".*controller.model.*") // diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java index 9b814291b9..302d94bfea 100644 --- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java +++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java @@ -27,7 +27,7 @@ public abstract class AbstractTest { @Inject @Filter(timeout=60*1000) BindingAwareBroker broker; - + @Inject BundleContext bundleContext; @@ -64,9 +64,12 @@ public abstract class AbstractTest { bindingAwareSalBundles(), configMinumumBundles(), // BASE Models - baseModelBundles(), - flowCapableModelBundles(), + baseModelBundles(), + flowCapableModelBundles(), + + // Set fail if unresolved bundle present + systemProperty("pax.exam.osgi.unresolved.fail").value("true"), junitAndMockitoBundles()); } - + } diff --git a/opendaylight/md-sal/sal-binding-it/src/test/resources/controller.config b/opendaylight/md-sal/sal-binding-it/src/test/resources/controller.config deleted file mode 100644 index 28c3becc98..0000000000 --- a/opendaylight/md-sal/sal-binding-it/src/test/resources/controller.config +++ /dev/null @@ -1,123 +0,0 @@ -//START OF CONFIG-LAST - - - - prefix:schema-service-singleton - yang-schema-service - - - prefix:hash-map-data-store - hash-map-data-store - - - prefix:dom-broker-impl - dom-broker - - dom:dom-data-store - ref_hash-map-data-store - - - - prefix:binding-broker-impl - binding-broker-impl - - binding:binding-notification-service - ref_binding-notification-broker - - - binding:binding-data-broker - ref_binding-data-broker - - - - prefix:runtime-generated-mapping - runtime-mapping-singleton - - - prefix:binding-notification-broker - binding-notification-broker - - - prefix:binding-data-broker - binding-data-broker - - dom:dom-broker-osgi-registry - ref_dom-broker - - - binding:binding-dom-mapping-service - ref_runtime-mapping-singleton - - - - - - dom:schema-service - - ref_yang-schema-service - /config/modules/module[name='schema-service-singleton']/instance[name='yang-schema-service'] - - - - binding:binding-notification-service - - ref_binding-notification-broker - /config/modules/module[name='binding-notification-broker']/instance[name='binding-notification-broker'] - - - - dom:dom-data-store - - ref_hash-map-data-store - /config/modules/module[name='hash-map-data-store']/instance[name='hash-map-data-store'] - - - - binding:binding-broker-osgi-registry - - ref_binding-broker-impl - /config/modules/module[name='binding-broker-impl']/instance[name='binding-broker-impl'] - - - - binding-impl:binding-dom-mapping-service - - ref_runtime-mapping-singleton - /config/modules/module[name='runtime-generated-mapping']/instance[name='runtime-mapping-singleton'] - - - - dom:dom-broker-osgi-registry - - ref_dom-broker - /config/modules/module[name='dom-broker-impl']/instance[name='dom-broker'] - - - - binding:binding-data-broker - - ref_binding-data-broker - /config/modules/module[name='binding-data-broker']/instance[name='binding-data-broker'] - - - - - - -//END OF SNAPSHOT -urn:opendaylight:l2:types?module=opendaylight-l2-types&revision=2013-08-27 -urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 -urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom?module=opendaylight-md-sal-dom&revision=2013-10-28 -urn:opendaylight:params:xml:ns:yang:controller:config?module=config&revision=2013-04-05 -urn:ietf:params:netconf:capability:candidate:1.0 -urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring?module=ietf-netconf-monitoring&revision=2010-10-04 -urn:ietf:params:xml:ns:yang:rpc-context?module=rpc-context&revision=2013-06-17 -urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl?module=opendaylight-sal-binding-broker-impl&revision=2013-10-28 -urn:ietf:params:xml:ns:yang:ietf-inet-types?module=ietf-inet-types&revision=2010-09-24 -urn:ietf:params:netconf:capability:rollback-on-error:1.0 -urn:ietf:params:xml:ns:yang:ietf-yang-types?module=ietf-yang-types&revision=2010-09-24 -urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl?module=opendaylight-sal-dom-broker-impl&revision=2013-10-28 -urn:opendaylight:params:xml:ns:yang:controller:logback:config?module=config-logging&revision=2013-07-16 -urn:opendaylight:yang:extension:yang-ext?module=yang-ext&revision=2013-07-09 -urn:opendaylight:params:xml:ns:yang:controller:md:sal:common?module=opendaylight-md-sal-common&revision=2013-10-28 -//END OF CONFIG diff --git a/opendaylight/md-sal/sal-binding-it/src/test/resources/controller.xml b/opendaylight/md-sal/sal-binding-it/src/test/resources/controller.xml new file mode 100644 index 0000000000..08d22b96d6 --- /dev/null +++ b/opendaylight/md-sal/sal-binding-it/src/test/resources/controller.xml @@ -0,0 +1,200 @@ + + + + + + urn:opendaylight:l2:types?module=opendaylight-l2-types&revision=2013-08-27 + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom?module=opendaylight-md-sal-dom&revision=2013-10-28 + + urn:opendaylight:params:xml:ns:yang:controller:config?module=config&revision=2013-04-05 + + urn:ietf:params:netconf:capability:candidate:1.0 + urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring?module=ietf-netconf-monitoring&revision=2010-10-04 + urn:ietf:params:xml:ns:yang:rpc-context?module=rpc-context&revision=2013-06-17 + + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl?module=opendaylight-sal-binding-broker-impl&revision=2013-10-28 + + urn:ietf:params:xml:ns:yang:ietf-inet-types?module=ietf-inet-types&revision=2010-09-24 + + urn:ietf:params:netconf:capability:rollback-on-error:1.0 + urn:ietf:params:xml:ns:yang:ietf-yang-types?module=ietf-yang-types&revision=2010-09-24 + + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl?module=opendaylight-sal-dom-broker-impl&revision=2013-10-28 + + urn:opendaylight:params:xml:ns:yang:controller:logback:config?module=config-logging&revision=2013-07-16 + urn:opendaylight:yang:extension:yang-ext?module=yang-ext&revision=2013-07-09 + + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:common?module=opendaylight-md-sal-common&revision=2013-10-28 + + + + + + + + + + prefix:schema-service-singleton + + yang-schema-service + + + + prefix:hash-map-data-store + + hash-map-data-store + + + + prefix:dom-broker-impl + + dom-broker + + + dom:dom-data-store + + ref_hash-map-data-store + + + + + prefix:binding-broker-impl + + binding-broker-impl + + + binding:binding-notification-service + + ref_binding-notification-broker + + + + binding:binding-data-broker + + ref_binding-data-broker + + + + + prefix:runtime-generated-mapping + + runtime-mapping-singleton + + + + prefix:binding-notification-broker + + binding-notification-broker + + + + prefix:binding-data-broker + + binding-data-broker + + + dom:dom-broker-osgi-registry + + ref_dom-broker + + + + binding:binding-dom-mapping-service + + ref_runtime-mapping-singleton + + + + + + + + dom:schema-service + + + ref_yang-schema-service + + /config/modules/module[name='schema-service-singleton']/instance[name='yang-schema-service'] + + + + + + binding:binding-notification-service + + + ref_binding-notification-broker + + /config/modules/module[name='binding-notification-broker']/instance[name='binding-notification-broker'] + + + + + + dom:dom-data-store + + + ref_hash-map-data-store + + /config/modules/module[name='hash-map-data-store']/instance[name='hash-map-data-store'] + + + + + + binding:binding-broker-osgi-registry + + + ref_binding-broker-impl + + /config/modules/module[name='binding-broker-impl']/instance[name='binding-broker-impl'] + + + + + + binding-impl:binding-dom-mapping-service + + + ref_runtime-mapping-singleton + + /config/modules/module[name='runtime-generated-mapping']/instance[name='runtime-mapping-singleton'] + + + + + + dom:dom-broker-osgi-registry + + + ref_dom-broker + /config/modules/module[name='dom-broker-impl']/instance[name='dom-broker'] + + + + + + binding:binding-data-broker + + + ref_binding-data-broker + + /config/modules/module[name='binding-data-broker']/instance[name='binding-data-broker'] + + + + + + + + + + + diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/resources/controller.config b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/resources/controller.config deleted file mode 100644 index 0d9cd6a9ab..0000000000 --- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/resources/controller.config +++ /dev/null @@ -1,123 +0,0 @@ -//START OF CONFIG-LAST - - - - prefix:schema-service-singleton - yang-schema-service - - - prefix:hash-map-data-store - hash-map-data-store - - - prefix:dom-broker-impl - dom-broker - - dom:dom-data-store - ref_hash-map-data-store - - - - prefix:binding-broker-impl - binding-broker-impl - - binding:binding-notification-service - ref_binding-notification-broker - - - binding:binding-data-broker - ref_binding-data-broker - - - - prefix:runtime-generated-mapping - runtime-mapping-singleton - - - prefix:binding-notification-broker - binding-notification-broker - - - prefix:binding-data-broker - binding-data-broker - - dom:dom-broker-osgi-registry - ref_dom-broker - - - binding:binding-dom-mapping-service - ref_runtime-mapping-singleton - - - - prefix:remote-zeromq-rpc-server - remoter - 5666 - - prefix:dom-broker-osgi-registry - ref_dom-broker - - - - - - dom:schema-service - - ref_yang-schema-service - /config/modules/module[name='schema-service-singleton']/instance[name='yang-schema-service'] - - - - binding:binding-notification-service - - ref_binding-notification-broker - /config/modules/module[name='binding-notification-broker']/instance[name='binding-notification-broker'] - - - - dom:dom-data-store - - ref_hash-map-data-store - /config/modules/module[name='hash-map-data-store']/instance[name='hash-map-data-store'] - - - - binding:binding-broker-osgi-registry - - ref_binding-broker-impl - /config/modules/module[name='binding-broker-impl']/instance[name='binding-broker-impl'] - - - - binding-impl:binding-dom-mapping-service - - ref_runtime-mapping-singleton - /config/modules/module[name='runtime-generated-mapping']/instance[name='runtime-mapping-singleton'] - - - - dom:dom-broker-osgi-registry - - ref_dom-broker - /config/modules/module[name='dom-broker-impl']/instance[name='dom-broker'] - - - - binding:binding-data-broker - - ref_binding-data-broker - /config/modules/module[name='binding-data-broker']/instance[name='binding-data-broker'] - - - - - - -//END OF SNAPSHOT -urn:opendaylight:params:xml:ns:yang:controller:config?module=config&revision=2013-04-05 -urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl?module=opendaylight-sal-binding-broker-impl&revision=2013-10-28 -urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 -urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl?module=opendaylight-sal-dom-broker-impl&revision=2013-10-28 -urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom?module=opendaylight-md-sal-dom&revision=2013-10-28 -urn:opendaylight:params:xml:ns:yang:controller:md:sal:remote:rpc?module=odl-sal-dom-rpc-remote-cfg&revision=2013-10-28 -//END OF CONFIG diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/resources/controller.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/resources/controller.xml new file mode 100644 index 0000000000..c8e3b8369d --- /dev/null +++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/resources/controller.xml @@ -0,0 +1,197 @@ + + + + + + urn:opendaylight:params:xml:ns:yang:controller:config?module=config&revision=2013-04-05 + + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl?module=opendaylight-sal-binding-broker-impl&revision=2013-10-28 + + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 + + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl?module=opendaylight-sal-dom-broker-impl&revision=2013-10-28 + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom?module=opendaylight-md-sal-dom&revision=2013-10-28 + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:remote:rpc?module=odl-sal-dom-rpc-remote-cfg&revision=2013-10-28 + + + + + + + + + prefix:schema-service-singleton + + yang-schema-service + + + + prefix:hash-map-data-store + + hash-map-data-store + + + + prefix:dom-broker-impl + + dom-broker + + + dom:dom-data-store + + ref_hash-map-data-store + + + + + prefix:binding-broker-impl + + binding-broker-impl + + + binding:binding-notification-service + + ref_binding-notification-broker + + + + binding:binding-data-broker + + ref_binding-data-broker + + + + + prefix:runtime-generated-mapping + + runtime-mapping-singleton + + + + prefix:binding-notification-broker + + binding-notification-broker + + + + prefix:binding-data-broker + + binding-data-broker + + + dom:dom-broker-osgi-registry + + ref_dom-broker + + + + binding:binding-dom-mapping-service + + ref_runtime-mapping-singleton + + + + + prefix:remote-zeromq-rpc-server + + remoter + 5666 + + + prefix:dom-broker-osgi-registry + + ref_dom-broker + + + + + + + + dom:schema-service + + + ref_yang-schema-service + + /config/modules/module[name='schema-service-singleton']/instance[name='yang-schema-service'] + + + + + + binding:binding-notification-service + + + ref_binding-notification-broker + + /config/modules/module[name='binding-notification-broker']/instance[name='binding-notification-broker'] + + + + + + dom:dom-data-store + + + ref_hash-map-data-store + + /config/modules/module[name='hash-map-data-store']/instance[name='hash-map-data-store'] + + + + + + binding:binding-broker-osgi-registry + + + ref_binding-broker-impl + + /config/modules/module[name='binding-broker-impl']/instance[name='binding-broker-impl'] + + + + + + binding-impl:binding-dom-mapping-service + + + ref_runtime-mapping-singleton + + /config/modules/module[name='runtime-generated-mapping']/instance[name='runtime-mapping-singleton'] + + + + + + dom:dom-broker-osgi-registry + + + ref_dom-broker + /config/modules/module[name='dom-broker-impl']/instance[name='dom-broker'] + + + + + + binding:binding-data-broker + + + ref_binding-data-broker + + /config/modules/module[name='binding-data-broker']/instance[name='binding-data-broker'] + + + + + + + + + + diff --git a/opendaylight/md-sal/src/test/resources/controller.xml b/opendaylight/md-sal/src/test/resources/controller.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java index 3340dde883..dd8e3c9664 100644 --- a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java +++ b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java @@ -48,7 +48,8 @@ public class NetconfClientSessionNegotiator extends @Nullable @Override public String apply(@Nullable XmlElement input) { - return input.getTextContent(); + // Trim possible leading/tailing whitespace + return input.getTextContent().trim(); } }); } -- 2.36.6