From 950c57ef6d29112964d4cf4a051d9ae30567cdb6 Mon Sep 17 00:00:00 2001 From: Bin Xu Date: Mon, 2 Apr 2018 15:31:40 +0800 Subject: [PATCH] Need paramiko >= 2.0.0, only rspconfig need paramiko (#5034) --- xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py | 4 +++- xCAT-openbmc-py/xCAT-openbmc-py.spec | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py index 25be9ecb9..7f8039a68 100644 --- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py +++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py @@ -20,7 +20,6 @@ from hwctl.executor.openbmc_flash import OpenBMCFlashTask from hwctl.executor.openbmc_inventory import OpenBMCInventoryTask from hwctl.executor.openbmc_power import OpenBMCPowerTask from hwctl.executor.openbmc_sensor import OpenBMCSensorTask -from hwctl.executor.openbmc_bmcconfig import OpenBMCBmcConfigTask from hwctl.executor.openbmc_eventlog import OpenBMCEventlogTask from hwctl.beacon import DefaultBeaconManager from hwctl.setboot import DefaultBootManager @@ -287,6 +286,9 @@ class OpenBMCManager(base.BaseManager): DefaultPowerManager().set_power_state(runner, power_state=action) def rspconfig(self, nodesinfo, args): + + from hwctl.executor.openbmc_bmcconfig import OpenBMCBmcConfigTask + try: opts=docopt(RSPCONFIG_USAGE, argv=args) except DocoptExit as e: diff --git a/xCAT-openbmc-py/xCAT-openbmc-py.spec b/xCAT-openbmc-py/xCAT-openbmc-py.spec index acfe6fdb5..3070167fd 100644 --- a/xCAT-openbmc-py/xCAT-openbmc-py.spec +++ b/xCAT-openbmc-py/xCAT-openbmc-py.spec @@ -20,7 +20,8 @@ BuildArch: noarch Requires: xCAT-server Requires: python-gevent >= 1.2.2-2 Requires: python-greenlet >= 0.4.13-2 -Requires: python2-docopt python-requests python-paramiko python-scp +Requires: python-paramiko >= 2.0.0 +Requires: python2-docopt python-requests python-scp %description xCAT-openbmc-py provides openbmc related functions.