x
/
ironic-staging-drivers
Code Issues Proposed changes

Ensure pep8 is present before trying to proceed 

All evidence appears to be that pep8 is disappearing
for some unknown reason.

Also fix pep8 w503 warning, this started to break the
pep8 CI job lately.

Change-Id: I8bf22c4944d272ed31a3281fa6ef4ca087a13ae9
This commit is contained in:
Derek Higgins 2018-04-17 15:22:39 +01:00 committed by Vladyslav Drok
parent 76308ee3b2
commit 8eb7cc8d70
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/plugin.sh
View File

@ -68,6 +68,13 @@ function update_ironic_enabled_drivers {
}
function install_ironic_staging_drivers {
# FIXME(derekh) Copied from similar fix in
# networking-generic-switch/devstack/plugin.sh
# See: Change-Id: I70f50584a7552e294681375e42879f68750f5096
# we need to ensure pep8 is present before proceeding, as it
# is required to install ironic-staging-drivers. For some unknown reason
# its getting removed before this point.
sudo -H pip install -I --force-reinstall pep8
setup_develop $IRONIC_STAGING_DRIVERS_DIR
}

14
ironic_staging_drivers/intel_nm/nm_commands.py
View File

@ -249,11 +249,15 @@ def set_policy(policy):
0x10 if policy['enable'] else 0x00))
_append_to_command(cmd, _hex(policy['policy_id']))
# 0x10 is policy add flag
_append_to_command(cmd, _hex(TRIGGERS[policy['policy_trigger']] |
CPU_CORRECTION[policy['cpu_power_correction']]
| STORAGE[policy['storage']] | 0x10))
_append_to_command(cmd, _hex(ACTIONS[policy['action']] |
POWER_DOMAIN[policy['power_domain']]))
flags = TRIGGERS[policy['policy_trigger']]
flags |= CPU_CORRECTION[policy['cpu_power_correction']]
flags |= STORAGE[policy['storage']]
flags |= 0x10
_append_to_command(cmd, _hex(flags))
flags = ACTIONS[policy['action']]
flags |= POWER_DOMAIN[policy['power_domain']]
_append_to_command(cmd, _hex(flags))
if isinstance(policy['target_limit'], int):
limit = policy['target_limit']