vhba 수정2

Author: jeongda-young

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

@@ -296,7 +296,7 @@ private boolean hasPartitionRecursive(JSONObject device) {
     protected Answer listHostHbaDevices(Command command) {
         List<String> hostDevicesText = new ArrayList<>();
         List<String> hostDevicesNames = new ArrayList<>();
-        
+
         // 물리 HBA 장치 조회
         Script listCommand = new Script("/bin/bash");
         listCommand.add("-c");
@@ -313,15 +313,15 @@ protected Answer listHostHbaDevices(Command command) {
                 }
             }
         }
-        
+
         // vHBA 장치 조회 (KVM 환경)
         try {
             Script vhbaCommand = new Script("/bin/bash");
             vhbaCommand.add("-c");
             vhbaCommand.add("virsh nodedev-list | grep vhba");
             OutputInterpreter.AllLinesParser vhbaParser = new OutputInterpreter.AllLinesParser();
             String vhbaResult = vhbaCommand.execute(vhbaParser);
-            
+
             if (vhbaResult == null && vhbaParser.getLines() != null) {
                 String[] vhbaLines = vhbaParser.getLines().split("\\n");
                 for (String vhbaLine : vhbaLines) {
@@ -333,7 +333,7 @@ protected Answer listHostHbaDevices(Command command) {
                         vhbaInfoCommand.add("virsh nodedev-dumpxml " + vhbaName);
                         OutputInterpreter.AllLinesParser vhbaInfoParser = new OutputInterpreter.AllLinesParser();
                         String vhbaInfoResult = vhbaInfoCommand.execute(vhbaInfoParser);
-                        
+
                         String vhbaDescription = "Virtual HBA Device";
                         if (vhbaInfoResult == null && vhbaInfoParser.getLines() != null) {
                             String[] infoLines = vhbaInfoParser.getLines().split("\\n");
@@ -345,7 +345,7 @@ protected Answer listHostHbaDevices(Command command) {
                                 }
                             }
                         }
-                        
+
                         hostDevicesNames.add(vhbaName);
                         hostDevicesText.add(vhbaDescription);
                     }
@@ -354,7 +354,7 @@ protected Answer listHostHbaDevices(Command command) {
         } catch (Exception e) {
             logger.debug("vHBA 조회 중 오류 발생 (일반적인 상황): " + e.getMessage());
         }
-        
+
         return new ListHostHbaDeviceAnswer(true, hostDevicesNames, hostDevicesText);
     }
 
@@ -417,14 +417,14 @@ protected Answer listHostVHbaDevices(Command command) {
             ListVhbaDevicesCommand cmd = (ListVhbaDevicesCommand) command;
             String keyword = cmd.getKeyword();
             List<ListVhbaDevicesCommand.VhbaDeviceInfo> vhbaDevices = new ArrayList<>();
-            
+
             // vHBA 장치 조회 (KVM 환경)
             Script vhbaCommand = new Script("/bin/bash");
             vhbaCommand.add("-c");
             vhbaCommand.add("virsh nodedev-list | grep vhba");
             OutputInterpreter.AllLinesParser vhbaParser = new OutputInterpreter.AllLinesParser();
             String vhbaResult = vhbaCommand.execute(vhbaParser);
-            
+
             if (vhbaResult == null && vhbaParser.getLines() != null) {
                 String[] vhbaLines = vhbaParser.getLines().split("\\n");
                 for (String vhbaLine : vhbaLines) {
@@ -434,20 +434,20 @@ protected Answer listHostVHbaDevices(Command command) {
                         if (keyword != null && !keyword.isEmpty() && !vhbaName.contains(keyword)) {
                             continue;
                         }
-                        
+
                         // vHBA 상세 정보 조회
                         Script vhbaInfoCommand = new Script("/bin/bash");
                         vhbaInfoCommand.add("-c");
                         vhbaInfoCommand.add("virsh nodedev-dumpxml " + vhbaName);
                         OutputInterpreter.AllLinesParser vhbaInfoParser = new OutputInterpreter.AllLinesParser();
                         String vhbaInfoResult = vhbaInfoCommand.execute(vhbaInfoParser);
-                        
+
                         String parentHbaName = "";
                         String wwnn = "";
                         String wwpn = "";
                         String description = "Virtual HBA Device";
                         String status = "Active";
-                        
+
                         if (vhbaInfoResult == null && vhbaInfoParser.getLines() != null) {
                             String[] infoLines = vhbaInfoParser.getLines().split("\\n");
                             for (String infoLine : infoLines) {
@@ -463,33 +463,33 @@ protected Answer listHostVHbaDevices(Command command) {
                                 }
                             }
                         }
-                        
+
                         // vHBA 상태 확인
                         Script statusCommand = new Script("/bin/bash");
                         statusCommand.add("-c");
                         statusCommand.add("virsh nodedev-info " + vhbaName + " | grep State");
                         OutputInterpreter.AllLinesParser statusParser = new OutputInterpreter.AllLinesParser();
                         String statusResult = statusCommand.execute(statusParser);
-                        
+
                         if (statusResult == null && statusParser.getLines() != null) {
                             String statusLine = statusParser.getLines().trim();
                             if (statusLine.contains("State:")) {
                                 status = statusLine.replaceAll(".*State:\\s*([^\\s]+).*", "$1").trim();
                             }
                         }
-                        
-                        com.cloud.agent.api.ListVhbaDevicesCommand.VhbaDeviceInfo vhbaInfo = 
+
+                        com.cloud.agent.api.ListVhbaDevicesCommand.VhbaDeviceInfo vhbaInfo =
                             new com.cloud.agent.api.ListVhbaDevicesCommand.VhbaDeviceInfo(
                                 vhbaName, parentHbaName, wwnn, wwpn, description, status
                             );
                         vhbaDevices.add(vhbaInfo);
                     }
                 }
             }
-            
+
             logger.info("vHBA 디바이스 조회 완료: " + vhbaDevices.size() + "개 발견");
             return new com.cloud.agent.api.ListVhbaDevicesAnswer(true, vhbaDevices);
-            
+
         } catch (Exception e) {
             logger.error("vHBA 디바이스 조회 중 오류: " + e.getMessage(), e);
             return new com.cloud.agent.api.ListVhbaDevicesAnswer(false, new ArrayList<>());
@@ -499,15 +499,15 @@ protected Answer listHostVHbaDevices(Command command) {
     protected Answer listVhbaCapableHbas(Command command) {
         List<String> hostDevicesText = new ArrayList<>();
         List<String> hostDevicesNames = new ArrayList<>();
-        
+
         try {
             // vHBA를 지원하는 HBA 조회
             Script vportsCommand = new Script("/bin/bash");
             vportsCommand.add("-c");
             vportsCommand.add("virsh nodedev-list --cap vports");
             OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
             String result = vportsCommand.execute(parser);
-            
+
             if (result == null && parser.getLines() != null) {
                 String[] lines = parser.getLines().split("\\n");
                 for (String line : lines) {
@@ -519,7 +519,7 @@ protected Answer listVhbaCapableHbas(Command command) {
                         hbaInfoCommand.add("virsh nodedev-dumpxml " + hbaName);
                         OutputInterpreter.AllLinesParser hbaInfoParser = new OutputInterpreter.AllLinesParser();
                         String hbaInfoResult = hbaInfoCommand.execute(hbaInfoParser);
-                        
+
                         String hbaDescription = "vHBA Capable HBA: " + hbaName;
                         if (hbaInfoResult == null && hbaInfoParser.getLines() != null) {
                             String[] infoLines = hbaInfoParser.getLines().split("\\n");
@@ -531,7 +531,7 @@ protected Answer listVhbaCapableHbas(Command command) {
                                 }
                             }
                         }
-                        
+
                         hostDevicesNames.add(hbaName);
                         hostDevicesText.add(hbaDescription);
                     }
@@ -540,7 +540,7 @@ protected Answer listVhbaCapableHbas(Command command) {
         } catch (Exception e) {
             logger.debug("vHBA 지원 HBA 조회 중 오류 발생: " + e.getMessage());
         }
-        
+
         return new ListHostHbaDeviceAnswer(true, hostDevicesNames, hostDevicesText);
     }