[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.11'

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 1fa4f10a9ea65f156464da1671a4dbf62cc88e06
Merge: 5313c04 f430f41
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Sun Oct 7 21:12:20 2018 +0530

    Merge remote-tracking branch 'origin/4.11'
    
    Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>

 .../cloudstack/ca/provider/RootCAProvider.java      |  2 +-
 .../src/main/java/com/cloud/utils/net/NetUtils.java | 21 +++++++++++++++++++++
 .../test/java/com/cloud/utils/net/NetUtilsTest.java |  5 +++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --cc utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
index 4abb87a,80d25e8..fe2e329
--- a/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
+++ b/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
@@@ -680,18 -680,8 +680,23 @@@ public class NetUtilsTest 
      }
  
      @Test
 +    public void testIsIpv4() {
 +        assertTrue(NetUtils.isIpv4("192.168.1.1"));
 +        assertFalse(NetUtils.isIpv4("2a01:4f8:130:2192::2"));
 +    }
 +
 +    @Test(expected = IllegalArgumentException.class)
 +    public void testIsIpv4ExpectException() {
 +        NetUtils.isIpv4("test");
 +    }
 +
 +    @Test(expected = IllegalArgumentException.class)
 +    public void testIsIpv4ExpectException2() {
 +        NetUtils.isIpv4("2001:db8:300::/64");
 +    }
++
+     public void testAllIpsOfDefaultNic() {
+         final String defaultHostIp = NetUtils.getDefaultHostIp();
+         
assertTrue(NetUtils.getAllDefaultNicIps().stream().anyMatch(defaultHostIp::contains));
+     }
  }