diff options
Diffstat (limited to 'asdc-controller')
4 files changed, 16 insertions, 6 deletions
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java index f722be7fd2..3ca8527b05 100644 --- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java +++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java @@ -3,6 +3,7 @@ * ONAP - SO
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.
@@ -397,7 +398,7 @@ public class ASDCController { outFile.write(payloadBytes, 0, payloadBytes.length);
outFile.close();
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
LOGGER.error(MessageEnum.ASDC_ARTIFACT_DOWNLOAD_FAIL,
artifact.getArtifactName (),
artifact.getArtifactURL (),
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java index 176f655b3a..70fa7c14be 100644 --- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java +++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java @@ -3,6 +3,7 @@ * ONAP - SO * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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. @@ -47,11 +48,14 @@ import org.openecomp.mso.db.catalog.beans.ServiceToAllottedResources; import org.openecomp.mso.db.catalog.beans.ServiceToNetworks; import org.openecomp.mso.db.catalog.beans.VnfResource; +import org.openecomp.mso.logger.MsoLogger; /** * This structure exists to avoid having issues if the order of the vfResource/vfmodule artifact is not good (tree structure). * */ public final class VfResourceStructure { + + protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC); private boolean isDeployedSuccessfully=false; /** @@ -231,11 +235,11 @@ public final class VfResourceStructure { return listVFModuleMetaData; } catch (JsonParseException e) { - e.printStackTrace(); + LOGGER.debug("JsonParseException : ",e); } catch (JsonMappingException e) { - e.printStackTrace(); + LOGGER.debug("JsonMappingException : ",e); } catch (IOException e) { - e.printStackTrace(); + LOGGER.debug("IOException : ",e); } return null; } diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java index 3d3c87f2e8..f9fd9c395d 100644 --- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java +++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java @@ -3,6 +3,7 @@ * ONAP - SO
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.
@@ -558,8 +559,7 @@ public class ToscaResourceInstaller {// implements IVfResourceInstaller { vfResourceStructure.setSuccessfulDeployment();
}catch(Exception e){
- System.out.println("Exception" + e.getMessage());
- e.printStackTrace();
+ logger.debug("Exception :",e);
Throwable dbExceptionToCapture = e;
while (!(dbExceptionToCapture instanceof ConstraintViolationException || dbExceptionToCapture instanceof LockAcquisitionException)
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java index da356bd2c6..9b38a50daf 100644 --- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java +++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java @@ -3,6 +3,7 @@ * ONAP - SO * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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. @@ -33,6 +34,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.openecomp.mso.logger.MsoLogger; import org.openecomp.sdc.api.notification.INotificationData; @@ -40,6 +42,8 @@ public class NotificationLogging implements InvocationHandler { private static Map<Object, List<Method>> objectMethodsToLog = new HashMap<>(); + protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC); + private static InvocationHandler handler = new InvocationHandler() { @Override public Object invoke(Object arg0, Method arg1, Object[] arg2) @@ -93,6 +97,7 @@ public class NotificationLogging implements InvocationHandler { buffer.append(testNull(m.invoke(iNotif, (Object[])null))); } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { + LOGGER.debug("Exception :"+e); buffer.append("UNREADABLE"); } buffer.append(System.lineSeparator()); |