Add support for Ampere Falcon HW

[ta/remote-installer.git] / src / remoteinstaller / installer / bmc_management / bmctools.py

diff --git a/src/remoteinstaller/installer/bmc_management/bmctools.py b/src/remoteinstaller/installer/bmc_management/bmctools.py
index cbe9565..b5be98d 100644 (file)
--- a/src/remoteinstaller/installer/bmc_management/bmctools.py
+++ b/src/remoteinstaller/installer/bmc_management/bmctools.py
@@ -1,5 +1,6 @@
 # Copyright 2019 Nokia
-
+# Copyright 2020 ENEA
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -201,15 +202,13 @@ class BMC(object):
 
     @staticmethod
     def _convert_to_hex(ascii_string, padding=False, length=0):
-        hex_value = ''.join('0x{} '.format(c.encode('hex')) for c in ascii_string).strip()
-        if padding and (len(ascii_string) < length):
-            hex_value += ''.join(' 0x00' for _ in range(len(ascii_string), length))
-
-        return hex_value
+        if padding:
+            ascii_string = ascii_string.ljust(length, '\0')
+        return ' '.join('0x{}'.format(c.encode('hex')) for c in ascii_string)
 
     @staticmethod
     def _convert_to_ascii(hex_string):
-        return ''.join('{}'.format(c.decode('hex')) for c in hex_string)
+        return hex_string.replace('0x','').replace(' ','').decode('hex')
 
     def _execute_ipmitool_command(self, ipmi_command):
         command = 'ipmitool -I lanplus -H {} -U {} -P {} -L {} {}'.format(self._host, self._user, self._passwd, self._priv_level, ipmi_command)