You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2015/08/31 08:01:40 UTC
[20/35] git commit: updated refs/heads/master to 8bc0294
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
index e9f066d..9024abb 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
@@ -30,6 +30,7 @@ import javax.persistence.EntityExistsException;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.messagebus.MessageBus;
import org.apache.cloudstack.framework.messagebus.MessageSubscriber;
+import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import com.cloud.agent.AgentManager;
@@ -93,6 +94,7 @@ import com.cloud.vm.dao.VMInstanceDao;
@Component
@Local(value = {OvsTunnelManager.class})
public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManager, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualMachine> {
+ public static final Logger s_logger = Logger.getLogger(OvsTunnelManagerImpl.class.getName());
// boolean _isEnabled;
ScheduledExecutorService _executorPool;
@@ -159,13 +161,13 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
OvsTunnelInterfaceVO lock = _tunnelInterfaceDao
.acquireInLockTable(Long.valueOf(1));
if (lock == null) {
- logger.warn("Cannot lock table ovs_tunnel_account");
+ s_logger.warn("Cannot lock table ovs_tunnel_account");
return null;
}
_tunnelInterfaceDao.persist(ti);
_tunnelInterfaceDao.releaseFromLockTable(lock.getId());
} catch (EntityExistsException e) {
- logger.debug("A record for the interface for network " + label
+ s_logger.debug("A record for the interface for network " + label
+ " on host id " + hostId + " already exists");
}
return ti;
@@ -181,7 +183,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
}
}
// Fetch interface failed!
- logger.warn("Unable to fetch the IP address for the GRE tunnel endpoint"
+ s_logger.warn("Unable to fetch the IP address for the GRE tunnel endpoint"
+ ans.getDetails());
return null;
}
@@ -193,13 +195,13 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
ta = new OvsTunnelNetworkVO(from, to, key, networkId);
OvsTunnelNetworkVO lock = _tunnelNetworkDao.acquireInLockTable(Long.valueOf(1));
if (lock == null) {
- logger.warn("Cannot lock table ovs_tunnel_account");
+ s_logger.warn("Cannot lock table ovs_tunnel_account");
return null;
}
_tunnelNetworkDao.persist(ta);
_tunnelNetworkDao.releaseFromLockTable(lock.getId());
} catch (EntityExistsException e) {
- logger.debug("A record for the tunnel from " + from + " to " + to + " already exists");
+ s_logger.debug("A record for the tunnel from " + from + " to " + to + " already exists");
}
return ta;
}
@@ -221,12 +223,12 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
}
if (!r.getResult()) {
tunnel.setState(OvsTunnel.State.Failed.name());
- logger.warn("Create GRE tunnel from " + from + " to " + to + " failed due to " + r.getDetails()
+ s_logger.warn("Create GRE tunnel from " + from + " to " + to + " failed due to " + r.getDetails()
+ s);
} else {
tunnel.setState(OvsTunnel.State.Established.name());
tunnel.setPortName(r.getInPortName());
- logger.info("Create GRE tunnel from " + from + " to " + to + " succeeded." + r.getDetails() + s);
+ s_logger.info("Create GRE tunnel from " + from + " to " + to + " succeeded." + r.getDetails() + s);
}
_tunnelNetworkDao.update(tunnel.getId(), tunnel);
}
@@ -271,7 +273,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
//for network with label on target host
Commands fetchIfaceCmds =
new Commands(new OvsFetchInterfaceCommand(physNetLabel));
- logger.debug("Ask host " + host.getId() +
+ s_logger.debug("Ask host " + host.getId() +
" to retrieve interface for phy net with label:" +
physNetLabel);
Answer[] fetchIfaceAnswers = _agentMgr.send(host.getId(), fetchIfaceCmds);
@@ -297,7 +299,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
return key;
} catch (NumberFormatException e) {
- logger.debug("Well well, how did '" + key
+ s_logger.debug("Well well, how did '" + key
+ "' end up in the broadcast URI for the network?");
throw new CloudRuntimeException(String.format(
"Invalid GRE key parsed from"
@@ -309,7 +311,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
@DB
protected void checkAndCreateTunnel(Network nw, Host host) {
- logger.debug("Creating tunnels with OVS tunnel manager");
+ s_logger.debug("Creating tunnels with OVS tunnel manager");
long hostId = host.getId();
int key = getGreKey(nw);
@@ -324,7 +326,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
OvsTunnelNetworkVO ta = _tunnelNetworkDao.getByFromToNetwork(hostId, rh.longValue(), nw.getId());
// Try and create the tunnel even if a previous attempt failed
if (ta == null || ta.getState().equals(OvsTunnel.State.Failed.name())) {
- logger.debug("Attempting to create tunnel from:" + hostId + " to:" + rh.longValue());
+ s_logger.debug("Attempting to create tunnel from:" + hostId + " to:" + rh.longValue());
if (ta == null) {
createTunnelRecord(hostId, rh.longValue(), nw.getId(), key);
}
@@ -337,7 +339,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
hostId, nw.getId());
// Try and create the tunnel even if a previous attempt failed
if (ta == null || ta.getState().equals(OvsTunnel.State.Failed.name())) {
- logger.debug("Attempting to create tunnel from:" +
+ s_logger.debug("Attempting to create tunnel from:" +
rh.longValue() + " to:" + hostId);
if (ta == null) {
createTunnelRecord(rh.longValue(), hostId,
@@ -365,8 +367,8 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
Commands cmds = new Commands(
new OvsCreateTunnelCommand(otherIp, key,
Long.valueOf(hostId), i, nw.getId(), myIp, bridgeName, nw.getUuid()));
- logger.debug("Attempting to create tunnel from:" + hostId + " to:" + i + " for the network " + nw.getId());
- logger.debug("Ask host " + hostId
+ s_logger.debug("Attempting to create tunnel from:" + hostId + " to:" + i + " for the network " + nw.getId());
+ s_logger.debug("Ask host " + hostId
+ " to create gre tunnel to " + i);
Answer[] answers = _agentMgr.send(hostId, cmds);
handleCreateTunnelAnswer(answers);
@@ -378,7 +380,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
String otherIp = getGreEndpointIP(rHost, nw);
Commands cmds = new Commands(new OvsCreateTunnelCommand(myIp,
key, i, Long.valueOf(hostId), nw.getId(), otherIp, bridgeName, nw.getUuid()));
- logger.debug("Ask host " + i + " to create gre tunnel to "
+ s_logger.debug("Ask host " + i + " to create gre tunnel to "
+ hostId);
Answer[] answers = _agentMgr.send(i, cmds);
handleCreateTunnelAnswer(answers);
@@ -389,13 +391,13 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
// anyway. This will ensure VIF rules will be triggered
if (noHost) {
Commands cmds = new Commands(new OvsSetupBridgeCommand(bridgeName, hostId, nw.getId()));
- logger.debug("Ask host " + hostId + " to configure bridge for network:" + nw.getId());
+ s_logger.debug("Ask host " + hostId + " to configure bridge for network:" + nw.getId());
Answer[] answers = _agentMgr.send(hostId, cmds);
handleSetupBridgeAnswer(answers);
}
} catch (GreTunnelException | OperationTimedoutException | AgentUnavailableException e) {
// I really thing we should do a better handling of these exceptions
- logger.warn("Ovs Tunnel network created tunnel failed", e);
+ s_logger.warn("Ovs Tunnel network created tunnel failed", e);
}
}
@@ -425,7 +427,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
if (ans.getResult()) {
OvsTunnelNetworkVO lock = _tunnelNetworkDao.acquireInLockTable(Long.valueOf(1));
if (lock == null) {
- logger.warn(String.format("failed to lock" +
+ s_logger.warn(String.format("failed to lock" +
"ovs_tunnel_account, remove record of " +
"tunnel(from=%1$s, to=%2$s account=%3$s) failed",
from, to, networkId));
@@ -435,11 +437,11 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
_tunnelNetworkDao.removeByFromToNetwork(from, to, networkId);
_tunnelNetworkDao.releaseFromLockTable(lock.getId());
- logger.debug(String.format("Destroy tunnel(account:%1$s," +
+ s_logger.debug(String.format("Destroy tunnel(account:%1$s," +
"from:%2$s, to:%3$s) successful",
networkId, from, to));
} else {
- logger.debug(String.format("Destroy tunnel(account:%1$s," + "from:%2$s, to:%3$s) failed", networkId, from, to));
+ s_logger.debug(String.format("Destroy tunnel(account:%1$s," + "from:%2$s, to:%3$s) failed", networkId, from, to));
}
}
@@ -449,24 +451,24 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
if (ans.getResult()) {
OvsTunnelNetworkVO lock = _tunnelNetworkDao.acquireInLockTable(Long.valueOf(1));
if (lock == null) {
- logger.warn("failed to lock ovs_tunnel_network," + "remove record");
+ s_logger.warn("failed to lock ovs_tunnel_network," + "remove record");
return;
}
_tunnelNetworkDao.removeByFromNetwork(hostId, networkId);
_tunnelNetworkDao.releaseFromLockTable(lock.getId());
- logger.debug(String.format("Destroy bridge for" +
+ s_logger.debug(String.format("Destroy bridge for" +
"network %1$s successful", networkId));
} else {
- logger.debug(String.format("Destroy bridge for" +
+ s_logger.debug(String.format("Destroy bridge for" +
"network %1$s failed", networkId));
}
}
private void handleSetupBridgeAnswer(Answer[] answers) {
//TODO: Add some error management here?
- logger.debug("Placeholder for something more meanginful to come");
+ s_logger.debug("Placeholder for something more meanginful to come");
}
@Override
@@ -493,7 +495,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
if (p.getState().equals(OvsTunnel.State.Established.name())) {
Command cmd= new OvsDestroyTunnelCommand(p.getNetworkId(), bridgeName,
p.getPortName());
- logger.debug("Destroying tunnel to " + host.getId() +
+ s_logger.debug("Destroying tunnel to " + host.getId() +
" from " + p.getFrom());
Answer ans = _agentMgr.send(p.getFrom(), cmd);
handleDestroyTunnelAnswer(ans, p.getFrom(), p.getTo(), p.getNetworkId());
@@ -503,11 +505,11 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
Command cmd = new OvsDestroyBridgeCommand(nw.getId(), generateBridgeNameForVpc(nw.getVpcId()),
host.getId());
- logger.debug("Destroying bridge for network " + nw.getId() + " on host:" + host.getId());
+ s_logger.debug("Destroying bridge for network " + nw.getId() + " on host:" + host.getId());
Answer ans = _agentMgr.send(host.getId(), cmd);
handleDestroyBridgeAnswer(ans, host.getId(), nw.getId());
} catch (Exception e) {
- logger.info("[ignored]"
+ s_logger.info("[ignored]"
+ "exception while removing host from networks: " + e.getLocalizedMessage());
}
} else {
@@ -521,7 +523,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
int key = getGreKey(nw);
String bridgeName = generateBridgeName(nw, key);
Command cmd = new OvsDestroyBridgeCommand(nw.getId(), bridgeName, host.getId());
- logger.debug("Destroying bridge for network " + nw.getId() + " on host:" + host.getId());
+ s_logger.debug("Destroying bridge for network " + nw.getId() + " on host:" + host.getId());
Answer ans = _agentMgr.send(host.getId(), cmd);
handleDestroyBridgeAnswer(ans, host.getId(), nw.getId());
@@ -534,7 +536,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
if (p.getState().equals(OvsTunnel.State.Established.name())) {
cmd = new OvsDestroyTunnelCommand(p.getNetworkId(), bridgeName,
p.getPortName());
- logger.debug("Destroying tunnel to " + host.getId() +
+ s_logger.debug("Destroying tunnel to " + host.getId() +
" from " + p.getFrom());
ans = _agentMgr.send(p.getFrom(), cmd);
handleDestroyTunnelAnswer(ans, p.getFrom(),
@@ -542,7 +544,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
}
}
} catch (Exception e) {
- logger.warn("Destroy tunnel failed", e);
+ s_logger.warn("Destroy tunnel failed", e);
}
}
}
@@ -571,12 +573,12 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
// since this is the first VM from the VPC being launched on the host, first setup the bridge
try {
Commands cmds = new Commands(new OvsSetupBridgeCommand(bridgeName, hostId, null));
- logger.debug("Ask host " + hostId + " to create bridge for vpc " + vpcId + " and configure the "
+ s_logger.debug("Ask host " + hostId + " to create bridge for vpc " + vpcId + " and configure the "
+ " bridge for distributed routing.");
Answer[] answers = _agentMgr.send(hostId, cmds);
handleSetupBridgeAnswer(answers);
} catch (OperationTimedoutException | AgentUnavailableException e) {
- logger.warn("Ovs Tunnel network created tunnel failed", e);
+ s_logger.warn("Ovs Tunnel network created tunnel failed", e);
}
// now that bridge is setup, populate network acl's before the VM gets created
@@ -584,7 +586,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
cmd.setSequenceNumber(getNextRoutingPolicyUpdateSequenceNumber(vpcId));
if (!sendVpcRoutingPolicyChangeUpdate(cmd, hostId, bridgeName)) {
- logger.debug("Failed to send VPC routing policy change update to host : " + hostId +
+ s_logger.debug("Failed to send VPC routing policy change update to host : " + hostId +
". But moving on with sending the updates to the rest of the hosts.");
}
}
@@ -608,7 +610,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
tunnelRecord = _tunnelNetworkDao.getByFromToNetwork(hostId, rh.longValue(), vpcNetwork.getId());
// Try and create the tunnel if does not exit or previous attempt failed
if (tunnelRecord == null || tunnelRecord.getState().equals(OvsTunnel.State.Failed.name())) {
- logger.debug("Attempting to create tunnel from:" + hostId + " to:" + rh.longValue());
+ s_logger.debug("Attempting to create tunnel from:" + hostId + " to:" + rh.longValue());
if (tunnelRecord == null) {
createTunnelRecord(hostId, rh.longValue(), vpcNetwork.getId(), key);
}
@@ -619,7 +621,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
tunnelRecord = _tunnelNetworkDao.getByFromToNetwork(rh.longValue(), hostId, vpcNetwork.getId());
// Try and create the tunnel if does not exit or previous attempt failed
if (tunnelRecord == null || tunnelRecord.getState().equals(OvsTunnel.State.Failed.name())) {
- logger.debug("Attempting to create tunnel from:" + rh.longValue() + " to:" + hostId);
+ s_logger.debug("Attempting to create tunnel from:" + rh.longValue() + " to:" + hostId);
if (tunnelRecord == null) {
createTunnelRecord(rh.longValue(), hostId, vpcNetwork.getId(), key);
}
@@ -645,9 +647,9 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
+ "Failure is on host:" + rHost.getId());
Commands cmds = new Commands( new OvsCreateTunnelCommand(otherIp, key, Long.valueOf(hostId),
i, vpcNetwork.getId(), myIp, bridgeName, vpcNetwork.getUuid()));
- logger.debug("Attempting to create tunnel from:" + hostId + " to:" + i + " for the network "
+ s_logger.debug("Attempting to create tunnel from:" + hostId + " to:" + i + " for the network "
+ vpcNetwork.getId());
- logger.debug("Ask host " + hostId
+ s_logger.debug("Ask host " + hostId
+ " to create gre tunnel to " + i);
Answer[] answers = _agentMgr.send(hostId, cmds);
handleCreateTunnelAnswer(answers);
@@ -659,14 +661,14 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
Commands cmds = new Commands(new OvsCreateTunnelCommand(myIp,
key, i, Long.valueOf(hostId), vpcNetwork.getId(), otherIp, bridgeName,
vpcNetwork.getUuid()));
- logger.debug("Ask host " + i + " to create gre tunnel to "
+ s_logger.debug("Ask host " + i + " to create gre tunnel to "
+ hostId);
Answer[] answers = _agentMgr.send(i, cmds);
handleCreateTunnelAnswer(answers);
}
} catch (GreTunnelException | OperationTimedoutException | AgentUnavailableException e) {
// I really thing we should do a better handling of these exceptions
- logger.warn("Ovs Tunnel network created tunnel failed", e);
+ s_logger.warn("Ovs Tunnel network created tunnel failed", e);
}
}
}
@@ -723,7 +725,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
// send topology change update to VPC spanned hosts
for (Long id: vpcSpannedHostIds) {
if (!sendVpcTopologyChangeUpdate(topologyConfigCommand, id, bridgeName)) {
- logger.debug("Failed to send VPC topology change update to host : " + id + ". Moving on " +
+ s_logger.debug("Failed to send VPC topology change update to host : " + id + ". Moving on " +
"with rest of the host update.");
}
}
@@ -732,19 +734,19 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
public boolean sendVpcTopologyChangeUpdate(OvsVpcPhysicalTopologyConfigCommand updateCmd, long hostId, String bridgeName) {
try {
- logger.debug("Sending VPC topology change update to the host " + hostId);
+ s_logger.debug("Sending VPC topology change update to the host " + hostId);
updateCmd.setHostId(hostId);
updateCmd.setBridgeName(bridgeName);
Answer ans = _agentMgr.send(hostId, updateCmd);
if (ans.getResult()) {
- logger.debug("Successfully updated the host " + hostId + " with latest VPC topology." );
+ s_logger.debug("Successfully updated the host " + hostId + " with latest VPC topology." );
return true;
} else {
- logger.debug("Failed to update the host " + hostId + " with latest VPC topology." );
+ s_logger.debug("Failed to update the host " + hostId + " with latest VPC topology." );
return false;
}
} catch (Exception e) {
- logger.debug("Failed to updated the host " + hostId + " with latest VPC topology.", e );
+ s_logger.debug("Failed to updated the host " + hostId + " with latest VPC topology.", e );
return false;
}
}
@@ -768,7 +770,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
try {
remoteIp = getGreEndpointIP(hostDetails, network);
} catch (Exception e) {
- logger.info("[ignored]"
+ s_logger.info("[ignored]"
+ "error getting GRE endpoint: " + e.getLocalizedMessage());
}
}
@@ -836,13 +838,13 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
List<Long> vpcSpannedHostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
for (Long id: vpcSpannedHostIds) {
if (!sendVpcRoutingPolicyChangeUpdate(cmd, id, bridgeName)) {
- logger.debug("Failed to send VPC routing policy change update to host : " + id +
+ s_logger.debug("Failed to send VPC routing policy change update to host : " + id +
". But moving on with sending the updates to the rest of the hosts.");
}
}
}
} catch (Exception e) {
- logger.debug("Failed to send VPC routing policy change updates all hosts in vpc", e);
+ s_logger.debug("Failed to send VPC routing policy change updates all hosts in vpc", e);
}
}
}
@@ -893,19 +895,19 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
private boolean sendVpcRoutingPolicyChangeUpdate(OvsVpcRoutingPolicyConfigCommand updateCmd, long hostId, String bridgeName) {
try {
- logger.debug("Sending VPC routing policies change update to the host " + hostId);
+ s_logger.debug("Sending VPC routing policies change update to the host " + hostId);
updateCmd.setHostId(hostId);
updateCmd.setBridgeName(bridgeName);
Answer ans = _agentMgr.send(hostId, updateCmd);
if (ans.getResult()) {
- logger.debug("Successfully updated the host " + hostId + " with latest VPC routing policies." );
+ s_logger.debug("Successfully updated the host " + hostId + " with latest VPC routing policies." );
return true;
} else {
- logger.debug("Failed to update the host " + hostId + " with latest routing policies." );
+ s_logger.debug("Failed to update the host " + hostId + " with latest routing policies." );
return false;
}
} catch (Exception e) {
- logger.debug("Failed to updated the host " + hostId + " with latest routing policies due to" , e );
+ s_logger.debug("Failed to updated the host " + hostId + " with latest routing policies due to" , e );
return false;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java
index cdd031e..88fa9c1 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java
@@ -18,6 +18,7 @@ package com.cloud.network.ovs.dao;
import javax.ejb.Local;
+import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import com.cloud.utils.db.GenericDaoBase;
@@ -27,6 +28,7 @@ import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {VpcDistributedRouterSeqNoDao.class})
public class VpcDistributedRouterSeqNoDaoImpl extends GenericDaoBase<VpcDistributedRouterSeqNoVO, Long> implements VpcDistributedRouterSeqNoDao {
+ protected static final Logger s_logger = Logger.getLogger(VpcDistributedRouterSeqNoDaoImpl.class);
private SearchBuilder<VpcDistributedRouterSeqNoVO> VpcIdSearch;
protected VpcDistributedRouterSeqNoDaoImpl() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java b/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java
index 1ed94b08..cfb64b8 100644
--- a/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java
+++ b/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java
@@ -25,6 +25,7 @@ import java.util.Set;
import javax.ejb.Local;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice;
@@ -86,6 +87,7 @@ import com.cloud.vm.VirtualMachineProfile;
public class PaloAltoExternalFirewallElement extends ExternalFirewallDeviceManagerImpl implements SourceNatServiceProvider, FirewallServiceProvider,
PortForwardingServiceProvider, IpDeployer, PaloAltoFirewallElementService, StaticNatServiceProvider {
+ private static final Logger s_logger = Logger.getLogger(PaloAltoExternalFirewallElement.class);
private static final Map<Service, Map<Capability, String>> capabilities = setCapabilities();
@@ -121,18 +123,18 @@ public class PaloAltoExternalFirewallElement extends ExternalFirewallDeviceManag
private boolean canHandle(Network network, Service service) {
DataCenter zone = _entityMgr.findById(DataCenter.class, network.getDataCenterId());
if (zone.getNetworkType() == NetworkType.Advanced && network.getGuestType() != Network.GuestType.Isolated) {
- logger.trace("Element " + getProvider().getName() + "is not handling network type = " + network.getGuestType());
+ s_logger.trace("Element " + getProvider().getName() + "is not handling network type = " + network.getGuestType());
return false;
}
if (service == null) {
if (!_networkManager.isProviderForNetwork(getProvider(), network.getId())) {
- logger.trace("Element " + getProvider().getName() + " is not a provider for the network " + network);
+ s_logger.trace("Element " + getProvider().getName() + " is not a provider for the network " + network);
return false;
}
} else {
if (!_networkManager.isProviderSupportServiceInNetwork(network.getId(), service, getProvider())) {
- logger.trace("Element " + getProvider().getName() + " doesn't support service " + service.getName() + " in the network " + network);
+ s_logger.trace("Element " + getProvider().getName() + " doesn't support service " + service.getName() + " in the network " + network);
return false;
}
}
@@ -147,7 +149,7 @@ public class PaloAltoExternalFirewallElement extends ExternalFirewallDeviceManag
// don't have to implement network is Basic zone
if (zone.getNetworkType() == NetworkType.Basic) {
- logger.debug("Not handling network implement in zone of type " + NetworkType.Basic);
+ s_logger.debug("Not handling network implement in zone of type " + NetworkType.Basic);
return false;
}
@@ -160,7 +162,7 @@ public class PaloAltoExternalFirewallElement extends ExternalFirewallDeviceManag
} catch (InsufficientCapacityException capacityException) {
// TODO: handle out of capacity exception in more gracefule manner when multiple providers are present for
// the network
- logger.error("Fail to implement the Palo Alto for network " + network, capacityException);
+ s_logger.error("Fail to implement the Palo Alto for network " + network, capacityException);
return false;
}
}
@@ -182,7 +184,7 @@ public class PaloAltoExternalFirewallElement extends ExternalFirewallDeviceManag
// don't have to implement network is Basic zone
if (zone.getNetworkType() == NetworkType.Basic) {
- logger.debug("Not handling network shutdown in zone of type " + NetworkType.Basic);
+ s_logger.debug("Not handling network shutdown in zone of type " + NetworkType.Basic);
return false;
}
@@ -430,7 +432,7 @@ public class PaloAltoExternalFirewallElement extends ExternalFirewallDeviceManag
@Override
public boolean verifyServicesCombination(Set<Service> services) {
if (!services.contains(Service.Firewall)) {
- logger.warn("Palo Alto must be used as Firewall Service Provider in the network");
+ s_logger.warn("Palo Alto must be used as Firewall Service Provider in the network");
return false;
}
return true;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java
index 2d6fe71..d088e7f 100644
--- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java
+++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java
@@ -20,6 +20,7 @@ import java.util.List;
import javax.ejb.Local;
+import org.apache.log4j.Logger;
import com.cloud.network.Network;
import com.cloud.utils.db.GenericDaoBase;
@@ -31,6 +32,7 @@ import com.cloud.vm.NicProfile;
@Local(SspUuidDao.class)
public class SspUuidDaoImpl extends GenericDaoBase<SspUuidVO, Long> implements SspUuidDao {
+ private static final Logger s_logger = Logger.getLogger(SspUuidDaoImpl.class);
protected final SearchBuilder<SspUuidVO> native2uuid;
protected final SearchBuilder<SspUuidVO> uuid2native;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java
index f8f303c..b41be40 100644
--- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java
+++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java
@@ -30,6 +30,7 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.log4j.Logger;
import org.apache.cloudstack.api.commands.AddSspCmd;
import org.apache.cloudstack.api.commands.DeleteSspCmd;
@@ -89,6 +90,7 @@ import com.cloud.vm.dao.NicDao;
*/
@Local(value = {NetworkElement.class, SspManager.class})
public class SspElement extends AdapterBase implements ConnectivityProvider, SspManager, SspService, NetworkMigrationResponder {
+ private static final Logger s_logger = Logger.getLogger(SspElement.class);
public static final String s_SSP_NAME = "StratosphereSsp";
private static final Provider s_ssp_provider = new Provider(s_SSP_NAME, false);
@@ -181,7 +183,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
if (fetchSspClients(physicalNetwork.getId(), physicalNetwork.getDataCenterId(), false).size() > 0) {
return true;
}
- logger.warn("Ssp api endpoint not found. " + physicalNetwork.toString());
+ s_logger.warn("Ssp api endpoint not found. " + physicalNetwork.toString());
return false;
}
@@ -195,9 +197,9 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
if (fetchSspClients(physicalNetwork.getId(), physicalNetwork.getDataCenterId(), true).size() > 0) {
return true;
}
- logger.warn("enabled Ssp api endpoint not found. " + physicalNetwork.toString());
+ s_logger.warn("enabled Ssp api endpoint not found. " + physicalNetwork.toString());
} else {
- logger.warn("PhysicalNetwork is NULL.");
+ s_logger.warn("PhysicalNetwork is NULL.");
}
return false;
}
@@ -205,7 +207,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
private boolean canHandle(Network network) {
if (canHandle(_physicalNetworkDao.findById(network.getPhysicalNetworkId()))) {
if (!_ntwkSrvcDao.canProviderSupportServiceInNetwork(network.getId(), Service.Connectivity, getProvider())) {
- logger.info("SSP is implicitly active for " + network);
+ s_logger.info("SSP is implicitly active for " + network);
}
return true;
}
@@ -232,7 +234,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
_sspCredentialDao.persist(credential);
} else {
if (cmd.getUsername() != null || cmd.getPassword() != null) {
- logger.warn("Tenant credential already configured for zone:" + zoneId);
+ s_logger.warn("Tenant credential already configured for zone:" + zoneId);
}
}
@@ -247,7 +249,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
_sspTenantDao.persist(tenant);
} else {
if (cmd.getTenantUuid() != null) {
- logger.warn("Tenant uuid already configured for zone:" + zoneId);
+ s_logger.warn("Tenant uuid already configured for zone:" + zoneId);
}
}
@@ -267,7 +269,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
_hostDao.loadDetails(host);
if ("v1Api".equals(host.getDetail("sspHost"))) {
if (normalizedUrl.equals(host.getDetail("url"))) {
- logger.warn("Ssp host already registered " + normalizedUrl);
+ s_logger.warn("Ssp host already registered " + normalizedUrl);
return host;
}
}
@@ -290,14 +292,14 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
@Override
public boolean deleteSspHost(DeleteSspCmd cmd) {
- logger.info("deleteStratosphereSsp");
+ s_logger.info("deleteStratosphereSsp");
return _hostDao.remove(cmd.getHostId());
}
@Override
public boolean createNetwork(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) {
if (_sspUuidDao.findUuidByNetwork(network) != null) {
- logger.info("Network already has ssp TenantNetwork uuid :" + network.toString());
+ s_logger.info("Network already has ssp TenantNetwork uuid :" + network.toString());
return true;
}
if (!canHandle(network)) {
@@ -323,10 +325,10 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
processed = true;
}
if (processed) {
- logger.error("Could not allocate an uuid for network " + network.toString());
+ s_logger.error("Could not allocate an uuid for network " + network.toString());
return false;
} else {
- logger.error("Skipping #createNetwork() for " + network.toString());
+ s_logger.error("Skipping #createNetwork() for " + network.toString());
return true;
}
}
@@ -344,10 +346,10 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
}
}
if (!processed) {
- logger.error("Ssp api tenant network deletion failed " + network.toString());
+ s_logger.error("Ssp api tenant network deletion failed " + network.toString());
}
} else {
- logger.debug("Silently skipping #deleteNetwork() for " + network.toString());
+ s_logger.debug("Silently skipping #deleteNetwork() for " + network.toString());
}
return true;
}
@@ -357,7 +359,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
public boolean createNicEnv(Network network, NicProfile nic, DeployDestination dest, ReservationContext context) {
String tenantNetworkUuid = _sspUuidDao.findUuidByNetwork(network);
if (tenantNetworkUuid == null) {
- logger.debug("Skipping #createNicEnv() for nic on " + network.toString());
+ s_logger.debug("Skipping #createNicEnv() for nic on " + network.toString());
return true;
}
@@ -365,7 +367,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
List<SspUuidVO> tenantPortUuidVos = _sspUuidDao.listUUidVoByNicProfile(nic);
for (SspUuidVO tenantPortUuidVo : tenantPortUuidVos) {
if (reservationId.equals(tenantPortUuidVo.getReservationId())) {
- logger.info("Skipping because reservation found " + reservationId);
+ s_logger.info("Skipping because reservation found " + reservationId);
return true;
}
}
@@ -387,7 +389,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
}
}
if (tenantPortUuid == null) {
- logger.debug("#createNicEnv() failed for nic on " + network.toString());
+ s_logger.debug("#createNicEnv() failed for nic on " + network.toString());
return false;
}
@@ -401,14 +403,14 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
return true;
}
}
- logger.error("Updating vif failed " + nic.toString());
+ s_logger.error("Updating vif failed " + nic.toString());
return false;
}
@Override
public boolean deleteNicEnv(Network network, NicProfile nic, ReservationContext context) {
if (context == null) {
- logger.error("ReservationContext was null for " + nic + " " + network);
+ s_logger.error("ReservationContext was null for " + nic + " " + network);
return false;
}
String reservationId = context.getReservationId();
@@ -435,7 +437,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
}
}
if (!processed) {
- logger.warn("Ssp api nic detach failed " + nic.toString());
+ s_logger.warn("Ssp api nic detach failed " + nic.toString());
}
processed = false;
for (SspClient client : fetchSspClients(network.getPhysicalNetworkId(), network.getDataCenterId(), true)) {
@@ -446,7 +448,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
}
}
if (!processed) {
- logger.warn("Ssp api tenant port deletion failed " + nic.toString());
+ s_logger.warn("Ssp api tenant port deletion failed " + nic.toString());
}
_sspUuidDao.removeUuid(tenantPortUuid);
}
@@ -468,7 +470,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
@Override
public boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException,
ResourceUnavailableException, InsufficientCapacityException {
- logger.info("implement");
+ s_logger.info("implement");
return createNetwork(network, offering, dest, context);
}
@@ -481,7 +483,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
*/
@Override
public boolean shutdown(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException {
- logger.trace("shutdown");
+ s_logger.trace("shutdown");
return deleteNetwork(network);
}
@@ -495,7 +497,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
@Override
public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context)
throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
- logger.trace("prepare");
+ s_logger.trace("prepare");
return createNicEnv(network, nic, dest, context);
}
@@ -509,7 +511,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
@Override
public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException,
ResourceUnavailableException {
- logger.trace("release");
+ s_logger.trace("release");
return deleteNicEnv(network, nic, context);
}
@@ -521,7 +523,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
*/
@Override
public boolean destroy(Network network, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException {
- logger.trace("destroy");
+ s_logger.trace("destroy");
// nothing to do here.
return true;
}
@@ -529,19 +531,19 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
@Override
public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException,
ResourceUnavailableException {
- logger.trace("shutdownProviderInstances");
+ s_logger.trace("shutdownProviderInstances");
return true;
}
@Override
public boolean canEnableIndividualServices() {
- logger.trace("canEnableIndividualServices");
+ s_logger.trace("canEnableIndividualServices");
return true; // because there is only Connectivity
}
@Override
public boolean verifyServicesCombination(Set<Service> services) {
- logger.trace("verifyServicesCombination " + services.toString());
+ s_logger.trace("verifyServicesCombination " + services.toString());
return true;
}
@@ -550,13 +552,13 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
try {
prepare(network, nic, vm, dest, context);
} catch (ConcurrentOperationException e) {
- logger.error("prepareForMigration failed.", e);
+ s_logger.error("prepareForMigration failed.", e);
return false;
} catch (ResourceUnavailableException e) {
- logger.error("prepareForMigration failed.", e);
+ s_logger.error("prepareForMigration failed.", e);
return false;
} catch (InsufficientCapacityException e) {
- logger.error("prepareForMigration failed.", e);
+ s_logger.error("prepareForMigration failed.", e);
return false;
}
return true;
@@ -567,9 +569,9 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
try {
release(network, nic, vm, dst);
} catch (ConcurrentOperationException e) {
- logger.error("rollbackMigration failed.", e);
+ s_logger.error("rollbackMigration failed.", e);
} catch (ResourceUnavailableException e) {
- logger.error("rollbackMigration failed.", e);
+ s_logger.error("rollbackMigration failed.", e);
}
}
@@ -578,9 +580,9 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp
try {
release(network, nic, vm, src);
} catch (ConcurrentOperationException e) {
- logger.error("commitMigration failed.", e);
+ s_logger.error("commitMigration failed.", e);
} catch (ResourceUnavailableException e) {
- logger.error("commitMigration failed.", e);
+ s_logger.error("commitMigration failed.", e);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java
index 3e0af50..7226873 100644
--- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java
+++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java
@@ -19,6 +19,7 @@ package org.apache.cloudstack.network.guru;
import javax.ejb.Local;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
import org.apache.cloudstack.network.element.SspElement;
import org.apache.cloudstack.network.element.SspManager;
@@ -47,6 +48,7 @@ import com.cloud.vm.VirtualMachineProfile;
*/
@Local(value = NetworkGuru.class)
public class SspGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigrationResponder {
+ private static final Logger s_logger = Logger.getLogger(SspGuestNetworkGuru.class);
@Inject
SspManager _sspMgr;
@@ -62,7 +64,7 @@ public class SspGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigr
@Override
protected boolean canHandle(NetworkOffering offering, NetworkType networkType, PhysicalNetwork physicalNetwork) {
- logger.trace("canHandle");
+ s_logger.trace("canHandle");
String setting = null;
if (physicalNetwork != null && physicalNetwork.getIsolationMethods().contains("SSP")) {
@@ -73,18 +75,18 @@ public class SspGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigr
}
if (setting != null) {
if (networkType != NetworkType.Advanced) {
- logger.info("SSP enebled by " + setting + " but not active because networkType was " + networkType);
+ s_logger.info("SSP enebled by " + setting + " but not active because networkType was " + networkType);
} else if (!isMyTrafficType(offering.getTrafficType())) {
- logger.info("SSP enabled by " + setting + " but not active because traffic type not Guest");
+ s_logger.info("SSP enabled by " + setting + " but not active because traffic type not Guest");
} else if (offering.getGuestType() != Network.GuestType.Isolated) {
- logger.info("SSP works for network isolatation.");
+ s_logger.info("SSP works for network isolatation.");
} else if (!_sspMgr.canHandle(physicalNetwork)) {
- logger.info("SSP manager not ready");
+ s_logger.info("SSP manager not ready");
} else {
return true;
}
} else {
- logger.debug("SSP not configured to be active");
+ s_logger.debug("SSP not configured to be active");
}
return false;
}
@@ -99,7 +101,7 @@ public class SspGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigr
@Override
public Network implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context)
throws InsufficientVirtualNetworkCapacityException {
- logger.trace("implement " + network.toString());
+ s_logger.trace("implement " + network.toString());
super.implement(network, offering, dest, context);
_sspMgr.createNetwork(network, offering, dest, context);
return network;
@@ -107,7 +109,7 @@ public class SspGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigr
@Override
public void shutdown(NetworkProfile profile, NetworkOffering offering) {
- logger.trace("shutdown " + profile.toString());
+ s_logger.trace("shutdown " + profile.toString());
_sspMgr.deleteNetwork(profile);
super.shutdown(profile, offering);
}
@@ -136,10 +138,10 @@ public class SspGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigr
try {
reserve(nic, network, vm, dest, context);
} catch (InsufficientVirtualNetworkCapacityException e) {
- logger.error("prepareForMigration failed", e);
+ s_logger.error("prepareForMigration failed", e);
return false;
} catch (InsufficientAddressCapacityException e) {
- logger.error("prepareForMigration failed", e);
+ s_logger.error("prepareForMigration failed", e);
return false;
}
return true;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java b/plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java
index f891543..4138b22 100644
--- a/plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java
+++ b/plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java
@@ -18,6 +18,7 @@ package com.cloud.network.guru;
import javax.ejb.Local;
+import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import org.apache.cloudstack.context.CallContext;
@@ -48,6 +49,7 @@ import com.cloud.vm.VirtualMachineProfile;
@Component
@Local(value = NetworkGuru.class)
public class VxlanGuestNetworkGuru extends GuestNetworkGuru {
+ private static final Logger s_logger = Logger.getLogger(VxlanGuestNetworkGuru.class);
public VxlanGuestNetworkGuru() {
super();
@@ -61,7 +63,7 @@ public class VxlanGuestNetworkGuru extends GuestNetworkGuru {
isMyIsolationMethod(physicalNetwork)) {
return true;
} else {
- logger.trace("We only take care of Guest networks of type " + GuestType.Isolated + " in zone of type " + NetworkType.Advanced);
+ s_logger.trace("We only take care of Guest networks of type " + GuestType.Isolated + " in zone of type " + NetworkType.Advanced);
return false;
}
}
@@ -149,7 +151,7 @@ public class VxlanGuestNetworkGuru extends GuestNetworkGuru {
public void shutdown(NetworkProfile profile, NetworkOffering offering) {
NetworkVO networkObject = _networkDao.findById(profile.getId());
if (networkObject.getBroadcastDomainType() != BroadcastDomainType.Vxlan || networkObject.getBroadcastUri() == null) {
- logger.warn("BroadcastUri is empty or incorrect for guestnetwork " + networkObject.getDisplayText());
+ s_logger.warn("BroadcastUri is empty or incorrect for guestnetwork " + networkObject.getDisplayText());
return;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java
----------------------------------------------------------------------
diff --git a/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java b/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java
index 04ee5c0..83c23c2 100644
--- a/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java
+++ b/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java
@@ -21,6 +21,7 @@ import java.util.List;
import javax.ejb.Local;
+import org.apache.log4j.Logger;
import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
@@ -34,6 +35,7 @@ import com.cloud.vm.VirtualMachineProfile;
@Local(value = StoragePoolAllocator.class)
public class RandomStoragePoolAllocator extends AbstractStoragePoolAllocator {
+ private static final Logger s_logger = Logger.getLogger(RandomStoragePoolAllocator.class);
@Override
public List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid, int returnUpTo) {
@@ -48,18 +50,18 @@ public class RandomStoragePoolAllocator extends AbstractStoragePoolAllocator {
return null;
}
- logger.debug("Looking for pools in dc: " + dcId + " pod:" + podId + " cluster:" + clusterId);
+ s_logger.debug("Looking for pools in dc: " + dcId + " pod:" + podId + " cluster:" + clusterId);
List<StoragePoolVO> pools = _storagePoolDao.listBy(dcId, podId, clusterId, ScopeType.CLUSTER);
if (pools.size() == 0) {
- if (logger.isDebugEnabled()) {
- logger.debug("No storage pools available for allocation, returning");
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("No storage pools available for allocation, returning");
}
return suitablePools;
}
Collections.shuffle(pools);
- if (logger.isDebugEnabled()) {
- logger.debug("RandomStoragePoolAllocator has " + pools.size() + " pools to check for allocation");
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("RandomStoragePoolAllocator has " + pools.size() + " pools to check for allocation");
}
for (StoragePoolVO pool : pools) {
if (suitablePools.size() == returnUpTo) {
@@ -72,8 +74,8 @@ public class RandomStoragePoolAllocator extends AbstractStoragePoolAllocator {
}
}
- if (logger.isDebugEnabled()) {
- logger.debug("RandomStoragePoolAllocator returning " + suitablePools.size() + " suitable storage pools");
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("RandomStoragePoolAllocator returning " + suitablePools.size() + " suitable storage pools");
}
return suitablePools;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiServiceImpl.java b/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiServiceImpl.java
index 83f7356..709c1fe 100644
--- a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiServiceImpl.java
+++ b/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiServiceImpl.java
@@ -26,6 +26,7 @@ import java.util.Map;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import org.apache.cloudstack.api.response.ListResponse;
@@ -46,6 +47,7 @@ import com.cloud.vm.dao.UserVmDao;
@Component
public class ElastistorVolumeApiServiceImpl extends ManagerBase implements ElastistorVolumeApiService {
+ private static final Logger s_logger = Logger.getLogger(ElastistorVolumeApiServiceImpl.class);
@Inject
protected VolumeDao _volsDao;
@@ -72,7 +74,7 @@ public class ElastistorVolumeApiServiceImpl extends ManagerBase implements Elast
cmdList.add(ListElastistorPoolCmd.class);
cmdList.add(ListElastistorInterfaceCmd.class);
- logger.info("Commands were registered successfully with elastistor volume api service. [cmdcount:" + cmdList.size() + "]");
+ s_logger.info("Commands were registered successfully with elastistor volume api service. [cmdcount:" + cmdList.size() + "]");
return cmdList;
}
@@ -123,7 +125,7 @@ public class ElastistorVolumeApiServiceImpl extends ManagerBase implements Elast
return response;
} catch (Throwable e) {
- logger.error("Unable to list elastistor volume.", e);
+ s_logger.error("Unable to list elastistor volume.", e);
throw new CloudRuntimeException("Unable to list elastistor volume. " + e.getMessage());
}
}
@@ -163,7 +165,7 @@ public class ElastistorVolumeApiServiceImpl extends ManagerBase implements Elast
return response;
} catch (Throwable e) {
- logger.error("Unable to list elastistor pools.", e);
+ s_logger.error("Unable to list elastistor pools.", e);
throw new CloudRuntimeException("Unable to list elastistor pools. " + e.getMessage());
}
@@ -197,7 +199,7 @@ public class ElastistorVolumeApiServiceImpl extends ManagerBase implements Elast
return response;
} catch (Throwable e) {
- logger.error("Unable to list elastistor interfaces.", e);
+ s_logger.error("Unable to list elastistor interfaces.", e);
throw new CloudRuntimeException("Unable to list elastistor interfaces. " + e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
index fd7bcd0..8c6820f 100644
--- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
+++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
@@ -21,11 +21,13 @@ import com.cloud.user.UserAccount;
import com.cloud.user.dao.UserAccountDao;
import com.cloud.utils.Pair;
import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
import javax.inject.Inject;
import java.util.Map;
public class LdapAuthenticator extends DefaultUserAuthenticator {
+ private static final Logger s_logger = Logger.getLogger(LdapAuthenticator.class.getName());
@Inject
private LdapManager _ldapManager;
@@ -46,14 +48,14 @@ public class LdapAuthenticator extends DefaultUserAuthenticator {
public Pair<Boolean, ActionOnFailedAuthentication> authenticate(final String username, final String password, final Long domainId, final Map<String, Object[]> requestParameters) {
if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
- logger.debug("Username or Password cannot be empty");
+ s_logger.debug("Username or Password cannot be empty");
return new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
}
final UserAccount user = _userAccountDao.getUserAccount(username, domainId);
if (user == null) {
- logger.debug("Unable to find user with " + username + " in domain " + domainId);
+ s_logger.debug("Unable to find user with " + username + " in domain " + domainId);
return new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
} else if (_ldapManager.isLdapEnabled()) {
boolean result = _ldapManager.canAuthenticate(username, password);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java b/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
index f91146b..f08ec37 100644
--- a/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
+++ b/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
@@ -20,6 +20,7 @@ import com.cloud.user.dao.UserAccountDao;
import com.cloud.utils.Pair;
import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
import javax.ejb.Local;
import javax.inject.Inject;
@@ -35,29 +36,30 @@ import java.util.Map;
*/
@Local(value = {UserAuthenticator.class})
public class MD5UserAuthenticator extends DefaultUserAuthenticator {
+ public static final Logger s_logger = Logger.getLogger(MD5UserAuthenticator.class);
@Inject
private UserAccountDao _userAccountDao;
@Override
public Pair<Boolean, ActionOnFailedAuthentication> authenticate(String username, String password, Long domainId, Map<String, Object[]> requestParameters) {
- if (logger.isDebugEnabled()) {
- logger.debug("Retrieving user: " + username);
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Retrieving user: " + username);
}
if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
- logger.debug("Username or Password cannot be empty");
+ s_logger.debug("Username or Password cannot be empty");
return new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
}
UserAccount user = _userAccountDao.getUserAccount(username, domainId);
if (user == null) {
- logger.debug("Unable to find user with " + username + " in domain " + domainId);
+ s_logger.debug("Unable to find user with " + username + " in domain " + domainId);
return new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
}
if (!user.getPassword().equals(encode(password))) {
- logger.debug("Password does not match");
+ s_logger.debug("Password does not match");
return new Pair<Boolean, ActionOnFailedAuthentication>(false, ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT);
}
return new Pair<Boolean, ActionOnFailedAuthentication>(true, null);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java b/plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java
index 735405e..130950d 100644
--- a/plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java
+++ b/plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java
@@ -23,6 +23,7 @@ import com.cloud.utils.ConstantTimeComparator;
import com.cloud.utils.Pair;
import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
import org.bouncycastle.crypto.PBEParametersGenerator;
import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
import org.bouncycastle.crypto.params.KeyParameter;
@@ -40,6 +41,7 @@ import static java.lang.String.format;
@Local({UserAuthenticator.class})
public class PBKDF2UserAuthenticator extends DefaultUserAuthenticator {
+ public static final Logger s_logger = Logger.getLogger(PBKDF2UserAuthenticator.class);
private static final int s_saltlen = 64;
private static final int s_rounds = 100000;
private static final int s_keylen = 512;
@@ -48,12 +50,12 @@ public class PBKDF2UserAuthenticator extends DefaultUserAuthenticator {
private UserAccountDao _userAccountDao;
public Pair<Boolean, UserAuthenticator.ActionOnFailedAuthentication> authenticate(String username, String password, Long domainId, Map<String, Object[]> requestParameters) {
- if (logger.isDebugEnabled()) {
- logger.debug("Retrieving user: " + username);
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Retrieving user: " + username);
}
if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
- logger.debug("Username or Password cannot be empty");
+ s_logger.debug("Username or Password cannot be empty");
return new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
}
@@ -62,7 +64,7 @@ public class PBKDF2UserAuthenticator extends DefaultUserAuthenticator {
if (user != null) {
isValidUser = true;
} else {
- logger.debug("Unable to find user with " + username + " in domain " + domainId);
+ s_logger.debug("Unable to find user with " + username + " in domain " + domainId);
}
byte[] salt = new byte[0];
@@ -71,7 +73,7 @@ public class PBKDF2UserAuthenticator extends DefaultUserAuthenticator {
if (isValidUser) {
String[] storedPassword = user.getPassword().split(":");
if ((storedPassword.length != 3) || (!StringUtils.isNumeric(storedPassword[2]))) {
- logger.warn("The stored password for " + username + " isn't in the right format for this authenticator");
+ s_logger.warn("The stored password for " + username + " isn't in the right format for this authenticator");
isValidUser = false;
} else {
// Encoding format = <salt>:<password hash>:<rounds>
@@ -110,7 +112,7 @@ public class PBKDF2UserAuthenticator extends DefaultUserAuthenticator {
} catch (UnsupportedEncodingException e) {
throw new CloudRuntimeException("Unable to hash password", e);
} catch (InvalidKeySpecException e) {
- logger.error("Exception in EncryptUtil.createKey ", e);
+ s_logger.error("Exception in EncryptUtil.createKey ", e);
throw new CloudRuntimeException("Unable to hash password", e);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java b/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
index 099feb9..aaff27e 100644
--- a/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
+++ b/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
@@ -19,6 +19,7 @@ import com.cloud.user.UserAccount;
import com.cloud.user.dao.UserAccountDao;
import com.cloud.utils.Pair;
import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
import javax.ejb.Local;
import javax.inject.Inject;
@@ -26,29 +27,30 @@ import java.util.Map;
@Local(value = {UserAuthenticator.class})
public class PlainTextUserAuthenticator extends DefaultUserAuthenticator {
+ public static final Logger s_logger = Logger.getLogger(PlainTextUserAuthenticator.class);
@Inject
private UserAccountDao _userAccountDao;
@Override
public Pair<Boolean, ActionOnFailedAuthentication> authenticate(String username, String password, Long domainId, Map<String, Object[]> requestParameters) {
- if (logger.isDebugEnabled()) {
- logger.debug("Retrieving user: " + username);
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Retrieving user: " + username);
}
if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
- logger.debug("Username or Password cannot be empty");
+ s_logger.debug("Username or Password cannot be empty");
return new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
}
UserAccount user = _userAccountDao.getUserAccount(username, domainId);
if (user == null) {
- logger.debug("Unable to find user with " + username + " in domain " + domainId);
+ s_logger.debug("Unable to find user with " + username + " in domain " + domainId);
return new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
}
if (!user.getPassword().equals(password)) {
- logger.debug("Password does not match");
+ s_logger.debug("Password does not match");
return new Pair<Boolean, ActionOnFailedAuthentication>(false, ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT);
}
return new Pair<Boolean, ActionOnFailedAuthentication>(true, null);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java
index 455f28e..a8740ac 100644
--- a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java
+++ b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java
@@ -37,6 +37,7 @@ import org.apache.cloudstack.framework.security.keystore.KeystoreDao;
import org.apache.cloudstack.framework.security.keystore.KeystoreVO;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.httpclient.HttpClient;
+import org.apache.log4j.Logger;
import org.opensaml.DefaultBootstrap;
import org.opensaml.common.xml.SAMLConstants;
import org.opensaml.saml2.metadata.ContactPerson;
@@ -92,6 +93,7 @@ import java.util.TimerTask;
@Component
@Local(value = {SAML2AuthManager.class, PluggableAPIAuthenticator.class})
public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManager, Configurable {
+ private static final Logger s_logger = Logger.getLogger(SAML2AuthManagerImpl.class);
private SAMLProviderMetadata _spMetadata = new SAMLProviderMetadata();
private Map<String, SAMLProviderMetadata> _idpMetadataMap = new HashMap<String, SAMLProviderMetadata>();
@@ -122,10 +124,10 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
@Override
public boolean start() {
if (isSAMLPluginEnabled()) {
- logger.info("SAML auth plugin loaded");
+ s_logger.info("SAML auth plugin loaded");
return setup();
} else {
- logger.info("SAML auth plugin not enabled so not loading");
+ s_logger.info("SAML auth plugin not enabled so not loading");
return super.start();
}
}
@@ -145,9 +147,9 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
KeyPair keyPair = SAMLUtils.generateRandomKeyPair();
_ksDao.save(SAMLPluginConstants.SAMLSP_KEYPAIR, SAMLUtils.savePrivateKey(keyPair.getPrivate()), SAMLUtils.savePublicKey(keyPair.getPublic()), "samlsp-keypair");
keyStoreVO = _ksDao.findByName(SAMLPluginConstants.SAMLSP_KEYPAIR);
- logger.info("No SAML keystore found, created and saved a new Service Provider keypair");
+ s_logger.info("No SAML keystore found, created and saved a new Service Provider keypair");
} catch (NoSuchProviderException | NoSuchAlgorithmException e) {
- logger.error("Unable to create and save SAML keypair: " + e.toString());
+ s_logger.error("Unable to create and save SAML keypair: " + e.toString());
}
}
@@ -176,7 +178,7 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
_ksDao.save(SAMLPluginConstants.SAMLSP_X509CERT, Base64.encodeBase64String(bos.toByteArray()), "", "samlsp-x509cert");
bos.close();
} catch (NoSuchAlgorithmException | NoSuchProviderException | CertificateEncodingException | SignatureException | InvalidKeyException | IOException e) {
- logger.error("SAML Plugin won't be able to use X509 signed authentication");
+ s_logger.error("SAML Plugin won't be able to use X509 signed authentication");
}
} else {
try {
@@ -185,7 +187,7 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
spX509Key = (X509Certificate) si.readObject();
bi.close();
} catch (IOException | ClassNotFoundException ignored) {
- logger.error("SAML Plugin won't be able to use X509 signed authentication. Failed to load X509 Certificate from Database.");
+ s_logger.error("SAML Plugin won't be able to use X509 signed authentication. Failed to load X509 Certificate from Database.");
}
}
}
@@ -212,7 +214,7 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
private void addIdpToMap(EntityDescriptor descriptor, Map<String, SAMLProviderMetadata> idpMap) {
SAMLProviderMetadata idpMetadata = new SAMLProviderMetadata();
idpMetadata.setEntityId(descriptor.getEntityID());
- logger.debug("Adding IdP to the list of discovered IdPs: " + descriptor.getEntityID());
+ s_logger.debug("Adding IdP to the list of discovered IdPs: " + descriptor.getEntityID());
if (descriptor.getOrganization() != null) {
if (descriptor.getOrganization().getDisplayNames() != null) {
for (OrganizationDisplayName orgName : descriptor.getOrganization().getDisplayNames()) {
@@ -286,21 +288,21 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
try {
idpMetadata.setSigningCertificate(KeyInfoHelper.getCertificates(kd.getKeyInfo()).get(0));
} catch (CertificateException ignored) {
- logger.info("[ignored] encountered invalid certificate signing.", ignored);
+ s_logger.info("[ignored] encountered invalid certificate signing.", ignored);
}
}
if (kd.getUse() == UsageType.ENCRYPTION) {
try {
idpMetadata.setEncryptionCertificate(KeyInfoHelper.getCertificates(kd.getKeyInfo()).get(0));
} catch (CertificateException ignored) {
- logger.info("[ignored] encountered invalid certificate encryption.", ignored);
+ s_logger.info("[ignored] encountered invalid certificate encryption.", ignored);
}
}
if (kd.getUse() == UsageType.UNSPECIFIED) {
try {
unspecifiedKey = KeyInfoHelper.getCertificates(kd.getKeyInfo()).get(0);
} catch (CertificateException ignored) {
- logger.info("[ignored] encountered invalid certificate.", ignored);
+ s_logger.info("[ignored] encountered invalid certificate.", ignored);
}
}
}
@@ -312,7 +314,7 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
idpMetadata.setEncryptionCertificate(unspecifiedKey);
}
if (idpMap.containsKey(idpMetadata.getEntityId())) {
- logger.warn("Duplicate IdP metadata found with entity Id: " + idpMetadata.getEntityId());
+ s_logger.warn("Duplicate IdP metadata found with entity Id: " + idpMetadata.getEntityId());
}
idpMap.put(idpMetadata.getEntityId(), idpMetadata);
}
@@ -343,16 +345,16 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
if (_idpMetaDataProvider == null) {
return;
}
- logger.debug("Starting SAML IDP Metadata Refresh Task");
+ s_logger.debug("Starting SAML IDP Metadata Refresh Task");
Map <String, SAMLProviderMetadata> metadataMap = new HashMap<String, SAMLProviderMetadata>();
try {
discoverAndAddIdp(_idpMetaDataProvider.getMetadata(), metadataMap);
_idpMetadataMap = metadataMap;
expireTokens();
- logger.debug("Finished refreshing SAML Metadata and expiring old auth tokens");
+ s_logger.debug("Finished refreshing SAML Metadata and expiring old auth tokens");
} catch (MetadataProviderException e) {
- logger.warn("SAML Metadata Refresh task failed with exception: " + e.getMessage());
+ s_logger.warn("SAML Metadata Refresh task failed with exception: " + e.getMessage());
}
}
@@ -360,7 +362,7 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
private boolean setup() {
if (!initSP()) {
- logger.error("SAML Plugin failed to initialize, please fix the configuration and restart management server");
+ s_logger.error("SAML Plugin failed to initialize, please fix the configuration and restart management server");
return false;
}
_timer = new Timer();
@@ -376,11 +378,11 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
} else {
File metadataFile = PropertiesUtil.findConfigFile(idpMetaDataUrl);
if (metadataFile == null) {
- logger.error("Provided Metadata is not a URL, Unable to locate metadata file from local path: " + idpMetaDataUrl);
+ s_logger.error("Provided Metadata is not a URL, Unable to locate metadata file from local path: " + idpMetaDataUrl);
return false;
}
else{
- logger.debug("Provided Metadata is not a URL, trying to read metadata file from local path: " + metadataFile.getAbsolutePath());
+ s_logger.debug("Provided Metadata is not a URL, trying to read metadata file from local path: " + metadataFile.getAbsolutePath());
_idpMetaDataProvider = new FilesystemMetadataProvider(_timer, metadataFile);
}
}
@@ -390,14 +392,14 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
_timer.scheduleAtFixedRate(new MetadataRefreshTask(), 0, _refreshInterval * 1000);
} catch (MetadataProviderException e) {
- logger.error("Unable to read SAML2 IDP MetaData URL, error:" + e.getMessage());
- logger.error("SAML2 Authentication may be unavailable");
+ s_logger.error("Unable to read SAML2 IDP MetaData URL, error:" + e.getMessage());
+ s_logger.error("SAML2 Authentication may be unavailable");
return false;
} catch (ConfigurationException | FactoryConfigurationError e) {
- logger.error("OpenSAML bootstrapping failed: error: " + e.getMessage());
+ s_logger.error("OpenSAML bootstrapping failed: error: " + e.getMessage());
return false;
} catch (NullPointerException e) {
- logger.error("Unable to setup SAML Auth Plugin due to NullPointerException" +
+ s_logger.error("Unable to setup SAML Auth Plugin due to NullPointerException" +
" please check the SAML global settings: " + e.getMessage());
return false;
}
@@ -475,7 +477,7 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
if (_samlTokenDao.findByUuid(authnId) == null) {
_samlTokenDao.persist(token);
} else {
- logger.warn("Duplicate SAML token for entity=" + entity + " token id=" + authnId + " domain=" + domainPath);
+ s_logger.warn("Duplicate SAML token for entity=" + entity + " token id=" + authnId + " domain=" + domainPath);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java
index fd507ae..65a7959 100644
--- a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java
+++ b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java
@@ -22,6 +22,7 @@ import com.cloud.user.dao.UserAccountDao;
import com.cloud.user.dao.UserDao;
import com.cloud.utils.Pair;
import org.apache.cxf.common.util.StringUtils;
+import org.apache.log4j.Logger;
import javax.ejb.Local;
import javax.inject.Inject;
@@ -29,6 +30,7 @@ import java.util.Map;
@Local(value = {UserAuthenticator.class})
public class SAML2UserAuthenticator extends DefaultUserAuthenticator {
+ public static final Logger s_logger = Logger.getLogger(SAML2UserAuthenticator.class);
@Inject
private UserAccountDao _userAccountDao;
@@ -37,18 +39,18 @@ public class SAML2UserAuthenticator extends DefaultUserAuthenticator {
@Override
public Pair<Boolean, ActionOnFailedAuthentication> authenticate(String username, String password, Long domainId, Map<String, Object[]> requestParameters) {
- if (logger.isDebugEnabled()) {
- logger.debug("Trying SAML2 auth for user: " + username);
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Trying SAML2 auth for user: " + username);
}
if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
- logger.debug("Username or Password cannot be empty");
+ s_logger.debug("Username or Password cannot be empty");
return new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
}
final UserAccount userAccount = _userAccountDao.getUserAccount(username, domainId);
if (userAccount == null || userAccount.getSource() != User.Source.SAML2) {
- logger.debug("Unable to find user with " + username + " in domain " + domainId + ", or user source is not SAML2");
+ s_logger.debug("Unable to find user with " + username + " in domain " + domainId + ", or user source is not SAML2");
return new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
} else {
User user = _userDao.getUser(userAccount.getId());