Merge branch 'master' into ci

Author: Obihoernchen

confluent_client/confluent/asynclient.py

@@ -762,7 +762,7 @@ async def updateattrib(session, updateargs, nodetype, noderange, options, dictas
         if "=" in updateargs[1]:
             update_ready = True
             for arg in updateargs[1:]:
-                if not '=' in arg:
+                if '=' not in arg:
                     update_ready = False
                     exitcode = 1
             if not update_ready:

confluent_client/confluent/client.py

@@ -712,7 +712,7 @@ def updateattrib(session, updateargs, nodetype, noderange, options, dictassign=N
         if "=" in updateargs[1]:
             update_ready = True
             for arg in updateargs[1:]:
-                if not '=' in arg:
+                if '=' not in arg:
                     update_ready = False
                     exitcode = 1
             if not update_ready:

confluent_client/confluent/textgroup.py

@@ -138,8 +138,6 @@ def get_group_text(self, nodes):
     def print_all(self, output=sys.stdout, skipmodal=False, reverse=False,
                   count=False):
         self.generate_byoutput()
-        modaloutput = None
-        ismodal = True
 
         if reverse:
             outdatalist = sorted(

confluent_client/confluent/vnc.py

@@ -215,7 +215,7 @@ async def _handle_framebuffer_update(self):
         self._request_screen_update(incremental=True)
 
     async def _handle_rectangle(self):
-        if self.framebuffer == None:
+        if self.framebuffer is None:
             self.framebuffer = Image.new('RGBA', (self.width, self.height))
         x = await self._read_number(2)
         y = await self._read_number(2)

confluent_osdeploy/common/profile/scripts/getinstalldisk

@@ -5,6 +5,20 @@ import os
 class SilentException(Exception):
     pass
 
+# List of models that are generally used for OS install disk (generally 2-disk mirroring)
+PRIORITY_MODELS = ('m.2 nvme 2-bay raid kit', 
+                   'thinksystem_m.2_vd',
+                   'thinksystem m.2',
+                   'thinksystem_m.2',
+                   'b540p-2hs',  # 7mm or M.2 in rear
+                   'b540d-2hs',  # M.2 in E3.S or 2.5inch
+                   'b550d-2hs',  # Front M.2
+                   'b550p-2hs',  # Rear M.2
+                   'raid b540p-2hs',
+                   'raid b540d-2hs',
+                   'raid b550d-2hs',
+                   'raid b550p-2hs')
+
 class DiskInfo(object):
     def __init__(self, devname):
         if devname.startswith('nvme') and 'c' in devname:
@@ -69,7 +83,7 @@ class DiskInfo(object):
 
     @property
     def priority(self):
-        if self.model.lower() in ('m.2 nvme 2-bay raid kit', 'thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
+        if self.model.lower() in PRIORITY_MODELS:
             return 0
         if 'imsm' in self.mdcontainer:
             return 1

confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/image2disk.py

@@ -431,4 +431,3 @@ def install_to_disk(imgpath):
         traceback.print_exc()
         time.sleep(86400)
         raise
-

confluent_server/aiohmi/ipmi/command.py

@@ -345,7 +345,7 @@ async def set_power(self, powerstate, wait=False, bridge_request=None):
             return {'powerstate': oldpowerstate}
         if newpowerstate == 'boot':
             newpowerstate = 'on' if oldpowerstate == 'off' else 'reset'
-        response = await self.raw_command(
+        await self.raw_command(
             netfn=0, command=2, data=[power_states[newpowerstate]],
             bridge_request=bridge_request)
         lastresponse = {'pendingpowerstate': newpowerstate}
@@ -564,7 +564,7 @@ async def set_identify(self, on=True, duration=None, blink=False):
                 duration = 255
             if duration < 0:
                 duration = 0
-            response = await self.raw_command(netfn=0, command=4, data=[duration])
+            await self.raw_command(netfn=0, command=4, data=[duration])
             return
         forceon = 0
         if on:
@@ -575,7 +575,7 @@ async def set_identify(self, on=True, duration=None, blink=False):
             identifydata = [255 * forceon]
         else:
             identifydata = [0, forceon]
-        response = await self.raw_command(netfn=0, command=4, data=identifydata)
+        await self.raw_command(netfn=0, command=4, data=identifydata)
 
     async def init_sdr(self):
         """Initialize SDR
@@ -892,7 +892,6 @@ async def set_net6_configuration(self, static_addresses=None, static_gateway=Non
         if channel is None:
             channel = await self.get_network_channel()
         if static_addresses is not None:
-            i = 0
             for va in static_addresses:
                 if '/' in va:
                     va, plen = va.split('/', 1)
@@ -2239,7 +2238,8 @@ async def update_firmware(self, filename, data=None, progress=None, bank=None):
 
         await self.oem_init()
         if progress is None:
-            progress = lambda x: True
+            def progress(x):
+                return True
         return await self._oem.update_firmware(filename, data, progress, bank)
 
     async def attach_remote_media(self, url, username=None, password=None):

confluent_server/aiohmi/ipmi/oem/generic.py

@@ -67,7 +67,6 @@ async def get_average_processor_temperature(self, ipmicmd):
         # in practice, some implementations use 0x27 ('External environment')
         if not hasattr(self, '_processor_names'):
             self._processor_names = []
-        readings = []
         if not self._processor_names:
             sdr = await ipmicmd.init_sdr()
             for sensename in sdr.sensors:

confluent_server/aiohmi/ipmi/oem/lenovo/config.py

@@ -23,7 +23,6 @@
 import random
 import struct
 
-import time
 
 import aiohmi.exceptions as pygexc
 

confluent_server/aiohmi/ipmi/oem/lenovo/imm.py

@@ -17,7 +17,6 @@
 import base64
 import binascii
 from datetime import datetime
-import errno
 import fnmatch
 import json
 import math
@@ -28,7 +27,6 @@
 import struct
 import weakref
 
-import six
 import zipfile
 
 import aiohmi.constants as pygconst
@@ -848,7 +846,7 @@ async def get_firmware_inventory(self, bmcver, components, category):
         # https, using the caller TLS verification scheme
         components = set(components)
         if 'core' in components:
-            category = 'core'        
+            category = 'core'
         if not components or set(('imm', 'xcc', 'bmc', 'core')) & components:
             rsp = await self.ipmicmd.raw_command(netfn=0x3a, command=0x50)
             immverdata = self.parse_imm_buildinfo(rsp['data'])