X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Fconfig%2FMicroServiceConfigTest.java;h=1fdc3355498ab689ac03c192128fc42cd255951e;hb=6cc976de165087178e784c40423242bc7f1b07ee;hp=a5d65975a6f3521a8ac166241f63de7f7af6b9bc;hpb=f0ae1a9f8d1464782a041c2361400dddbf1e890a;p=holmes%2Fcommon.git

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java
index a5d6597..1fdc335 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java
@@ -1,12 +1,12 @@
 /**
- * Copyright 2017 ZTE Corporation.
- *
+ * Copyright 2017-2020 ZTE Corporation.
+ * <p>
  * 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
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * 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.
@@ -16,55 +16,61 @@
 
 package org.onap.holmes.common.config;
 
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.onap.holmes.common.config.MicroServiceConfig.*;
-
+import org.apache.commons.lang3.StringUtils;
 import org.easymock.EasyMock;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.powermock.api.easymock.PowerMock;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.rule.PowerMockRule;
+import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.internal.WhiteboxImpl;
 
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.Assert.assertThat;
+import static org.onap.holmes.common.config.MicroServiceConfig.*;
+
 @PrepareForTest(MicroServiceConfig.class)
 @PowerMockIgnore({"javax.ws.*"})
+@RunWith(PowerMockRunner.class)
 public class MicroServiceConfigTest {
 
-    @Rule
-    public PowerMockRule powerMockRule = new PowerMockRule();
+    private static String ACTUAL_HOSTNAME = System.getenv(HOSTNAME);
 
     @Test
     public void getMsbServerAddrTest() {
-        System.setProperty(MSB_ADDR, "test:80");
-        assertThat("http://test:80", equalTo(getMsbServerAddrWithHttpPrefix()));
-        System.clearProperty(MicroServiceConfig.MSB_ADDR);
+        System.setProperty(MSB_IAG_SERVICE_HOST, "test");
+        System.setProperty(MSB_IAG_SERVICE_PORT, "443");
+        assertThat("http://test:443", equalTo(getMsbServerAddrWithHttpPrefix()));
+        System.clearProperty(MicroServiceConfig.MSB_IAG_SERVICE_PORT);
+        System.clearProperty(MicroServiceConfig.MSB_IAG_SERVICE_HOST);
     }
 
     @Test
     public void getMsbServerIpTest() {
-        System.setProperty(MSB_ADDR, "10.54.23.79:80");
+        System.setProperty(MSB_IAG_SERVICE_HOST, "10.54.23.79");
+        System.setProperty(MSB_IAG_SERVICE_PORT, "443");
         System.setProperty(HOSTNAME, "rule-mgmt");
         PowerMock.mockStaticPartial(MicroServiceConfig.class, "getServiceConfigInfoFromCBS", String.class);
         EasyMock.expect(MicroServiceConfig.getServiceConfigInfoFromCBS(System.getProperty(HOSTNAME)))
-                .andReturn("{\"msb.hostname\": \"10.54.23.79:80\"}").times(2);
+                .andReturn("{\"msb.hostname\": \"10.54.23.79:443\"}").times(2);
         PowerMock.replayAll();
         assertThat("10.54.23.79", equalTo(getMsbIpAndPort()[0]));
-        assertThat("80", equalTo(getMsbIpAndPort()[1]));
+        assertThat("443", equalTo(getMsbIpAndPort()[1]));
         System.clearProperty(MicroServiceConfig.HOSTNAME);
-        System.clearProperty(MSB_ADDR);
+        System.clearProperty(MicroServiceConfig.MSB_IAG_SERVICE_PORT);
+        System.clearProperty(MicroServiceConfig.MSB_IAG_SERVICE_HOST);
     }
 
     @Test
     public void getServiceIpTest() {
-        System.setProperty(HOSTNAME, "127.0.0.1");
-        assertThat("127.0.0.1", equalTo(getMicroServiceIpAndPort()[0]));
+        String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;
+        String hostname = String.format("http://%s", ip);
+        System.setProperty(HOSTNAME, hostname);
+        assertThat(ip, equalTo(getMicroServiceIpAndPort()[0]));
         assertThat("80", equalTo(getMicroServiceIpAndPort()[1]));
         System.clearProperty(HOSTNAME);
     }
@@ -112,7 +118,26 @@ public class MicroServiceConfigTest {
     }
 
     @Test
-    public void getConfigBindingServiceAddrInfoTest_consul_exists_propertie_not_exist() throws Exception {
+    public void getConfigBindingServiceAddrInfoTest_consul_return_empty_array() throws Exception {
+        System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");
+        PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
+        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
+                .andReturn("[]");
+        System.setProperty(CONSUL_HOST, "127.0.0.1");
+
+        PowerMock.replayAll();
+
+        assertThat(getServiceAddrInfoFromDcaeConsulByHostName(System.getProperty(CONFIG_BINDING_SERVICE)),
+                is(nullValue()));
+
+        PowerMock.verifyAll();
+
+        System.clearProperty(CONSUL_HOST);
+        System.clearProperty(CONFIG_BINDING_SERVICE);
+    }
+
+    @Test
+    public void getConfigBindingServiceAddrInfoTest_consul_exists_property_not_exist() throws Exception {
         System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");
         PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
         PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
@@ -156,7 +181,8 @@ public class MicroServiceConfigTest {
 
     @Ignore
     public void getMsbAddrInfo_msb_registered() throws Exception {
-        System.setProperty(MSB_ADDR, "10.74.5.8:1545");
+        System.setProperty(MSB_IAG_SERVICE_HOST, "10.74.5.8");
+        System.setProperty(MSB_IAG_SERVICE_PORT, "1545");
         System.setProperty(HOSTNAME, "rule-mgmt");
         PowerMock.mockStaticPartial(MicroServiceConfig.class, "getServiceConfigInfoFromCBS", String.class);
         EasyMock.expect(MicroServiceConfig.getServiceConfigInfoFromCBS(System.getProperty(HOSTNAME)))
@@ -170,12 +196,14 @@ public class MicroServiceConfigTest {
         assertThat(msbInfo[1], equalTo("5432"));
 
         System.clearProperty(HOSTNAME);
-        System.clearProperty(MSB_ADDR);
+        System.clearProperty(MSB_IAG_SERVICE_PORT);
+        System.clearProperty(MSB_IAG_SERVICE_HOST);
     }
 
     @Ignore
     public void getMsbAddrInfo_msb_not_registered() throws Exception {
-        System.setProperty(MSB_ADDR, "10.74.5.8:1545");
+        System.setProperty(MSB_IAG_SERVICE_HOST, "10.74.5.8");
+        System.setProperty(MSB_IAG_SERVICE_PORT, "1545");
         System.setProperty(HOSTNAME, "rule-mgmt");
         PowerMock.mockStaticPartial(MicroServiceConfig.class, "getServiceConfigInfoFromCBS", String.class);
         EasyMock.expect(MicroServiceConfig.getServiceConfigInfoFromCBS(System.getProperty(HOSTNAME)))
@@ -189,7 +217,8 @@ public class MicroServiceConfigTest {
         assertThat(msbInfo[1], equalTo("1545"));
 
         System.clearProperty(HOSTNAME);
-        System.clearProperty(MSB_ADDR);
+        System.clearProperty(MSB_IAG_SERVICE_PORT);
+        System.clearProperty(MSB_IAG_SERVICE_HOST);
     }
 
     @Test
@@ -211,7 +240,10 @@ public class MicroServiceConfigTest {
 
     @Test
     public void getMicroServiceIpAndPort_service_not_registered_to_consul() throws Exception {
-        System.setProperty(HOSTNAME, "10.74.5.8:1545");
+        String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;
+        String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";
+        String hostname = String.format("http://%s:%s", ip, port);
+        System.setProperty(HOSTNAME, hostname);
         PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
         PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
                 .andReturn("[]");
@@ -220,15 +252,18 @@ public class MicroServiceConfigTest {
         String[] msbInfo = getMicroServiceIpAndPort();
         PowerMock.verifyAll();
 
-        assertThat(msbInfo[0], equalTo("10.74.5.8"));
-        assertThat(msbInfo[1], equalTo("1545"));
+        assertThat(msbInfo[0], equalTo(ip));
+        assertThat(msbInfo[1], equalTo(port));
 
         System.clearProperty(HOSTNAME);
     }
 
     @Test
     public void getMicroServiceIpAndPort_service_not_registered_full_addr() throws Exception {
-        System.setProperty(HOSTNAME, "http://10.74.5.8:1545");
+        String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;
+        String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";
+        String hostname = String.format("http://%s:%s", ip, port);
+        System.setProperty(HOSTNAME, hostname);
         PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
         PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
                 .andReturn("{}");
@@ -237,15 +272,17 @@ public class MicroServiceConfigTest {
         String[] msbInfo = getMicroServiceIpAndPort();
         PowerMock.verifyAll();
 
-        assertThat(msbInfo[0], equalTo("10.74.5.8"));
-        assertThat(msbInfo[1], equalTo("1545"));
+        assertThat(msbInfo[0], equalTo(ip));
+        assertThat(msbInfo[1], equalTo(port));
 
-        System.clearProperty(MSB_ADDR);
+        System.clearProperty(HOSTNAME);
     }
 
     @Test
     public void getMicroServiceIpAndPort_service_not_registered_no_port() throws Exception {
-        System.setProperty(HOSTNAME, "http://10.74.5.8");
+        String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;
+        String hostname = String.format("http://%s", ip);
+        System.setProperty(HOSTNAME, hostname);
         PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
         PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
                 .andReturn("{}");
@@ -254,15 +291,17 @@ public class MicroServiceConfigTest {
         String[] msbInfo = getMicroServiceIpAndPort();
         PowerMock.verifyAll();
 
-        assertThat(msbInfo[0], equalTo("10.74.5.8"));
+        assertThat(msbInfo[0], equalTo(ip));
         assertThat(msbInfo[1], equalTo("80"));
 
-        System.clearProperty(MSB_ADDR);
+        System.clearProperty(HOSTNAME);
     }
 
     @Test
     public void getMicroServiceIpAndPort_service_not_registered_only_ip() throws Exception {
-        System.setProperty(HOSTNAME, "10.74.5.8");
+        String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;
+        String hostname = String.format("http://%s", ip);
+        System.setProperty(HOSTNAME, hostname);
         PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
         PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
                 .andReturn("{}");
@@ -271,15 +310,18 @@ public class MicroServiceConfigTest {
         String[] msbInfo = getMicroServiceIpAndPort();
         PowerMock.verifyAll();
 
-        assertThat(msbInfo[0], equalTo("10.74.5.8"));
+        assertThat(msbInfo[0], equalTo(ip));
         assertThat(msbInfo[1], equalTo("80"));
 
-        System.clearProperty(MSB_ADDR);
+        System.clearProperty(HOSTNAME);
     }
 
     @Test
     public void getMicroServiceIpAndPort_service_not_registered_full_addr_https() throws Exception {
-        System.setProperty(HOSTNAME, "https://10.74.5.8:5432");
+        String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;
+        String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";
+        String hostname = String.format("http://%s:%s", ip, port);
+        System.setProperty(HOSTNAME, hostname);
         PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
         PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
                 .andReturn("[]");
@@ -288,57 +330,9 @@ public class MicroServiceConfigTest {
         String[] msbInfo = getMicroServiceIpAndPort();
         PowerMock.verifyAll();
 
-        assertThat(msbInfo[0], equalTo("10.74.5.8"));
-        assertThat(msbInfo[1], equalTo("5432"));
+        assertThat(msbInfo[0], equalTo(ip));
+        assertThat(msbInfo[1], equalTo(port));
 
-        System.clearProperty(MSB_ADDR);
-    }
-
-    @Test
-    public void isValidIpAddress_with_port() throws Exception {
-        boolean res = WhiteboxImpl.invokeMethod(MicroServiceConfig.class, "isIpAddress", "10.75.13.21:90");
-        assertThat(res, is(true));
-    }
-
-    @Test
-    public void isValidIpAddress_without_port() throws Exception {
-        boolean res = WhiteboxImpl.invokeMethod(MicroServiceConfig.class, "isIpAddress", "10.75.13.21");
-        assertThat(res, is(true));
-    }
-
-    @Test
-    public void isValidIpAddress_with_port_with_http_prefix() throws Exception {
-        boolean res = WhiteboxImpl.invokeMethod(MicroServiceConfig.class, "isIpAddress", "http://10.75.13.21:90");
-        assertThat(res, is(true));
-    }
-
-    @Test
-    public void isValidIpAddress_without_port_with_https_prefix() throws Exception {
-        boolean res = WhiteboxImpl.invokeMethod(MicroServiceConfig.class, "isIpAddress", "https://10.75.13.21");
-        assertThat(res, is(true));
-    }
-
-    @Test
-    public void isValidIpAddress_invalid_ip_without_port() throws Exception {
-        boolean res = WhiteboxImpl.invokeMethod(MicroServiceConfig.class, "isIpAddress", "holmes-rule-mgmt");
-        assertThat(res, is(false));
-    }
-
-    @Test
-    public void isValidIpAddress_invalid_ip_with_port() throws Exception {
-        boolean res = WhiteboxImpl.invokeMethod(MicroServiceConfig.class, "isIpAddress", "holmes-rule-mgmt:80");
-        assertThat(res, is(false));
-    }
-
-    @Test
-    public void isValidIpAddress_invalid_ip_without_port_with_http_prefix() throws Exception {
-        boolean res = WhiteboxImpl.invokeMethod(MicroServiceConfig.class, "isIpAddress", "http://holmes-rule-mgmt");
-        assertThat(res, is(false));
-    }
-
-    @Test
-    public void isValidIpAddress_invalid_ip_with_port_with_https_prefix() throws Exception {
-        boolean res = WhiteboxImpl.invokeMethod(MicroServiceConfig.class, "isIpAddress", "https://holmes-rule-mgmt:80");
-        assertThat(res, is(false));
+        System.clearProperty(HOSTNAME);
     }
 }
\ No newline at end of file