usb, lun 디바이스 할당/해제

Author: jeongda-young

core/src/main/java/com/cloud/resource/ServerResourceBase.java

@@ -19,6 +19,18 @@
 
 package com.cloud.resource;
 
+import com.cloud.agent.IAgentControl;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.ListHostDeviceAnswer;
+import com.cloud.agent.api.ListHostLunDeviceAnswer;
+import com.cloud.agent.api.ListHostUsbDeviceAnswer;
+import com.cloud.agent.api.StartupCommand;
+import com.cloud.agent.api.UpdateHostLunDeviceAnswer;
+import com.cloud.agent.api.UpdateHostUsbDeviceAnswer;
+import com.cloud.utils.net.NetUtils;
+import com.cloud.utils.script.OutputInterpreter;
+import com.cloud.utils.script.Script;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -36,28 +48,19 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-
 import javax.naming.ConfigurationException;
-
-import org.apache.cloudstack.storage.command.browser.ListRbdObjectsAnswer;
 import org.apache.cloudstack.storage.command.browser.ListDataStoreObjectsAnswer;
+import org.apache.cloudstack.storage.command.browser.ListRbdObjectsAnswer;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import com.cloud.agent.IAgentControl;
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.Command;
-import com.cloud.agent.api.ListHostDeviceAnswer;
-import com.cloud.agent.api.ListHostLunDeviceAnswer;
-import com.cloud.agent.api.ListHostUsbDeviceAnswer;
-import com.cloud.agent.api.StartupCommand;
-import com.cloud.agent.api.UpdateHostUsbDeviceAnswer;
-import com.cloud.utils.net.NetUtils;
-import com.cloud.utils.script.OutputInterpreter;
-import com.cloud.utils.script.Script;
+
+
+// import org.apache.cloudstack.storage.command.browser.ListRbdObjectsAnswer;
+
 // import com.cloud.agent.api.ListHostLunDeviceCommand;
 
 public abstract class ServerResourceBase implements ServerResource {
@@ -235,18 +238,17 @@ public Answer listHostLunDevices(Command command) {
                     String size = device.getString("size");
 
                     // 파티션 존재 여부 확인
-                    JSONArray children = device.optJSONArray("children");
-                    boolean hasPartition = (children != null && children.length() > 0);
+                    boolean hasPartition = hasPartitionRecursive(device);
 
                     StringBuilder info = new StringBuilder();
                     if (isMultipathActive && name.startsWith("/dev/disk/by-path/")) {
-                        info.append("Multipath LUN Device: ").append(name);
+                        // info.append("Multipath LUN Device: ").append(name);
                     } else {
-                        info.append("LUN Device: ").append(name);
+                        // info.append("LUN Device: ").append(name);
                     }
-                    info.append(" Size: ").append(size);
+                    info.append(size);
                     if (hasPartition) {
-                        info.append(" (").append(children.length()).append(" partitions)");
+                        info.append(" (").append(hasPartition ? "has partitions" : "no partitions").append(")");
                     }
 
                     hostDevicesNames.add(name);
@@ -274,6 +276,25 @@ private boolean checkMultipathStatus() {
         return "active".equals(result != null ? result.trim() : "");
     }
 
+    private boolean hasPartitionRecursive(JSONObject device) {
+        // children이 없으면 false
+        if (!device.has("children")) {
+            return false;
+        }
+        JSONArray children = device.getJSONArray("children");
+        for (int i = 0; i < children.length(); i++) {
+            JSONObject child = children.getJSONObject(i);
+            String type = child.optString("type", "");
+            if ("part".equals(type)) {
+                return true;
+            }
+            if (hasPartitionRecursive(child)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     protected Answer createImageRbd(String poolUuid, String skey, String authUserName, String host, String names, long sizes, String poolPath) {
         createRBDSecretKeyFileIfNoExist(poolUuid, DEFAULT_LOCAL_STORAGE_PATH, skey);
         String cmdout = Script.runSimpleBashScript("rbd -p " + poolPath + " --id " + authUserName + " -m " + host + " -K " + DEFAULT_LOCAL_STORAGE_PATH + poolUuid + " create -s " + (sizes * 1024) + " " + names);
@@ -626,6 +647,8 @@ protected Answer updateHostUsbDevices(Command command, String vmName, String xml
                 logger.info("Executing detach command for VM: {} with XML: {}", vmName, xmlConfig);
             }
 
+            logger.info("isAttach value: {}", isAttach);
+
             String result = virshCmd.execute();
 
             if (result != null) {
@@ -664,22 +687,24 @@ protected Answer updateHostLunDevices(Command command, String vmName, String xml
                 logger.info("Executing detach command for VM: {} with XML: {}", vmName, xmlConfig);
             }
 
+            logger.info("isAttach value: {}", isAttach);
+
             String result = virshCmd.execute();
 
             if (result != null) {
                 String action = isAttach ? "attach" : "detach";
                 logger.error("Failed to {} USB device: {}", action, result);
-                return new UpdateHostUsbDeviceAnswer(false, vmName, xmlConfig, isAttach);
+                return new UpdateHostLunDeviceAnswer(false, vmName, xmlConfig, isAttach);
             }
 
             String action = isAttach ? "attached to" : "detached from";
             logger.info("Successfully {} USB device for VM {}", action, vmName);
-            return new UpdateHostUsbDeviceAnswer(true, vmName, xmlConfig, isAttach);
+            return new UpdateHostLunDeviceAnswer(true, vmName, xmlConfig, isAttach);
 
         } catch (Exception e) {
             String action = isAttach ? "attaching" : "detaching";
             logger.error("Error {} USB device: {}", action, e.getMessage(), e);
-            return new UpdateHostUsbDeviceAnswer(false, vmName, xmlConfig, isAttach);
+            return new UpdateHostLunDeviceAnswer(false, vmName, xmlConfig, isAttach);
         }
     }
 }

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

@@ -4259,7 +4259,7 @@ private void createVif(final LibvirtVMDef vm, final VirtualMachineTO vmSpec, fin
             enableOVSDriver = true;
         }
 
-        if (!nic.isSecurityGroupEnabled() && !enableOVSDriver && nic.getNwfilter()) {
+        if (!nic.isSecurityGroupEnabled() && !enableOVSDriver) {
             interfaceDef.setFilterrefFilterTag();
         }
         if (vmSpec.getDetails() != null) {