http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index 38fb7fa..eb0ec55 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -36,6 +36,7 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; import com.vmware.vim25.AboutInfo; import com.vmware.vim25.ManagedObjectReference; @@ -124,6 +125,7 @@ import com.cloud.vm.DomainRouterVO; @Local(value = {VmwareManager.class, VmwareDatacenterService.class}) public class VmwareManagerImpl extends ManagerBase implements VmwareManager, VmwareStorageMount, Listener, VmwareDatacenterService { + private static final Logger s_logger = Logger.getLogger(VmwareManagerImpl.class); private static final int STARTUP_DELAY = 60000; // 60 seconds private static final long DEFAULT_HOST_SCAN_INTERVAL = 600000; // every 10 minutes @@ -201,10 +203,10 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw @Override public boolean configure(String name, Map<String, Object> params) throws ConfigurationException { - logger.info("Configure VmwareManagerImpl, manager name: " + name); + s_logger.info("Configure VmwareManagerImpl, manager name: " + name); if (!_configDao.isPremium()) { - logger.error("Vmware component can only run under premium distribution"); + s_logger.error("Vmware component can only run under premium distribution"); throw new ConfigurationException("Vmware component can only run under premium distribution"); } @@ -212,7 +214,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw if (_instance == null) { _instance = "DEFAULT"; } - logger.info("VmwareManagerImpl config - instance.name: " + _instance); + s_logger.info("VmwareManagerImpl config - instance.name: " + _instance); _mountParent = _configDao.getValue(Config.MountParent.key()); if (_mountParent == null) { @@ -222,7 +224,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw if (_instance != null) { _mountParent = _mountParent + File.separator + _instance; } - logger.info("VmwareManagerImpl config - _mountParent: " + _mountParent); + s_logger.info("VmwareManagerImpl config - _mountParent: " + _mountParent); String value = (String)params.get("scripts.timeout"); _timeout = NumbersUtil.parseInt(value, 1440) * 1000; @@ -266,20 +268,20 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw _additionalPortRangeStart = NumbersUtil.parseInt(_configDao.getValue(Config.VmwareAdditionalVncPortRangeStart.key()), 59000); if (_additionalPortRangeStart > 65535) { - logger.warn("Invalid port range start port (" + _additionalPortRangeStart + ") for additional VNC port allocation, reset it to default start port 59000"); + s_logger.warn("Invalid port range start port (" + _additionalPortRangeStart + ") for additional VNC port allocation, reset it to default start port 59000"); _additionalPortRangeStart = 59000; } _additionalPortRangeSize = NumbersUtil.parseInt(_configDao.getValue(Config.VmwareAdditionalVncPortRangeSize.key()), 1000); if (_additionalPortRangeSize < 0 || _additionalPortRangeStart + _additionalPortRangeSize > 65535) { - logger.warn("Invalid port range size (" + _additionalPortRangeSize + " for range starts at " + _additionalPortRangeStart); + s_logger.warn("Invalid port range size (" + _additionalPortRangeSize + " for range starts at " + _additionalPortRangeStart); _additionalPortRangeSize = Math.min(1000, 65535 - _additionalPortRangeStart); } _routerExtraPublicNics = NumbersUtil.parseInt(_configDao.getValue(Config.RouterExtraPublicNics.key()), 2); _vCenterSessionTimeout = NumbersUtil.parseInt(_configDao.getValue(Config.VmwareVcenterSessionTimeout.key()), 1200) * 1000; - logger.info("VmwareManagerImpl config - vmware.vcenter.session.timeout: " + _vCenterSessionTimeout); + s_logger.info("VmwareManagerImpl config - vmware.vcenter.session.timeout: " + _vCenterSessionTimeout); _recycleHungWorker = _configDao.getValue(Config.VmwareRecycleHungWorker.key()); if (_recycleHungWorker == null || _recycleHungWorker.isEmpty()) { @@ -291,17 +293,17 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw _rootDiskController = DiskControllerType.ide.toString(); } - logger.info("Additional VNC port allocation range is settled at " + _additionalPortRangeStart + " to " + (_additionalPortRangeStart + _additionalPortRangeSize)); + s_logger.info("Additional VNC port allocation range is settled at " + _additionalPortRangeStart + " to " + (_additionalPortRangeStart + _additionalPortRangeSize)); value = _configDao.getValue("vmware.host.scan.interval"); _hostScanInterval = NumbersUtil.parseLong(value, DEFAULT_HOST_SCAN_INTERVAL); - logger.info("VmwareManagerImpl config - vmware.host.scan.interval: " + _hostScanInterval); + s_logger.info("VmwareManagerImpl config - vmware.host.scan.interval: " + _hostScanInterval); ((VmwareStorageManagerImpl)_storageMgr).configure(params); _agentMgr.registerForHostEvents(this, true, true, true); - logger.info("VmwareManagerImpl has been successfully configured"); + s_logger.info("VmwareManagerImpl has been successfully configured"); return true; } @@ -319,7 +321,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw try { _hostScanScheduler.awaitTermination(3000, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { - logger.debug("[ignored] interupted while stopping<:/."); + s_logger.debug("[ignored] interupted while stopping<:/."); } shutdownCleanup(); @@ -360,7 +362,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw vlanId = mgmtTrafficLabelObj.getVlanId(); vSwitchType = mgmtTrafficLabelObj.getVirtualSwitchType().toString(); - logger.info("Preparing network on host " + hostMo.getContext().toString() + " for " + privateTrafficLabel); + s_logger.info("Preparing network on host " + hostMo.getContext().toString() + " for " + privateTrafficLabel); VirtualSwitchType vsType = VirtualSwitchType.getType(vSwitchType); //The management network is probably always going to be a physical network with islation type of vlans, so assume BroadcastDomainType VLAN if (VirtualSwitchType.StandardVirtualSwitch == vsType) { @@ -408,7 +410,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw int maxHostsPerCluster = _hvCapabilitiesDao.getMaxHostsPerCluster(HypervisorType.VMware, version); if (hosts.size() > maxHostsPerCluster) { String msg = "Failed to add VMware cluster as size is too big, current size: " + hosts.size() + ", max. size: " + maxHostsPerCluster; - logger.error(msg); + s_logger.error(msg); throw new DiscoveredWithErrorException(msg); } } @@ -427,12 +429,12 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw returnedHostList.add(mor); return returnedHostList; } else { - logger.error("Unsupport host type " + mor.getType() + ":" + mor.getValue() + " from inventory path: " + hostInventoryPath); + s_logger.error("Unsupport host type " + mor.getType() + ":" + mor.getValue() + " from inventory path: " + hostInventoryPath); return null; } } - logger.error("Unable to find host from inventory path: " + hostInventoryPath); + s_logger.error("Unable to find host from inventory path: " + hostInventoryPath); return null; } @@ -447,12 +449,12 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw if (secUrl == null) { // we are using non-NFS image store, then use cache storage instead - logger.info("Secondary storage is not NFS, we need to use staging storage"); + s_logger.info("Secondary storage is not NFS, we need to use staging storage"); DataStore cacheStore = _dataStoreMgr.getImageCacheStore(dcId); if (cacheStore != null) { secUrl = cacheStore.getUri(); } else { - logger.warn("No staging storage is found when non-NFS secondary storage is used"); + s_logger.warn("No staging storage is found when non-NFS secondary storage is used"); } } @@ -500,17 +502,17 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw @Override public boolean needRecycle(String workerTag) { - if (logger.isInfoEnabled()) - logger.info("Check to see if a worker VM with tag " + workerTag + " needs to be recycled"); + if (s_logger.isInfoEnabled()) + s_logger.info("Check to see if a worker VM with tag " + workerTag + " needs to be recycled"); if (workerTag == null || workerTag.isEmpty()) { - logger.error("Invalid worker VM tag " + workerTag); + s_logger.error("Invalid worker VM tag " + workerTag); return false; } String tokens[] = workerTag.split("-"); if (tokens.length != 3) { - logger.error("Invalid worker VM tag " + workerTag); + s_logger.error("Invalid worker VM tag " + workerTag); return false; } @@ -519,14 +521,14 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw long runid = Long.parseLong(tokens[2]); if (_mshostPeerDao.countStateSeenInPeers(msid, runid, ManagementServerHost.State.Down) > 0) { - if (logger.isInfoEnabled()) - logger.info("Worker VM's owner management server node has been detected down from peer nodes, recycle it"); + if (s_logger.isInfoEnabled()) + s_logger.info("Worker VM's owner management server node has been detected down from peer nodes, recycle it"); return true; } if (runid != _clusterMgr.getManagementRunId(msid)) { - if (logger.isInfoEnabled()) - logger.info("Worker VM's owner management server has changed runid, recycle it"); + if (s_logger.isInfoEnabled()) + s_logger.info("Worker VM's owner management server has changed runid, recycle it"); return true; } @@ -534,8 +536,8 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw // there are pending tasks on the subject VM /* if(System.currentTimeMillis() - startTick > _hungWorkerTimeout) { - if(logger.isInfoEnabled()) - logger.info("Worker VM expired, seconds elapsed: " + (System.currentTimeMillis() - startTick) / 1000); + if(s_logger.isInfoEnabled()) + s_logger.info("Worker VM expired, seconds elapsed: " + (System.currentTimeMillis() - startTick) / 1000); return true; } */ @@ -554,7 +556,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw if (!patchFolder.exists()) { if (!patchFolder.mkdirs()) { String msg = "Unable to create systemvm folder on secondary storage. location: " + patchFolder.toString(); - logger.error(msg); + s_logger.error(msg); throw new CloudRuntimeException(msg); } } @@ -562,23 +564,23 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw File srcIso = getSystemVMPatchIsoFile(); File destIso = new File(mountPoint + "/systemvm/" + getSystemVMIsoFileNameOnDatastore()); if (!destIso.exists()) { - logger.info("Inject SSH key pairs before copying systemvm.iso into secondary storage"); + s_logger.info("Inject SSH key pairs before copying systemvm.iso into secondary storage"); _configServer.updateKeyPairs(); - logger.info("Copy System VM patch ISO file to secondary storage. source ISO: " + srcIso.getAbsolutePath() + ", destination: " + + s_logger.info("Copy System VM patch ISO file to secondary storage. source ISO: " + srcIso.getAbsolutePath() + ", destination: " + destIso.getAbsolutePath()); try { FileUtil.copyfile(srcIso, destIso); } catch (IOException e) { - logger.error("Unexpected exception ", e); + s_logger.error("Unexpected exception ", e); String msg = "Unable to copy systemvm ISO on secondary storage. src location: " + srcIso.toString() + ", dest location: " + destIso; - logger.error(msg); + s_logger.error(msg); throw new CloudRuntimeException(msg); } } else { - if (logger.isTraceEnabled()) { - logger.trace("SystemVM ISO file " + destIso.getPath() + " already exists"); + if (s_logger.isTraceEnabled()) { + s_logger.trace("SystemVM ISO file " + destIso.getPath() + " already exists"); } } } finally { @@ -616,7 +618,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw assert (isoFile != null); if (!isoFile.exists()) { - logger.error("Unable to locate systemvm.iso in your setup at " + isoFile.toString()); + s_logger.error("Unable to locate systemvm.iso in your setup at " + isoFile.toString()); } return isoFile; } @@ -633,7 +635,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw } assert (keyFile != null); if (!keyFile.exists()) { - logger.error("Unable to locate id_rsa.cloud in your setup at " + keyFile.toString()); + s_logger.error("Unable to locate id_rsa.cloud in your setup at " + keyFile.toString()); } return keyFile; } @@ -664,12 +666,12 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw try { uri = new URI(storageUrl); } catch (URISyntaxException e) { - logger.error("Invalid storage URL format ", e); + s_logger.error("Invalid storage URL format ", e); throw new CloudRuntimeException("Unable to create mount point due to invalid storage URL format " + storageUrl); } mountPoint = mount(uri.getHost() + ":" + uri.getPath(), _mountParent); if (mountPoint == null) { - logger.error("Unable to create mount point for " + storageUrl); + s_logger.error("Unable to create mount point for " + storageUrl); return "/mnt/sec"; // throw new CloudRuntimeException("Unable to create mount point for " + storageUrl); } @@ -690,14 +692,14 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw break; } } - logger.error("Unable to create mount: " + mntPt); + s_logger.error("Unable to create mount: " + mntPt); } return mountPoint; } private void startupCleanup(String parent) { - logger.info("Cleanup mounted NFS mount points used in previous session"); + s_logger.info("Cleanup mounted NFS mount points used in previous session"); long mshostId = ManagementServerNode.getManagementServerId(); @@ -705,14 +707,14 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw List<String> mounts = _storage.listMountPointsByMsHost(parent, mshostId); if (mounts != null && !mounts.isEmpty()) { for (String mountPoint : mounts) { - logger.info("umount NFS mount from previous session: " + mountPoint); + s_logger.info("umount NFS mount from previous session: " + mountPoint); String result = null; - Script command = new Script(true, "umount", _timeout, logger); + Script command = new Script(true, "umount", _timeout, s_logger); command.add(mountPoint); result = command.execute(); if (result != null) { - logger.warn("Unable to umount " + mountPoint + " due to " + result); + s_logger.warn("Unable to umount " + mountPoint + " due to " + result); } File file = new File(mountPoint); if (file.exists()) { @@ -723,17 +725,17 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw } private void shutdownCleanup() { - logger.info("Cleanup mounted NFS mount points used in current session"); + s_logger.info("Cleanup mounted NFS mount points used in current session"); for (String mountPoint : _storageMounts.values()) { - logger.info("umount NFS mount: " + mountPoint); + s_logger.info("umount NFS mount: " + mountPoint); String result = null; - Script command = new Script(true, "umount", _timeout, logger); + Script command = new Script(true, "umount", _timeout, s_logger); command.add(mountPoint); result = command.execute(); if (result != null) { - logger.warn("Unable to umount " + mountPoint + " due to " + result); + s_logger.warn("Unable to umount " + mountPoint + " due to " + result); } File file = new File(mountPoint); if (file.exists()) { @@ -745,13 +747,13 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw protected String mount(String path, String parent) { String mountPoint = setupMountPoint(parent); if (mountPoint == null) { - logger.warn("Unable to create a mount point"); + s_logger.warn("Unable to create a mount point"); return null; } Script script = null; String result = null; - Script command = new Script(true, "mount", _timeout, logger); + Script command = new Script(true, "mount", _timeout, s_logger); command.add("-t", "nfs"); // command.add("-o", "soft,timeo=133,retrans=2147483647,tcp,acdirmax=0,acdirmin=0"); if ("Mac OS X".equalsIgnoreCase(System.getProperty("os.name"))) { @@ -761,7 +763,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw command.add(mountPoint); result = command.execute(); if (result != null) { - logger.warn("Unable to mount " + path + " due to " + result); + s_logger.warn("Unable to mount " + path + " due to " + result); File file = new File(mountPoint); if (file.exists()) { file.delete(); @@ -770,11 +772,11 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw } // Change permissions for the mountpoint - script = new Script(true, "chmod", _timeout, logger); + script = new Script(true, "chmod", _timeout, s_logger); script.add("1777", mountPoint); result = script.execute(); if (result != null) { - logger.warn("Unable to set permissions for " + mountPoint + " due to " + result); + s_logger.warn("Unable to set permissions for " + mountPoint + " due to " + result); } return mountPoint; } @@ -842,8 +844,8 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw protected final static int DEFAULT_DOMR_SSHPORT = 3922; protected boolean shutdownRouterVM(DomainRouterVO router) { - if (logger.isDebugEnabled()) { - logger.debug("Try to shutdown router VM " + router.getInstanceName() + " directly."); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Try to shutdown router VM " + router.getInstanceName() + " directly."); } Pair<Boolean, String> result; @@ -851,15 +853,15 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw result = SshHelper.sshExecute(router.getPrivateIpAddress(), DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "poweroff -f"); if (!result.first()) { - logger.debug("Unable to shutdown " + router.getInstanceName() + " directly"); + s_logger.debug("Unable to shutdown " + router.getInstanceName() + " directly"); return false; } } catch (Throwable e) { - logger.warn("Unable to shutdown router " + router.getInstanceName() + " directly."); + s_logger.warn("Unable to shutdown router " + router.getInstanceName() + " directly."); return false; } - if (logger.isDebugEnabled()) { - logger.debug("Shutdown router " + router.getInstanceName() + " successful."); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Shutdown router " + router.getInstanceName() + " successful."); } return true; } @@ -913,11 +915,11 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw long vsmId = 0; if (vsmMapVO != null) { vsmId = vsmMapVO.getVsmId(); - logger.info("vsmId is " + vsmId); + s_logger.info("vsmId is " + vsmId); nexusVSM = _nexusDao.findById(vsmId); - logger.info("Fetching nexus vsm credentials from database."); + s_logger.info("Fetching nexus vsm credentials from database."); } else { - logger.info("Found empty vsmMapVO."); + s_logger.info("Found empty vsmMapVO."); return null; } @@ -926,7 +928,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw nexusVSMCredentials.put("vsmip", nexusVSM.getipaddr()); nexusVSMCredentials.put("vsmusername", nexusVSM.getUserName()); nexusVSMCredentials.put("vsmpassword", nexusVSM.getPassword()); - logger.info("Successfully fetched the credentials of Nexus VSM."); + s_logger.info("Successfully fetched the credentials of Nexus VSM."); } return nexusVSMCredentials; } @@ -994,7 +996,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw Long associatedVmwareDcId = vmwareDcZoneMap.getVmwareDcId(); VmwareDatacenterVO associatedVmwareDc = _vmwareDcDao.findById(associatedVmwareDcId); if (associatedVmwareDc.getVcenterHost().equalsIgnoreCase(vCenterHost) && associatedVmwareDc.getVmwareDatacenterName().equalsIgnoreCase(vmwareDcName)) { - logger.info("Ignoring API call addVmwareDc, because VMware DC " + vCenterHost + "/" + vmwareDcName + + s_logger.info("Ignoring API call addVmwareDc, because VMware DC " + vCenterHost + "/" + vmwareDcName + " is already associated with specified zone with id " + zoneId); return associatedVmwareDc; } else { @@ -1028,7 +1030,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw dcMor = dcMo.getMor(); if (dcMor == null) { String msg = "Unable to find VMware DC " + vmwareDcName + " in vCenter " + vCenterHost + ". "; - logger.error(msg); + s_logger.error(msg); throw new InvalidParameterValueException(msg); } @@ -1125,7 +1127,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw dcMo = new DatacenterMO(context, vmwareDcName); } catch (Throwable t) { String msg = "Unable to find DC " + vmwareDcName + " in vCenter " + vCenterHost; - logger.error(msg); + s_logger.error(msg); throw new DiscoveryException(msg); } @@ -1133,10 +1135,10 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw // Reset custom field property cloud.zone over this DC dcMo.setCustomFieldValue(CustomFieldConstants.CLOUD_ZONE, "false"); - logger.info("Sucessfully reset custom field property cloud.zone over DC " + vmwareDcName); + s_logger.info("Sucessfully reset custom field property cloud.zone over DC " + vmwareDcName); } catch (Exception e) { String msg = "Unable to reset custom field property cloud.zone over DC " + vmwareDcName + " due to : " + VmwareHelper.getExceptionMessage(e); - logger.error(msg); + s_logger.error(msg); throw new CloudRuntimeException(msg); } finally { if (context != null) { @@ -1157,8 +1159,8 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw if (isLegacyZone(zoneId)) { throw new InvalidParameterValueException("The specified zone is legacy zone. Adding VMware datacenter to legacy zone is not supported."); } else { - if (logger.isTraceEnabled()) { - logger.trace("The specified zone is not legacy zone."); + if (s_logger.isTraceEnabled()) { + s_logger.trace("The specified zone is not legacy zone."); } } } @@ -1218,11 +1220,11 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw vsmMapVo = _vsmMapDao.findByClusterId(clusterId); if (vsmMapVo == null) { - logger.info("There is no instance of Nexus 1000v VSM associated with this cluster [Id:" + clusterId + "] yet."); + s_logger.info("There is no instance of Nexus 1000v VSM associated with this cluster [Id:" + clusterId + "] yet."); return false; } else { - logger.info("An instance of Nexus 1000v VSM [Id:" + vsmMapVo.getVsmId() + "] associated with this cluster [Id:" + clusterId + "]"); + s_logger.info("An instance of Nexus 1000v VSM [Id:" + vsmMapVo.getVsmId() + "] associated with this cluster [Id:" + clusterId + "]"); return true; } }
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java index beac489..136e442 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java @@ -20,6 +20,7 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; import com.cloud.agent.api.StartupCommand; import com.cloud.dc.ClusterDetailsDao; @@ -64,6 +65,7 @@ public abstract class CiscoNexusVSMDeviceManagerImpl extends AdapterBase { @Inject PortProfileDao _ppDao; + private static final org.apache.log4j.Logger s_logger = Logger.getLogger(ExternalLoadBalancerDeviceManagerImpl.class); @DB //public CiscoNexusVSMDeviceVO addCiscoNexusVSM(long clusterId, String ipaddress, String username, String password, ServerResource resource, String vsmName) { @@ -105,7 +107,7 @@ public abstract class CiscoNexusVSMDeviceManagerImpl extends AdapterBase { netconfClient = new NetconfHelper(ipaddress, username, password); } catch (CloudRuntimeException e) { String msg = "Failed to connect to Nexus VSM " + ipaddress + " with credentials of user " + username; - logger.error(msg); + s_logger.error(msg); throw new CloudRuntimeException(msg); } @@ -201,7 +203,7 @@ public abstract class CiscoNexusVSMDeviceManagerImpl extends AdapterBase { if (hosts != null && hosts.size() > 0) { for (Host host : hosts) { if (host.getType() == Host.Type.Routing) { - logger.info("Non-empty cluster with id" + clusterId + "still has a host that uses this VSM. Please empty the cluster first"); + s_logger.info("Non-empty cluster with id" + clusterId + "still has a host that uses this VSM. Please empty the cluster first"); throw new ResourceInUseException("Non-empty cluster with id" + clusterId + "still has a host that uses this VSM. Please empty the cluster first"); } @@ -265,7 +267,7 @@ public abstract class CiscoNexusVSMDeviceManagerImpl extends AdapterBase { public CiscoNexusVSMDeviceVO getCiscoVSMbyClusId(long clusterId) { ClusterVSMMapVO mapVO = _clusterVSMDao.findByClusterId(clusterId); if (mapVO == null) { - logger.info("Couldn't find a VSM associated with the specified cluster Id"); + s_logger.info("Couldn't find a VSM associated with the specified cluster Id"); return null; } // Else, pull out the VSM associated with the VSM id in mapVO. http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java b/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java index 5b03714..6951779 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java @@ -20,6 +20,7 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.network.CiscoNexusVSMDeviceVO; @@ -33,6 +34,7 @@ import com.cloud.utils.db.SearchCriteria.Op; @Local(value = CiscoNexusVSMDeviceDao.class) @DB public class CiscoNexusVSMDeviceDaoImpl extends GenericDaoBase<CiscoNexusVSMDeviceVO, Long> implements CiscoNexusVSMDeviceDao { + protected static final Logger s_logger = Logger.getLogger(CiscoNexusVSMDeviceDaoImpl.class); final SearchBuilder<CiscoNexusVSMDeviceVO> mgmtVlanIdSearch; final SearchBuilder<CiscoNexusVSMDeviceVO> domainIdSearch; final SearchBuilder<CiscoNexusVSMDeviceVO> nameSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java index 56bc816..81e4f86 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java @@ -25,6 +25,7 @@ import java.util.Set; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; import com.cloud.api.commands.DeleteCiscoNexusVSMCmd; import com.cloud.api.commands.DisableCiscoNexusVSMCmd; @@ -70,6 +71,7 @@ import com.cloud.vm.VirtualMachineProfile; @Local(value = NetworkElement.class) public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl implements CiscoNexusVSMElementService, NetworkElement, Manager { + private static final Logger s_logger = Logger.getLogger(CiscoNexusVSMElement.class); @Inject CiscoNexusVSMDeviceDao _vsmDao; @@ -146,7 +148,7 @@ public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl impleme try { result = deleteCiscoNexusVSM(cmd.getCiscoNexusVSMDeviceId()); } catch (ResourceInUseException e) { - logger.info("VSM could not be deleted"); + s_logger.info("VSM could not be deleted"); // TODO: Throw a better exception here. throw new CloudRuntimeException("Failed to delete specified VSM"); } @@ -265,7 +267,7 @@ public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl impleme netconfClient.disconnect(); } catch (CloudRuntimeException e) { String msg = "Invalid credentials supplied for user " + vsmUser + " for Cisco Nexus 1000v VSM at " + vsmIp; - logger.error(msg); + s_logger.error(msg); _clusterDao.remove(clusterId); throw new CloudRuntimeException(msg); } @@ -275,7 +277,7 @@ public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl impleme if (vsm != null) { List<ClusterVSMMapVO> clusterList = _clusterVSMDao.listByVSMId(vsm.getId()); if (clusterList != null && !clusterList.isEmpty()) { - logger.error("Failed to add cluster: specified Nexus VSM is already associated with another cluster"); + s_logger.error("Failed to add cluster: specified Nexus VSM is already associated with another cluster"); ResourceInUseException ex = new ResourceInUseException("Failed to add cluster: specified Nexus VSM is already associated with another cluster with specified Id"); // get clusterUuid to report error @@ -320,7 +322,7 @@ public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl impleme msg += "vsmpassword: Password of user account with admin privileges over Cisco Nexus 1000v dvSwitch. "; } } - logger.error(msg); + s_logger.error(msg); // Cleaning up the cluster record as addCluster operation failed because of invalid credentials of Nexus dvSwitch. _clusterDao.remove(clusterId); throw new CloudRuntimeException(msg); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/hypervisors/xenserver/src/com/cloud/ha/XenServerFencer.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xenserver/src/com/cloud/ha/XenServerFencer.java b/plugins/hypervisors/xenserver/src/com/cloud/ha/XenServerFencer.java index 7de7941..28cba2b 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/ha/XenServerFencer.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/ha/XenServerFencer.java @@ -23,6 +23,7 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -41,6 +42,7 @@ import com.cloud.vm.VirtualMachine; @Local(value = FenceBuilder.class) public class XenServerFencer extends AdapterBase implements FenceBuilder { + private static final Logger s_logger = Logger.getLogger(XenServerFencer.class); @Inject HostDao _hostDao; @@ -52,7 +54,7 @@ public class XenServerFencer extends AdapterBase implements FenceBuilder { @Override public Boolean fenceOff(VirtualMachine vm, Host host) { if (host.getHypervisorType() != HypervisorType.XenServer) { - logger.debug("Don't know how to fence non XenServer hosts " + host.getHypervisorType()); + s_logger.debug("Don't know how to fence non XenServer hosts " + host.getHypervisorType()); return null; } @@ -71,18 +73,18 @@ public class XenServerFencer extends AdapterBase implements FenceBuilder { try { Answer ans = _agentMgr.send(h.getId(), fence); if (!(ans instanceof FenceAnswer)) { - logger.debug("Answer is not fenceanswer. Result = " + ans.getResult() + "; Details = " + ans.getDetails()); + s_logger.debug("Answer is not fenceanswer. Result = " + ans.getResult() + "; Details = " + ans.getDetails()); continue; } answer = (FenceAnswer)ans; } catch (AgentUnavailableException e) { - if (logger.isDebugEnabled()) { - logger.debug("Moving on to the next host because " + h.toString() + " is unavailable"); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Moving on to the next host because " + h.toString() + " is unavailable"); } continue; } catch (OperationTimedoutException e) { - if (logger.isDebugEnabled()) { - logger.debug("Moving on to the next host because " + h.toString() + " is unavailable"); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Moving on to the next host because " + h.toString() + " is unavailable"); } continue; } @@ -92,8 +94,8 @@ public class XenServerFencer extends AdapterBase implements FenceBuilder { } } - if (logger.isDebugEnabled()) { - logger.debug("Unable to fence off " + vm.toString() + " on " + host.toString()); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Unable to fence off " + vm.toString() + " on " + host.toString()); } return false; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java index 3011914..3f1e52e 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java @@ -83,6 +83,7 @@ import com.xensource.xenapi.Types.UuidInvalid; import com.xensource.xenapi.Types.XenAPIException; import org.apache.cloudstack.hypervisor.xenserver.XenserverConfigs; +import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; import javax.ejb.Local; @@ -103,6 +104,7 @@ import java.util.Set; @Local(value = Discoverer.class) public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter { + private static final Logger s_logger = Logger.getLogger(XcpServerDiscoverer.class); protected String _publicNic; protected String _privateNic; protected String _storageNic1; @@ -161,16 +163,16 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L for(HostPatch patch : patches) { PoolPatch pp = patch.getPoolPatch(conn); if (pp != null && pp.equals(poolPatch) && patch.getApplied(conn)) { - logger.debug("host " + hostIp + " does have " + hotFixUuid +" Hotfix."); + s_logger.debug("host " + hostIp + " does have " + hotFixUuid +" Hotfix."); return true; } } } return false; } catch (UuidInvalid e) { - logger.debug("host " + hostIp + " doesn't have " + hotFixUuid + " Hotfix"); + s_logger.debug("host " + hostIp + " doesn't have " + hotFixUuid + " Hotfix"); } catch (Exception e) { - logger.debug("can't get patches information, consider it doesn't have " + hotFixUuid + " Hotfix"); + s_logger.debug("can't get patches information, consider it doesn't have " + hotFixUuid + " Hotfix"); } return false; } @@ -184,25 +186,25 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L Connection conn = null; if (!url.getScheme().equals("http")) { String msg = "urlString is not http so we're not taking care of the discovery for this: " + url; - logger.debug(msg); + s_logger.debug(msg); return null; } if (clusterId == null) { String msg = "must specify cluster Id when add host"; - logger.debug(msg); + s_logger.debug(msg); throw new RuntimeException(msg); } if (podId == null) { String msg = "must specify pod Id when add host"; - logger.debug(msg); + s_logger.debug(msg); throw new RuntimeException(msg); } ClusterVO cluster = _clusterDao.findById(clusterId); if (cluster == null || cluster.getHypervisorType() != HypervisorType.XenServer) { - if (logger.isInfoEnabled()) - logger.info("invalid cluster id or cluster is not for XenServer hypervisors"); + if (s_logger.isInfoEnabled()) + s_logger.info("invalid cluster id or cluster is not for XenServer hypervisors"); return null; } @@ -215,7 +217,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L conn = _connPool.getConnect(hostIp, username, pass); if (conn == null) { String msg = "Unable to get a connection to " + url; - logger.debug(msg); + s_logger.debug(msg); throw new DiscoveryException(msg); } @@ -241,7 +243,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L if (!clu.getGuid().equals(poolUuid)) { String msg = "Please join the host " + hostIp + " to XS pool " + clu.getGuid() + " through XC/XS before adding it through CS UI"; - logger.warn(msg); + s_logger.warn(msg); throw new DiscoveryException(msg); } } else { @@ -253,7 +255,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L try { Session.logout(conn); } catch (Exception e) { - logger.debug("Caught exception during logout", e); + s_logger.debug("Caught exception during logout", e); } conn.dispose(); conn = null; @@ -276,7 +278,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L if (!support_hvm) { String msg = "Unable to add host " + record.address + " because it doesn't support hvm"; _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, dcId, podId, msg, msg); - logger.debug(msg); + s_logger.debug(msg); throw new RuntimeException(msg); } } @@ -297,12 +299,12 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L String hostKernelVer = record.softwareVersion.get("linux"); if (_resourceMgr.findHostByGuid(record.uuid) != null) { - logger.debug("Skipping " + record.address + " because " + record.uuid + " is already in the database."); + s_logger.debug("Skipping " + record.address + " because " + record.uuid + " is already in the database."); continue; } CitrixResourceBase resource = createServerResource(dcId, podId, record, latestHotFix); - logger.info("Found host " + record.hostname + " ip=" + record.address + " product version=" + prodVersion); + s_logger.info("Found host " + record.hostname + " ip=" + record.address + " product version=" + prodVersion); Map<String, String> details = new HashMap<String, String>(); Map<String, Object> params = new HashMap<String, Object>(); @@ -353,7 +355,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L resource.configure("XenServer", params); } catch (ConfigurationException e) { _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, dcId, podId, "Unable to add " + record.address, "Error is " + e.getMessage()); - logger.warn("Unable to instantiate " + record.address, e); + s_logger.warn("Unable to instantiate " + record.address, e); continue; } resource.start(); @@ -362,16 +364,16 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L } catch (SessionAuthenticationFailed e) { throw new DiscoveredWithErrorException("Authentication error"); } catch (XenAPIException e) { - logger.warn("XenAPI exception", e); + s_logger.warn("XenAPI exception", e); return null; } catch (XmlRpcException e) { - logger.warn("Xml Rpc Exception", e); + s_logger.warn("Xml Rpc Exception", e); return null; } catch (UnknownHostException e) { - logger.warn("Unable to resolve the host name", e); + s_logger.warn("Unable to resolve the host name", e); return null; } catch (Exception e) { - logger.debug("other exceptions: " + e.toString(), e); + s_logger.debug("other exceptions: " + e.toString(), e); return null; } return resources; @@ -431,7 +433,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6, XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.0, 6.0.2, 6.1.0, 6.2.0, 6.5.0 but this one is " + prodBrand + " " + prodVersion; - logger.warn(msg); + s_logger.warn(msg); throw new RuntimeException(msg); } @@ -551,7 +553,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L StartupRoutingCommand startup = (StartupRoutingCommand)cmd; if (startup.getHypervisorType() != HypervisorType.XenServer) { - logger.debug("Not XenServer so moving on."); + s_logger.debug("Not XenServer so moving on."); return; } @@ -563,7 +565,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L _clusterDao.update(cluster.getId(), cluster); } else if (!cluster.getGuid().equals(startup.getPool())) { String msg = "pool uuid for cluster " + cluster.getId() + " changed from " + cluster.getGuid() + " to " + startup.getPool(); - logger.warn(msg); + s_logger.warn(msg); throw new CloudRuntimeException(msg); } @@ -577,15 +579,15 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L if (!resource.equals(host.getResource())) { String msg = "host " + host.getPrivateIpAddress() + " changed from " + host.getResource() + " to " + resource; - logger.debug(msg); + s_logger.debug(msg); host.setResource(resource); host.setSetup(false); _hostDao.update(agentId, host); throw new HypervisorVersionChangedException(msg); } - if (logger.isDebugEnabled()) { - logger.debug("Setting up host " + agentId); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Setting up host " + agentId); } HostEnvironment env = new HostEnvironment(); @@ -609,12 +611,12 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L } return; } else { - logger.warn("Unable to setup agent " + agentId + " due to " + ((answer != null) ? answer.getDetails() : "return null")); + s_logger.warn("Unable to setup agent " + agentId + " due to " + ((answer != null) ? answer.getDetails() : "return null")); } } catch (AgentUnavailableException e) { - logger.warn("Unable to setup agent " + agentId + " because it became unavailable.", e); + s_logger.warn("Unable to setup agent " + agentId + " because it became unavailable.", e); } catch (OperationTimedoutException e) { - logger.warn("Unable to setup agent " + agentId + " because it timed out", e); + s_logger.warn("Unable to setup agent " + agentId + " because it timed out", e); } throw new ConnectionException(true, "Reinitialize agent after setup."); } @@ -654,7 +656,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L HostPodVO pod = _podDao.findById(host.getPodId()); DataCenterVO dc = _dcDao.findById(host.getDataCenterId()); - logger.info("Host: " + host.getName() + " connected with hypervisor type: " + HypervisorType.XenServer + ". Checking CIDR..."); + s_logger.info("Host: " + host.getName() + " connected with hypervisor type: " + HypervisorType.XenServer + ". Checking CIDR..."); _resourceMgr.checkCIDR(pod, dc, ssCmd.getPrivateIpAddress(), ssCmd.getPrivateNetmask()); return _resourceMgr.fillRoutingHostVO(host, ssCmd, HypervisorType.XenServer, details, hostTags); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/bigswitch/src/com/cloud/network/element/BigSwitchBcfElement.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/element/BigSwitchBcfElement.java b/plugins/network-elements/bigswitch/src/com/cloud/network/element/BigSwitchBcfElement.java index 5311ff5..dba9de2 100644 --- a/plugins/network-elements/bigswitch/src/com/cloud/network/element/BigSwitchBcfElement.java +++ b/plugins/network-elements/bigswitch/src/com/cloud/network/element/BigSwitchBcfElement.java @@ -30,6 +30,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.ExternalNetworkDeviceManager.NetworkDevice; import org.apache.commons.net.util.SubnetUtils; @@ -131,6 +132,7 @@ import com.cloud.vm.dao.VMInstanceDao; public class BigSwitchBcfElement extends AdapterBase implements BigSwitchBcfElementService, ConnectivityProvider, IpDeployer, SourceNatServiceProvider, StaticNatServiceProvider, NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter { + private static final Logger s_logger = Logger.getLogger(BigSwitchBcfElement.class); private static final Map<Service, Map<Capability, String>> capabilities = setCapabilities(); @@ -196,18 +198,18 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter { } private boolean canHandle(Network network, Service service) { - logger.debug("Checking if BigSwitchBcfElement can handle service " + service.getName() + " on network " + network.getDisplayText()); + s_logger.debug("Checking if BigSwitchBcfElement can handle service " + service.getName() + " on network " + network.getDisplayText()); if (network.getBroadcastDomainType() != BroadcastDomainType.Vlan) { return false; } if (!_networkModel.isProviderForNetwork(getProvider(), network.getId())) { - logger.debug("BigSwitchBcfElement is not a provider for network " + network.getDisplayText()); + s_logger.debug("BigSwitchBcfElement is not a provider for network " + network.getDisplayText()); return false; } if (!_ntwkSrvcDao.canProviderSupportServiceInNetwork(network.getId(), service, BcfConstants.BIG_SWITCH_BCF)) { - logger.debug("BigSwitchBcfElement can't provide the " + service.getName() + " service on network " + network.getDisplayText()); + s_logger.debug("BigSwitchBcfElement can't provide the " + service.getName() + " service on network " + network.getDisplayText()); return false; } @@ -300,7 +302,7 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter { } if (network.getBroadcastUri() == null) { - logger.error("Nic has no broadcast Uri"); + s_logger.error("Nic has no broadcast Uri"); return false; } @@ -358,7 +360,7 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter { @Override public boolean verifyServicesCombination(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; } return true; @@ -644,14 +646,14 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter { String dstIp = rule.getDestIpAddress(); String mac = rule.getSourceMacAddress(); if(!rule.isForRevoke()) { - logger.debug("BCF enables static NAT for public IP: " + srcIp + " private IP " + dstIp + s_logger.debug("BCF enables static NAT for public IP: " + srcIp + " private IP " + dstIp + " mac " + mac); CreateBcfStaticNatCommand cmd = new CreateBcfStaticNatCommand( tenantId, network.getUuid(), dstIp, srcIp, mac); _bcfUtils.sendBcfCommandWithNetworkSyncCheck(cmd, network); } else { - logger.debug("BCF removes static NAT for public IP: " + srcIp + " private IP " + dstIp + s_logger.debug("BCF removes static NAT for public IP: " + srcIp + " private IP " + dstIp + " mac " + mac); DeleteBcfStaticNatCommand cmd = new DeleteBcfStaticNatCommand(tenantId, srcIp); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/bigswitch/src/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java b/plugins/network-elements/bigswitch/src/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java index 2d13b42..e205f47 100644 --- a/plugins/network-elements/bigswitch/src/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java +++ b/plugins/network-elements/bigswitch/src/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java @@ -26,6 +26,7 @@ import javax.inject.Inject; import org.apache.cloudstack.context.CallContext; import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.api.CreateBcfAttachmentCommand; @@ -91,6 +92,7 @@ import com.cloud.vm.dao.VMInstanceDao; */ @Local(value = NetworkGuru.class) public class BigSwitchBcfGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigrationResponder { + private static final Logger s_logger = Logger.getLogger(BigSwitchBcfGuestNetworkGuru.class); @Inject PhysicalNetworkDao _physicalNetworkDao; @@ -138,7 +140,7 @@ public class BigSwitchBcfGuestNetworkGuru extends GuestNetworkGuru implements Ne 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; } } @@ -148,21 +150,21 @@ public class BigSwitchBcfGuestNetworkGuru extends GuestNetworkGuru implements Ne // Check if the isolation type of the physical network is BCF_SEGMENT, then delegate GuestNetworkGuru to design PhysicalNetworkVO physnet = _physicalNetworkDao.findById(plan.getPhysicalNetworkId()); if (physnet == null || physnet.getIsolationMethods() == null || !physnet.getIsolationMethods().contains("BCF_SEGMENT")) { - logger.debug("Refusing to design this network, the physical isolation type is not BCF_SEGMENT"); + s_logger.debug("Refusing to design this network, the physical isolation type is not BCF_SEGMENT"); return null; } List<BigSwitchBcfDeviceVO> devices = _bigswitchBcfDao.listByPhysicalNetwork(physnet.getId()); if (devices.isEmpty()) { - logger.error("No BigSwitch Controller on physical network " + physnet.getName()); + s_logger.error("No BigSwitch Controller on physical network " + physnet.getName()); return null; } for (BigSwitchBcfDeviceVO d: devices){ - logger.debug("BigSwitch Controller " + d.getUuid() + s_logger.debug("BigSwitch Controller " + d.getUuid() + " found on physical network " + physnet.getId()); } - logger.debug("Physical isolation type is BCF_SEGMENT, asking GuestNetworkGuru to design this network"); + s_logger.debug("Physical isolation type is BCF_SEGMENT, asking GuestNetworkGuru to design this network"); NetworkVO networkObject = (NetworkVO)super.design(offering, plan, userSpecified, owner); if (networkObject == null) { return null; @@ -310,7 +312,7 @@ public class BigSwitchBcfGuestNetworkGuru extends GuestNetworkGuru implements Ne public void shutdown(NetworkProfile profile, NetworkOffering offering) { NetworkVO networkObject = _networkDao.findById(profile.getId()); if (networkObject.getBroadcastDomainType() != BroadcastDomainType.Vlan || 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; } @@ -354,7 +356,7 @@ public class BigSwitchBcfGuestNetworkGuru extends GuestNetworkGuru implements Ne tenantId = vpc.getUuid(); tenantName = vpc.getName(); boolean released = _vpcDao.releaseFromLockTable(vpc.getId()); - logger.debug("BCF guru release lock vpc id: " + vpc.getId() + s_logger.debug("BCF guru release lock vpc id: " + vpc.getId() + " released? " + released); } else { // use network id in CS as tenant in BSN @@ -400,14 +402,14 @@ public class BigSwitchBcfGuestNetworkGuru extends GuestNetworkGuru implements Ne public void rollbackMigration(NicProfile nic, Network network, VirtualMachineProfile vm, ReservationContext src, ReservationContext dst) { - logger.debug("BCF guru rollback migration"); + s_logger.debug("BCF guru rollback migration"); } @Override public void commitMigration(NicProfile nic, Network network, VirtualMachineProfile vm, ReservationContext src, ReservationContext dst) { - logger.debug("BCF guru commit migration"); + s_logger.debug("BCF guru commit migration"); } private void bcfUtilsInit(){ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/bigswitch/src/com/cloud/network/resource/BigSwitchBcfResource.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/resource/BigSwitchBcfResource.java b/plugins/network-elements/bigswitch/src/com/cloud/network/resource/BigSwitchBcfResource.java index dcc8326..a43cad3 100644 --- a/plugins/network-elements/bigswitch/src/com/cloud/network/resource/BigSwitchBcfResource.java +++ b/plugins/network-elements/bigswitch/src/com/cloud/network/resource/BigSwitchBcfResource.java @@ -25,6 +25,7 @@ import java.util.Map; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; import com.cloud.agent.IAgentControl; import com.cloud.agent.api.Answer; @@ -69,6 +70,7 @@ import com.cloud.resource.ServerResource; import com.cloud.utils.component.ManagerBase; public class BigSwitchBcfResource extends ManagerBase implements ServerResource { + private static final Logger s_logger = Logger.getLogger(BigSwitchBcfResource.class); private String _name; private String _guid; @@ -174,20 +176,20 @@ public class BigSwitchBcfResource extends ManagerBase implements ServerResource try{ executeRequest(new SyncBcfTopologyCommand(true, true), _numRetries); } catch(Exception e){ - logger.error("BigSwitch BCF sync error", e); + s_logger.error("BigSwitch BCF sync error", e); } } else { try{ executeRequest(new SyncBcfTopologyCommand(true, false), _numRetries); } catch (Exception e){ - logger.error("BigSwitch BCF sync error", e); + s_logger.error("BigSwitch BCF sync error", e); } } } try { ControlClusterStatus ccs = _bigswitchBcfApi.getControlClusterStatus(); if (!ccs.getStatus()) { - logger.error("ControlCluster state is not ready: " + ccs.getStatus()); + s_logger.error("ControlCluster state is not ready: " + ccs.getStatus()); return null; } if (ccs.isTopologySyncRequested()) { @@ -198,11 +200,11 @@ public class BigSwitchBcfResource extends ManagerBase implements ServerResource executeRequest(new SyncBcfTopologyCommand(true, false), _numRetries); } } else { - logger.debug("topology sync needed but no topology history"); + s_logger.debug("topology sync needed but no topology history"); } } } catch (BigSwitchBcfApiException e) { - logger.error("getControlClusterStatus failed", e); + s_logger.error("getControlClusterStatus failed", e); return null; } try { @@ -220,7 +222,7 @@ public class BigSwitchBcfResource extends ManagerBase implements ServerResource } } catch (BigSwitchBcfApiException e) { - logger.error("getCapabilities failed", e); + s_logger.error("getCapabilities failed", e); } return new PingCommand(Host.Type.L2Networking, id); } @@ -272,7 +274,7 @@ public class BigSwitchBcfResource extends ManagerBase implements ServerResource } else if (cmd instanceof GetControllerDataCommand) { return executeRequest((GetControllerDataCommand)cmd, numRetries); } - logger.debug("Received unsupported command " + cmd.toString()); + s_logger.debug("Received unsupported command " + cmd.toString()); return Answer.createUnsupportedCommandAnswer(cmd); } @@ -573,7 +575,7 @@ public class BigSwitchBcfResource extends ManagerBase implements ServerResource } private Answer retry(Command cmd, int numRetries) { - logger.warn("Retrying " + cmd.getClass().getSimpleName() + ". Number of retries remaining: " + numRetries); + s_logger.warn("Retrying " + cmd.getClass().getSimpleName() + ". Number of retries remaining: " + numRetries); return executeRequest(cmd, numRetries); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/brocade-vcs/src/com/cloud/network/element/BrocadeVcsElement.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/element/BrocadeVcsElement.java b/plugins/network-elements/brocade-vcs/src/com/cloud/network/element/BrocadeVcsElement.java index 29e4d60..b551092 100644 --- a/plugins/network-elements/brocade-vcs/src/com/cloud/network/element/BrocadeVcsElement.java +++ b/plugins/network-elements/brocade-vcs/src/com/cloud/network/element/BrocadeVcsElement.java @@ -30,6 +30,7 @@ import javax.naming.ConfigurationException; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; @@ -93,6 +94,7 @@ import com.cloud.vm.dao.NicDao; @Component @Local(value = {NetworkElement.class}) public class BrocadeVcsElement extends AdapterBase implements NetworkElement, ResourceStateAdapter, BrocadeVcsElementService { + private static final Logger s_logger = Logger.getLogger(BrocadeVcsElement.class); private static final Map<Service, Map<Capability, String>> capabilities = setCapabilities(); @@ -138,18 +140,18 @@ public class BrocadeVcsElement extends AdapterBase implements NetworkElement, Re } protected boolean canHandle(Network network, Service service) { - logger.debug("Checking if BrocadeVcsElement can handle service " + service.getName() + " on network " + network.getDisplayText()); + s_logger.debug("Checking if BrocadeVcsElement can handle service " + service.getName() + " on network " + network.getDisplayText()); if (network.getBroadcastDomainType() != BroadcastDomainType.Vcs) { return false; } if (!_networkModel.isProviderForNetwork(getProvider(), network.getId())) { - logger.debug("BrocadeVcsElement is not a provider for network " + network.getDisplayText()); + s_logger.debug("BrocadeVcsElement is not a provider for network " + network.getDisplayText()); return false; } if (!_ntwkSrvcDao.canProviderSupportServiceInNetwork(network.getId(), service, Network.Provider.BrocadeVcs)) { - logger.debug("BrocadeVcsElement can't provide the " + service.getName() + " service on network " + network.getDisplayText()); + s_logger.debug("BrocadeVcsElement can't provide the " + service.getName() + " service on network " + network.getDisplayText()); return false; } @@ -166,7 +168,7 @@ public class BrocadeVcsElement extends AdapterBase implements NetworkElement, Re @Override public boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { - logger.debug("entering BrocadeVcsElement implement function for network " + network.getDisplayText() + " (state " + network.getState() + ")"); + s_logger.debug("entering BrocadeVcsElement implement function for network " + network.getDisplayText() + " (state " + network.getState() + ")"); if (!canHandle(network, Service.Connectivity)) { return false; @@ -234,7 +236,7 @@ public class BrocadeVcsElement extends AdapterBase implements NetworkElement, Re public boolean verifyServicesCombination(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; } return true; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/plugins/network-elements/brocade-vcs/src/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java b/plugins/network-elements/brocade-vcs/src/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java index c079a9e..92bf113 100644 --- a/plugins/network-elements/brocade-vcs/src/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java +++ b/plugins/network-elements/brocade-vcs/src/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java @@ -21,6 +21,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.AssociateMacToNetworkAnswer; @@ -64,6 +65,7 @@ import com.cloud.vm.VirtualMachineProfile; @Local(value = NetworkGuru.class) public class BrocadeVcsGuestNetworkGuru extends GuestNetworkGuru { + private static final Logger s_logger = Logger.getLogger(BrocadeVcsGuestNetworkGuru.class); @Inject NetworkOfferingServiceMapDao _ntwkOfferingSrvcDao; @@ -92,7 +94,7 @@ public class BrocadeVcsGuestNetworkGuru 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; } } @@ -103,10 +105,10 @@ public class BrocadeVcsGuestNetworkGuru 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; } - logger.debug("Physical isolation type is VCS, asking GuestNetworkGuru to design this network"); + s_logger.debug("Physical isolation type is VCS, asking GuestNetworkGuru to design this network"); NetworkVO networkObject = (NetworkVO)super.design(offering, plan, userSpecified, owner); if (networkObject == null) { return null; @@ -131,7 +133,7 @@ public class BrocadeVcsGuestNetworkGuru extends GuestNetworkGuru { List<BrocadeVcsDeviceVO> devices = _brocadeVcsDao.listByPhysicalNetwork(physicalNetworkId); if (devices.isEmpty()) { - logger.error("No Brocade VCS Switch on physical network " + physicalNetworkId); + s_logger.error("No Brocade VCS Switch on physical network " + physicalNetworkId); return null; } @@ -143,8 +145,8 @@ public class BrocadeVcsGuestNetworkGuru extends GuestNetworkGuru { CreateNetworkAnswer answer = (CreateNetworkAnswer)_agentMgr.easySend(brocadeVcsHost.getId(), cmd); if (answer == null || !answer.getResult()) { - logger.error("CreateNetworkCommand failed"); - logger.error("Unable to create network " + network.getId()); + s_logger.error("CreateNetworkCommand failed"); + s_logger.error("Unable to create network " + network.getId()); return null; } @@ -168,7 +170,7 @@ public class BrocadeVcsGuestNetworkGuru extends GuestNetworkGuru { List<BrocadeVcsDeviceVO> devices = _brocadeVcsDao.listByPhysicalNetwork(network.getPhysicalNetworkId()); if (devices.isEmpty()) { - logger.error("No Brocade VCS Switch on physical network " + network.getPhysicalNetworkId()); + s_logger.error("No Brocade VCS Switch on physical network " + network.getPhysicalNetworkId()); return; } for (BrocadeVcsDeviceVO brocadeVcsDevice : devices) { @@ -180,7 +182,7 @@ public class BrocadeVcsGuestNetworkGuru extends GuestNetworkGuru { AssociateMacToNetworkAnswer answer = (AssociateMacToNetworkAnswer)_agentMgr.easySend(brocadeVcsHost.getId(), cmd); if (answer == null || !answer.getResult()) { - logger.error("AssociateMacToNetworkCommand failed"); + s_logger.error("AssociateMacToNetworkCommand failed"); throw new InsufficientVirtualNetworkCapacityException("Unable to associate mac " + interfaceMac + " to network " + network.getId(), DataCenter.class, dc.getId()); } } @@ -194,7 +196,7 @@ public class BrocadeVcsGuestNetworkGuru extends GuestNetworkGuru { List<BrocadeVcsDeviceVO> devices = _brocadeVcsDao.listByPhysicalNetwork(network.getPhysicalNetworkId()); if (devices.isEmpty()) { - logger.error("No Brocade VCS Switch on physical network " + network.getPhysicalNetworkId()); + s_logger.error("No Brocade VCS Switch on physical network " + network.getPhysicalNetworkId()); return; } for (BrocadeVcsDeviceVO brocadeVcsDevice : devices) { @@ -205,8 +207,8 @@ public class BrocadeVcsGuestNetworkGuru extends GuestNetworkGuru { DisassociateMacFromNetworkAnswer answer = (DisassociateMacFromNetworkAnswer)_agentMgr.easySend(brocadeVcsHost.getId(), cmd); if (answer == null || !answer.getResult()) { - logger.error("DisassociateMacFromNetworkCommand failed"); - logger.error("Unable to disassociate mac " + interfaceMac + " from network " + network.getId()); + s_logger.error("DisassociateMacFromNetworkCommand failed"); + s_logger.error("Unable to disassociate mac " + interfaceMac + " from network " + network.getId()); return; } } @@ -234,13 +236,13 @@ public class BrocadeVcsGuestNetworkGuru extends GuestNetworkGuru { if (brocadeVcsNetworkVlanMapping != null) { vlanTag = brocadeVcsNetworkVlanMapping.getVlanId(); } else { - logger.error("Not able to find vlanId for network " + network.getId()); + s_logger.error("Not able to find vlanId for network " + network.getId()); return false; } List<BrocadeVcsDeviceVO> devices = _brocadeVcsDao.listByPhysicalNetwork(network.getPhysicalNetworkId()); if (devices.isEmpty()) { - logger.error("No Brocade VCS Switch on physical network " + network.getPhysicalNetworkId()); + s_logger.error("No Brocade VCS Switch on physical network " + network.getPhysicalNetworkId()); return false; } for (BrocadeVcsDeviceVO brocadeVcsDevice : devices) { @@ -251,8 +253,8 @@ public class BrocadeVcsGuestNetworkGuru extends GuestNetworkGuru { DeleteNetworkAnswer answer = (DeleteNetworkAnswer)_agentMgr.easySend(brocadeVcsHost.getId(), cmd); if (answer == null || !answer.getResult()) { - logger.error("DeleteNetworkCommand failed"); - logger.error("Unable to delete network " + network.getId()); + s_logger.error("DeleteNetworkCommand failed"); + s_logger.error("Unable to delete network " + network.getId()); return false; } }
