* =============================================================================
* Modifications Copyright (C) 2018-2019 IBM.
* =============================================================================
- * Modifications Copyright (C) 2018 Ericsson
+ * Modifications Copyright (C) 2018-2019 Ericsson
* =============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
public class ConfigComponentAdaptor implements SvcLogicAdaptor {
-private static final EELFLogger log = EELFManager.getInstance().getLogger(ConfigComponentAdaptor.class);
+private static EELFLogger log = EELFManager.getInstance().getLogger(ConfigComponentAdaptor.class);
DebugLog debugLog = new DebugLog();
private String configUrl = null;
private String configUser = null;
WebResource webResource = client.resource(url);
log.info("SENDING...............");
- log.info(xmlRequest);
-
+ if (log.isTraceEnabled()) {
+ log.trace(xmlRequest);
+ }
+ else {
+ if(xmlRequest.length() > 255 ) {
+ log.info(xmlRequest.substring(0, 255));
+ log.info("\n...\n" + xmlRequest.length() +
+ " characters in request, turn on TRACE logging to log entire request");
+ }
+ else {
+ log.info(xmlRequest);
+ }
+ }
String authString = user + ":" + password;
byte[] authEncBytes = Base64.encode(authString);
String authStringEnc = new String(authEncBytes);
}
runningConfig = sb.toString();
+ if (log.isTraceEnabled()) {
+ log.trace("ConfigComponentAdaptor:RunningConfig after trimResponse : " + runningConfig);
+ }
+ else {
+ if (runningConfig.length() > 255) {
+ log.info("ConfigComponentAdaptor:RunningConfig after trimResponse : " +
+ runningConfig.substring(0, 255));
+ log.info("\n...\n" + runningConfig.length() +
+ " characters in config, turn on TRACE logging to log entire config");
+ }
+ else {
+ log.info("ConfigComponentAdaptor:RunningConfig after trimResponse : " +
+ runningConfig);
+ }
+ }
log.info("ConfigComponentAdaptor:RunningConfig after trimResponse : " + runningConfig);
return runningConfig;
}
* =============================================================================
* Modifications Copyright (C) 2018-2019 IBM.
* =============================================================================
- * Modifications Copyright (C) 2018 Ericsson
+ * Modifications Copyright (C) 2018-2019 Ericsson
* =============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
assertEquals(ConfigStatus.SUCCESS, cca.configure(key, parameters, ctx));
}
+ @Test
+ public void testXmlGetrunningconfigLongResponse() throws TimedOutException, IOException {
+ Properties props = null;
+ ConfigComponentAdaptor cca = Mockito.spy(new ConfigComponentAdaptor(props));
+ Mockito.doReturn("<configuration xmlns=\"\n<data>\nData line 1\nData line 2\nData line 3\nData line 4\n"
+ + "Data line 5\nData line 6\nData line 7\nData line 8\nData line 9\n Data line 10\n"
+ + "Data line 11\nData line 12\nData line 13\nData line 14\nData line 15\n"
+ + "Data line 16\nData line 17\nData line 18\nData line 19\nData line 20</data>\n</configuration>")
+ .when(mockWrapper)
+ .receiveUntil(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString());
+ Mockito.doReturn(mockWrapper).when(cca).getSshJcraftWrapper();
+ String key = "xml-getrunningconfig";
+ Map<String, String> parameters = new HashMap<>();
+ loadSshParameters(parameters);
+ SvcLogicContext ctx = new SvcLogicContext();
+ assertEquals(ConfigStatus.SUCCESS, cca.configure(key, parameters, ctx));
+ }
+
@Test
public void testXmlGetrunningconfigExceptionFlow() throws TimedOutException, IOException {
Properties props = new Properties();
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Copyright (C) 2017 Amdocs
+ * ================================================================================
+ * Modifications Copyright (C) 2019 Ericsson
* =============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
public void writeFile(Map<String, String> inParams, SvcLogicContext ctx)
throws SvcLogicException {
- log.info("Received writeFile call with params : " + inParams);
+ if (log.isTraceEnabled()) {
+ log.trace("Received writeFile call with params : " + inParams);
+ }
+ else {
+ String mapString = inParams.toString();
+ if (mapString.length() > 255) {
+ log.info("Received writeFile call with params : " + mapString.substring(0, 255));
+ log.info("\n...\n" + mapString.length() +
+ " characters in parameters map, turn on TRACE logging to log entire parameter map");
+ }
+ else {
+ log.info("Received writeFile call with params : " + mapString);
+ }
+ }
String responsePrefix = inParams.get(ConfigGeneratorConstant.INPUT_PARAM_RESPONSE_PRIFIX);
try {
responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix + ".") : "";
* Copyright (C) 2017 Amdocs
* =============================================================================
* Modfication Copyright (C) 2018 IBM.
+ * ================================================================================
+ * Modifications Copyright (C) 2019 Ericsson
* =============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
assertEquals(ConfigGeneratorConstant.OUTPUT_STATUS_SUCCESS,
ctx.getAttribute("test." + ConfigGeneratorConstant.OUTPUT_PARAM_STATUS));
}
-
- @Test(expected=SvcLogicException.class)
+
+ @Test
+ public void writeFileForLongParameters() throws Exception {
+ FileWriterNode FileWriterNode = new FileWriterNode();
+ Map<String, String> inParams = new HashMap<String, String>();
+ inParams.put(ConfigGeneratorConstant.INPUT_PARAM_FILE_NAME,
+ "src/test/resources/writer/testcvaas.json");
+ inParams.put(ConfigGeneratorConstant.INPUT_PARAM_REQUEST_DATA,
+ "{'name':'Name','role':'admin'}");
+ inParams.put(ConfigGeneratorConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test");
+ inParams.put("TEST", "Lorem ipsum dolor sit amet, prompta mediocrem quo an, eos odio esse pertinax an."
+ + " Vis timeam suscipiantur no, eos ex vidisse appareat. Vel ipsum verterem in, qui eu cetero"
+ + " vituperatoribus. Semper insolens contentiones mei ea, vitae persius suavitate no quo, prompta"
+ + " impedit minimum cu sed. Everti disputationi id eam, essent.");
+ SvcLogicContext ctx = new SvcLogicContext();
+ FileWriterNode.writeFile(inParams, ctx);
+ assertEquals(ConfigGeneratorConstant.OUTPUT_STATUS_SUCCESS,
+ ctx.getAttribute("test." + ConfigGeneratorConstant.OUTPUT_PARAM_STATUS));
+ }
+
+ @Test(expected = SvcLogicException.class)
public void testWriteFileForEmptyParams() throws Exception {
FileWriterNode FileWriterNode = new FileWriterNode();
Map<String, String> inParams = new HashMap<String, String>();
SvcLogicContext ctx = new SvcLogicContext();
FileWriterNode.writeFile(inParams, ctx);
- }
+ }
}
String parmName = (String) key;
String parmValue = ctx.getAttribute(parmName);
parms.put(parmName, parmValue);
- log.info(fn + "Setting Key= " + parmName + "and Value = " + parmValue);
+ log.info(fn + "Setting Key= " + parmName + " and Value = " + parmValue);
}
Properties returnParams =
while (e.hasMoreElements()) {
String key = (String) e.nextElement();
- log.info("NEW KEY = " + key + " -- " + returnParams.getProperty(key));
+ String property = returnParams.getProperty(key);
+ if (log.isTraceEnabled()) {
+ log.trace("NEW KEY = " + key + " -- " + property);
+ }
+ else {
+ if (property.length() > 255) {
+ log.info("NEW KEY = " + key + " -- " + property.substring(0, 255));
+ log.info("\n...\n" + property.length() +
+ " characters in property, turn on TRACE logging to log entire property");
+ }
+ else {
+ log.info("NEW KEY = " + key + " -- " + property);
+ }
+ }
ctx.setAttribute(key, returnParams.getProperty(key));
}
assertNull(graphExecutor.execute(transaction, ctx));
}
+ @Test
+ public void testExecuteWithLongPropertyValue() throws Exception {
+ GraphExecutor graphExecutor = new GraphExecutor();
+ Whitebox.setInternalState(GraphExecutor.class, "log", log);
+ Properties properties = new Properties();
+ properties.put("TEST", "Lorem ipsum dolor sit amet, prompta mediocrem quo an, eos odio esse pertinax an."
+ + " Vis timeam suscipiantur no, eos ex vidisse appareat. Vel ipsum verterem in, qui eu cetero"
+ + " vituperatoribus. Semper insolens contentiones mei ea, vitae persius suavitate no quo, prompta"
+ + " impedit minimum cu sed. Everti disputationi id eam, essent.");
+ Transaction transaction = Mockito.spy(new Transaction());
+ transaction.setExecutionRPC("EXECUTION_RPC");
+ transaction.setPayload("PAYLOAD");
+ SvcLogicContext ctx = new SvcLogicContext();
+ ctx.setAttribute("TEST", "TEST");
+ Mockito.when(svcLogic.execute(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(),
+ Mockito.anyString(), Mockito.any(Properties.class))).thenReturn(properties);
+ assertNull(graphExecutor.execute(transaction, ctx));
+ }
+
@Test
public void testExecuteFailure() throws Exception {
GraphExecutor graphExecutor = new GraphExecutor();
Code Review / appc.git / commitdiff