diff options
4 files changed, 20 insertions, 13 deletions
diff --git a/dcae-analytics-cdap-tca/src/main/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtils.java b/dcae-analytics-cdap-tca/src/main/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtils.java index 986c301..8a16f0f 100644 --- a/dcae-analytics-cdap-tca/src/main/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtils.java +++ b/dcae-analytics-cdap-tca/src/main/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtils.java @@ -136,6 +136,7 @@ public abstract class CDAPTCAUtils extends TCAUtils { if (null != tcaAppPreferences.getSubscriberHostName() || null != tcaAppPreferences.getPublisherHostName()) {
LOG.info("DMaaP Information is set from runtime preferences. Skipping getting DMaaP info from App Config");
+ return;
}
LOG.info("Fetching DMaaP information from App Configuration String: {}", appConfigString);
diff --git a/dcae-analytics-cdap-tca/src/test/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtilsTest.java b/dcae-analytics-cdap-tca/src/test/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtilsTest.java index 2cb9002..7b4f72b 100644 --- a/dcae-analytics-cdap-tca/src/test/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtilsTest.java +++ b/dcae-analytics-cdap-tca/src/test/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtilsTest.java @@ -28,6 +28,8 @@ import org.openecomp.dcae.apod.analytics.cdap.tca.BaseAnalyticsCDAPTCAUnitTest; import org.openecomp.dcae.apod.analytics.cdap.tca.settings.TCAAppPreferences;
import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
+import java.util.Map;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
@@ -42,7 +44,10 @@ public class CDAPTCAUtilsTest extends BaseAnalyticsCDAPTCAUnitTest { @Test
public void testGetValidatedTCAAppPreferences() throws Exception {
RuntimeContext runtimeContext = mock(RuntimeContext.class);
- when(runtimeContext.getRuntimeArguments()).thenReturn(getPreferenceMap());
+ final Map<String, String> preferenceMap = getPreferenceMap();
+ preferenceMap.remove("subscriberHostName");
+ preferenceMap.remove("publisherHostName");
+ when(runtimeContext.getRuntimeArguments()).thenReturn(preferenceMap);
ApplicationSpecification mockApplicationSpecification = Mockito.mock(ApplicationSpecification.class);
when(mockApplicationSpecification.getConfiguration()).thenReturn(fromStream(TCA_APP_CONFIG_FILE_LOCATION));
when(runtimeContext.getApplicationSpecification()).thenReturn(mockApplicationSpecification);
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java index b3e303e..32e09fa 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java @@ -69,8 +69,9 @@ public class DMaaPMRPublisherImpl extends BaseDMaaPMRComponent implements DMaaPM CloseableHttpClient closeableHttpClient) {
this.publisherConfig = publisherConfig;
+ final int maxBatchSize = publisherConfig.getMaxBatchSize() > 0 ? publisherConfig.getMaxBatchSize() : 1;
this.publisherQueue = dMaaPMRPublisherQueueFactory.create(
- publisherConfig.getMaxBatchSize(), publisherConfig.getMaxRecoveryQueueSize());
+ maxBatchSize, publisherConfig.getMaxRecoveryQueueSize());
this.closeableHttpClient = closeableHttpClient;
this.publisherUri = createPublisherURI(publisherConfig);
this.publisherCreationTime = new Date();
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyEventNameFilter.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyEventNameFilter.java index 50bd92b..ddf3888 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyEventNameFilter.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyEventNameFilter.java @@ -67,22 +67,22 @@ public class TCACEFPolicyEventNameFilter extends AbstractTCAECEFPolicyProcessor // Determine Policy Functional Roles
final TCAPolicy tcaPolicy = processorContext.getTCAPolicy();
- final List<String> policyFunctionalRoles = getPolicyEventNamesSupplier(tcaPolicy).get();
- final String policyFunctionalRolesString = Joiner.on(",").join(policyFunctionalRoles);
+ final List<String> policyEventNames = getPolicyEventNamesSupplier(tcaPolicy).get();
+ final String policyEventNamesString = Joiner.on(",").join(policyEventNames);
- // If Policy functional Roles contains CEF message Functional Role then continue processing
- if (policyFunctionalRoles.contains(cefMessageEventName)) {
+ // If Policy event names contains CEF message event names then continue processing
+ if (policyEventNames.contains(cefMessageEventName)) {
final String finishMessage = String.format(
- "Policy Functional Roles and CEF Message Functional match successful." +
- "Message Functional Role: %s, Policy Functional Roles: %s",
- cefMessageEventName, policyFunctionalRolesString);
+ "Policy Event Name and CEF Message Event Name match successful." +
+ "Message EventName: %s, Policy Event Names: %s",
+ cefMessageEventName, policyEventNamesString);
setFinishedProcessingMessage(finishMessage, processorContext);
} else {
- // If Policy functional Roles does not contain CEF message Functiona Role then terminate processing
+ // If Policy event names does not contain CEF message event names then terminate processing
final String terminatingMessage = String.format(
- "Policy Domain and CEF Message Domain match unsuccessful." +
- "Message Functional Role: %s, Policy Functional Roles: %s",
- cefMessageEventName, policyFunctionalRolesString);
+ "Policy Event name and CEF Message Event name match unsuccessful." +
+ "Message EventName: %s, Policy Event Names: %s",
+ cefMessageEventName, policyEventNamesString);
setTerminatingProcessingMessage(terminatingMessage, processorContext);
}
|