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

recover

Browse Source
This commit is contained in:
xuweibj
2018-12-21 00:35:44 -05:00
parent 1f16968621
commit fae4c21d8f
4 changed files with 0 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
xCAT-openbmc-py/lib/python/agent/hwctl/executor/redfish_setboot.py
View File

@@ -1,51 +0,0 @@
#!/usr/bin/env python
###############################################################################
# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
###############################################################################
# -*- coding: utf-8 -*-
#
from __future__ import print_function
import gevent
import time
from common.task import ParallelNodesCommand
from common.exceptions import SelfClientException, SelfServerException
from hwctl import redfish_client as redfish
import logging
logger = logging.getLogger('xcatagent')
class RedfishBootTask(ParallelNodesCommand):
"""Executor for setboot-related actions."""
def get_state(self, **kw):
node = kw['node']
rf = redfish.RedfishRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
debugmode=self.debugmode, verbose=self.verbose)
state = 'Unknown'
try:
rf.login()
state = rf.get_boot_state()
self.callback.info('%s: %s' % (node, state))
except (SelfServerException, SelfClientException) as e:
self.callback.error(e.message, node)
return state
def set_state(self, setboot_state, persistant, **kw):
node = kw['node']
rf = redfish.RedfishRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
debugmode=self.debugmode, verbose=self.verbose)
try:
rf.login()
rf.set_boot_state(persistant, setboot_state)
state = rf.get_boot_state()
self.callback.info('%s: %s' % (node, state))
except (SelfServerException, SelfClientException) as e:
self.callback.error(e.message, node)

58
xCAT-openbmc-py/lib/python/agent/hwctl/redfish_client.py
View File

@@ -32,24 +32,6 @@ POWER_RESET_TYPE = {
'on' : 'ForceOn',
}
BOOTSOURCE_SET_STATE = {
"cd" : "Cd",
"def" : "None",
"floppy": "Floppy",
"hd" : 'Hdd',
"net" : "Pxe",
"setup" : "BiosSetup",
}
BOOTSOURCE_GET_STATE = {
"BiosSetup": "BIOS Setup",
"Floppy" : "Floppy",
"Cd" : "CD/DVD",
"Hdd" : "Hard Drive",
"None" : "boot override inactive",
"Pxe" : "Network",
}
class RedfishRest(object):
headers = {'Content-Type': 'application/json'}
@@ -241,43 +223,3 @@ class RedfishRest(object):
data = { "ResetType": POWER_RESET_TYPE[state] }
return self.request('POST', target_url, payload=data, cmd='set_power_state')
def get_boot_state(self):
members = self._get_members(SYSTEMS_URL)
target_url = members[0]['@odata.id']
data = self.request('GET', target_url, cmd='get_boot_state')
try:
boot_enable = data['Boot']['BootSourceOverrideEnabled']
if boot_enable == 'Disabled':
return 'boot override inactive'
bootsource = data['Boot']['BootSourceOverrideTarget']
return BOOTSOURCE_GET_STATE.get(bootsource, bootsource)
except KeyError as e:
raise SelfServerException('Get KeyError %s' % e.message)
def _get_boot_actions(self):
members = self._get_members(SYSTEMS_URL)
target_url = members[0]['@odata.id']
data = self.request('GET', target_url, cmd='get_boot_actions')
try:
actions = data['Boot']['BootSourceOverrideTarget@Redfish.AllowableValues']
except KeyError as e:
raise SelfServerException('Get KeyError %s' % e.message)
return (target_url, actions)
def set_boot_state(self, persistant, state):
target_url, actions = self._get_boot_actions()
target_data = BOOTSOURCE_SET_STATE[state]
if target_data not in actions:
raise SelfClientException('Unsupport option: %s' % state)
boot_enable = 'Once'
if persistant:
boot_enable = 'Continuous'
if target_data == 'None':
boot_enable = 'Disabled'
data = {'Boot': {'BootSourceOverrideEnabled': boot_enable, "BootSourceOverrideTarget": target_data} }
return self.request('PATCH', target_url, payload=data, cmd='set_boot_state')

42
xCAT-openbmc-py/lib/python/agent/xcatagent/redfish.py
View File

@@ -14,7 +14,6 @@ from docopt import docopt,DocoptExit
from common import utils
from common import exceptions as xcat_exception
from hwctl.executor.redfish_power import RedfishPowerTask
from hwctl.executor.redfish_setboot import RedfishBootTask
from hwctl.power import DefaultPowerManager
from hwctl.setboot import DefaultBootManager
@@ -35,10 +34,6 @@ POWER_REBOOT_OPTIONS = ('boot', 'reset')
POWER_SET_OPTIONS = ('on', 'off', 'bmcreboot')
POWER_GET_OPTIONS = ('bmcstate', 'state', 'stat', 'status')
# global variables of rsetboot
SETBOOT_GET_OPTIONS = ('stat', '')
SETBOOT_SET_OPTIONS = ('cd', 'def', 'default', 'floppy', 'hd', 'net', 'setup')
class RedfishManager(base.BaseManager):
def __init__(self, messager, cwd, nodes=None, envs=None):
super(RedfishManager, self).__init__(messager, cwd)
@@ -90,40 +85,3 @@ class RedfishManager(base.BaseManager):
else:
DefaultPowerManager().set_power_state(runner, power_state=action)
def rsetboot(self, nodesinfo, args):
# 1, parse args
if not args:
args = ['stat']
rsetboot_usage = """
Usage:
rsetboot [-V|--verbose] [cd|def|default|floppy||hd|net|stat|setup] [-p]
Options:
-V --verbose rsetboot verbose mode.
-p persistant boot source.
"""
try:
opts = docopt(rsetboot_usage, argv=args)
self.verbose = opts.pop('--verbose')
action_type = opts.pop('-p')
action = [k for k,v in opts.items() if v][0]
except Exception as e:
self.messager.error("Failed to parse arguments for rsetboot: %s" % args)
return
# 2, validate the args
if action not in (SETBOOT_GET_OPTIONS + SETBOOT_SET_OPTIONS):
self.messager.error("Not supported subcommand for rsetboot: %s" % action)
return
# 3, run the subcommands
runner = RedfishBootTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=self.verbose)
if action in SETBOOT_GET_OPTIONS:
DefaultBootManager().get_boot_state(runner)
else:
DefaultBootManager().set_boot_state(runner, setboot_state=action, persistant=action_type)

8
xCAT-server/lib/xcat/plugins/redfish.pm
View File

@@ -165,14 +165,6 @@ sub parse_args {
unless ($subcommand =~ /^on$|^off$|^reset$|^boot$|^bmcreboot$|^bmcstate$|^status$|^stat$|^state$/) {
return ([ 1, "Unsupported command: $command $subcommand" ]);
}
} elsif ($command eq "rsetboot") {
my $persistant;
GetOptions('p' => \$persistant);
return ([ 1, "Only one option is supported at the same time for $command" ]) if (@ARGV > 1);
$subcommand = "stat" if (!defined($ARGV[0]));
unless ($subcommand =~ /^net$|^hd$|^cd$|^def$|^default$|^stat$|^setup$|^floppy$/) {
return ([ 1, "Unsupported command: $command $subcommand" ]);
}
} else {
return ([ 1, "Unsupported command: $command" ]);
}