Browse Source

Copy and append to static lists

core_interfaces and standard_interfaces are both static members of BaseDriver
we need to take a copy of them before appending to them.

Change-Id: Ic6edc5e49a25849c7871dbc9e6e1d5a5eb229e57
Closes-Bug: #1672457
(cherry picked from commit 338651eae5)
tags/7.0.1^0
Derek Higgins 3 years ago
parent
commit
7f1639e77e
2 changed files with 13 additions and 12 deletions
  1. +10
    -12
      ironic/drivers/base.py
  2. +3
    -0
      releasenotes/notes/bug-1672457-563d5354b41b060e.yaml

+ 10
- 12
ironic/drivers/base.py View File

@@ -131,7 +131,6 @@ class BaseDriver(object):
"""
standard_interfaces.append('raid')

@abc.abstractmethod
def __init__(self):
pass

@@ -164,20 +163,19 @@ class BareDriver(BaseDriver):
class, as well as appended to core_interfaces or standard_interfaces here.
"""

def __init__(self):
self.network = None
"""`Core` attribute for network connectivity.
network = None
"""`Core` attribute for network connectivity.

A reference to an instance of :class:NetworkInterface.
"""
self.core_interfaces.append('network')
A reference to an instance of :class:NetworkInterface.
"""
core_interfaces = BaseDriver.core_interfaces + ['network']

self.storage = None
"""`Standard` attribute for (remote) storage interface.
storage = None
"""`Standard` attribute for (remote) storage interface.

A reference to an instance of :class:StorageInterface.
"""
self.standard_interfaces.append('storage')
A reference to an instance of :class:StorageInterface.
"""
standard_interfaces = BaseDriver.standard_interfaces + ['storage']


ALL_INTERFACES = set(BareDriver().all_interfaces)


+ 3
- 0
releasenotes/notes/bug-1672457-563d5354b41b060e.yaml View File

@@ -0,0 +1,3 @@
---
fixes:
- Fixed a bug that was causing an increase in CPU usage over time.

Loading…
Cancel
Save