package org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.impl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-
import java.io.IOException;
-
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DMaaPFaultVESMsgConsumer extends DMaaPVESMsgConsumerImpl {
private static final String DEFAULT_SDNRUSER = "admin";
private static final String DEFAULT_SDNRPASSWD = "admin";
+ private final GeneralConfig generalConfig;
+
+ public DMaaPFaultVESMsgConsumer(GeneralConfig generalConfig) {
+ this.generalConfig = generalConfig;
+ }
+
@Override
public void processMsg(String msg) throws Exception {
String faultNodeId;
}
public String getBaseUrl() {
- return GeneralConfig.getBaseUrl();
+ return generalConfig.getBaseUrl();
}
public String getSDNRUser() {
- return GeneralConfig.getSDNRUser() != null ? GeneralConfig.getSDNRUser() : DEFAULT_SDNRUSER;
+ return generalConfig.getSDNRUser() != null ? generalConfig.getSDNRUser() : DEFAULT_SDNRUSER;
}
public String getSDNRPasswd() {
- return GeneralConfig.getSDNRPasswd() != null ? GeneralConfig.getSDNRPasswd() : DEFAULT_SDNRPASSWD;
+ return generalConfig.getSDNRPasswd() != null ? generalConfig.getSDNRPasswd() : DEFAULT_SDNRPASSWD;
}
public FaultNotificationClient getFaultNotificationClient(String baseUrl) {
package org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.impl;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
public class DMaaPPNFRegVESMsgConsumer extends DMaaPVESMsgConsumerImpl {
private static final Logger LOG = LoggerFactory.getLogger(DMaaPPNFRegVESMsgConsumer.class);
private static final String DEFAULT_SDNRUSER = "admin";
private static final String DEFAULT_SDNRPASSWD = "admin";
+ private final GeneralConfig generalConfig;
+
+ public DMaaPPNFRegVESMsgConsumer(GeneralConfig generalConfig) {
+ this.generalConfig = generalConfig;
+ }
+
@Override
public void processMsg(String msg) {
LOG.debug("Message from DMaaP topic is - {} ", msg);
}
public String getBaseUrl() {
- return GeneralConfig.getBaseUrl();
+ return generalConfig.getBaseUrl();
}
public String getSDNRUser() {
- return GeneralConfig.getSDNRUser() != null ? GeneralConfig.getSDNRUser() : DEFAULT_SDNRUSER;
+ return generalConfig.getSDNRUser() != null ? generalConfig.getSDNRUser() : DEFAULT_SDNRUSER;
}
public String getSDNRPasswd() {
- return GeneralConfig.getSDNRPasswd() != null ? GeneralConfig.getSDNRPasswd() : DEFAULT_SDNRPASSWD;
+ return generalConfig.getSDNRPasswd() != null ? generalConfig.getSDNRPasswd() : DEFAULT_SDNRPASSWD;
}
public PNFMountPointClient getPNFMountPointClient(String baseUrl) {
import java.util.List;
import java.util.Map;
import java.util.Properties;
-
import org.onap.ccsdk.features.sdnr.wt.common.configuration.Configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DMaaPVESMsgConsumerMain implements Runnable {
private static final Logger LOG = LoggerFactory.getLogger(DMaaPVESMsgConsumerMain.class);
-
+ private static final String pnfRegClass =
+ "org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.impl.DMaaPPNFRegVESMsgConsumer";
+ private static final String faultClass =
+ "org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.impl.DMaaPFaultVESMsgConsumer";
boolean threadsRunning = false;
- static List<DMaaPVESMsgConsumer> consumers = new LinkedList<>();
- public GeneralConfig config;
+ List<DMaaPVESMsgConsumer> consumers = new LinkedList<>();
public PNFRegistrationConfig pnfRegistrationConfig;
public FaultConfig faultConfig;
+ public GeneralConfig generalConfig;
- public DMaaPVESMsgConsumerMain(Map<String, Configuration> configMap) {
+ public DMaaPVESMsgConsumerMain(Map<String, Configuration> configMap, GeneralConfig generalConfig) {
+ this.generalConfig = generalConfig;
configMap.forEach((k, v) -> initialize(k, v));
}
pnfRegistrationConfig.getClientReadTimeout());
consumerProperties.put(PNFRegistrationConfig.PROPERTY_KEY_CONSUMER_CLIENT_CONNECTTIMEOUT,
pnfRegistrationConfig.getClientConnectTimeout());
+ threadsRunning = createConsumer("pnfRegistration", consumerProperties);
} else if (domain.equalsIgnoreCase("fault")) {
this.faultConfig = (FaultConfig) domainConfig;
consumerClass = faultConfig.getConsumerClass();
faultConfig.getClientReadTimeout());
consumerProperties.put(FaultConfig.PROPERTY_KEY_CONSUMER_CLIENT_CONNECTTIMEOUT,
faultConfig.getClientConnectTimeout());
+ threadsRunning = createConsumer("fault", consumerProperties);
}
-
- if (consumerClass != null) {
- LOG.info("Calling createConsumer : {}", consumerClass);
- threadsRunning = createConsumer(consumerClass, consumerProperties);
- }
-
}
- private static boolean updateThreadState(List<DMaaPVESMsgConsumer> consumers) {
+ private boolean updateThreadState(List<DMaaPVESMsgConsumer> consumers) {
boolean threadsRunning = false;
for (DMaaPVESMsgConsumer consumer : consumers) {
if (consumer.isRunning()) {
return threadsRunning;
}
- static boolean createConsumer(String consumerClassName, Properties properties) {
- Class<?> consumerClass = null;
+ public boolean createConsumer(String consumerType, Properties properties) {
+ DMaaPVESMsgConsumerImpl consumer = null;
- try {
- consumerClass = Class.forName(consumerClassName);
- } catch (Exception e) {
- LOG.error("Could not find DMaap VES Message consumer class {}", consumerClassName, e);
- }
+ if (consumerType.equalsIgnoreCase("pnfRegistration"))
+ consumer = new DMaaPPNFRegVESMsgConsumer(generalConfig);
+ else if (consumerType.equalsIgnoreCase("fault"))
+ consumer = new DMaaPFaultVESMsgConsumer(generalConfig);
- if (consumerClass != null) {
- LOG.debug("Calling handleConsumerClass");
- handleConsumerClass(consumerClass, consumerClassName, properties, consumers);
- }
+ handleConsumer(consumer, properties, consumers);
return !consumers.isEmpty();
}
- private static boolean handleConsumerClass(Class<?> consumerClass, String consumerClassName, Properties properties,
+ private boolean handleConsumer(DMaaPVESMsgConsumer consumer, Properties properties,
List<DMaaPVESMsgConsumer> consumers) {
- DMaaPVESMsgConsumer consumer = null;
-
- try {
- consumer = (DMaaPVESMsgConsumer) consumerClass.newInstance();
- LOG.debug("Successfully created an instance of consumerClass : {}", consumerClassName);
- } catch (Exception e) {
- LOG.error("Could not create consumer from class {}", consumerClassName, e);
- }
-
if (consumer != null) {
- LOG.info("Initializing consumer {}({})", consumerClassName, properties);
consumer.init(properties);
if (consumer.isReady()) {
consumerThread.start();
consumers.add(consumer);
- LOG.info("Started consumer thread ({} : {})", consumerClassName, properties);
+ LOG.info("Started consumer thread ({} : {})", consumer.getClass().getSimpleName(), properties);
return true;
} else {
- LOG.debug("Consumer {} is not ready", consumerClassName);
+ LOG.debug("Consumer {} is not ready", consumer.getClass().getSimpleName());
}
}
return false;
}
+ @Override
public void run() {
while (threadsRunning) {
threadsRunning = updateThreadState(consumers);
LOG.info("No listener threads running - exiting");
}
- public static List<DMaaPVESMsgConsumer> getConsumers() {
+ public List<DMaaPVESMsgConsumer> getConsumers() {
return consumers;
}
private static final String DEFAULT_VALUE_BASEURL = "http://localhost:8181";
- private static ConfigurationFileRepresentation configuration;
+ private ConfigurationFileRepresentation configuration;
public GeneralConfig(ConfigurationFileRepresentation configuration) {
- GeneralConfig.configuration = configuration;
- GeneralConfig.configuration.addSection(SECTION_MARKER);
+ this.configuration = configuration;
+ configuration.addSection(SECTION_MARKER);
defaults();
}
return enabled;
}
- public static String getBaseUrl() {
+ public String getBaseUrl() {
return configuration.getProperty(SECTION_MARKER, PROPERTY_KEY_BASEURL);
}
- public static String getSDNRUser() {
+ public String getSDNRUser() {
return configuration.getProperty(SECTION_MARKER, PROPERTY_KEY_USER);
}
- public static String getSDNRPasswd() {
+ public String getSDNRPasswd() {
return configuration.getProperty(SECTION_MARKER, PROPERTY_KEY_USERPASSWD);
}
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.onap.ccsdk.features.sdnr.wt.common.configuration.Configuration;
import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
import org.onap.ccsdk.features.sdnr.wt.common.configuration.filechange.IConfigChangedListener;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private GeneralConfig generalConfig;
private boolean dmaapEnabled = false;
private Map<String, Configuration> configMap = new HashMap<>();
+ private DMaaPVESMsgConsumerMain dmaapConsumerMain = null;
// Blueprint 1
public MountpointRegistrarImpl() {
dmaapEnabled = generalConfig.getEnabled();
if (dmaapEnabled) { // start dmaap consumer thread only if dmaapEnabled=true
LOG.info("DMaaP seems to be enabled, starting consumer(s)");
- dmaapVESMsgConsumerMain = new Thread(new DMaaPVESMsgConsumerMain(configMap));
+ dmaapConsumerMain = new DMaaPVESMsgConsumerMain(configMap, generalConfig);
+ dmaapVESMsgConsumerMain = new Thread(dmaapConsumerMain);
dmaapVESMsgConsumerMain.start();
} else {
LOG.info("DMaaP seems to be disabled, not starting any consumer(s)");
/**
* Reflect status for Unit Tests
- *
+ *
* @return Text with status
*/
public String isInitializationOk() {
boolean dmaapEnabledNewVal = generalConfig.getEnabled();
if (!dmaapEnabled && dmaapEnabledNewVal) { // Dmaap disabled earlier (or during bundle startup) but enabled later, start Consumer(s)
LOG.info("DMaaP is enabled, starting consumer(s)");
- dmaapVESMsgConsumerMain = new Thread(new DMaaPVESMsgConsumerMain(configMap));
+ dmaapConsumerMain = new DMaaPVESMsgConsumerMain(configMap, generalConfig);
+ dmaapVESMsgConsumerMain = new Thread(dmaapConsumerMain);
dmaapVESMsgConsumerMain.start();
} else if (dmaapEnabled && !dmaapEnabledNewVal) { // Dmaap enabled earlier (or during bundle startup) but disabled later, stop consumer(s)
LOG.info("DMaaP is disabled, stopping consumer(s)");
- List<DMaaPVESMsgConsumer> consumers = DMaaPVESMsgConsumerMain.getConsumers();
+ List<DMaaPVESMsgConsumer> consumers = dmaapConsumerMain.getConsumers();
for (DMaaPVESMsgConsumer consumer : consumers) {
// stop all consumers
consumer.stopConsumer();
--- /dev/null
+/*
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * 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
+ *
+ * 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
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
+
+package org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.test;
+
+import com.google.common.io.Files;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.impl.GeneralConfig;
+
+public class GeneralConfigForTest implements AutoCloseable {
+
+ // @formatter:off
+ private static final String TESTCONFIG_CONTENT = "[general]\n"
+ + "dmaapEnabled=false\n"
+ + "baseUrl=http://localhost:8181\n"
+ + "sdnrUser=admin\n"
+ + "sdnrPasswd=admin\n"
+ + "";
+ // @formatter:on
+
+ private GeneralConfig cfg ;
+ private String filename;
+
+ GeneralConfigForTest(String filename) throws IOException {
+
+ Files.asCharSink(new File(filename), StandardCharsets.UTF_8).write(TESTCONFIG_CONTENT);
+ ConfigurationFileRepresentation globalCfg = new ConfigurationFileRepresentation(filename);
+ this.filename = filename;
+ this.cfg = new GeneralConfig(globalCfg);
+
+ }
+
+ public GeneralConfig getCfg() {
+ return cfg;
+ }
+
+
+ @Override
+ public
+ void close() {
+ File file = new File(filename);
+ if (file.exists()) {
+ System.out.println("File exists, Deleting it");
+ file.delete();
+ }
+
+ }
+}
+ "";
// @formatter:on
private ConfigurationFileRepresentation cfg;
+ private static final String configFile = "test.properties";
@Test
public void test() {
try {
- Files.asCharSink(new File("test.properties"), StandardCharsets.UTF_8).write(TESTCONFIG_CONTENT);
- cfg = new ConfigurationFileRepresentation("test.properties");
+ Files.asCharSink(new File(configFile), StandardCharsets.UTF_8).write(TESTCONFIG_CONTENT);
+ cfg = new ConfigurationFileRepresentation(configFile);
PNFRegistrationConfig pnfCfg = new PNFRegistrationConfig(cfg);
assertEquals("pnfRegistration", pnfCfg.getSectionName());
assertEquals("org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.impl.DMaaPPNFRegVESMsgConsumer",
assertEquals("25000", pnfCfg.getClientConnectTimeout());
} catch (IOException e) {
- // TODO Auto-generated catch block
+ e.printStackTrace();
}
}
@After
public void cleanUp() {
- File file = new File("test.properties");
+ File file = new File(configFile);
if (file.exists()) {
System.out.println("File exists, Deleting it");
file.delete();
package org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.test;
+import java.io.IOException;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.impl.DMaaPFaultVESMsgConsumer;
-import org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.impl.FaultNotificationClient;
-public class TestDMaaPFaultVESMsgConsumer extends DMaaPFaultVESMsgConsumer {
+public class TestDMaaPFaultVESMsgConsumer {
private static final String DEFAULT_SDNRUSER = "admin";
private static final String DEFAULT_SDNRPASSWD = "admin";
private static final String DEFAULT_SDNRBASEURL = "http://localhost:8181";
+ private static final String CONFIGURATIONFILE = "test2.properties";
// @formatter:off
private static final String faultVESMsg = ""
+ "}";
// @formatter:on
+ private GeneralConfigForTest cfgTest;
+
+ @Before
+ public void before() throws IOException {
+ cfgTest = new GeneralConfigForTest(CONFIGURATIONFILE);
+ }
+ @After
+ public void after() {
+ cfgTest.close();
+ }
+
+
@Test
- public void test() {
- DMaaPFaultVESMsgConsumer faultMsgConsumer = new TestDMaaPFaultVESMsgConsumer();
+ public void test() throws IOException {
+ DMaaPFaultVESMsgConsumer faultMsgConsumer = new DMaaPFaultVESMsgConsumer(cfgTest.getCfg());
try {
faultMsgConsumer.processMsg(faultVESMsg.replace("@eventSeverity@", "CRITICAL"));
}
}
- @Override
- public FaultNotificationClient getFaultNotificationClient(String baseUrl) {
- return new TestFaultNotificationClient();
- }
-
- @Override
- public String getSDNRUser() {
- return DEFAULT_SDNRUSER;
- }
-
- @Override
- public String getSDNRPasswd() {
- return DEFAULT_SDNRPASSWD;
- }
-
- @Override
- public String getBaseUrl() {
- return DEFAULT_SDNRBASEURL;
- }
-
- @Test
- public void Test1() {
- TestGeneralConfig cfgTest = new TestGeneralConfig();
- cfgTest.test();
- DMaaPFaultVESMsgConsumer faultConsumer = new DMaaPFaultVESMsgConsumer();
- System.out.println(faultConsumer.getBaseUrl());
- System.out.println(faultConsumer.getSDNRUser());
- System.out.println(faultConsumer.getSDNRPasswd());
- }
-
- /*
- * @Test public void Test2() { TestGeneralConfig cfgTest = new
- * TestGeneralConfig(); cfgTest.test1(); //cfgTest.test();
- * DMaaPFaultVESMsgConsumer faultConsumer = new DMaaPFaultVESMsgConsumer();
- * System.out.println(faultConsumer.getBaseUrl());
- * System.out.println(faultConsumer.getSDNRUser());
- * System.out.println(faultConsumer.getSDNRPasswd()); }
- */
}
package org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.test;
+import java.io.IOException;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.impl.DMaaPPNFRegVESMsgConsumer;
-import org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.impl.PNFMountPointClient;
-public class TestDMaaPPNFRegVESMsgConsumer extends DMaaPPNFRegVESMsgConsumer {
+public class TestDMaaPPNFRegVESMsgConsumer {
private static final String DEFAULT_SDNRUSER = "admin";
private static final String DEFAULT_SDNRPASSWD = "admin";
private static final String DEFAULT_SDNRBASEURL = "http://localhost:8181";
+ private static final String CONFIGURATIONFILE = "test4.properties";
// @formatter:off
private static final String pnfRegMsg_TLS = "{\n"
- + " \"event\": {\n"
+ + " \"event\": {\n"
+ " \"commonEventHeader\": {\n"
+ " \"domain\": \"pnfRegistration\",\n"
+ " \"eventId\": \"NSHMRIACQ01M01123401_1234 BestInClass\",\n"
+ " }\n"
+ "}\n"
+ "";
-
private static final String pnfRegMsg_SSH = "{\n"
+ " \"event\": {\n"
+ " \"commonEventHeader\": {\n"
+ " }\n"
+ "}\n"
+ "";
-
private static final String pnfRegMsg_OTHER = "{\n"
+ " \"event\": {\n"
+ " \"commonEventHeader\": {\n"
+ "";
// @formatter:on
+ private GeneralConfigForTest cfgTest;
+
+ @Before
+ public void before() throws IOException {
+ cfgTest = new GeneralConfigForTest(CONFIGURATIONFILE);
+ }
+
+ @After
+ public void after() {
+ cfgTest.close();
+ }
+
@Test
public void processMsgTest() {
- DMaaPPNFRegVESMsgConsumer pnfRegMsgConsumer = new TestDMaaPPNFRegVESMsgConsumer();
+ DMaaPPNFRegVESMsgConsumer pnfRegMsgConsumer = new DMaaPPNFRegVESMsgConsumer(cfgTest.getCfg());
try {
pnfRegMsgConsumer.processMsg(pnfRegMsg);
pnfRegMsgConsumer.processMsg(pnfRegMsg_SSH);
}
}
- @Override
- public PNFMountPointClient getPNFMountPointClient(String baseUrl) {
- return new TestPNFMountPointClient();
- }
-
- @Override
- public String getSDNRUser() {
- return DEFAULT_SDNRUSER;
- }
-
- @Override
- public String getSDNRPasswd() {
- return DEFAULT_SDNRPASSWD;
- }
-
- @Override
- public String getBaseUrl() {
- return DEFAULT_SDNRBASEURL;
- }
-
@Test
public void Test1() {
- TestGeneralConfig cfgTest = new TestGeneralConfig();
- cfgTest.test();
- DMaaPPNFRegVESMsgConsumer pnfConsumer = new DMaaPPNFRegVESMsgConsumer();
+ DMaaPPNFRegVESMsgConsumer pnfConsumer = new DMaaPPNFRegVESMsgConsumer(cfgTest.getCfg());
System.out.println(pnfConsumer.getBaseUrl());
System.out.println(pnfConsumer.getSDNRUser());
System.out.println(pnfConsumer.getSDNRPasswd());
public class TestDMaaPVESMsgConsumerMain {
- private static final String CONFIGURATIONFILE = "test.properties";
+ private static final String CONFIGURATIONFILE = "test1.properties";
// @formatter:off
private static final String TESTCONFIG_GENERAL = "[general]\n"
+ "dmaapEnabled=false\n"
+ "fetchPause=WORLD\n"
+ "\n"
+ "";
- public GeneralConfig generalConfig;
// @formatter:on
+ public GeneralConfig generalConfig;
Map<String, Configuration> configMap = new HashMap<String, Configuration>();
DMaaPVESMsgConsumerMain dmaapMain;
public void testDMaaPVESMsgConsumerMainMapOfStringConfiguration() {
preTest1();
assertNotNull(configMap);
- dmaapMain = new DMaaPVESMsgConsumerMain(configMap);
+ dmaapMain = new DMaaPVESMsgConsumerMain(configMap, generalConfig);
}
@Test
public void testDMaaPVESMsgConsumerMainMapOfStringConfiguration1() {
preTest2();
assertNotNull(configMap);
- dmaapMain = new DMaaPVESMsgConsumerMain(configMap);
+ dmaapMain = new DMaaPVESMsgConsumerMain(configMap, generalConfig);
}
@After
public void postTest() {
- File file = new File("test.properties");
+ File file = new File(CONFIGURATIONFILE);
if (file.exists()) {
System.out.println("File exists, Deleting it");
file.delete();
}
- List<DMaaPVESMsgConsumer> consumers = DMaaPVESMsgConsumerMain.getConsumers();
+ List<DMaaPVESMsgConsumer> consumers = dmaapMain.getConsumers();
for (DMaaPVESMsgConsumer consumer : consumers) {
// stop all consumers
consumer.stopConsumer();
// @formatter:on
private ConfigurationFileRepresentation cfg;
-
+ private static final String CONFIGURATIONFILE = "test2.properties";
@Test
public void test() {
try {
- Files.asCharSink(new File("test.properties"), StandardCharsets.UTF_8).write(TESTCONFIG_CONTENT);
- cfg = new ConfigurationFileRepresentation("test.properties");
+ Files.asCharSink(new File(CONFIGURATIONFILE), StandardCharsets.UTF_8).write(TESTCONFIG_CONTENT);
+ cfg = new ConfigurationFileRepresentation(CONFIGURATIONFILE);
FaultConfig faultCfg = new FaultConfig(cfg);
assertEquals("fault", faultCfg.getSectionName());
assertEquals("org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.impl.DMaaPFaultVESMsgConsumer",
assertEquals("25000", faultCfg.getClientConnectTimeout());
} catch (IOException e) {
- // TODO Auto-generated catch block
+ e.printStackTrace();
}
}
@After
public void cleanUp() {
- File file = new File("test.properties");
+ File file = new File(CONFIGURATIONFILE);
if (file.exists()) {
System.out.println("File exists, Deleting it");
file.delete();
package org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.test;
import static org.junit.Assert.assertEquals;
-import com.google.common.io.Files;
-import java.io.File;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
import org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.impl.GeneralConfig;
public class TestGeneralConfig {
- // @formatter:off
- private static final String TESTCONFIG_CONTENT = "[general]\n"
- + "dmaapEnabled=false\n"
- + "baseUrl=http://localhost:8181\n"
- + "sdnrUser=admin\n"
- + "sdnrPasswd=admin\n"
- + "";
- // @formatter:on
+ private static final String CONFIGURATIONFILE = "test1.properties";
- private ConfigurationFileRepresentation globalCfg;
+ private GeneralConfigForTest config;
+
+ @Before
+ public void before() throws IOException {
+ config = new GeneralConfigForTest(CONFIGURATIONFILE);
+ }
@Test
- public void test() {
- try {
- Files.asCharSink(new File("test.properties"), StandardCharsets.UTF_8).write(TESTCONFIG_CONTENT);
- globalCfg = new ConfigurationFileRepresentation("test.properties");
- GeneralConfig cfg = new GeneralConfig(globalCfg);
+ public void test() throws IOException {
+ GeneralConfig cfg = config.getCfg();
+
assertEquals(false, cfg.getEnabled());
- assertEquals("http://localhost:8181", GeneralConfig.getBaseUrl());
- assertEquals("admin", GeneralConfig.getSDNRUser());
- assertEquals("admin", GeneralConfig.getSDNRPasswd());
+ assertEquals("http://localhost:8181", cfg.getBaseUrl());
+ assertEquals("admin", cfg.getSDNRUser());
+ assertEquals("admin", cfg.getSDNRPasswd());
assertEquals("general", cfg.getSectionName());
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
}
@After
public void cleanUp() {
- File file = new File("test.properties");
- if (file.exists()) {
- System.out.println("File exists, Deleting it");
- file.delete();
- }
-
+ config.close();
}
}
*/
package org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.test;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.Optional;
-
import org.junit.Test;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.PushFaultNotificationInputBuilder;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
public class TestMapping {
private final ObjectMapper mapper = new ObjectMapper();
faultNotificationBuilder.setTimestamp(new DateAndTime(faultOccurrenceTime));
faultNotificationBuilder.setObjectId(faultObjectId);
faultNotificationBuilder.setProblem(faultReason);
- Optional<SeverityType> oSeverity = getSeverity(faultSeverity); //TODO getSeverity
+ Optional<SeverityType> oSeverity = getSeverity(faultSeverity);
if (oSeverity.isPresent()) {
faultNotificationBuilder.setSeverity(oSeverity.get());
} else {
Code Review / ccsdk / features.git / commitdiff