Change in vdsm[master]: vdsm: making PM 'on' and 'off' sync

ybronhei at redhat.com ybronhei at redhat.com
Mon Sep 15 13:10:48 UTC 2014


Yaniv Bronhaim has posted comments on this change.

Change subject: vdsm: making PM 'on' and 'off' sync
......................................................................


Patch Set 2:

(1 comment)

http://gerrit.ovirt.org/#/c/32695/2/vdsm/API.py
File vdsm/API.py:

Line 1247:                     'power': power}
Line 1248:         if rc != 0:
Line 1249:             message = out + err
Line 1250:         return {'status': {'code': rc, 'message': message},
Line 1251:                 'power': 'unknown'}
and if you'll verify that and we'll decide to change this part, please consider having one exit path- set ret and return only once.

something like:
        ret = None
        try:
            rc, out, err = fence(script, inp)
        except OSError as e:
            if e.errno == os.errno.ENOENT:
                ret = errCode['fenceAgent']
            else:
                raise
        self.log.debug('rc %s in %s out %s err %s', rc,
                       hidePasswd(inp), out, err)
        if not 0 <= rc <= 2:
            ret = {'status': {'code': 1,
                               'message': out + err}}
        else:
            message = doneCode['message']
            if action == 'status':
                if rc == 0:
                    power = 'on'
                elif rc == 2:
                    power = 'off'
                else:
                    power = 'unknown'
                    message = out + err
                ret = {'status': {'code': 0, 'message': message},
                    'power': power}
            else:
                if rc != 0:
                    message = out + err
                ret = {'status': {'code': rc, 'message': message},
                    'power': 'unknown'}

          return ret
Line 1252: 
Line 1253:     def ping(self):
Line 1254:         "Ping the server. Useful for tests"
Line 1255:         updateTimestamp()


-- 
To view, visit http://gerrit.ovirt.org/32695
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eli Mesika <emesika at redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika at redhat.com>
Gerrit-Reviewer: Martin Peřina <mperina at redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali at redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes


More information about the vdsm-patches mailing list