starlingx
/
config
Code Issues Proposed changes

Revert "Fix DRBD task affinity to platform cores" 

This reverts commit b2dd5fb464.

This solution will be replaced with a better solution that updates the cpu-mask formatting in the puppet-drbd template.

Conflicts:
	sysinv/sysinv/sysinv/sysinv/tests/common/test_utils.py

Change-Id: I4b1b887a6928488ce12bd2dbe7e6c2fa58fb6467
This commit is contained in:
Jim Gauld 2020-10-28 23:34:56 +00:00 committed by Jim Gauld
parent c002ad15ee
commit 77de7dc969
3 changed files with 1 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sysinv/sysinv/sysinv/sysinv/common/utils.py
View File

@ -2410,21 +2410,3 @@ def run_playbook(playbook_command):
out, _ = proc.communicate()
LOG.info("ansible-playbook: %s." % out)
return proc.returncode
def format_hex_grouped(value, sep=',', chunk=8):
"""
Format integer as hex string with a separater every 'chunk'
characters from the right.
E.g., 0x300000003 is formatted as '3,00000003'.
:param value: integer
:param sep: string
:param chunk: integer
:return: string
"""
x = '{:x}'.format(value)
r = x[::-1]
chunks = [r[i:i + chunk][::-1] for i in range(0, len(r), chunk)]
return sep.join(reversed(chunks))

3
sysinv/sysinv/sysinv/sysinv/puppet/platform.py
View File

@ -504,8 +504,7 @@ class PlatformPuppet(base.BasePuppet):
for cpu in platform_cpus:
platform_cpumask |= 1 << cpu.cpu
drbd_cpumask = "\"%s\"" % (utils.format_hex_grouped(
platform_cpumask, sep=',', chunk=8))
drbd_cpumask = '%x' % platform_cpumask
config.update({
'platform::drbd::params::cpumask': drbd_cpumask

82
sysinv/sysinv/sysinv/sysinv/tests/common/test_utils.py
View File

@ -1,82 +0,0 @@
#
# Copyright (c) 2020 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
"""
Tests for the common utilities.
"""
from sysinv.common import utils
from sysinv.tests import base
class TestCommonUtilities(base.TestCase):
def test_format_hex_grouped(self):
TEST_MASKS = [
{'value': 0xabcdef1234, 'sep': ',', 'chunk': 8,
'expect': 'ab,cdef1234'},
{'value': 0xabcdef1234, 'sep': ',', 'chunk': 4,
'expect': 'ab,cdef,1234'},
{'value': 0xabcdef1234, 'sep': ',', 'chunk': 2,
'expect': 'ab,cd,ef,12,34'},
{'value': 0xabcdef1234567890, 'sep': ',', 'chunk': 8,
'expect': 'abcdef12,34567890'},
{'value': 0xabcdef1234567890cab, 'sep': ',', 'chunk': 8,
'expect': 'abc,def12345,67890cab'},
{'value': 0xabcdef1234, 'sep': ':', 'chunk': 4,
'expect': 'ab:cdef:1234'},
{'value': 0x300000003, 'sep': ',', 'chunk': 8, 'expect':
'3,00000003'},
{'value': 0x8008, 'sep': ',', 'chunk': 8,
'expect': '8008'},
{'value': 0x8008, 'sep': ',', 'chunk': 2,
'expect': '80,08'},
{'value': 0x3, 'sep': ',', 'chunk': 8,
'expect': '3'},
{'value': 0x0, 'sep': ',', 'chunk': 8,
'expect': '0'},
]
for t in TEST_MASKS:
result = utils.format_hex_grouped(
t['value'], sep=t['sep'], chunk=t['chunk'])
self.assertEqual(result, t['expect'])
def test_is_valid_domain_or_ip(self):
SAMPLE_VALIDATION_URLS = (
# Valid URL
('localhost', True), # localhost
('localhost:5000', True),
('localhost/mirror/k8s.gcr.io', True),
('localhost:5000/mirror/k8s.gcr.io', True),
('10.10.10.1', True), # IPv4
('10.10.10.1:5000', True),
('10.10.10.1/mirror/k8s.gcr.io', True),
('10.10.10.1:5000/mirror/k8s.gcr.io', True),
('2001:0db8:85a3:0000:0000:8a2e:0370:7334', True), # IPv6
('[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:5000', True),
('[2001:0db8:85a3:0000:0000:8a2e:0370:7334]/mirror/k8s.gcr.io', True),
('[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:5000/mirror/k8s.gcr.io', True),
('g.com', True), # domain
('www.g.com', True),
('g.com:5000', True),
('g.com/mirror/k8s.gcr.io', True),
('g.com:5000/mirror/k8s.gcr.io', True),
('g.com//mirror/k8s.gcr.io', True),
('has-dash.com', True),
# Invalid URL
('localhost:22:5000', False), # extra conlon
('10.10.10.10.1', False), # IPv4 with extra segment
('10.10.10.1.', False),
('2001:0db8:85a3:0000:0000:8a2e:0370:7334:5000', False), # IPv6 withextra segment
('.com', False), # Domain name without enough labels
('mis-type,comma', False),
('extra space.com', False), # Extra space in the middle
('has_trailing.com', False),
('hastrailing_.com', False),
(' frontspace.com', False),
('backspace .com', False)
)
for url in SAMPLE_VALIDATION_URLS:
self.assertEqual(utils.is_valid_domain_or_ip(url[0]), url[1])