diff options
4 files changed, 37 insertions, 8 deletions
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2.java index 9b13b8e..d025fea 100644 --- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2.java +++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2.java @@ -96,6 +96,9 @@ public class AaiQuery4Ccvpn2 { public JSONObject getSiteServiceInstance(String siteService) throws CorrelationException { String vnfId = getSiteVNFId(siteService); + if (vnfId == null) { + return null; + } JSONObject serviceInstanceInfo = getServiceInstanceByVnfId(vnfId); String serviceInstancePath = serviceInstanceInfo.getString("related-link"); Response response = get(getHostAddr(), getPath(serviceInstancePath)); diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java index 3373470..8d86900 100644 --- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java +++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java @@ -1,11 +1,11 @@ /** * Copyright 2017 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 - * + * <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. See the License for the specific language governing permissions and limitations under @@ -23,12 +23,12 @@ public class AaiConfig { private static final String AAI_AUTHENTICATION_USER = "AAI"; - private static final String AAI_AUTHENTICATION_PAASWORD = "AAI"; + private static final String AAI_AUTHENTICATION_PWD = "AAI"; public static String getAuthenticationCredentials() { - String usernameAndPassword = AAI_AUTHENTICATION_USER + ":" - + AAI_AUTHENTICATION_PAASWORD; - return "Basic " + java.util.Base64.getEncoder().encodeToString(usernameAndPassword.getBytes()); + String userCredentials = AAI_AUTHENTICATION_USER + ":" + + AAI_AUTHENTICATION_PWD; + return "Basic " + java.util.Base64.getEncoder().encodeToString(userCredentials.getBytes()); } public static class AaiConsts { diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2Test.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2Test.java index 1fca1da..cd1d505 100644 --- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2Test.java +++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2Test.java @@ -140,6 +140,28 @@ public class AaiQuery4Ccvpn2Test { PowerMock.verifyAll(); } + @Test + public void test_getServiceInstancesNull_exception() throws CorrelationException { + mockGetMethod(); + EasyMock.expect(response.readEntity(String.class)).andReturn(data.getJSONObject("site-resources1").toJSONString + ()); + EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); + + mockGetMethod(); + EasyMock.expect(response.readEntity(String.class)).andReturn(data.getJSONObject("499hkg9933NNN").toJSONString + ()); + EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); + + mockGetMethod(); + EasyMock.expect(response.readEntity(String.class)).andReturn(data.getJSONObject("499hkg9933NNN").toJSONString + ()); + EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); + + PowerMock.replayAll(); + + aai.getSiteServiceInstance("HkHubONSDEMOSZHKCustomer"); + } + private void mockGetMethod() { initCommonMock(); diff --git a/holmes-actions/src/test/resources/ccvpn2.data.json b/holmes-actions/src/test/resources/ccvpn2.data.json index 23faa60..7739893 100644 --- a/holmes-actions/src/test/resources/ccvpn2.data.json +++ b/holmes-actions/src/test/resources/ccvpn2.data.json @@ -49,6 +49,10 @@ } ] }, + "site-resources1": { + "site-resource": [ + ] + }, "499hkg9933NNN": { "site-resource-id": "3801b392-f596-4f7b-93d6-4d0a33b014bc", "site-resource-name": "HkHubONSDEMOBJHKCustomer", @@ -95,4 +99,4 @@ ] } } -}
\ No newline at end of file +} |