fix logger

Author: Pearl1594

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmIpAddressCommandWrapper.java

@@ -136,7 +136,7 @@ private Pair<String, String> getIpAddresses(String output, String macAddress) {
                 ipv6 = ipPart;
             }
         }
-        s_logger.debug(String.format("Found ipv4: %s and ipv6: %s with mac address %s", ipv4, ipv6, macAddress));
+        logger.debug(String.format("Found ipv4: %s and ipv6: %s with mac address %s", ipv4, ipv6, macAddress));
         return new Pair<>(ipv4, ipv6);
     }
 

plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupVMCommandWrapper.java

@@ -20,8 +20,6 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
-
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.CleanupVMCommand;
 import com.cloud.hypervisor.xenserver.resource.CitrixResourceBase;
@@ -34,12 +32,10 @@
 @ResourceWrapper(handles =  CleanupVMCommand.class)
 public class CitrixCleanupVMCommandWrapper extends CommandWrapper<CleanupVMCommand, Answer, CitrixResourceBase> {
 
-    private static final Logger s_logger = Logger.getLogger(CitrixCleanupVMCommandWrapper.class);
-
     @Override
     public Answer execute(final CleanupVMCommand command, final CitrixResourceBase citrixResourceBase) {
         if (citrixResourceBase.isDestroyHaltedVms()) {
-            s_logger.debug(String.format("Cleanup VM is not needed for host with version %s",
+            logger.debug(String.format("Cleanup VM is not needed for host with version %s",
                     citrixResourceBase.getHost().getProductVersion()));
             return new Answer(command);
         }
@@ -57,7 +53,7 @@ public Answer execute(final CleanupVMCommand command, final CitrixResourceBase c
                 final VM.Record vmr = vm.getRecord(conn);
                 if (!Types.VmPowerState.HALTED.equals(vmr.powerState)) {
                     final String msg = String.format("VM %s is not in %s state", vmName, Types.VmPowerState.HALTED);
-                    s_logger.error(msg);
+                    logger.error(msg);
                     return new Answer(command, false, msg);
                 }
                 if (citrixResourceBase.isRefNull(vmr.residentOn)) {
@@ -74,7 +70,7 @@ public Answer execute(final CleanupVMCommand command, final CitrixResourceBase c
 
         } catch (final Exception e) {
             final String msg = String.format("Clean up VM %s fail due to %s", vmName, e);
-            s_logger.error(msg, e);
+            logger.error(msg, e);
             return new Answer(command, false, e.getMessage());
         }
         return new Answer(command);

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java

@@ -300,7 +300,7 @@ public static String composeCloudNetworkName(String prefix, String vlanId, Strin
         String networkName = sb.toString();
         if (networkName.length() > 80) {
             // the maximum limit for a vSwitch name is 80 chars, applies to both standard and distributed virtual switches.
-            s_logger.warn(String.format("The network name: %s for the vSwitch %s of type %s, exceeds 80 chars", networkName, vSwitchName, vSwitchType));
+            LOGGER.warn(String.format("The network name: %s for the vSwitch %s of type %s, exceeds 80 chars", networkName, vSwitchName, vSwitchType));
         }
         return networkName;
     }