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:41 UTC
[21/35] git commit: updated refs/heads/master to 8bc0294
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/element/NiciraNvpElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/element/NiciraNvpElement.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/element/NiciraNvpElement.java
index d59d4e1..0243e2d 100644
--- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/element/NiciraNvpElement.java
+++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/element/NiciraNvpElement.java
@@ -32,6 +32,7 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
@@ -136,6 +137,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
private static final int MAX_PORT = 65535;
private static final int MIN_PORT = 0;
+ private static final Logger s_logger = Logger.getLogger(NiciraNvpElement.class);
private static final Map<Service, Map<Capability, String>> capabilities = setCapabilities();
@@ -185,18 +187,18 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
}
protected boolean canHandle(Network network, Service service) {
- logger.debug("Checking if NiciraNvpElement can handle service " + service.getName() + " on network " + network.getDisplayText());
+ s_logger.debug("Checking if NiciraNvpElement can handle service " + service.getName() + " on network " + network.getDisplayText());
if (network.getBroadcastDomainType() != BroadcastDomainType.Lswitch) {
return false;
}
if (!networkModel.isProviderForNetwork(getProvider(), network.getId())) {
- logger.debug("NiciraNvpElement is not a provider for network " + network.getDisplayText());
+ s_logger.debug("NiciraNvpElement is not a provider for network " + network.getDisplayText());
return false;
}
if (!ntwkSrvcDao.canProviderSupportServiceInNetwork(network.getId(), service, Network.Provider.NiciraNvp)) {
- logger.debug("NiciraNvpElement can't provide the " + service.getName() + " service on network " + network.getDisplayText());
+ s_logger.debug("NiciraNvpElement can't provide the " + service.getName() + " service on network " + network.getDisplayText());
return false;
}
@@ -213,20 +215,20 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
@Override
public boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException,
ResourceUnavailableException, InsufficientCapacityException {
- logger.debug("entering NiciraNvpElement implement function for network " + network.getDisplayText() + " (state " + network.getState() + ")");
+ s_logger.debug("entering NiciraNvpElement implement function for network " + network.getDisplayText() + " (state " + network.getState() + ")");
if (!canHandle(network, Service.Connectivity)) {
return false;
}
if (network.getBroadcastUri() == null) {
- logger.error("Nic has no broadcast Uri with the LSwitch Uuid");
+ s_logger.error("Nic has no broadcast Uri with the LSwitch Uuid");
return false;
}
List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(network.getPhysicalNetworkId());
if (devices.isEmpty()) {
- logger.error("No NiciraNvp Controller on physical network " + network.getPhysicalNetworkId());
+ s_logger.error("No NiciraNvp Controller on physical network " + network.getPhysicalNetworkId());
return false;
}
NiciraNvpDeviceVO niciraNvpDevice = devices.get(0);
@@ -242,7 +244,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
// Implement SourceNat immediately as we have al the info already
if (networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.SourceNat, Provider.NiciraNvp)) {
- logger.debug("Apparently we are supposed to provide SourceNat on this network");
+ s_logger.debug("Apparently we are supposed to provide SourceNat on this network");
PublicIp sourceNatIp = ipAddrMgr.assignSourceNatIpAddressToGuestNetwork(owner, network);
String publicCidr = sourceNatIp.getAddress().addr() + "/" + NetUtils.getCidrSize(sourceNatIp.getVlanNetmask());
@@ -268,7 +270,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
context.getAccount().getAccountName());
CreateLogicalRouterAnswer answer = (CreateLogicalRouterAnswer)agentMgr.easySend(niciraNvpHost.getId(), cmd);
if (answer.getResult() == false) {
- logger.error("Failed to create Logical Router for network " + network.getDisplayText());
+ s_logger.error("Failed to create Logical Router for network " + network.getDisplayText());
return false;
}
@@ -289,7 +291,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
}
if (network.getBroadcastUri() == null) {
- logger.error("Nic has no broadcast Uri with the LSwitch Uuid");
+ s_logger.error("Nic has no broadcast Uri with the LSwitch Uuid");
return false;
}
@@ -297,7 +299,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(network.getPhysicalNetworkId());
if (devices.isEmpty()) {
- logger.error("No NiciraNvp Controller on physical network " + network.getPhysicalNetworkId());
+ s_logger.error("No NiciraNvp Controller on physical network " + network.getPhysicalNetworkId());
return false;
}
NiciraNvpDeviceVO niciraNvpDevice = devices.get(0);
@@ -309,14 +311,14 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
FindLogicalSwitchPortAnswer answer = (FindLogicalSwitchPortAnswer)agentMgr.easySend(niciraNvpHost.getId(), findCmd);
if (answer.getResult()) {
- logger.warn("Existing Logical Switchport found for nic " + nic.getName() + " with uuid " + existingNicMap.getLogicalSwitchPortUuid());
+ s_logger.warn("Existing Logical Switchport found for nic " + nic.getName() + " with uuid " + existingNicMap.getLogicalSwitchPortUuid());
UpdateLogicalSwitchPortCommand cmd =
new UpdateLogicalSwitchPortCommand(existingNicMap.getLogicalSwitchPortUuid(), BroadcastDomainType.getValue(network.getBroadcastUri()),
nicVO.getUuid(), context.getDomain().getName() + "-" + context.getAccount().getAccountName(), nic.getName());
agentMgr.easySend(niciraNvpHost.getId(), cmd);
return true;
} else {
- logger.error("Stale entry found for nic " + nic.getName() + " with logical switchport uuid " + existingNicMap.getLogicalSwitchPortUuid());
+ s_logger.error("Stale entry found for nic " + nic.getName() + " with logical switchport uuid " + existingNicMap.getLogicalSwitchPortUuid());
niciraNvpNicMappingDao.remove(existingNicMap.getId());
}
}
@@ -327,7 +329,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
CreateLogicalSwitchPortAnswer answer = (CreateLogicalSwitchPortAnswer)agentMgr.easySend(niciraNvpHost.getId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("CreateLogicalSwitchPortCommand failed");
+ s_logger.error("CreateLogicalSwitchPortCommand failed");
return false;
}
@@ -347,7 +349,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
}
if (network.getBroadcastUri() == null) {
- logger.error("Nic has no broadcast Uri with the LSwitch Uuid");
+ s_logger.error("Nic has no broadcast Uri with the LSwitch Uuid");
return false;
}
@@ -355,7 +357,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(network.getPhysicalNetworkId());
if (devices.isEmpty()) {
- logger.error("No NiciraNvp Controller on physical network " + network.getPhysicalNetworkId());
+ s_logger.error("No NiciraNvp Controller on physical network " + network.getPhysicalNetworkId());
return false;
}
NiciraNvpDeviceVO niciraNvpDevice = devices.get(0);
@@ -363,7 +365,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
NiciraNvpNicMappingVO nicMap = niciraNvpNicMappingDao.findByNicUuid(nicVO.getUuid());
if (nicMap == null) {
- logger.error("No mapping for nic " + nic.getName());
+ s_logger.error("No mapping for nic " + nic.getName());
return false;
}
@@ -371,7 +373,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
DeleteLogicalSwitchPortAnswer answer = (DeleteLogicalSwitchPortAnswer)agentMgr.easySend(niciraNvpHost.getId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("DeleteLogicalSwitchPortCommand failed");
+ s_logger.error("DeleteLogicalSwitchPortCommand failed");
return false;
}
@@ -388,20 +390,20 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(network.getPhysicalNetworkId());
if (devices.isEmpty()) {
- logger.error("No NiciraNvp Controller on physical network " + network.getPhysicalNetworkId());
+ s_logger.error("No NiciraNvp Controller on physical network " + network.getPhysicalNetworkId());
return false;
}
NiciraNvpDeviceVO niciraNvpDevice = devices.get(0);
HostVO niciraNvpHost = hostDao.findById(niciraNvpDevice.getHostId());
if (networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.SourceNat, Provider.NiciraNvp)) {
- logger.debug("Apparently we were providing SourceNat on this network");
+ s_logger.debug("Apparently we were providing SourceNat on this network");
// Deleting the LogicalRouter will also take care of all provisioned
// nat rules.
NiciraNvpRouterMappingVO routermapping = niciraNvpRouterMappingDao.findByNetworkId(network.getId());
if (routermapping == null) {
- logger.warn("No logical router uuid found for network " + network.getDisplayText());
+ s_logger.warn("No logical router uuid found for network " + network.getDisplayText());
// This might be cause by a failed deployment, so don't make shutdown fail as well.
return true;
}
@@ -409,7 +411,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
DeleteLogicalRouterCommand cmd = new DeleteLogicalRouterCommand(routermapping.getLogicalRouterUuid());
DeleteLogicalRouterAnswer answer = (DeleteLogicalRouterAnswer)agentMgr.easySend(niciraNvpHost.getId(), cmd);
if (answer.getResult() == false) {
- logger.error("Failed to delete LogicalRouter for network " + network.getDisplayText());
+ s_logger.error("Failed to delete LogicalRouter for network " + network.getDisplayText());
return false;
}
@@ -450,11 +452,11 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
// This element can only function in a Nicra Nvp based
// SDN network, so Connectivity needs to be present here
if (!services.contains(Service.Connectivity)) {
- logger.warn("Unable to provide services without Connectivity service enabled for this element");
+ s_logger.warn("Unable to provide services without Connectivity service enabled for this element");
return false;
}
if ((services.contains(Service.PortForwarding) || services.contains(Service.StaticNat)) && !services.contains(Service.SourceNat)) {
- logger.warn("Unable to provide StaticNat and/or PortForwarding without the SourceNat service");
+ s_logger.warn("Unable to provide StaticNat and/or PortForwarding without the SourceNat service");
return false;
}
return true;
@@ -732,7 +734,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
// SourceNat is required for StaticNat and PortForwarding
List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(network.getPhysicalNetworkId());
if (devices.isEmpty()) {
- logger.error("No NiciraNvp Controller on physical network " + network.getPhysicalNetworkId());
+ s_logger.error("No NiciraNvp Controller on physical network " + network.getPhysicalNetworkId());
return false;
}
NiciraNvpDeviceVO niciraNvpDevice = devices.get(0);
@@ -741,7 +743,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
NiciraNvpRouterMappingVO routermapping = niciraNvpRouterMappingDao.findByNetworkId(network.getId());
if (routermapping == null) {
- logger.error("No logical router uuid found for network " + network.getDisplayText());
+ s_logger.error("No logical router uuid found for network " + network.getDisplayText());
return false;
}
@@ -760,7 +762,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
//FIXME answer can be null if the host is down
return answer.getResult();
} else {
- logger.debug("No need to provision ip addresses as we are not providing L3 services.");
+ s_logger.debug("No need to provision ip addresses as we are not providing L3 services.");
}
return true;
@@ -777,7 +779,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(network.getPhysicalNetworkId());
if (devices.isEmpty()) {
- logger.error("No NiciraNvp Controller on physical network " + network.getPhysicalNetworkId());
+ s_logger.error("No NiciraNvp Controller on physical network " + network.getPhysicalNetworkId());
return false;
}
NiciraNvpDeviceVO niciraNvpDevice = devices.get(0);
@@ -785,7 +787,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
NiciraNvpRouterMappingVO routermapping = niciraNvpRouterMappingDao.findByNetworkId(network.getId());
if (routermapping == null) {
- logger.error("No logical router uuid found for network " + network.getDisplayText());
+ s_logger.error("No logical router uuid found for network " + network.getDisplayText());
return false;
}
@@ -817,7 +819,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(network.getPhysicalNetworkId());
if (devices.isEmpty()) {
- logger.error("No NiciraNvp Controller on physical network " + network.getPhysicalNetworkId());
+ s_logger.error("No NiciraNvp Controller on physical network " + network.getPhysicalNetworkId());
return false;
}
NiciraNvpDeviceVO niciraNvpDevice = devices.get(0);
@@ -825,7 +827,7 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
NiciraNvpRouterMappingVO routermapping = niciraNvpRouterMappingDao.findByNetworkId(network.getId());
if (routermapping == null) {
- logger.error("No logical router uuid found for network " + network.getDisplayText());
+ s_logger.error("No logical router uuid found for network " + network.getDisplayText());
return false;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java
index bfce332..975ebd1 100644
--- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java
+++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java
@@ -26,6 +26,7 @@ import java.util.List;
import javax.ejb.Local;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.CreateLogicalSwitchAnswer;
@@ -70,6 +71,7 @@ import com.cloud.vm.VirtualMachineProfile;
public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
private static final int MAX_NAME_LENGTH = 40;
+ private static final Logger s_logger = Logger.getLogger(NiciraNvpGuestNetworkGuru.class);
@Inject
protected NetworkModel networkModel;
@@ -106,7 +108,7 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
&& isMyIsolationMethod(physicalNetwork) && ntwkOfferingSrvcDao.areServicesSupportedByNetworkOffering(offering.getId(), Service.Connectivity)) {
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;
}
}
@@ -117,18 +119,18 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
final PhysicalNetworkVO physnet = physicalNetworkDao.findById(plan.getPhysicalNetworkId());
final DataCenter dc = _dcDao.findById(plan.getDataCenterId());
if (!canHandle(offering, dc.getNetworkType(), physnet)) {
- logger.debug("Refusing to design this network");
+ s_logger.debug("Refusing to design this network");
return null;
}
final List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(physnet.getId());
if (devices.isEmpty()) {
- logger.error("No NiciraNvp Controller on physical network " + physnet.getName());
+ s_logger.error("No NiciraNvp Controller on physical network " + physnet.getName());
return null;
}
- logger.debug("Nicira Nvp " + devices.get(0).getUuid() + " found on physical network " + physnet.getId());
+ s_logger.debug("Nicira Nvp " + devices.get(0).getUuid() + " found on physical network " + physnet.getId());
- logger.debug("Physical isolation type is supported, asking GuestNetworkGuru to design this network");
+ s_logger.debug("Physical isolation type is supported, asking GuestNetworkGuru to design this network");
final NetworkVO networkObject = (NetworkVO) super.design(offering, plan, userSpecified, owner);
if (networkObject == null) {
return null;
@@ -174,7 +176,7 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
final List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(physicalNetworkId);
if (devices.isEmpty()) {
- logger.error("No NiciraNvp Controller on physical network " + physicalNetworkId);
+ s_logger.error("No NiciraNvp Controller on physical network " + physicalNetworkId);
return null;
}
final NiciraNvpDeviceVO niciraNvpDevice = devices.get(0);
@@ -188,16 +190,16 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
final CreateLogicalSwitchAnswer answer = (CreateLogicalSwitchAnswer) agentMgr.easySend(niciraNvpHost.getId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("CreateLogicalSwitchCommand failed");
+ s_logger.error("CreateLogicalSwitchCommand failed");
return null;
}
try {
implemented.setBroadcastUri(new URI("lswitch", answer.getLogicalSwitchUuid(), null));
implemented.setBroadcastDomainType(BroadcastDomainType.Lswitch);
- logger.info("Implemented OK, network linked to = " + implemented.getBroadcastUri().toString());
+ s_logger.info("Implemented OK, network linked to = " + implemented.getBroadcastUri().toString());
} catch (final URISyntaxException e) {
- logger.error("Unable to store logical switch id in broadcast uri, uuid = " + implemented.getUuid(), e);
+ s_logger.error("Unable to store logical switch id in broadcast uri, uuid = " + implemented.getUuid(), e);
return null;
}
@@ -219,13 +221,13 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
public void shutdown(final NetworkProfile profile, final NetworkOffering offering) {
final NetworkVO networkObject = networkDao.findById(profile.getId());
if (networkObject.getBroadcastDomainType() != BroadcastDomainType.Lswitch || 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;
}
final List<NiciraNvpDeviceVO> devices = niciraNvpDao.listByPhysicalNetwork(networkObject.getPhysicalNetworkId());
if (devices.isEmpty()) {
- logger.error("No NiciraNvp Controller on physical network " + networkObject.getPhysicalNetworkId());
+ s_logger.error("No NiciraNvp Controller on physical network " + networkObject.getPhysicalNetworkId());
return;
}
final NiciraNvpDeviceVO niciraNvpDevice = devices.get(0);
@@ -235,7 +237,7 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru {
final DeleteLogicalSwitchAnswer answer = (DeleteLogicalSwitchAnswer) agentMgr.easySend(niciraNvpHost.getId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("DeleteLogicalSwitchCommand failed");
+ s_logger.error("DeleteLogicalSwitchCommand failed");
}
super.shutdown(profile, offering);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java b/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java
index c092706..e777268 100644
--- a/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java
+++ b/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java
@@ -31,6 +31,7 @@ import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.InternalIdentity;
import org.apache.cloudstack.network.ExternalNetworkDeviceManager;
+import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.StartupCommand;
@@ -92,6 +93,7 @@ import com.cloud.vm.dao.NicDao;
public class NuageVspElement extends AdapterBase implements ConnectivityProvider, IpDeployer, SourceNatServiceProvider, StaticNatServiceProvider, FirewallServiceProvider,
DhcpServiceProvider, NetworkACLServiceProvider, ResourceStateAdapter {
+ private static final Logger s_logger = Logger.getLogger(NuageVspElement.class);
private static final Map<Service, Map<Capability, String>> capabilities = setCapabilities();
@@ -192,14 +194,14 @@ public class NuageVspElement extends AdapterBase implements ConnectivityProvider
@Override
public boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException,
ResourceUnavailableException, InsufficientCapacityException {
- logger.debug("Entering NuageElement implement function for network " + network.getDisplayText() + " (state " + network.getState() + ")");
+ s_logger.debug("Entering NuageElement implement function for network " + network.getDisplayText() + " (state " + network.getState() + ")");
if (!canHandle(network, Service.Connectivity)) {
return false;
}
if (network.getBroadcastUri() == null) {
- logger.error("Nic has no broadcast Uri with the virtual router IP");
+ s_logger.error("Nic has no broadcast Uri with the virtual router IP");
return false;
}
@@ -214,7 +216,7 @@ public class NuageVspElement extends AdapterBase implements ConnectivityProvider
}
if (network.getBroadcastUri() == null) {
- logger.error("Nic has no broadcast Uri with the virtual router IP");
+ s_logger.error("Nic has no broadcast Uri with the virtual router IP");
return false;
}
@@ -228,7 +230,7 @@ public class NuageVspElement extends AdapterBase implements ConnectivityProvider
}
if (network.getBroadcastUri() == null) {
- logger.error("Nic has no broadcast Uri with the virtual router IP");
+ s_logger.error("Nic has no broadcast Uri with the virtual router IP");
return false;
}
@@ -273,12 +275,12 @@ public class NuageVspElement extends AdapterBase implements ConnectivityProvider
// This element can only function in a NuageVsp based
// SDN network, so Connectivity needs to be present here
if (!services.contains(Service.Connectivity)) {
- logger.warn("Unable to support services combination without Connectivity service provided by Nuage VSP.");
+ s_logger.warn("Unable to support services combination without Connectivity service provided by Nuage VSP.");
return false;
}
if ((services.contains(Service.StaticNat)) && (!services.contains(Service.SourceNat))) {
- logger.warn("Unable to provide StaticNat without the SourceNat service.");
+ s_logger.warn("Unable to provide StaticNat without the SourceNat service.");
return false;
}
@@ -287,7 +289,7 @@ public class NuageVspElement extends AdapterBase implements ConnectivityProvider
// NuageVsp doesn't implement any of these services, and we don't
// want anyone else to do it for us. So if these services
// exist, we can't handle it.
- logger.warn("Unable to support services combination. The services list contains service(s) not supported by Nuage VSP.");
+ s_logger.warn("Unable to support services combination. The services list contains service(s) not supported by Nuage VSP.");
return false;
}
@@ -301,13 +303,13 @@ public class NuageVspElement extends AdapterBase implements ConnectivityProvider
}
if (!_networkModel.isProviderForNetwork(getProvider(), network.getId())) {
- logger.debug("NuageElement is not a provider for network " + network.getDisplayText());
+ s_logger.debug("NuageElement is not a provider for network " + network.getDisplayText());
return false;
}
if (service != null) {
if (!_ntwkSrvcDao.canProviderSupportServiceInNetwork(network.getId(), service, getProvider())) {
- logger.debug("NuageElement can't provide the " + service.getName() + " service on network " + network.getDisplayText());
+ s_logger.debug("NuageElement can't provide the " + service.getName() + " service on network " + network.getDisplayText());
return false;
}
}
@@ -371,13 +373,13 @@ public class NuageVspElement extends AdapterBase implements ConnectivityProvider
ApplyStaticNatVspCommand cmd = new ApplyStaticNatVspCommand(networkDomain.getUuid(), vpcOrSubnetUuid, isL3Network, sourceNatDetails);
ApplyStaticNatVspAnswer answer = (ApplyStaticNatVspAnswer)_agentMgr.easySend(nuageVspHost.getId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("ApplyStaticNatNuageVspCommand for network " + config.getUuid() + " failed");
+ s_logger.error("ApplyStaticNatNuageVspCommand for network " + config.getUuid() + " failed");
if ((null != answer) && (null != answer.getDetails())) {
throw new ResourceUnavailableException(answer.getDetails(), Network.class, config.getId());
}
}
} catch (Exception e) {
- logger.warn("Failed to apply static Nat in Vsp " + e.getMessage());
+ s_logger.warn("Failed to apply static Nat in Vsp " + e.getMessage());
}
} catch (Exception e) {
throw new ResourceUnavailableException("Failed to apply Static NAT in VSP", Network.class, config.getId(), e);
@@ -393,9 +395,9 @@ public class NuageVspElement extends AdapterBase implements ConnectivityProvider
@Override
public boolean applyFWRules(Network network, List<? extends FirewallRule> rules) throws ResourceUnavailableException {
- logger.debug("Handling applyFWRules for network " + network.getName() + " with " + rules.size() + " FWRules");
+ s_logger.debug("Handling applyFWRules for network " + network.getName() + " with " + rules.size() + " FWRules");
if (rules != null && rules.size() == 1 && rules.iterator().next().getType().equals(FirewallRuleType.System)) {
- logger.debug("Default ACL added by CS as system is ignored for network " + network.getName() + " with rule " + rules);
+ s_logger.debug("Default ACL added by CS as system is ignored for network " + network.getName() + " with rule " + rules);
return true;
}
return applyACLRules(network, rules, false);
@@ -404,12 +406,12 @@ public class NuageVspElement extends AdapterBase implements ConnectivityProvider
@Override
public boolean applyNetworkACLs(Network network, List<? extends NetworkACLItem> rules) throws ResourceUnavailableException {
if (rules == null || rules.isEmpty()) {
- logger.debug("No rules to apply. So, delete all the existing ACL in VSP from Subnet with uuid " + network.getUuid());
+ s_logger.debug("No rules to apply. So, delete all the existing ACL in VSP from Subnet with uuid " + network.getUuid());
} else {
- logger.debug("New rules has to applied. So, delete all the existing ACL in VSP from Subnet with uuid " + network.getUuid());
+ s_logger.debug("New rules has to applied. So, delete all the existing ACL in VSP from Subnet with uuid " + network.getUuid());
}
if (rules != null) {
- logger.debug("Handling applyNetworkACLs for network " + network.getName() + " with " + rules.size() + " Network ACLs");
+ s_logger.debug("Handling applyNetworkACLs for network " + network.getName() + " with " + rules.size() + " Network ACLs");
applyACLRules(network, rules, true);
}
return true;
@@ -438,7 +440,7 @@ public class NuageVspElement extends AdapterBase implements ConnectivityProvider
isVpc, network.getId());
ApplyAclRuleVspAnswer answer = (ApplyAclRuleVspAnswer)_agentMgr.easySend(nuageVspHost.getId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("ApplyAclRuleNuageVspCommand for network " + network.getUuid() + " failed");
+ s_logger.error("ApplyAclRuleNuageVspCommand for network " + network.getUuid() + " failed");
if ((null != answer) && (null != answer.getDetails())) {
throw new ResourceUnavailableException(answer.getDetails(), Network.class, network.getId());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java b/plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java
index e611d02..9bbaf40 100644
--- a/plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java
+++ b/plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java
@@ -31,6 +31,7 @@ import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.guru.DeallocateVmVspAnswer;
@@ -84,6 +85,7 @@ import com.cloud.vm.VirtualMachineProfile;
@Local(value = NetworkGuru.class)
public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
+ public static final Logger s_logger = Logger.getLogger(NuageVspGuestNetworkGuru.class);
@Inject
NetworkOfferingServiceMapDao _ntwkOfferingSrvcDao;
@@ -112,7 +114,7 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
PhysicalNetworkVO physnet = _physicalNetworkDao.findById(plan.getPhysicalNetworkId());
DataCenter dc = _dcDao.findById(plan.getDataCenterId());
if (!canHandle(offering, dc.getNetworkType(), physnet)) {
- logger.debug("Refusing to design this network");
+ s_logger.debug("Refusing to design this network");
return null;
}
@@ -161,7 +163,7 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
AccountVO networksAccount = _accountDao.findById(network.getAccountId());
if (networksAccount.getType() == Account.ACCOUNT_TYPE_PROJECT) {
String errorMessage = "CS project support is not yet implemented in NuageVsp";
- logger.debug(errorMessage);
+ s_logger.debug(errorMessage);
throw new InsufficientVirtualNetworkCapacityException(errorMessage, Account.class, network.getAccountId());
}
boolean isL3Network = isL3Network(offering.getId());
@@ -180,13 +182,13 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
ImplementNetworkVspAnswer answer = (ImplementNetworkVspAnswer)_agentMgr.easySend(nuageVspHost.getId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("ImplementNetworkNuageVspCommand failed");
+ s_logger.error("ImplementNetworkNuageVspCommand failed");
if ((null != answer) && (null != answer.getDetails())) {
- logger.error(answer.getDetails());
+ s_logger.error(answer.getDetails());
}
return null;
}
- logger.info("Implemented OK, network " + networkUuid + " in tenant " + tenantId + " linked to " + implemented.getBroadcastUri().toString());
+ s_logger.info("Implemented OK, network " + networkUuid + " in tenant " + tenantId + " linked to " + implemented.getBroadcastUri().toString());
return implemented;
}
@@ -202,7 +204,7 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
nic.setBroadcastUri(network.getBroadcastUri());
nic.setIsolationUri(network.getBroadcastUri());
- logger.debug("Handling reserve() call back to with Create a new VM or add an interface to existing VM in network " + network.getName());
+ s_logger.debug("Handling reserve() call back to with Create a new VM or add an interface to existing VM in network " + network.getName());
DataCenter dc = _dcDao.findById(network.getDataCenterId());
Account networksAccount = _accountDao.findById(network.getAccountId());
DomainVO networksDomain = _domainDao.findById(network.getDomainId());
@@ -231,9 +233,9 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
ReserveVmInterfaceVspAnswer answer = (ReserveVmInterfaceVspAnswer)_agentMgr.easySend(nuageVspHost.getId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("ReserveVmInterfaceNuageVspCommand failed");
+ s_logger.error("ReserveVmInterfaceNuageVspCommand failed");
if ((null != answer) && (null != answer.getDetails())) {
- logger.error(answer.getDetails());
+ s_logger.error(answer.getDetails());
}
throw new InsufficientVirtualNetworkCapacityException("Failed to reserve VM in Nuage VSP.", Network.class, network.getId());
}
@@ -247,7 +249,7 @@ public class NuageVspGuestNetworkGuru 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;
}
}
@@ -256,7 +258,7 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
public boolean release(NicProfile nic, VirtualMachineProfile vm, String reservationId) {
long networkId = nic.getNetworkId();
Network network = _networkDao.findById(networkId);
- logger.debug("Handling release() call back, which is called when a VM is stopped or destroyed, to delete the VM with state " + vm.getVirtualMachine().getState()
+ s_logger.debug("Handling release() call back, which is called when a VM is stopped or destroyed, to delete the VM with state " + vm.getVirtualMachine().getState()
+ " from netork " + network.getName());
if (vm.getVirtualMachine().getState().equals(VirtualMachine.State.Stopping)) {
try {
@@ -264,16 +266,16 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
ReleaseVmVspCommand cmd = new ReleaseVmVspCommand(network.getUuid(), vm.getUuid(), vm.getInstanceName());
ReleaseVmVspAnswer answer = (ReleaseVmVspAnswer)_agentMgr.easySend(nuageVspHost.getId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("ReleaseVmNuageVspCommand for VM " + vm.getUuid() + " failed");
+ s_logger.error("ReleaseVmNuageVspCommand for VM " + vm.getUuid() + " failed");
if ((null != answer) && (null != answer.getDetails())) {
- logger.error(answer.getDetails());
+ s_logger.error(answer.getDetails());
}
}
} catch (InsufficientVirtualNetworkCapacityException e) {
- logger.debug("Handling release() call back. Failed to delete CS VM " + vm.getInstanceName() + " in VSP. " + e.getMessage());
+ s_logger.debug("Handling release() call back. Failed to delete CS VM " + vm.getInstanceName() + " in VSP. " + e.getMessage());
}
} else {
- logger.debug("Handling release() call back. VM " + vm.getInstanceName() + " is in " + vm.getVirtualMachine().getState() + " state. So, the CS VM is not deleted."
+ s_logger.debug("Handling release() call back. VM " + vm.getInstanceName() + " is in " + vm.getVirtualMachine().getState() + " state. So, the CS VM is not deleted."
+ " This could be a case where VM interface is deleted. deallocate() call back should be called later");
}
@@ -285,7 +287,7 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
public void deallocate(Network network, NicProfile nic, VirtualMachineProfile vm) {
try {
- logger.debug("Handling deallocate() call back, which is called when a VM is destroyed or interface is removed, " + "to delete VM Interface with IP "
+ s_logger.debug("Handling deallocate() call back, which is called when a VM is destroyed or interface is removed, " + "to delete VM Interface with IP "
+ nic.getIPv4Address() + " from a VM " + vm.getInstanceName() + " with state " + vm.getVirtualMachine().getState());
DomainVO networksDomain = _domainDao.findById(network.getDomainId());
NicVO nicFrmDd = _nicDao.findById(nic.getId());
@@ -301,13 +303,13 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
isL3Network(networkOfferingId), vpcUuid, networksDomain.getUuid(), vm.getInstanceName(), vm.getUuid());
DeallocateVmVspAnswer answer = (DeallocateVmVspAnswer)_agentMgr.easySend(nuageVspHost.getId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("DeallocateVmNuageVspCommand for VM " + vm.getUuid() + " failed");
+ s_logger.error("DeallocateVmNuageVspCommand for VM " + vm.getUuid() + " failed");
if ((null != answer) && (null != answer.getDetails())) {
- logger.error(answer.getDetails());
+ s_logger.error(answer.getDetails());
}
}
} catch (InsufficientVirtualNetworkCapacityException e) {
- logger.error("Handling deallocate(). VM " + vm.getInstanceName() + " with NIC IP " + nic.getIPv4Address()
+ s_logger.error("Handling deallocate(). VM " + vm.getInstanceName() + " with NIC IP " + nic.getIPv4Address()
+ " is getting destroyed. REST API failed to update the VM state in NuageVsp", e);
}
super.deallocate(network, nic, vm);
@@ -321,7 +323,7 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
@Override
public boolean trash(Network network, NetworkOffering offering) {
- logger.debug("Handling trash() call back to delete the network " + network.getName() + " with uuid " + network.getUuid() + " from VSP");
+ s_logger.debug("Handling trash() call back to delete the network " + network.getName() + " with uuid " + network.getUuid() + " from VSP");
long domainId = network.getDomainId();
Domain domain = _domainDao.findById(domainId);
Long vpcId = network.getVpcId();
@@ -335,13 +337,13 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
TrashNetworkVspCommand cmd = new TrashNetworkVspCommand(domain.getUuid(), network.getUuid(), isL3Network(offering.getId()), vpcUuid);
TrashNetworkVspAnswer answer = (TrashNetworkVspAnswer)_agentMgr.easySend(nuageVspHost.getId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("TrashNetworkNuageVspCommand for network " + network.getUuid() + " failed");
+ s_logger.error("TrashNetworkNuageVspCommand for network " + network.getUuid() + " failed");
if ((null != answer) && (null != answer.getDetails())) {
- logger.error(answer.getDetails());
+ s_logger.error(answer.getDetails());
}
}
} catch (Exception e) {
- logger.warn("Failed to clean up network information in Vsp " + e.getMessage());
+ s_logger.warn("Failed to clean up network information in Vsp " + e.getMessage());
}
return super.trash(network, offering);
@@ -359,13 +361,13 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
Iterator<Long> ipIterator = allIPsInCidr.iterator();
long vip = ipIterator.next();
if (NetUtils.ip2Long(network.getGateway()) == vip) {
- logger.debug("Gateway of the Network(" + network.getUuid() + ") has the first IP " + NetUtils.long2Ip(vip));
+ s_logger.debug("Gateway of the Network(" + network.getUuid() + ") has the first IP " + NetUtils.long2Ip(vip));
vip = ipIterator.next();
virtualRouterIp = NetUtils.long2Ip(vip);
- logger.debug("So, reserving the 2nd IP " + virtualRouterIp + " for the Virtual Router IP in Network(" + network.getUuid() + ")");
+ s_logger.debug("So, reserving the 2nd IP " + virtualRouterIp + " for the Virtual Router IP in Network(" + network.getUuid() + ")");
} else {
virtualRouterIp = NetUtils.long2Ip(vip);
- logger.debug("1nd IP is not used as the gateway IP. So, reserving" + virtualRouterIp + " for the Virtual Router IP for " + "Network(" + network.getUuid() + ")");
+ s_logger.debug("1nd IP is not used as the gateway IP. So, reserving" + virtualRouterIp + " for the Virtual Router IP for " + "Network(" + network.getUuid() + ")");
}
addressRange.add(NetUtils.long2Ip(ipIterator.next()));
addressRange.add(NetUtils.long2Ip((Long)allIPsInCidr.toArray()[allIPsInCidr.size() - 1]));
@@ -388,7 +390,7 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
}
}
} catch (Exception e) {
- logger.error("Failed to parse the VM interface Json response from VSP REST API. VM interface json string is " + vmInterfacesDetails, e);
+ s_logger.error("Failed to parse the VM interface Json response from VSP REST API. VM interface json string is " + vmInterfacesDetails, e);
throw new InsufficientVirtualNetworkCapacityException("Failed to parse the VM interface Json response from VSP REST API. VM interface Json " + "string is "
+ vmInterfacesDetails + ". So. failed to get IP for the VM from VSP address for network " + network, Network.class, network.getId());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java b/plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java
index 0932057..fed970e 100644
--- a/plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java
+++ b/plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java
@@ -39,6 +39,7 @@ import org.apache.cloudstack.framework.config.Configurable;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.network.ExternalNetworkDeviceManager;
import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.commands.AddNuageVspDeviceCmd;
@@ -81,6 +82,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
@Local(value = {NuageVspManager.class})
public class NuageVspManagerImpl extends ManagerBase implements NuageVspManager, Configurable {
+ private static final Logger s_logger = Logger.getLogger(NuageVspManagerImpl.class);
private static final int ONE_MINUTE_MULTIPLIER = 60 * 1000;
@@ -288,7 +290,7 @@ public class NuageVspManagerImpl extends ManagerBase implements NuageVspManager,
try {
initNuageScheduledTasks();
} catch (Exception ce) {
- logger.warn("Failed to load NuageVsp configuration properties. Check if the NuageVsp properties are configured correctly");
+ s_logger.warn("Failed to load NuageVsp configuration properties. Check if the NuageVsp properties are configured correctly");
}
return true;
}
@@ -316,7 +318,7 @@ public class NuageVspManagerImpl extends ManagerBase implements NuageVspManager,
scheduler
.scheduleWithFixedDelay(new NuageVspSyncTask("ENTERPRISE"), ONE_MINUTE_MULTIPLIER * 15, ONE_MINUTE_MULTIPLIER * syncUpIntervalInMinutes, TimeUnit.MILLISECONDS);
} else {
- logger.warn("NuageVsp configuration for syncWorkers=" + numOfSyncThreads + " syncInterval=" + syncUpIntervalInMinutes
+ s_logger.warn("NuageVsp configuration for syncWorkers=" + numOfSyncThreads + " syncInterval=" + syncUpIntervalInMinutes
+ " could not be read properly. So, check if the properties are configured properly in global properties");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/NuageVspResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/NuageVspResource.java b/plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/NuageVspResource.java
index c4a3ff1..65c8ae9 100644
--- a/plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/NuageVspResource.java
+++ b/plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/NuageVspResource.java
@@ -32,6 +32,7 @@ import net.nuage.vsp.acs.client.NuageVspGuruClient;
import net.nuage.vsp.acs.client.NuageVspSyncClient;
import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
import com.cloud.agent.IAgentControl;
import com.cloud.agent.api.Answer;
@@ -69,6 +70,7 @@ import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.exception.CloudRuntimeException;
public class NuageVspResource extends ManagerBase implements ServerResource {
+ private static final Logger s_logger = Logger.getLogger(NuageVspResource.class);
private String _name;
private String _guid;
@@ -182,7 +184,7 @@ public class NuageVspResource extends ManagerBase implements ServerResource {
try {
login();
} catch (Exception e) {
- logger.error("Failed to login to Nuage VSD on " + name + " as user " + cmsUser + " Exception " + e.getMessage());
+ s_logger.error("Failed to login to Nuage VSD on " + name + " as user " + cmsUser + " Exception " + e.getMessage());
throw new CloudRuntimeException("Failed to login to Nuage VSD on " + name + " as user " + cmsUser, e);
}
@@ -217,7 +219,7 @@ public class NuageVspResource extends ManagerBase implements ServerResource {
} catch (Exception e) {
_isNuageVspClientLoaded = false;
String errorMessage = "Nuage Vsp Plugin client is not yet installed. Please install NuageVsp plugin client to use NuageVsp plugin in Cloudstack. ";
- logger.warn(errorMessage + e.getMessage());
+ s_logger.warn(errorMessage + e.getMessage());
throw new Exception(errorMessage);
}
@@ -259,13 +261,13 @@ public class NuageVspResource extends ManagerBase implements ServerResource {
@Override
public PingCommand getCurrentStatus(long id) {
if ((_relativePath == null) || (_relativePath.isEmpty()) || (_cmsUserInfo == null) || (_cmsUserInfo.length == 0)) {
- logger.error("Failed to ping to Nuage VSD");
+ s_logger.error("Failed to ping to Nuage VSD");
return null;
}
try {
login();
} catch (Exception e) {
- logger.error("Failed to ping to Nuage VSD on " + _name + " as user " + _cmsUserInfo[1] + " Exception " + e.getMessage());
+ s_logger.error("Failed to ping to Nuage VSD on " + _name + " as user " + _cmsUserInfo[1] + " Exception " + e.getMessage());
return null;
}
return new PingCommand(Host.Type.L2Networking, id);
@@ -304,7 +306,7 @@ public class NuageVspResource extends ManagerBase implements ServerResource {
else if (cmd instanceof SyncVspCommand) {
return executeRequest((SyncVspCommand)cmd);
}
- logger.debug("Received unsupported command " + cmd.toString());
+ s_logger.debug("Received unsupported command " + cmd.toString());
return Answer.createUnsupportedCommandAnswer(cmd);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightElement.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightElement.java
index ccb0b9d..05bc831 100644
--- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightElement.java
+++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightElement.java
@@ -28,6 +28,7 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import org.apache.cloudstack.network.opendaylight.agent.commands.StartupOpenDaylightControllerCommand;
@@ -61,6 +62,7 @@ import com.cloud.vm.VirtualMachineProfile;
@Local(value = {NetworkElement.class, ConnectivityProvider.class})
public class OpendaylightElement extends AdapterBase implements ConnectivityProvider, ResourceStateAdapter {
+ private static final Logger s_logger = Logger.getLogger(OpendaylightElement.class);
private static final Map<Service, Map<Capability, String>> s_capabilities = setCapabilities();
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightGuestNetworkGuru.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightGuestNetworkGuru.java
index 3553249..cbaa4d0 100644
--- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightGuestNetworkGuru.java
+++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightGuestNetworkGuru.java
@@ -24,6 +24,7 @@ import java.util.UUID;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
import org.apache.cloudstack.network.opendaylight.agent.commands.AddHypervisorCommand;
import org.apache.cloudstack.network.opendaylight.agent.commands.ConfigureNetworkCommand;
@@ -69,6 +70,7 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachineProfile;
public class OpendaylightGuestNetworkGuru extends GuestNetworkGuru {
+ private static final Logger s_logger = Logger.getLogger(OpendaylightGuestNetworkGuru.class);
@Inject
protected NetworkOfferingServiceMapDao ntwkOfferingSrvcDao;
@@ -94,7 +96,7 @@ public class OpendaylightGuestNetworkGuru extends GuestNetworkGuru {
&& ntwkOfferingSrvcDao.isProviderForNetworkOffering(offering.getId(), Provider.Opendaylight)) {
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;
}
}
@@ -104,17 +106,17 @@ public class OpendaylightGuestNetworkGuru extends GuestNetworkGuru {
PhysicalNetworkVO physnet = physicalNetworkDao.findById(plan.getPhysicalNetworkId());
DataCenter dc = _dcDao.findById(plan.getDataCenterId());
if (!canHandle(offering, dc.getNetworkType(), physnet)) {
- logger.debug("Refusing to design this network");
+ s_logger.debug("Refusing to design this network");
return null;
}
List<OpenDaylightControllerVO> devices = openDaylightControllerMappingDao.listByPhysicalNetwork(physnet.getId());
if (devices.isEmpty()) {
- logger.error("No Controller on physical network " + physnet.getName());
+ s_logger.error("No Controller on physical network " + physnet.getName());
return null;
}
- logger.debug("Controller " + devices.get(0).getUuid() + " found on physical network " + physnet.getId());
- logger.debug("Physical isolation type is ODL, asking GuestNetworkGuru to design this network");
+ s_logger.debug("Controller " + devices.get(0).getUuid() + " found on physical network " + physnet.getId());
+ s_logger.debug("Physical isolation type is ODL, asking GuestNetworkGuru to design this network");
NetworkVO networkObject = (NetworkVO)super.design(offering, plan, userSpecified, owner);
if (networkObject == null) {
@@ -159,7 +161,7 @@ public class OpendaylightGuestNetworkGuru extends GuestNetworkGuru {
List<OpenDaylightControllerVO> devices = openDaylightControllerMappingDao.listByPhysicalNetwork(physicalNetworkId);
if (devices.isEmpty()) {
- logger.error("No Controller on physical network " + physicalNetworkId);
+ s_logger.error("No Controller on physical network " + physicalNetworkId);
return null;
}
OpenDaylightControllerVO controller = devices.get(0);
@@ -168,13 +170,13 @@ public class OpendaylightGuestNetworkGuru extends GuestNetworkGuru {
ConfigureNetworkAnswer answer = (ConfigureNetworkAnswer)agentManager.easySend(controller.getHostId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("ConfigureNetworkCommand failed");
+ s_logger.error("ConfigureNetworkCommand failed");
return null;
}
implemented.setBroadcastUri(BroadcastDomainType.OpenDaylight.toUri(answer.getNetworkUuid()));
implemented.setBroadcastDomainType(BroadcastDomainType.OpenDaylight);
- logger.info("Implemented OK, network linked to = " + implemented.getBroadcastUri().toString());
+ s_logger.info("Implemented OK, network linked to = " + implemented.getBroadcastUri().toString());
return implemented;
}
@@ -189,7 +191,7 @@ public class OpendaylightGuestNetworkGuru extends GuestNetworkGuru {
List<OpenDaylightControllerVO> devices = openDaylightControllerMappingDao.listByPhysicalNetwork(physicalNetworkId);
if (devices.isEmpty()) {
- logger.error("No Controller on physical network " + physicalNetworkId);
+ s_logger.error("No Controller on physical network " + physicalNetworkId);
throw new InsufficientVirtualNetworkCapacityException("No OpenDaylight Controller configured for this network", dest.getPod().getId());
}
OpenDaylightControllerVO controller = devices.get(0);
@@ -197,7 +199,7 @@ public class OpendaylightGuestNetworkGuru extends GuestNetworkGuru {
AddHypervisorCommand addCmd = new AddHypervisorCommand(dest.getHost().getUuid(), dest.getHost().getPrivateIpAddress());
AddHypervisorAnswer addAnswer = (AddHypervisorAnswer)agentManager.easySend(controller.getHostId(), addCmd);
if (addAnswer == null || !addAnswer.getResult()) {
- logger.error("Failed to add " + dest.getHost().getName() + " as a node to the controller");
+ s_logger.error("Failed to add " + dest.getHost().getName() + " as a node to the controller");
throw new InsufficientVirtualNetworkCapacityException("Failed to add destination hypervisor to the OpenDaylight Controller", dest.getPod().getId());
}
@@ -206,7 +208,7 @@ public class OpendaylightGuestNetworkGuru extends GuestNetworkGuru {
ConfigurePortAnswer answer = (ConfigurePortAnswer)agentManager.easySend(controller.getHostId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("ConfigureNetworkCommand failed");
+ s_logger.error("ConfigureNetworkCommand failed");
throw new InsufficientVirtualNetworkCapacityException("Failed to configure the port on the OpenDaylight Controller", dest.getPod().getId());
}
@@ -223,7 +225,7 @@ public class OpendaylightGuestNetworkGuru extends GuestNetworkGuru {
List<OpenDaylightControllerVO> devices = openDaylightControllerMappingDao.listByPhysicalNetwork(physicalNetworkId);
if (devices.isEmpty()) {
- logger.error("No Controller on physical network " + physicalNetworkId);
+ s_logger.error("No Controller on physical network " + physicalNetworkId);
throw new CloudRuntimeException("No OpenDaylight controller on this physical network");
}
OpenDaylightControllerVO controller = devices.get(0);
@@ -232,7 +234,7 @@ public class OpendaylightGuestNetworkGuru extends GuestNetworkGuru {
DestroyPortAnswer answer = (DestroyPortAnswer)agentManager.easySend(controller.getHostId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("DestroyPortCommand failed");
+ s_logger.error("DestroyPortCommand failed");
success = false;
}
}
@@ -244,13 +246,13 @@ public class OpendaylightGuestNetworkGuru extends GuestNetworkGuru {
public void shutdown(NetworkProfile profile, NetworkOffering offering) {
NetworkVO networkObject = networkDao.findById(profile.getId());
if (networkObject.getBroadcastDomainType() != BroadcastDomainType.OpenDaylight || 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;
}
List<OpenDaylightControllerVO> devices = openDaylightControllerMappingDao.listByPhysicalNetwork(networkObject.getPhysicalNetworkId());
if (devices.isEmpty()) {
- logger.error("No Controller on physical network " + networkObject.getPhysicalNetworkId());
+ s_logger.error("No Controller on physical network " + networkObject.getPhysicalNetworkId());
return;
}
OpenDaylightControllerVO controller = devices.get(0);
@@ -259,7 +261,7 @@ public class OpendaylightGuestNetworkGuru extends GuestNetworkGuru {
DestroyNetworkAnswer answer = (DestroyNetworkAnswer)agentManager.easySend(controller.getHostId(), cmd);
if (answer == null || !answer.getResult()) {
- logger.error("DestroyNetworkCommand failed");
+ s_logger.error("DestroyNetworkCommand failed");
}
super.shutdown(profile, offering);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
index 66050ea..5ce4d93 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
@@ -28,6 +28,7 @@ import javax.naming.ConfigurationException;
import org.apache.cloudstack.network.topology.NetworkTopology;
import org.apache.cloudstack.network.topology.NetworkTopologyContext;
+import org.apache.log4j.Logger;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupOvsCommand;
@@ -106,6 +107,7 @@ StaticNatServiceProvider, IpDeployer {
@Inject
NetworkTopologyContext _networkTopologyContext;
+ private static final Logger s_logger = Logger.getLogger(OvsElement.class);
private static final Map<Service, Map<Capability, String>> capabilities = setCapabilities();
@Override
@@ -119,21 +121,21 @@ StaticNatServiceProvider, IpDeployer {
}
protected boolean canHandle(final Network network, final Service service) {
- logger.debug("Checking if OvsElement can handle service "
+ s_logger.debug("Checking if OvsElement can handle service "
+ service.getName() + " on network " + network.getDisplayText());
if (network.getBroadcastDomainType() != BroadcastDomainType.Vswitch) {
return false;
}
if (!_networkModel.isProviderForNetwork(getProvider(), network.getId())) {
- logger.debug("OvsElement is not a provider for network "
+ s_logger.debug("OvsElement is not a provider for network "
+ network.getDisplayText());
return false;
}
if (!_ntwkSrvcDao.canProviderSupportServiceInNetwork(network.getId(),
service, Network.Provider.Ovs)) {
- logger.debug("OvsElement can't provide the " + service.getName()
+ s_logger.debug("OvsElement can't provide the " + service.getName()
+ " service on network " + network.getDisplayText());
return false;
}
@@ -154,7 +156,7 @@ StaticNatServiceProvider, IpDeployer {
final DeployDestination dest, final ReservationContext context)
throws ConcurrentOperationException, ResourceUnavailableException,
InsufficientCapacityException {
- logger.debug("entering OvsElement implement function for network "
+ s_logger.debug("entering OvsElement implement function for network "
+ network.getDisplayText() + " (state " + network.getState()
+ ")");
@@ -252,7 +254,7 @@ StaticNatServiceProvider, IpDeployer {
@Override
public boolean verifyServicesCombination(final Set<Service> services) {
if (!services.contains(Service.Connectivity)) {
- logger.warn("Unable to provide services without Connectivity service enabled for this element");
+ s_logger.warn("Unable to provide services without Connectivity service enabled for this element");
return false;
}
@@ -441,7 +443,7 @@ StaticNatServiceProvider, IpDeployer {
List<DomainRouterVO> routers = _routerDao.listByNetworkAndRole(
network.getId(), Role.VIRTUAL_ROUTER);
if (routers == null || routers.isEmpty()) {
- logger.debug("Virtual router element doesn't need to associate ip addresses on the backend; virtual "
+ s_logger.debug("Virtual router element doesn't need to associate ip addresses on the backend; virtual "
+ "router doesn't exist in the network "
+ network.getId());
return true;
@@ -465,7 +467,7 @@ StaticNatServiceProvider, IpDeployer {
List<DomainRouterVO> routers = _routerDao.listByNetworkAndRole(
network.getId(), Role.VIRTUAL_ROUTER);
if (routers == null || routers.isEmpty()) {
- logger.debug("Ovs element doesn't need to apply static nat on the backend; virtual "
+ s_logger.debug("Ovs element doesn't need to apply static nat on the backend; virtual "
+ "router doesn't exist in the network " + network.getId());
return true;
}
@@ -485,7 +487,7 @@ StaticNatServiceProvider, IpDeployer {
List<DomainRouterVO> routers = _routerDao.listByNetworkAndRole(
network.getId(), Role.VIRTUAL_ROUTER);
if (routers == null || routers.isEmpty()) {
- logger.debug("Ovs element doesn't need to apply firewall rules on the backend; virtual "
+ s_logger.debug("Ovs element doesn't need to apply firewall rules on the backend; virtual "
+ "router doesn't exist in the network " + network.getId());
return true;
}
@@ -507,7 +509,7 @@ StaticNatServiceProvider, IpDeployer {
List<DomainRouterVO> routers = _routerDao.listByNetworkAndRole(
network.getId(), Role.VIRTUAL_ROUTER);
if (routers == null || routers.isEmpty()) {
- logger.debug("Virtual router elemnt doesn't need to apply firewall rules on the backend; virtual "
+ s_logger.debug("Virtual router elemnt doesn't need to apply firewall rules on the backend; virtual "
+ "router doesn't exist in the network "
+ network.getId());
return true;
@@ -557,7 +559,7 @@ StaticNatServiceProvider, IpDeployer {
if (schemeCaps != null) {
for (LoadBalancingRule rule : rules) {
if (!schemeCaps.contains(rule.getScheme().toString())) {
- logger.debug("Scheme " + rules.get(0).getScheme()
+ s_logger.debug("Scheme " + rules.get(0).getScheme()
+ " is not supported by the provider "
+ getName());
return false;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
index ca5b068..be49757 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
@@ -21,6 +21,7 @@ import com.cloud.network.vpc.dao.VpcDao;
import javax.ejb.Local;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import org.apache.cloudstack.context.CallContext;
@@ -55,6 +56,8 @@ import com.cloud.vm.VirtualMachineProfile;
@Component
@Local(value = NetworkGuru.class)
public class OvsGuestNetworkGuru extends GuestNetworkGuru {
+ private static final Logger s_logger = Logger
+ .getLogger(OvsGuestNetworkGuru.class);
@Inject
OvsTunnelManager _ovsTunnelMgr;
@@ -82,7 +85,7 @@ public class OvsGuestNetworkGuru extends GuestNetworkGuru {
offering.getId(), Service.Connectivity)) {
return true;
} else {
- logger.trace("We only take care of Guest networks of type "
+ s_logger.trace("We only take care of Guest networks of type "
+ GuestType.Isolated + " in zone of type "
+ NetworkType.Advanced);
return false;
@@ -97,7 +100,7 @@ public class OvsGuestNetworkGuru extends GuestNetworkGuru {
.getPhysicalNetworkId());
DataCenter dc = _dcDao.findById(plan.getDataCenterId());
if (!canHandle(offering, dc.getNetworkType(), physnet)) {
- logger.debug("Refusing to design this network");
+ s_logger.debug("Refusing to design this network");
return null;
}
NetworkVO config = (NetworkVO)super.design(offering, plan,
@@ -132,7 +135,7 @@ public class OvsGuestNetworkGuru extends GuestNetworkGuru {
.findById(physicalNetworkId);
if (!canHandle(offering, nwType, physnet)) {
- logger.debug("Refusing to design this network");
+ s_logger.debug("Refusing to design this network");
return null;
}
NetworkVO implemented = (NetworkVO)super.implement(network, offering,
@@ -181,13 +184,13 @@ public class OvsGuestNetworkGuru extends GuestNetworkGuru {
NetworkVO networkObject = _networkDao.findById(profile.getId());
if (networkObject.getBroadcastDomainType() != BroadcastDomainType.Vswitch
|| networkObject.getBroadcastUri() == null) {
- logger.warn("BroadcastUri is empty or incorrect for guestnetwork "
+ s_logger.warn("BroadcastUri is empty or incorrect for guestnetwork "
+ networkObject.getDisplayText());
return;
}
if (profile.getBroadcastDomainType() == BroadcastDomainType.Vswitch ) {
- logger.debug("Releasing vnet for the network id=" + profile.getId());
+ s_logger.debug("Releasing vnet for the network id=" + profile.getId());
_dcDao.releaseVnet(BroadcastDomainType.getValue(profile.getBroadcastUri()), profile.getDataCenterId(), profile.getPhysicalNetworkId(),
profile.getAccountId(), profile.getReservationId());
}