From: Tomas Olvecky Date: Fri, 15 Nov 2013 14:33:05 +0000 (+0100) Subject: Config-netconf: Remove unnecessary capability advertistments from hello message X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~394^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=436377150e6c38b7e70261619dbc68894f4664a8;ds=sidebyside Config-netconf: Remove unnecessary capability advertistments from hello message Change-Id: I207f6c7ae57b983f8fdca39512da0ef917d5dfe6 Signed-off-by: Tomas Olvecky --- diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java index ce0036f9af..5055c93583 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java @@ -72,13 +72,12 @@ public class NetconfOperationServiceImpl implements NetconfOperationService { private static Set setupCapabilities(YangStoreSnapshot yangStoreSnapshot) { Set capabilities = Sets.newHashSet(); + // [RFC6241] 8.3. Candidate Configuration Capability capabilities.add(new BasicCapability("urn:ietf:params:netconf:capability:candidate:1.0")); + // [RFC6241] 8.5. Rollback-on-Error Capability capabilities.add(new BasicCapability("urn:ietf:params:netconf:capability:rollback-on-error:1.0")); - capabilities.add(new BasicCapability("urn:ietf:params:netconf:capability:operations:1.0")); - capabilities.add(new BasicCapability("urn:ietf:params:netconf:capability:operations:1.1")); - capabilities - .add(new BasicCapability( - "urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring?module=ietf-netconf-monitoring&revision=2010-10-04")); + // [RFC6022] get-schema RPC. TODO: implement rest of the RFC + capabilities.add(new BasicCapability("urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring?module=ietf-netconf-monitoring&revision=2010-10-04")); final Collection> modulesAndContents = yangStoreSnapshot.getModuleMap().values(); for (Map.Entry moduleAndContent : modulesAndContents) {