Skip to content

Commit 85de31c

Browse files
Daan Hooglandclaude
authored andcommitted
replace key lookups with value() calls in BaremetalManager
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
1 parent fd26016 commit 85de31c

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BareMetalDiscoverer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public Map<? extends ServerResource, Map<String, String>> find(long dcId, Long p
160160
params.put("vmDao", _vmDao);
161161
params.put("configDao", _configDao);
162162

163-
String resourceClassName = _configDao.getValue(BaremetalManager.ExternalBaremetalResourceClassName.key());
163+
String resourceClassName = BaremetalManager.ExternalBaremetalResourceClassName.value();
164164
BareMetalResourceBase resource = null;
165165
if (resourceClassName != null) {
166166
Class<?> clazz = Class.forName(resourceClassName);
@@ -193,7 +193,7 @@ public Map<? extends ServerResource, Map<String, String>> find(long dcId, Long p
193193
if (vmIp != null) {
194194
details.put(ApiConstants.IP_ADDRESS, vmIp);
195195
}
196-
String isEchoScAgent = _configDao.getValue(BaremetalManager.EnableBaremetalSecurityGroupAgentEcho.key());
196+
String isEchoScAgent = String.valueOf(BaremetalManager.EnableBaremetalSecurityGroupAgentEcho.value());
197197
details.put(BaremetalManager.EchoSecurityGroupAgent, isEchoScAgent);
198198

199199
resources.put(resource, details);

plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalResourceBase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,20 +172,20 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
172172

173173
String ipmiIface = "default";
174174
try {
175-
ipmiIface = configDao.getValue(BaremetalManager.BaremetalIpmiLanInterface.key());
175+
ipmiIface = BaremetalManager.BaremetalIpmiLanInterface.value();
176176
} catch (Exception e) {
177177
logger.debug(e.getMessage(), e);
178178
}
179179

180180
try {
181-
ipmiRetryTimes = Integer.parseInt(configDao.getValue(BaremetalManager.BaremetalIpmiRetryTimes.key()));
181+
ipmiRetryTimes = Integer.parseInt(BaremetalManager.BaremetalIpmiRetryTimes.value());
182182
} catch (Exception e) {
183183
logger.debug(e.getMessage(), e);
184184
}
185185

186186
try {
187187
provisionDoneNotificationOn = ManagementServer.BaremetalProvisionDoneNotificationEnabled.value();
188-
isProvisionDoneNotificationTimeout = Integer.parseInt(configDao.getValue(BaremetalManager.BaremetalProvisionDoneNotificationTimeout.key()));
188+
isProvisionDoneNotificationTimeout = BaremetalManager.BaremetalProvisionDoneNotificationTimeout.value();
189189
} catch (Exception e) {
190190
logger.debug(e.getMessage(), e);
191191
}

plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ private boolean preparePxeInAdvancedZone(VirtualMachineProfile profile, NicProfi
219219
throw new CloudRuntimeException(String.format("Cannot find Management NIC on virtual router[id:%s]", vr.getId()));
220220
}
221221

222-
String internalServerIp = _configDao.getValue(BaremetalManager.BaremetalInternalStorageServer.key());
222+
String internalServerIp = BaremetalManager.BaremetalInternalStorageServer.value();
223223
if (internalServerIp == null) {
224224
throw new CloudRuntimeException(String.format("please specify 'baremetal.internal.storage.server.ip', which is the http server/nfs server storing kickstart files and ISO files, in global setting"));
225225
}

0 commit comments

Comments
 (0)