Merge 8d88011 into 246c4e8

pyipmi/interfaces/ipmitool.py

@@ -42,12 +42,17 @@ class Ipmitool(object):
     IPMITOOL_PATH = 'ipmitool'
     supported_interfaces = ['lan', 'lanplus', 'serial-terminal', 'open']
 
-    def __init__(self, interface_type='lan'):
+    def __init__(self, interface_type='lan', cipher=None):
         if interface_type in self.supported_interfaces:
             self._interface_type = interface_type
         else:
             raise RuntimeError('interface type %s not supported' %
                                interface_type)
+        if cipher is not None and int(cipher) not in range(0,255):
+            raise RuntimeError('cipher %s not in allowed range [0-255]' %
+                               cipher)
+        else:
+            self._cipher = cipher
 
         self.re_completion_code = re.compile(
                 r"Unable to send RAW command \(.*rsp=(0x[0-9a-f]+)\)")
@@ -233,6 +238,8 @@ def _build_ipmitool_cmd(self, target, lun, netfn, raw_bytes):
 
         cmd += self._build_ipmitool_priv_level(self._session.priv_level)
 
+        if self._cipher:
+            cmd += (' -C %s' % self._cipher)
         if self._session.auth_type == Session.AUTH_TYPE_NONE:
             cmd += ' -P ""'
         elif self._session.auth_type == Session.AUTH_TYPE_PASSWORD:

pyipmi/ipmitool.py

@@ -488,6 +488,7 @@ def usage(toplevel=False):
 
 Ipmitool interface options:
   interface_type    Set the interface type to be used (lan, lanplus, serial, open)
+  cipher            Set the cipher to be used (0-255)
 
 Ipmbdev interface options:
   port=<path>       Specify path to Linux IPMB device (/dev/ipmb-0 by default)
@@ -533,6 +534,8 @@ def parse_interface_options(interface_name, options):
         elif interface_name == 'ipmitool':
             if name == 'interface_type':
                 interface_options['interface_type'] = value
+            elif name == 'cipher':
+                interface_options['cipher'] = value
             else:
                 print('Warning: unknown option %s' % name)
         elif interface_name == 'ipmbdev':