You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2013/10/25 13:20:16 UTC
git commit: updated refs/heads/4.2 to 295a87e
Updated Branches:
refs/heads/4.2 d6b3164ca -> 295a87ea4
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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/295a87ea
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/295a87ea
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/295a87ea
Branch: refs/heads/4.2
Commit: 295a87ea4084f875e3f61802ec9389e88a609221
Parents: d6b3164
Author: Koushik Das <ko...@apache.org>
Authored: Fri Oct 25 16:49:10 2013 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Fri Oct 25 16:49:10 2013 +0530
----------------------------------------------------------------------
.../com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java | 3 +++
.../src/com/cloud/network/element/CiscoVnmcElement.java | 6 +-----
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/295a87ea/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java
----------------------------------------------------------------------
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 b20ad1f..863b347 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;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/295a87ea/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java
----------------------------------------------------------------------
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 88ef66e..93122a1 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
}
}