47db2b2993
#### Why I did it As of https://github.com/Azure/sonic-swss-common/pull/587 the blackout issue in ConfigDBConnector has been resolved. In the past hostcfgd was refactored to use SubscriberStateTable instead of ConfigDBConnector for subscribing to CONFIG_DB updates due to a "blackout" period between hostcfgd pulling the table data down and running the initialization and actually calling `listen()` on ConfigDBConnector which starts the update handler. However SusbscriberStateTable creates many file descriptors against the redis DB which is inefficient compared to ConfigDBConnector which only opens a single file descriptor. With the new fix to ConfigDBConnector I refactored hostcfgd to take advantage of these updates. #### How I did it Replaced SubscriberStateTable with ConfigDBConnector #### How to verify it The functionality of hostcfgd can be verified by booting the switch and verifying that NTP is properly configured. To check the blackout period you can add a delay in the hostcfgd `load()` function and also add a print statement before and after the load so you know when it occurs. Then restart hostcfgd and wait for the load to start, then during the load push a partial change to the FEATURE table and verify that the change is picked up and the feature is enabled after the load period finishes. #### Description for the changelog [hostcfgd] Move hostcfgd back to ConfigDBConnector for subscribing to updates
104 lines
3.9 KiB
Python
104 lines
3.9 KiB
Python
import importlib.machinery
|
|
import importlib.util
|
|
import filecmp
|
|
import shutil
|
|
import os
|
|
import sys
|
|
import subprocess
|
|
from swsscommon import swsscommon
|
|
|
|
from parameterized import parameterized
|
|
from unittest import TestCase, mock
|
|
from tests.hostcfgd.test_radius_vectors import HOSTCFGD_TEST_RADIUS_VECTOR
|
|
from tests.common.mock_configdb import MockConfigDb, MockDBConnector
|
|
|
|
|
|
test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
modules_path = os.path.dirname(test_path)
|
|
scripts_path = os.path.join(modules_path, "scripts")
|
|
src_path = os.path.dirname(modules_path)
|
|
templates_path = os.path.join(src_path, "sonic-host-services-data/templates")
|
|
output_path = os.path.join(test_path, "hostcfgd/output")
|
|
sample_output_path = os.path.join(test_path, "hostcfgd/sample_output")
|
|
sys.path.insert(0, modules_path)
|
|
|
|
# Load the file under test
|
|
hostcfgd_path = os.path.join(scripts_path, 'hostcfgd')
|
|
loader = importlib.machinery.SourceFileLoader('hostcfgd', hostcfgd_path)
|
|
spec = importlib.util.spec_from_loader(loader.name, loader)
|
|
hostcfgd = importlib.util.module_from_spec(spec)
|
|
loader.exec_module(hostcfgd)
|
|
sys.modules['hostcfgd'] = hostcfgd
|
|
|
|
# Mock swsscommon classes
|
|
hostcfgd.ConfigDBConnector = MockConfigDb
|
|
hostcfgd.DBConnector = MockDBConnector
|
|
hostcfgd.Table = mock.Mock()
|
|
|
|
class TestHostcfgdRADIUS(TestCase):
|
|
"""
|
|
Test hostcfd daemon - RADIUS
|
|
"""
|
|
def run_diff(self, file1, file2):
|
|
return subprocess.check_output('diff -uR {} {} || true'.format(file1, file2), shell=True)
|
|
|
|
|
|
@parameterized.expand(HOSTCFGD_TEST_RADIUS_VECTOR)
|
|
def test_hostcfgd_radius(self, test_name, test_data):
|
|
"""
|
|
Test RADIUS hostcfd daemon initialization
|
|
Args:
|
|
test_name(str): test name
|
|
test_data(dict): test data which contains initial Config Db tables, and expected results
|
|
Returns:
|
|
None
|
|
"""
|
|
|
|
t_path = templates_path
|
|
op_path = output_path + "/" + test_name
|
|
sop_path = sample_output_path + "/" + test_name
|
|
|
|
hostcfgd.PAM_AUTH_CONF_TEMPLATE = t_path + "/common-auth-sonic.j2"
|
|
hostcfgd.NSS_TACPLUS_CONF_TEMPLATE = t_path + "/tacplus_nss.conf.j2"
|
|
hostcfgd.NSS_RADIUS_CONF_TEMPLATE = t_path + "/radius_nss.conf.j2"
|
|
hostcfgd.PAM_RADIUS_AUTH_CONF_TEMPLATE = t_path + "/pam_radius_auth.conf.j2"
|
|
hostcfgd.PAM_AUTH_CONF = op_path + "/common-auth-sonic"
|
|
hostcfgd.NSS_TACPLUS_CONF = op_path + "/tacplus_nss.conf"
|
|
hostcfgd.NSS_RADIUS_CONF = op_path + "/radius_nss.conf"
|
|
hostcfgd.NSS_CONF = op_path + "/nsswitch.conf"
|
|
hostcfgd.ETC_PAMD_SSHD = op_path + "/sshd"
|
|
hostcfgd.ETC_PAMD_LOGIN = op_path + "/login"
|
|
hostcfgd.RADIUS_PAM_AUTH_CONF_DIR = op_path + "/"
|
|
|
|
shutil.rmtree( op_path, ignore_errors=True)
|
|
os.mkdir( op_path)
|
|
|
|
shutil.copyfile( sop_path + "/sshd.old", op_path + "/sshd")
|
|
shutil.copyfile( sop_path + "/login.old", op_path + "/login")
|
|
|
|
MockConfigDb.set_config_db(test_data["config_db"])
|
|
host_config_daemon = hostcfgd.HostConfigDaemon()
|
|
|
|
aaa = host_config_daemon.config_db.get_table('AAA')
|
|
|
|
try:
|
|
radius_global = host_config_daemon.config_db.get_table('RADIUS')
|
|
except:
|
|
radius_global = []
|
|
try:
|
|
radius_server = \
|
|
host_config_daemon.config_db.get_table('RADIUS_SERVER')
|
|
except:
|
|
radius_server = []
|
|
|
|
host_config_daemon.aaacfg.load(aaa,[],[],radius_global,radius_server)
|
|
dcmp = filecmp.dircmp(sop_path, op_path)
|
|
diff_output = ""
|
|
for name in dcmp.diff_files:
|
|
diff_output += \
|
|
"Diff: file: {} expected: {} output: {}\n".format(\
|
|
name, dcmp.left, dcmp.right)
|
|
diff_output += self.run_diff( dcmp.left + "/" + name,\
|
|
dcmp.right + "/" + name)
|
|
self.assertTrue(len(diff_output) == 0, diff_output)
|