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>

1 files changed, 4 insertions, 4 deletions

diff --git a/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/BaseMinimalDistributionTest.java b/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/BaseMinimalDistributionTest.java
index 8377dc4c8..f083903fe 100644
--- a/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/BaseMinimalDistributionTest.java
+++ b/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/BaseMinimalDistributionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Copyright (c) 2016, 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.
@@ -75,7 +75,7 @@ public class BaseMinimalDistributionTest {
     /**
      * Start base distribution and check all northbound interfaces
      */
-    @Test(timeout = 120000)
+    @Test(timeout = 180000)
     public void test() throws Exception {
         Main.init(new ActivationModule());
 
@@ -121,14 +121,14 @@ public class BaseMinimalDistributionTest {
         Properties config = new Properties();
         config.put("StrictHostKeyChecking", "no");
         session.setConfig(config);
-        session.connect(20000);
+        session.connect(60000);
 
         Channel channel = session.openChannel("subsystem");
 
         ((ChannelSubsystem) channel).setSubsystem("netconf");
         ((ChannelSubsystem) channel).setPty(true);
         final InputStream inputStream = channel.getInputStream();
-        channel.connect(20000);
+        channel.connect(60000);
 
         // Wait until hello msg is sent from server
         Thread.sleep(HELLO_WAIT);