import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class AaiQuery4Ccvpn {
private MultivaluedMap<String, Object> headers;
return new AaiQuery4Ccvpn();
}
+ private static final String EMPTY_STR = "";
+
+ private static final JSONObject EMPTY_JSON = new JSONObject();
+
private AaiQuery4Ccvpn() {
headers = new MultivaluedHashMap<>();
headers.add("X-TransactionId", AaiConfig.X_TRANSACTION_ID);
Response response = get(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_LINK_QUERY, params)
+ (status == null ? "" : String.format("&operational-status=%s", status)));
JSONObject linkInfo = getInfo(response.readEntity(String.class), "p-interface", "logical-link");
+ if (linkInfo == null) {
+ log.warn(String.format("Link information is missing from AAI. Method: [getLogicLink], " +
+ "params: [networkId - %s, pnfName - %s, ifName - %s].", networkId, pnfName, ifName));
+ return EMPTY_STR;
+ }
return extractValueFromJsonArray(linkInfo.getJSONArray("relationship-data"), "logical-link.link-name");
}
public JSONObject getServiceInstance(String networkId, String pnfName, String ifName, String status) {
try {
JSONObject vpnBindingInfo = getVpnBindingInfo(networkId, pnfName, ifName, status);
+ if (vpnBindingInfo == null) {
+ log.warn(String.format("VPN binding information is missing from AAI. " +
+ "Method: [getServiceInstance], params: [networkId - %s, pnfName - %s, " +
+ "ifName - %s, status - %s].", networkId, pnfName, ifName, status));
+ return EMPTY_JSON;
+ }
String vpnBindingId = extractValueFromJsonArray(vpnBindingInfo.getJSONArray("relationship-data"),
- "vpn-binding.vpn-id");
+ "vpn-binding.vpn-id");
JSONObject connectivityInfo = getConnectivityInfo(vpnBindingId);
+ if (connectivityInfo == null) {
+ log.warn(String.format("Connectivity information is missing from AAI. " +
+ "Method: [getServiceInstance], params: [networkId - %s, pnfName - %s, " +
+ "ifName - %s, status - %s].", networkId, pnfName, ifName, status));
+ return EMPTY_JSON;
+ }
String connectivityId = extractValueFromJsonArray(connectivityInfo.getJSONArray("relationship-data"),
- "connectivity.connectivity-id");
+ "connectivity.connectivity-id");
JSONObject serviceInstanceInfo = getServiceInstanceByConn(connectivityId);
+ if (serviceInstanceInfo == null) {
+ log.warn(String.format("Service instance information is missing from AAI. " +
+ "Method: [getServiceInstance], params: [networkId - %s, pnfName - %s, " +
+ "ifName - %s, status - %s].", networkId, pnfName, ifName, status));
+ return EMPTY_JSON;
+ }
String serviceInstancePath = serviceInstanceInfo.getString("related-link");
Response response = get(getHostAddr(), getPath(serviceInstancePath));
String[] params = new String[2];
Pattern pattern = Pattern.compile("/aai/v\\d+/business/customers/customer/(.+)" +
- "/service-subscriptions/service-subscription/(.+)" +
- "/service-instances/service-instance/(.+)");
+ "/service-subscriptions/service-subscription/(.+)" +
+ "/service-instances/service-instance/(.+)");
Matcher matcher = pattern.matcher(serviceInstancePath);
if (matcher.find()) {
params[0] = matcher.group(1);
private JSONObject getServiceInstanceByConn(String connectivityId) throws CorrelationException {
Response response = get(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_SERVICE_INSTANCE_ADDR_4_CCVPN,
- "connectivityId", connectivityId));
+ "connectivityId", connectivityId));
return getInfo(response.readEntity(String.class), "connectivity", "service-instance");
}
private String getPath(String urlTemplate, Map<String, String> pathParams) {
String url = urlTemplate;
- for(Map.Entry<String, String> entry : pathParams.entrySet()){
+ for (Map.Entry<String, String> entry : pathParams.entrySet()) {
url = url.replaceAll("\\{" + entry.getKey() + "\\}", entry.getValue());
}
return url;
Response response = target.request().headers(getAaiHeaders()).get();
if (response.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) {
throw new CorrelationException("Failed to connect to AAI. \nCause: "
- + response.getStatusInfo().getReasonPhrase() + "\nDetails: \n"
- + getErrorMsg(String.format("%s%s", host, path), null, response));
+ + response.getStatusInfo().getReasonPhrase() + "\nDetails: \n"
+ + getErrorMsg(String.format("%s%s", host, path), null, response));
}
return response;
} catch (CorrelationException e) {
throw e;
} catch (Exception e) {
throw new CorrelationException(e.getMessage() + "More info: "
- + getErrorMsg(String.format("%s%s", host, path), null, null), e);
+ + getErrorMsg(String.format("%s%s", host, path), null, null), e);
}
}
.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true).invoke();
if (response.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) {
throw new CorrelationException("Failed to connect to AAI. \nCause: "
- + response.getStatusInfo().getReasonPhrase() + "\nDetails: \n"
- + getErrorMsg(String.format("%s%s", host, path), body, response));
+ + response.getStatusInfo().getReasonPhrase() + "\nDetails: \n"
+ + getErrorMsg(String.format("%s%s", host, path), body, response));
}
} catch (CorrelationException e) {
throw e;
} catch (Exception e) {
throw new CorrelationException(e.getMessage() + "More info: "
- + getErrorMsg(String.format("%s%s", host, path), body, null), e);
+ + getErrorMsg(String.format("%s%s", host, path), body, null), e);
}
}
}
private String extractValueFromJsonArray(JSONArray relationshipData, String keyName) {
- for (int i = 0; i < relationshipData.size(); ++i) {
- JSONObject item = relationshipData.getJSONObject(i);
- if (item.getString("relationship-key").equals(keyName)) {
- return item.getString("relationship-value");
+ if (relationshipData != null) {
+ for (int i = 0; i < relationshipData.size(); ++i) {
+ JSONObject item = relationshipData.getJSONObject(i);
+ if (item.getString("relationship-key").equals(keyName)) {
+ return item.getString("relationship-value");
+ }
}
}
return null;
\r
import com.google.gson.annotations.SerializedName;\r
import lombok.Data;\r
+import lombok.Getter;\r
import lombok.NoArgsConstructor;\r
+import lombok.Setter;\r
\r
-@Data\r
+@Getter\r
+@Setter\r
@NoArgsConstructor\r
public class AlarmInfo {\r
\r
import com.google.gson.annotations.SerializedName;\r
import java.util.Date;\r
import lombok.Data;\r
+import lombok.Getter;\r
import lombok.NoArgsConstructor;\r
+import lombok.Setter;\r
\r
-@Data\r
+@Getter\r
+@Setter\r
@NoArgsConstructor\r
public class AlarmsCorrelation {\r
\r
private long reserve2 = -1;\r
\r
private long reserve3 = -1;\r
+\r
+ @Override\r
+ public String toString() {\r
+ StringBuilder sb = new StringBuilder("[");\r
+ sb.append("ruleId=").append(ruleId).append(",");\r
+ sb.append("ruleInfo=").append(ruleInfo).append(",");\r
+ sb.append("createTime=").append(createTime == null ? null : createTime.toString()).append(",");\r
+ sb.append("parentAlarmId=").append(parentAlarmId).append(",");\r
+ sb.append("childAlarmId=").append(childAlarmId).append(",");\r
+ sb.append("reserve1=").append(reserve1).append(",");\r
+ sb.append("reserve2=").append(reserve2).append(",");\r
+ sb.append("reserve3=").append(reserve3).append("]");\r
+ return sb.toString();\r
+ }\r
}\r
throw new InternalError(e);\r
}\r
\r
- r.rid = rid == null ? null : rid;\r
- r.name = name == null ? null : name;\r
- r.description = description == null ? null : description;\r
+ r.rid = rid;\r
+ r.name = name;\r
+ r.description = description;\r
r.enabled = enabled;\r
r.templateID = templateID;\r
- r.engineID = engineID == null ? null : engineID;\r
- r.engineType = engineType == null ? null : engineType;\r
- r.creator = creator == null ? null : creator;\r
- r.modifier = modifier == null ? null : modifier;\r
+ r.engineID = engineID;\r
+ r.engineType = engineType;\r
+ r.creator = creator;\r
+ r.modifier = modifier;\r
r.params = params == null ? null : (Properties) params.clone();\r
- r.content = content == null ? null : content;\r
- r.vendor = vendor == null ? null : vendor;\r
+ r.content = content;\r
+ r.vendor = vendor;\r
r.createTime = createTime == null ? null : (Date) createTime.clone();\r
r.updateTime = updateTime == null ? null : (Date) updateTime.clone();\r
- r.packageName = packageName == null ? null : packageName;\r
- r.closedControlLoopName = closedControlLoopName == null ? null : closedControlLoopName;\r
- r.engineInstance = engineInstance == null ? null : engineInstance;\r
+ r.packageName = packageName;\r
+ r.closedControlLoopName = closedControlLoopName;\r
+ r.engineInstance = engineInstance;\r
\r
return r;\r
}\r
package org.onap.holmes.common.api.entity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
import java.util.List;
-
-@Data
@NoArgsConstructor
@AllArgsConstructor
+@Getter
+@Setter
public class ServiceEntity {
private String serviceName;
import lombok.NoArgsConstructor;\r
import lombok.Setter;\r
\r
-@Data\r
@NoArgsConstructor\r
@AllArgsConstructor\r
@Getter\r
*/
package org.onap.holmes.common.api.entity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
-@Data
+@Getter
+@Setter
@NoArgsConstructor
@AllArgsConstructor
public class ServiceNode4Query {
import lombok.NoArgsConstructor;\r
import lombok.Setter;\r
\r
-@Data\r
@NoArgsConstructor\r
@AllArgsConstructor\r
@Setter\r
import java.util.List;\r
import java.util.Map;\r
import java.util.Set;\r
-import lombok.NoArgsConstructor;\r
\r
public class DcaeConfigurations extends HashMap<String, Object>{\r
\r
if (rootAlarm.getAlarmIsCleared() == PolicyMassgeConstant.POLICY_MESSAGE_ONSET) {
enrichVnfInfo(vmEntity, childAlarm, policyMsg);
policyMsg.setClosedLoopEventStatus(EVENT_STATUS.ONSET);
- try {
- policyMsg.getAai().put("vserver.in-maint", vmEntity.getInMaint());
- } catch (Exception e) {
- log.error("Failed to parse the field \"in-maint\". A boolean string (\"true\"/\"false\")"
- + " is expected but the actual value is " + vmEntity.getInMaint() + ".", e);
- }
- try {
- policyMsg.getAai().put("vserver.is-closed-loop-disabled",
+ policyMsg.getAai().put("vserver.in-maint", vmEntity.getInMaint());
+ policyMsg.getAai().put("vserver.is-closed-loop-disabled",
vmEntity.getClosedLoopDisable());
- } catch (Exception e) {
- log.error("Failed to parse the field \"is-closed-loop-disabled\". A boolean string (\"true\"/\"false\")"
- + " is expected but the actual value is " + vmEntity.getClosedLoopDisable() + ".", e);
- }
policyMsg.getAai().put("vserver.prov-status", vmEntity.getProvStatus());
policyMsg.getAai().put("vserver.resource-version", vmEntity.getResourceVersion());
} else {
break;
}
}
- log.info("Clear alarm, requestId deleted successful");
+ log.info("An alarm is cleared and the corresponding requestId is deleted successfully");
}
}
}
assertThat(alarmsCorrelation.getReserve3(), equalTo(reserve3));
}
-
@Test
public void testToString() throws Exception {
final AlarmsCorrelation alarmsCorrelationTemp = new AlarmsCorrelation();
alarmsCorrelation.setRuleId(ruleId);
assertThat(alarmsCorrelation.toString(), equalTo(alarmsCorrelationTemp.toString()));
}
-
-
- @Test
- public void testEqualsAndHashCode() throws Exception {
- final AlarmsCorrelation alarmsCorrelationTemp = new AlarmsCorrelation();
- String ruleId = "ruleId";
- alarmsCorrelationTemp.setRuleId(ruleId);
- alarmsCorrelation.setRuleId(ruleId);
- assertThat(alarmsCorrelation, equalTo(alarmsCorrelationTemp));
- }
-}
+}
correlationRule.setEngineInstance(engineInstance);
assertThat(correlationRule.getEngineInstance(), equalTo(engineInstance));
}
+
+ @Test
+ public void getterAndSetter4ClosedControlLoopName(){
+ final String closedControlLoopName = "closedControlLoopName";
+ correlationRule.setClosedControlLoopName(closedControlLoopName);
+ assertThat(correlationRule.getClosedControlLoopName(), equalTo(closedControlLoopName));
+ }
+
+ @Test
+ public void testClone() {
+ final String rid = "rid";
+ correlationRule.setRid(rid);
+ CorrelationRule rule = (CorrelationRule) correlationRule.clone();
+ assertThat(rule.getRid(), equalTo(rid));
+ }
}
import java.net.URI;\r
import java.net.URISyntaxException;\r
import java.net.URL;\r
+\r
+import org.junit.Rule;\r
import org.junit.Test;\r
+import org.junit.rules.ExpectedException;\r
import org.onap.holmes.common.dcae.entity.DcaeConfigurations;\r
import org.onap.holmes.common.dcae.entity.SecurityInfo;\r
+import org.onap.holmes.common.exception.CorrelationException;\r
\r
public class DcaeConfigurationParserTest {\r
\r
+ @Rule\r
+ public ExpectedException thrown = ExpectedException.none();\r
+\r
@Test\r
public void parse() throws Exception {\r
DcaeConfigurations obj = DcaeConfigurationParser.parse(readConfigurationsFromFile("dcae.config.json"));\r
assertThat(((SecurityInfo) obj.getPubSecInfo("sec_measurement")).getDmaapInfo().getLocation(), equalTo("mtl5"));\r
}\r
\r
+ @Test\r
+ public void parse_with_empty_contents_excption() throws CorrelationException {\r
+ thrown.expect(CorrelationException.class);\r
+ thrown.expectMessage("Can not resolve configurations from DCAE. The configuration string is empty.");\r
+ DcaeConfigurationParser.parse("");\r
+ }\r
+\r
+ @Test\r
+ public void parse_with_illegal_dcae_response_excption() throws CorrelationException {\r
+ thrown.expect(CorrelationException.class);\r
+ DcaeConfigurationParser.parse("This is an ordinary string.");\r
+ }\r
+\r
private String readConfigurationsFromFile(String fileName) throws URISyntaxException, FileNotFoundException {\r
URL url = DcaeConfigurationParserTest.class.getClassLoader().getResource(fileName);\r
File configFile = new File(new URI(url.toString()).getPath());\r
import static org.easymock.EasyMock.anyObject;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
+import java.io.*;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+
+import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.onap.holmes.common.aai.entity.VmEntity;
import org.onap.holmes.common.aai.entity.VnfEntity;
import org.onap.holmes.common.api.stat.VesAlarm;
+import org.onap.holmes.common.dcae.DcaeConfigurationsCache;
+import org.onap.holmes.common.dcae.utils.DcaeConfigurationParser;
import org.onap.holmes.common.dmaap.entity.PolicyMsg;
import org.onap.holmes.common.dmaap.entity.PolicyMsg.EVENT_STATUS;
import org.onap.holmes.common.exception.CorrelationException;
}
@Test
- public void testDmaapService_getEnrichedPolicyMsg_ok() throws Exception {
+ public void testDmaapService_getEnrichedPolicyMsg_onset() throws Exception {
PowerMock.resetAll();
VmEntity vmEntity = new VmEntity();
vmEntity.setInMaint(false);
.invokeMethod(dmaapService, "getEnrichedPolicyMsg", vmEntity, vesAlarm, vesAlarm, "loopName");
PowerMock.verifyAll();
- assertThat(actual.getClosedLoopControlName(), equalTo(null));
+ assertThat(actual.getClosedLoopControlName(), nullValue());
assertThat(actual.getAai().get("vserver.prov-status"), equalTo("prov"));
- assertThat(actual.getAai().get("vserver.vserver-name2") == null, equalTo(true));
+ assertThat(actual.getAai().get("vserver.vserver-name2"), nullValue());
assertThat(actual.getAai().get("generic-vnf.service-instance-id"), equalTo(""));
}
+
+ @Test
+ public void testDmaapService_getEnrichedPolicyMsg_abated() throws Exception {
+ PowerMock.resetAll();
+ VmEntity vmEntity = new VmEntity();
+ vmEntity.setInMaint(false);
+ vmEntity.setClosedLoopDisable(true);
+ vmEntity.setProvStatus("prov");
+ vmEntity.setResourceVersion("kkkk");
+ VesAlarm vesAlarm = new VesAlarm();
+ vesAlarm.setEventId("11111");
+ vesAlarm.setEventName("3333");
+ vesAlarm.setSourceId("111");
+ vesAlarm.setStartEpochMicrosec(11111L);
+ vesAlarm.setLastEpochMicrosec(21111L);
+ vesAlarm.setAlarmIsCleared(PolicyMassgeConstant.POLICY_MESSAGE_ABATED);
+
+ PowerMock.expectPrivate(dmaapService, "getVnfEntity", anyObject(String.class),
+ anyObject(String.class)).andReturn(null).anyTimes();
+
+ PowerMock.replayAll();
+ PolicyMsg actual = Whitebox
+ .invokeMethod(dmaapService, "getEnrichedPolicyMsg", vmEntity, vesAlarm, vesAlarm, "loopName");
+ PowerMock.verifyAll();
+
+ assertThat(actual.getClosedLoopControlName(), nullValue());
+ assertThat(actual.getAai().get("vserver.prov-status"), nullValue());
+ assertThat(actual.getAai().get("vserver.vserver-name2"), nullValue());
+ assertThat(actual.getAai().get("generic-vnf.service-instance-id"), nullValue());
+ }
+
+ @Test
+ public void testPublishPolicyMsg_onset() throws Exception {
+ PowerMock.resetAll();
+ Publisher publisher = PowerMock.createPartialMock(Publisher.class, "publish", PolicyMsg.class);
+ PolicyMsg policyMsg = new PolicyMsg();
+ policyMsg.setClosedLoopEventStatus(EVENT_STATUS.ONSET);
+ PowerMock.expectNew(Publisher.class).andReturn(publisher);
+ EasyMock.expect(publisher.publish(policyMsg)).andReturn(true);
+
+ DcaeConfigurationsCache.setDcaeConfigurations(
+ DcaeConfigurationParser.parse(readConfigurationsFromFile("dcae.config.json")));
+
+ PowerMock.replayAll();
+ dmaapService.publishPolicyMsg(policyMsg, "sec_fault_unsecure");
+ PowerMock.verifyAll();
+
+ }
+
+ @Test
+ public void testPublishPolicyMsg_abated() throws Exception {
+ PowerMock.resetAll();
+ Publisher publisher = PowerMock.createPartialMock(Publisher.class, "publish", PolicyMsg.class);
+ PolicyMsg policyMsg = new PolicyMsg();
+ policyMsg.setClosedLoopEventStatus(EVENT_STATUS.ABATED);
+ policyMsg.setRequestID("testRequestid");
+ DmaapService.alarmUniqueRequestID.put("testAlarmId", "testRequestid");
+ PowerMock.expectNew(Publisher.class).andReturn(publisher);
+ EasyMock.expect(publisher.publish(policyMsg)).andReturn(true);
+
+ DcaeConfigurationsCache.setDcaeConfigurations(
+ DcaeConfigurationParser.parse(readConfigurationsFromFile("dcae.config.json")));
+
+ PowerMock.replayAll();
+ dmaapService.publishPolicyMsg(policyMsg, "sec_fault_unsecure");
+ PowerMock.verifyAll();
+
+ }
+
+ private String readConfigurationsFromFile(String fileName) throws URISyntaxException, FileNotFoundException {
+ URL url = DmaapServiceTest.class.getClassLoader().getResource(fileName);
+ File configFile = new File(new URI(url.toString()).getPath());
+ BufferedReader br = new BufferedReader(new FileReader(configFile));
+
+ final StringBuilder sb = new StringBuilder();
+ br.lines().forEach(line -> {
+ sb.append(line);
+ });
+ try {
+ br.close();
+ } catch (IOException e) {
+ // Do nothing
+ }
+ return sb.toString();
+ }
}
\ No newline at end of file
\r
@Rule\r
public PowerMockRule powerMockRule = new PowerMockRule();\r
+\r
private MSBRegisterUtil msbRegisterUtil = new MSBRegisterUtil();\r
\r
@Test\r
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
<maven.test.skip>false</maven.test.skip>\r
+ <powermock.version>1.7.1</powermock.version>\r
<maven.test.failure.ignore>false</maven.test.failure.ignore>\r
<finalName>${project.artifactId}-${project.version}</finalName>\r
<release.dir>${basedir}/target</release.dir>\r
<bundle.name>${project.artifactId}-${project.version}</bundle.name>\r
<pkgzip.dir>${basedir}/../release/pkgzip</pkgzip.dir>\r
<excludesFile>**/*$*</excludesFile>\r
- <nexusproxy>https://nexus.open-o.org/content</nexusproxy>\r
\r
<stringtemplate.version>3.2.1</stringtemplate.version>\r
<dropwizard.version>1.3.0</dropwizard.version>\r
<slf4j.version>1.7.25</slf4j.version>\r
<quartz.version>2.2.1</quartz.version>\r
</properties>\r
+\r
<dependencyManagement>\r
<dependencies>\r
<dependency>\r
<dependency>\r
<groupId>org.powermock</groupId>\r
<artifactId>powermock-module-junit4</artifactId>\r
- <version>1.6.5</version>\r
+ <version>${powermock.version}</version>\r
<scope>test</scope>\r
</dependency>\r
<dependency>\r
<dependency>\r
<groupId>org.powermock</groupId>\r
<artifactId>powermock-api-easymock</artifactId>\r
- <version>1.6.5</version>\r
+ <version>${powermock.version}</version>\r
<scope>test</scope>\r
</dependency>\r
<dependency>\r
<groupId>org.powermock</groupId>\r
<artifactId>powermock-api-mockito</artifactId>\r
- <version>1.7.1</version>\r
+ <version>${powermock.version}</version>\r
<scope>test</scope>\r
</dependency>\r
<dependency>\r
<groupId>org.powermock</groupId>\r
<artifactId>powermock-module-junit4-rule</artifactId>\r
- <version>1.6.5</version>\r
+ <version>${powermock.version}</version>\r
<scope>test</scope>\r
</dependency>\r
<dependency>\r
<groupId>org.powermock</groupId>\r
<artifactId>powermock-classloading-xstream</artifactId>\r
- <version>1.6.5</version>\r
+ <version>${powermock.version}</version>\r
<scope>test</scope>\r
</dependency>\r
<dependency>\r
Code Review / holmes / common.git / commitdiff