diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2017-11-07 09:21:08 +0100 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2017-11-10 10:00:39 +0100 |
commit | 0f92e8f1eb7ec29f589ed92c55b049f13cce0f30 (patch) | |
tree | 30e7fa6562a136755f1e5a9e5348db51c221f59b /infra/impl/src/main/java/io/fd/honeycomb/impl/EmptyDomMountService.java | |
parent | cccd174ab736465bc36faacfeaa30297acb724a7 (diff) |
HONEYCOMB-385: bump ODL dependencies to Nitrogen
* guava bumped to 22.0 (same as used by ODL)
* use 4K RSA for SSH server (related to bouncy-castle bump in ODL)
- based on https://git.opendaylight.org/gerrit/#/c/60138/2
- also fixes HC2VPP-207
* removed some yang models from netconf-whitelist.xml,
that are no longer present in ODL dependencies,
* increased timeouts in distro tests, because generating 4K RSA key
my last longer (especially on slow jenkins nodes).
* EmptyMountPointService exposed to enable reuse by notification
and restconf providers
Change-Id: I2ff32bd7f0298716210fcfee4918007a42fab171
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'infra/impl/src/main/java/io/fd/honeycomb/impl/EmptyDomMountService.java')
-rw-r--r-- | infra/impl/src/main/java/io/fd/honeycomb/impl/EmptyDomMountService.java | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/infra/impl/src/main/java/io/fd/honeycomb/impl/EmptyDomMountService.java b/infra/impl/src/main/java/io/fd/honeycomb/impl/EmptyDomMountService.java new file mode 100644 index 000000000..c42045f11 --- /dev/null +++ b/infra/impl/src/main/java/io/fd/honeycomb/impl/EmptyDomMountService.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2015, 2017 Cisco and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.fd.honeycomb.impl; + +import com.google.common.base.Optional; +import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint; +import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; +import org.opendaylight.controller.sal.core.api.mount.MountProvisionListener; +import org.opendaylight.yangtools.concepts.ListenerRegistration; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; + +/** + * Empty implementation of DOMMountPointService. HC does not support mountpoints, but Restconf requires + * DOMMountPointService implementation to be present. + */ +public class EmptyDomMountService implements DOMMountPointService { + @Override + public Optional<DOMMountPoint> getMountPoint(final YangInstanceIdentifier yangInstanceIdentifier) { + return Optional.absent(); + } + + @Override + public DOMMountPointBuilder createMountPoint(final YangInstanceIdentifier yangInstanceIdentifier) { + throw new UnsupportedOperationException("No mountpoint support"); + } + + @Override + public ListenerRegistration<MountProvisionListener> registerProvisionListener( + final MountProvisionListener mountProvisionListener) { + return new ListenerRegistration<MountProvisionListener>() { + @Override + public void close() { + // Noop + } + + @Override + public MountProvisionListener getInstance() { + return mountProvisionListener; + } + }; + } +} |