We are using a constant QName in lookups, use a constant for that.
Also mark a FIXME for netconf-monitoring/yang-library preference.
Change-Id: Ia30ece91868b55e811e734b817ffaa71d86da0a0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
* Default implementation resolving schemas QNames from netconf-state or from modules-state.
*/
public final class NetconfStateSchemasResolverImpl implements NetconfDeviceSchemasResolver {
* Default implementation resolving schemas QNames from netconf-state or from modules-state.
*/
public final class NetconfStateSchemasResolverImpl implements NetconfDeviceSchemasResolver {
+ private static final QName YANG_LIBRARY_CAPABILITY = QName.create(ModulesState.QNAME, "ietf-yang-library").intern();
@Override
public NetconfDeviceSchemas resolve(final NetconfDeviceRpc deviceRpc,
@Override
public NetconfDeviceSchemas resolve(final NetconfDeviceRpc deviceRpc,
final RemoteDeviceId id) {
if (remoteSessionCapabilities.isMonitoringSupported()) {
return NetconfStateSchemas.create(deviceRpc, remoteSessionCapabilities, id);
final RemoteDeviceId id) {
if (remoteSessionCapabilities.isMonitoringSupported()) {
return NetconfStateSchemas.create(deviceRpc, remoteSessionCapabilities, id);
- } else if (remoteSessionCapabilities.containsModuleCapability(QName.create(ModulesState.QNAME,
- "ietf-yang-library"))) {
- return LibraryModulesSchemas.create(deviceRpc, id);
- return NetconfStateSchemas.EMPTY;
+
+ // FIXME: I think we should prefer YANG library here
+ return remoteSessionCapabilities.containsModuleCapability(YANG_LIBRARY_CAPABILITY)
+ ? LibraryModulesSchemas.create(deviceRpc, id) : NetconfStateSchemas.EMPTY;