From 295a87ea4084f875e3f61802ec9389e88a609221 Mon Sep 17 00:00:00 2001 From: Koushik Das Date: Fri, 25 Oct 2013 16:49:10 +0530 Subject: [PATCH] CLOUDSTACK-4964: Cisco VNMC: Nexus password gets logged in MS logs during guest n/w implementation with VNMC provider Suppressing the password from getting logged --- .../com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java | 3 +++ .../src/com/cloud/network/element/CiscoVnmcElement.java | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java index b20ad1f2df6..863b3476a9f 100755 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java @@ -16,6 +16,8 @@ // under the License. package com.cloud.agent.api; +import com.cloud.agent.api.LogLevel.Log4jLevel; + /** * Command for configuring n1kv VSM for asa1kv device. It does the following in VSM: * a. creating vservice node for asa1kv @@ -25,6 +27,7 @@ public class ConfigureNexusVsmForAsaCommand extends Command { private long _vlanId; private String _ipAddress; private String _vsmUsername; + @LogLevel(Log4jLevel.Off) private String _vsmPassword; private String _vsmIp; private String _asaInPortProfile; diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java index 88ef66e3407..93122a1beed 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java @@ -306,11 +306,8 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro return false; } - Transaction txn = Transaction.currentTxn(); boolean status = false; try { - txn.start(); - // ensure that there is an ASA 1000v assigned to this network CiscoAsa1000vDevice assignedAsa = assignAsa1000vToNetwork(network); if (assignedAsa == null) { @@ -408,10 +405,9 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro } status = true; - txn.commit(); } finally { if (!status) { - txn.rollback(); + unassignAsa1000vFromNetwork(network); //FIXME: also undo changes in VNMC, VSM if anything failed } }