openstack
/
swift
Code Issues Proposed changes

Merge "swift-init: Re-enable targeted configs"

This commit is contained in:
Zuul 2021-01-16 05:48:45 +00:00 committed by Gerrit Code Review
parent c6356c907f 969b05fcf5
commit a65f98045a
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/common/manager.py
View File

@ -185,6 +185,8 @@ def format_server_name(servername):
:param servername: server name
:returns: swift compatible server name and its binary name
"""
if '.' in servername:
servername = servername.split('.', 1)[0]
if '-' not in servername:
servername = '%s-server' % servername
cmd = 'swift-%s' % servername

2
test/unit/common/test_manager.py
View File

@ -313,6 +313,8 @@ class TestManagerModule(unittest.TestCase):
# test valid servers
self.assertTrue(manager.verify_server('object'))
self.assertTrue(manager.verify_server('object-server'))
self.assertTrue(manager.verify_server('object.replication'))
self.assertTrue(manager.verify_server('object-server.1'))
# test invalid servers
self.assertFalse(manager.verify_server('test'))
self.assertFalse(manager.verify_server('test-server'))