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>

2 files changed, 60 insertions, 73 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;
+            }
+        };
+    }
+}
diff --git a/infra/impl/src/main/java/io/fd/honeycomb/impl/NorthboundFacadeHoneycombDOMBroker.java b/infra/impl/src/main/java/io/fd/honeycomb/impl/NorthboundFacadeHoneycombDOMBroker.java
index ebf0e6ed2..96f24f7cd 100644
--- a/infra/impl/src/main/java/io/fd/honeycomb/impl/NorthboundFacadeHoneycombDOMBroker.java
+++ b/infra/impl/src/main/java/io/fd/honeycomb/impl/NorthboundFacadeHoneycombDOMBroker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Cisco and/or its affiliates.
+ * 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.
@@ -16,34 +16,20 @@
 
 package io.fd.honeycomb.impl;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.Maps;
-import com.google.common.util.concurrent.CheckedFuture;
-import com.google.common.util.concurrent.Futures;
 import java.util.Map;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
 import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService;
 import org.opendaylight.controller.md.sal.dom.api.DOMNotificationService;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcAvailabilityListener;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcException;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementationNotAvailableException;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
 import org.opendaylight.controller.sal.core.api.Broker;
 import org.opendaylight.controller.sal.core.api.BrokerService;
 import org.opendaylight.controller.sal.core.api.Consumer;
 import org.opendaylight.controller.sal.core.api.Provider;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
-import org.opendaylight.controller.sal.core.api.mount.MountProvisionListener;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.osgi.framework.BundleContext;
 
 /**
@@ -51,14 +37,13 @@ import org.osgi.framework.BundleContext;
  */
 public class NorthboundFacadeHoneycombDOMBroker implements AutoCloseable, Broker {
 
-    private static final BrokerService EMPTY_DOM_MOUNT_SERVICE = new EmptyDomMountService();
-
     private Map<Class<? extends BrokerService>, BrokerService> services;
 
     public NorthboundFacadeHoneycombDOMBroker(@Nonnull final DOMDataBroker domDataBrokerDependency,
                                               @Nonnull final SchemaService schemaBiService,
                                               @Nonnull final DOMNotificationService domNotificatioNService,
-                                              @Nonnull final DOMRpcService domRpcService) {
+                                              @Nonnull final DOMRpcService domRpcService,
+                                              @Nonnull final DOMMountPointService domMountPointService) {
         services = Maps.newHashMap();
         services.put(DOMDataBroker.class, domDataBrokerDependency);
         services.put(SchemaService.class, schemaBiService);
@@ -66,7 +51,7 @@ public class NorthboundFacadeHoneycombDOMBroker implements AutoCloseable, Broker
         services.put(DOMNotificationPublishService.class, domNotificatioNService);
         services.put(DOMRpcService.class, domRpcService);
         // Required to be present by Restconf northbound even if not used:
-        services.put(DOMMountPointService.class, EMPTY_DOM_MOUNT_SERVICE);
+        services.put(DOMMountPointService.class, domMountPointService);
     }
 
     @Override
@@ -147,58 +132,4 @@ public class NorthboundFacadeHoneycombDOMBroker implements AutoCloseable, Broker
             closed = true;
         }
     }
-
-    private static class EmptyDomRpcService implements DOMRpcService {
-        @Nonnull
-        @Override
-        public CheckedFuture<DOMRpcResult, DOMRpcException> invokeRpc(@Nonnull final SchemaPath schemaPath,
-                                                                      @Nullable final NormalizedNode<?, ?> normalizedNode) {
-            return Futures.<DOMRpcResult, DOMRpcException>immediateFailedCheckedFuture(
-                new DOMRpcImplementationNotAvailableException("RPCs not supported"));
-        }
-
-        @Nonnull
-        @Override
-        public <T extends DOMRpcAvailabilityListener> ListenerRegistration<T> registerRpcListener(@Nonnull final T t) {
-            return new ListenerRegistration<T>() {
-                @Override
-                public void close() {
-                    // Noop
-                }
-
-                @Override
-                public T getInstance() {
-                    return t;
-                }
-            };
-        }
-    }
-
-    private static 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;
-                }
-            };
-        }
-    }
 }