xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity

modified depending on comments

Browse Source
This commit is contained in:
XuWei
2018-04-10 02:54:48 -04:00
parent dc61ea57da
commit ba32210e9b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
View File

@@ -388,10 +388,10 @@ rmdir \"/tmp/$userid\" \n")
return self.callback.error(e.message, node)
except SelfClientException:
if e.code == 404:
return self.callback.error('404 Not Found - Requested endpoint does not exists and may \
return self.callback.error('404 Not Found - Requested endpoint does not exist or may \
indicate function is not supported on this OpenBMC firmware.', node)
if e.code == 403:
return self.callback.error('403 Forbidden - Requested endpoint does not exists and may \
return self.callback.error('403 Forbidden - Requested endpoint does not exist or may \
indicate function is not yet supported by OpenBMC firmware.', node)
return self.callback.error(e.message, node)
@@ -409,10 +409,10 @@ rmdir \"/tmp/$userid\" \n")
return self.callback.error(e.message, node)
except SelfClientException:
if e.code == 404:
return self.callback.error('404 Not Found - Requested endpoint does not exists and may \
return self.callback.error('404 Not Found - Requested endpoint does not exist or may \
indicate function is not supported on this OpenBMC firmware.', node)
if e.code == 403:
return self.callback.error('403 Forbidden - Requested endpoint does not exists and may \
return self.callback.error('403 Forbidden - Requested endpoint does not exist or may \
indicate function is not yet supported by OpenBMC firmware.', node)
return self.callback.error(e.message, node)

4
xCAT-server/lib/xcat/plugins/openbmc.pm
View File

@@ -2423,7 +2423,7 @@ sub deal_with_response {
my $log_id = (split ('/', $cur_url))[5];
$error = "Invalid ID=$log_id provided to be resolved. [$::RESPONSE_FORBIDDEN]";
} else{
$error = "$::RESPONSE_FORBIDDEN - Requested endpoint does not exists and may indicate function is not yet supported by OpenBMC firmware.";
$error = "$::RESPONSE_FORBIDDEN - Requested endpoint does not exist or may indicate function is not yet supported by OpenBMC firmware.";
}
# Handle 404
} elsif ($response->status_line eq $::RESPONSE_NOT_FOUND) {
@@ -2434,7 +2434,7 @@ sub deal_with_response {
$error = "Invalid ID provided to delete. Use the -l option to view valid firmware IDs.";
} elsif (($node_info{$node}{cur_status} eq "RSPCONFIG_API_CONFIG_QUERY_RESPONSE") ||
($node_info{$node}{cur_status} eq "RSPCONFIG_API_CONFIG_ATTR_RESPONSE")) {
$error = "$::RESPONSE_NOT_FOUND - Requested endpoint does not exists and may indicate function is not supported on this OpenBMC firmware.";
$error = "$::RESPONSE_NOT_FOUND - Requested endpoint does not exist or may indicate function is not supported on this OpenBMC firmware.";
} else {
$error = "[" . $response->code . "] " . $response_info->{'data'}->{'description'};
}