From 8e0da3df5642cec24e73618a1adda8d3db988d41 Mon Sep 17 00:00:00 2001 From: Wlodek Wencel Date: Thu, 20 Jun 2019 15:10:26 +0200 Subject: [PATCH] review, style fixes --- tests/cb_model.py | 6 +- tests/dhcpv4/kea_only/HA/test_ha_states.py | 33 ++-- .../kea_only/class_cmds/test_class_cmds.py | 8 +- .../test_command_control_http.py | 62 ++++---- .../test_command_control_keashell.py | 52 +++---- .../test_command_control_socket.py | 42 ++--- tests/dhcpv4/kea_only/flexid/test_flex_id.py | 32 ++-- .../kea_only/host_cmds/test_hosts_cmds.py | 88 +++++------ .../kea_only/leases_cmds/test_leases_cmds.py | 76 ++++----- .../test_leases_cmds_legal_logging.py | 64 ++++---- .../subnets_cmds/test_network_cmds.py | 54 +++---- .../kea_only/subnets_cmds/test_subnet_cmds.py | 56 +++---- tests/dhcpv4/kea_only/test_all_hooks.py | 25 ++- tests/dhcpv4/kea_only/test_kea_logging.py | 102 ++++++------- tests/dhcpv4/kea_only/test_legalloghook.py | 42 ++--- tests/dhcpv4/kea_only/test_shared_networks.py | 36 ++--- tests/dhcpv4/kea_only/test_statistics.py | 80 +++++----- .../test_v4_user_check_general_logs.py | 18 +-- tests/dhcpv6/kea_only/HA/test_ha_states.py | 32 ++-- tests/dhcpv6/kea_only/HA/test_ha_sync.py | 44 +++--- .../test_command_control_http.py | 60 ++++---- .../test_command_control_keashell.py | 52 +++---- .../test_command_control_socket.py | 42 ++--- .../test_command_control_socket_2.py | 40 ++--- tests/dhcpv6/kea_only/flexid/test_flex_id.py | 18 +-- .../kea_only/host_cmds/test_hosts_cmds.py | 90 +++++------ .../kea_only/leases_cmds/test_leases_cmds.py | 82 +++++----- .../test_leases_cmds_legal_logging.py | 62 ++++---- .../subnets_cmds/test_network_cmds.py | 66 ++++---- .../kea_only/subnets_cmds/test_subnet_cmds.py | 80 +++++----- tests/dhcpv6/kea_only/test_kea_logging.py | 90 +++++------ tests/dhcpv6/kea_only/test_legalloghook.py | 40 ++--- tests/dhcpv6/kea_only/test_mac_in_dhcp6.py | 48 +++--- tests/dhcpv6/kea_only/test_shared_networks.py | 48 +++--- .../kea_only/test_subnet_id_sanity_check.py | 144 +++++++++--------- .../test_v6_user_check_general_logs.py | 10 +- tests/other_tests/v6/test_statistics.py | 100 ++++++------ tests/softwaresupport/configuration.py | 10 +- tests/softwaresupport/kea.py | 6 +- .../softwaresupport/kea4_server/functions.py | 8 +- .../softwaresupport/kea6_server/functions.py | 16 +- tests/srv_msg.py | 2 +- 42 files changed, 1035 insertions(+), 1031 deletions(-) diff --git a/tests/cb_model.py b/tests/cb_model.py index 1811b057..df6bbd49 100644 --- a/tests/cb_model.py +++ b/tests/cb_model.py @@ -215,7 +215,7 @@ class ConfigModel(ConfigElem): cfg['shared-networks'].append(net.get_dict()) cfg["loggers"] = [{"name": "kea-dhcp" + proto, - "output_options": [{"output": "$(SOFTWARE_INSTALL_PATH)/var/kea/kea.log"}], + "output_options": [{"output": "$(SOFTWARE_INSTALL_PATH)/etc/kea/kea.log"}], "debuglevel": 99, "severity": "DEBUG"}] @@ -224,7 +224,7 @@ class ConfigModel(ConfigElem): "Control-agent": {"http-host": '$(MGMT_ADDRESS)', "http-port": 8000, "control-sockets": {"dhcp" + proto: {"socket-type": 'unix', - "socket-name": '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket'}}}} + "socket-name": '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket'}}}} _substitute_vars(cfg) @@ -540,7 +540,7 @@ def setup_server(**kwargs): init_cfg = {"interfaces-config": {"interfaces": ["$(SERVER_IFACE)"]}, "lease-database": {"type": "memfile"}, "control-socket": {"socket-type": 'unix', - "socket-name":'$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket'}} + "socket-name": '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket'}} for param, val in kwargs.items(): if val is None or param == 'check-config': diff --git a/tests/dhcpv4/kea_only/HA/test_ha_states.py b/tests/dhcpv4/kea_only/HA/test_ha_states.py index 01648bcf..335cd0dc 100644 --- a/tests/dhcpv4/kea_only/HA/test_ha_states.py +++ b/tests/dhcpv4/kea_only/HA/test_ha_states.py @@ -17,11 +17,11 @@ def test_v4_hooks_HA_state_hold_lb_always(): # HA SERVER 1 misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp4', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') @@ -52,11 +52,11 @@ def test_v4_hooks_HA_state_hold_lb_always(): # HA SERVER 2 misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS_2)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp4', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL2') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') @@ -421,11 +421,11 @@ def test_v4_hooks_HA_state_hold_lb_once(): # HA SERVER 1 misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp4', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') @@ -456,11 +456,11 @@ def test_v4_hooks_HA_state_hold_lb_once(): # HA SERVER 2 misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS_2)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp4', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL2') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') @@ -761,16 +761,17 @@ def test_v4_hooks_HA_state_hold_lb_once(): @pytest.mark.v4 @pytest.mark.hook @pytest.mark.HA +@pytest.mark.wtf def test_v4_hooks_HA_state_hold_hs_once(): # HA SERVER 1 misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp4', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL') @@ -802,11 +803,11 @@ def test_v4_hooks_HA_state_hold_hs_once(): # HA SERVER 2 misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS_2)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp4', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL2') @@ -1114,11 +1115,11 @@ def test_v4_hooks_HA_state_hold_hs_always(): # HA SERVER 1 misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp4', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL') @@ -1150,11 +1151,11 @@ def test_v4_hooks_HA_state_hold_hs_always(): # HA SERVER 2 misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS_2)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp4', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL2') diff --git a/tests/dhcpv4/kea_only/class_cmds/test_class_cmds.py b/tests/dhcpv4/kea_only/class_cmds/test_class_cmds.py index a30872e4..365b8468 100644 --- a/tests/dhcpv4/kea_only/class_cmds/test_class_cmds.py +++ b/tests/dhcpv4/kea_only/class_cmds/test_class_cmds.py @@ -27,11 +27,11 @@ def _setup_server_for_class_cmds(dhcp_version): srv_control.config_client_classification('0', 'Client_Class_1') srv_control.open_control_channel('unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_class_cmds.so') @@ -54,7 +54,7 @@ def _send_request(dhcp_version, cmd, channel='http'): cmd_str) response = response[0] elif channel == 'socket': - response = srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + response = srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', cmd_str) else: raise ValueError('unsupported channel type: %s' % str(channel)) @@ -68,7 +68,7 @@ def run_around_tests(dhcp_version): def test_availability(dhcp_version): # pylint: disable=unused-argument - response = srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + response = srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"list-commands","arguments":{}}') for cmd in ['class-list', 'class-add', 'class-update', 'class-get', 'class-del']: diff --git a/tests/dhcpv4/kea_only/control_channel/test_command_control_http.py b/tests/dhcpv4/kea_only/control_channel/test_command_control_http.py index 630dba70..5c866c68 100644 --- a/tests/dhcpv4/kea_only/control_channel/test_command_control_http.py +++ b/tests/dhcpv4/kea_only/control_channel/test_command_control_http.py @@ -15,11 +15,11 @@ import srv_control def test_control_channel_http_dhcp_disable_timer(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -64,11 +64,11 @@ def test_control_channel_http_dhcp_disable_timer(): def test_control_channel_http_dhcp_disable(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -101,11 +101,11 @@ def test_control_channel_http_dhcp_disable(): def test_control_channel_http_dhcp_disable_and_enable(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -152,11 +152,11 @@ def test_control_channel_http_dhcp_disable_and_enable(): def test_control_channel_http_config_set_basic(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -173,11 +173,11 @@ def test_control_channel_http_config_set_basic(): misc.test_setup() srv_control.config_srv_subnet('192.168.51.0/24', '192.168.51.1-192.168.51.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.generate_config_files() srv_msg.send_through_http('$(SRV4_ADDR)', @@ -208,11 +208,11 @@ def test_control_channel_http_change_socket_during_reconfigure(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -228,11 +228,11 @@ def test_control_channel_http_change_socket_during_reconfigure(): misc.test_setup() srv_control.config_srv_subnet('192.168.51.0/24', '192.168.51.1-192.168.51.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2') srv_control.generate_config_files() srv_msg.send_through_http('$(SRV4_ADDR)', @@ -261,11 +261,11 @@ def test_control_channel_http_after_restart_load_config_file(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -284,7 +284,7 @@ def test_control_channel_http_after_restart_load_config_file(): srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.generate_config_files() srv_msg.send_through_http('$(SRV4_ADDR)', @@ -320,11 +320,11 @@ def test_control_channel_http_after_restart_load_config_file(): def test_control_channel_http_get_config(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -341,11 +341,11 @@ def test_control_channel_http_get_config(): def test_control_channel_http_test_config(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -365,7 +365,7 @@ def test_control_channel_http_test_config(): srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket_ANOTHER_ONE') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket_ANOTHER_ONE') srv_control.add_ddns_server('127.0.0.1', '53001') srv_control.add_ddns_server_options('enable-updates', 'true') srv_control.add_ddns_server_options('qualifying-suffix', 'my.domain.com') @@ -396,7 +396,7 @@ def test_control_channel_http_test_config(): srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket_ANOTHER_ONE') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket_ANOTHER_ONE') srv_control.add_ddns_server('127.0.0.1', '53001') srv_control.add_ddns_server_options('enable-updates', 'true') srv_control.add_ddns_server_options('qualifying-suffix', 'my.domain.com') @@ -430,11 +430,11 @@ def test_control_channel_http_config_write(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -460,10 +460,10 @@ def test_control_channel_http_config_write(): srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.generate_config_files() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-set", "service": ["dhcp4"],"arguments": $(SERVER_CONFIG) }') misc.test_procedure() @@ -496,11 +496,11 @@ def test_control_channel_http_reload_config(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -516,11 +516,11 @@ def test_control_channel_http_reload_config(): misc.test_setup() srv_control.config_srv_subnet('192.168.51.0/24', '192.168.51.1-192.168.51.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_msg.send_through_http('$(SRV4_ADDR)', diff --git a/tests/dhcpv4/kea_only/control_channel/test_command_control_keashell.py b/tests/dhcpv4/kea_only/control_channel/test_command_control_keashell.py index 331c2cd4..d70ea2e3 100644 --- a/tests/dhcpv4/kea_only/control_channel/test_command_control_keashell.py +++ b/tests/dhcpv4/kea_only/control_channel/test_command_control_keashell.py @@ -15,11 +15,11 @@ import misc def test_control_channel_keashell_dhcp_disable_timer(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -64,11 +64,11 @@ def test_control_channel_keashell_dhcp_disable_timer(): def test_control_channel_keashell_dhcp_disable(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -101,11 +101,11 @@ def test_control_channel_keashell_dhcp_disable(): def test_control_channel_keashell_dhcp_disable_and_enable(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -152,11 +152,11 @@ def test_control_channel_keashell_dhcp_disable_and_enable(): def test_control_channel_keashell_set_config_basic(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -174,7 +174,7 @@ def test_control_channel_keashell_set_config_basic(): # this command is with new configuration srv_msg.execute_shell_with_args('python', '$(SOFTWARE_INSTALL_DIR)/sbin/kea-shell', - '--host 127.0.0.1 --port 8000 --service dhcp4 config-set <<<\'"Dhcp4":{"renew-timer":1000,"rebind-timer":2000,"valid-lifetime":4000,"interfaces-config":{"interfaces":["$(SERVER_IFACE)"]},"subnet4":[{"subnet":"192.168.51.0/24","interface":"$(SERVER_IFACE)","pools":[{"pool":"192.168.51.1-192.168.51.1"}]}],"lease-database":{"type":"memfile"},"control-socket":{"socket-type":"unix","socket-name":"$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket"}}\'') + '--host 127.0.0.1 --port 8000 --service dhcp4 config-set <<<\'"Dhcp4":{"renew-timer":1000,"rebind-timer":2000,"valid-lifetime":4000,"interfaces-config":{"interfaces":["$(SERVER_IFACE)"]},"subnet4":[{"subnet":"192.168.51.0/24","interface":"$(SERVER_IFACE)","pools":[{"pool":"192.168.51.1-192.168.51.1"}]}],"lease-database":{"type":"memfile"},"control-socket":{"socket-type":"unix","socket-name":"$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket"}}\'') srv_msg.forge_sleep('$(SLEEP_TIME_2)', 'seconds') @@ -196,11 +196,11 @@ def test_control_channel_keashell_after_restart_load_config_file(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -216,7 +216,7 @@ def test_control_channel_keashell_after_restart_load_config_file(): srv_msg.execute_shell_with_args('python', '$(SOFTWARE_INSTALL_DIR)/sbin/kea-shell', - '--host 127.0.0.1 --port 8000 --service dhcp4 config-set <<<\'"Dhcp4":{"renew-timer":1000,"rebind-timer":2000,"valid-lifetime":4000,"interfaces-config":{"interfaces":["$(SERVER_IFACE)"]},"subnet4":[{"subnet":"192.168.51.0/24","interface":"$(SERVER_IFACE)","pools":[{"pool":"192.168.51.1-192.168.51.1"}]}],"lease-database":{"type":"memfile"},"control-socket":{"socket-type":"unix","socket-name":"$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket"}}\'') + '--host 127.0.0.1 --port 8000 --service dhcp4 config-set <<<\'"Dhcp4":{"renew-timer":1000,"rebind-timer":2000,"valid-lifetime":4000,"interfaces-config":{"interfaces":["$(SERVER_IFACE)"]},"subnet4":[{"subnet":"192.168.51.0/24","interface":"$(SERVER_IFACE)","pools":[{"pool":"192.168.51.1-192.168.51.1"}]}],"lease-database":{"type":"memfile"},"control-socket":{"socket-type":"unix","socket-name":"$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket"}}\'') srv_msg.forge_sleep('$(SLEEP_TIME_2)', 'seconds') @@ -249,11 +249,11 @@ def test_control_channel_keashell_after_restart_load_config_file(): def test_control_channel_keashell_get_config(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -270,11 +270,11 @@ def test_control_channel_keashell_get_config(): def test_control_channel_keashell_test_config(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -294,7 +294,7 @@ def test_control_channel_keashell_test_config(): srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket_ANOTHER_ONE') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket_ANOTHER_ONE') srv_control.add_ddns_server('127.0.0.1', '53001') srv_control.add_ddns_server_options('enable-updates', 'true') srv_control.add_ddns_server_options('qualifying-suffix', 'my.domain.com') @@ -325,7 +325,7 @@ def test_control_channel_keashell_test_config(): srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket_ANOTHER_ONE') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket_ANOTHER_ONE') srv_control.add_ddns_server('127.0.0.1', '53001') srv_control.add_ddns_server_options('enable-updates', 'true') srv_control.add_ddns_server_options('qualifying-suffix', 'my.domain.com') @@ -360,11 +360,11 @@ def test_control_channel_keashell_write_config(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -383,12 +383,12 @@ def test_control_channel_keashell_write_config(): srv_control.agent_control_channel('localhost', '8000', 'UNIX', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.generate_config_files() srv_msg.execute_shell_with_args('python', '$(SOFTWARE_INSTALL_DIR)/sbin/kea-shell', - '--host 127.0.0.1 --port 8000 --service dhcp4 config-set <<<\'"Dhcp4":{"renew-timer":1000,"rebind-timer":2000,"valid-lifetime":4000,"interfaces-config":{"interfaces":["$(SERVER_IFACE)"]},"subnet4":[{"subnet":"192.168.51.0/24","interface":"$(SERVER_IFACE)","pools":[{"pool":"192.168.51.1-192.168.51.1"}]}],"lease-database":{"type":"memfile"},"control-socket":{"socket-type":"unix","socket-name":"$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket"}}\'') + '--host 127.0.0.1 --port 8000 --service dhcp4 config-set <<<\'"Dhcp4":{"renew-timer":1000,"rebind-timer":2000,"valid-lifetime":4000,"interfaces-config":{"interfaces":["$(SERVER_IFACE)"]},"subnet4":[{"subnet":"192.168.51.0/24","interface":"$(SERVER_IFACE)","pools":[{"pool":"192.168.51.1-192.168.51.1"}]}],"lease-database":{"type":"memfile"},"control-socket":{"socket-type":"unix","socket-name":"$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket"}}\'') srv_msg.forge_sleep('$(SLEEP_TIME_2)', 'seconds') misc.test_procedure() @@ -426,11 +426,11 @@ def test_control_channel_socket_reload_config(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -446,11 +446,11 @@ def test_control_channel_socket_reload_config(): misc.test_setup() srv_control.config_srv_subnet('192.168.51.0/24', '192.168.51.1-192.168.51.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_msg.execute_shell_with_args('python', diff --git a/tests/dhcpv4/kea_only/control_channel/test_command_control_socket.py b/tests/dhcpv4/kea_only/control_channel/test_command_control_socket.py index 90087eed..20c6995c 100644 --- a/tests/dhcpv4/kea_only/control_channel/test_command_control_socket.py +++ b/tests/dhcpv4/kea_only/control_channel/test_command_control_socket.py @@ -15,7 +15,7 @@ import srv_control def test_control_channel_socket_dhcp_disable_timer(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -30,7 +30,7 @@ def test_control_channel_socket_dhcp_disable_timer(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.5') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "dhcp-disable", "arguments": {"max-period": 5}}') misc.test_procedure() @@ -59,7 +59,7 @@ def test_control_channel_socket_dhcp_disable_timer(): def test_control_channel_socket_dhcp_disable(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -74,7 +74,7 @@ def test_control_channel_socket_dhcp_disable(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.5') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "dhcp-disable" }') misc.test_procedure() @@ -91,7 +91,7 @@ def test_control_channel_socket_dhcp_disable(): def test_control_channel_socket_dhcp_disable_and_enable(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -106,7 +106,7 @@ def test_control_channel_socket_dhcp_disable_and_enable(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.5') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "dhcp-disable" }') misc.test_procedure() @@ -116,7 +116,7 @@ def test_control_channel_socket_dhcp_disable_and_enable(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "dhcp-enable" }') misc.test_procedure() @@ -136,7 +136,7 @@ def test_control_channel_socket_dhcp_disable_and_enable(): def test_control_channel_socket_config_get_basic(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -153,10 +153,10 @@ def test_control_channel_socket_config_get_basic(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.generate_config_files() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-get","arguments": $(SERVER_CONFIG) }') @@ -166,7 +166,7 @@ def test_control_channel_socket_config_get_basic(): def test_control_channel_socket_config_set_basic(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -183,10 +183,10 @@ def test_control_channel_socket_config_set_basic(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.generate_config_files() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-set","arguments": $(SERVER_CONFIG) }') misc.test_procedure() @@ -206,7 +206,7 @@ def test_control_channel_socket_config_set_basic(): def test_control_channel_socket_change_socket_during_reconfigure(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -223,10 +223,10 @@ def test_control_channel_socket_change_socket_during_reconfigure(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2') srv_control.generate_config_files() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-set","arguments": $(SERVER_CONFIG) }') misc.test_procedure() @@ -239,9 +239,9 @@ def test_control_channel_socket_change_socket_during_reconfigure(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "list-commands","arguments": {}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2', '{"command": "list-commands","arguments": {}}') @@ -252,7 +252,7 @@ def test_control_channel_socket_after_restart_load_config_file(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -269,10 +269,10 @@ def test_control_channel_socket_after_restart_load_config_file(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.generate_config_files() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-set","arguments": $(SERVER_CONFIG) }') misc.test_procedure() diff --git a/tests/dhcpv4/kea_only/flexid/test_flex_id.py b/tests/dhcpv4/kea_only/flexid/test_flex_id.py index bfa4b6cf..aad57207 100644 --- a/tests/dhcpv4/kea_only/flexid/test_flex_id.py +++ b/tests/dhcpv4/kea_only/flexid/test_flex_id.py @@ -24,7 +24,7 @@ def test_v4_hooks_flexid_libreload(): srv_control.add_line('"host-reservation-identifiers": [ "flex-id" ]') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_flex_id.so') srv_control.add_parameter_to_hook('1', 'identifier-expression', 'option[60].hex') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -37,7 +37,7 @@ def test_v4_hooks_flexid_libreload(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.10') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "libreload","arguments": {}}') # if reload works - classification should work without changes @@ -66,7 +66,7 @@ def test_v4_hooks_flexid_reconfigure(): srv_control.add_line('"host-reservation-identifiers": [ "flex-id" ]') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_flex_id.so') srv_control.add_parameter_to_hook('1', 'identifier-expression', 'option[60].hex') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -90,7 +90,7 @@ def test_v4_hooks_flexid_reconfigure(): srv_control.add_line('"host-reservation-identifiers": [ "flex-id" ]') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_flex_id.so') srv_control.add_parameter_to_hook('1', 'identifier-expression', 'option[60].hex') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'reconfigured') @@ -278,10 +278,10 @@ def test_v4_hooks_flexid_replace_mac_addr_inside_pool(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.50.10,ff:01:02:03:ff:04,,4000') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.50.10,ff:01:02:03:ff:04,,0') @@ -396,13 +396,13 @@ def test_v4_hooks_flexid_replace_client_id_release_1(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.10') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', 'NOT ', 'ff:01:02:03:ff:04:11:22:33') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.50.10,ff:01:02:03:ff:04,00:64:6f:63:73:69:73:33:2e:30,4000') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', 'NOT ', '192.168.50.10,ff:01:02:03:ff:04,00:64:6f:63:73:69:73:33:2e:30,0') @@ -473,13 +473,13 @@ def test_v4_hooks_flexid_replace_client_id_release_2(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.10') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', 'NOT ', 'ff:01:02:03:ff:04:11:22:33') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.50.10,ff:01:02:03:ff:04,00:64:6f:63:73:69:73:33:2e:30,4000') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.50.10,ff:01:02:03:ff:04,00:64:6f:63:73:69:73:33:2e:30,0') @@ -541,10 +541,10 @@ def test_v4_hooks_flexid_replace_client_id_renew_1(): srv_msg.response_check_include_option('Response', None, '61') srv_msg.response_check_include_option('Response', None, '54') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', 'NOT ', 'ff:01:02:03:ff:04:11:22:33') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.50.10,ff:01:02:03:ff:04,00:64:6f:63:73:69:73:33:2e:30,4000') @@ -606,10 +606,10 @@ def test_v4_hooks_flexid_replace_client_id_renew_2(): srv_msg.response_check_include_option('Response', None, '61') srv_msg.response_check_include_option('Response', None, '54') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', 'NOT ', 'ff:01:02:03:ff:04:11:22:33') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.50.10,ff:01:02:03:ff:04,00:64:6f:63:73:69:73:33:2e:30,4000') diff --git a/tests/dhcpv4/kea_only/host_cmds/test_hosts_cmds.py b/tests/dhcpv4/kea_only/host_cmds/test_hosts_cmds.py index 1f029fdb..dbda0d2c 100644 --- a/tests/dhcpv4/kea_only/host_cmds/test_hosts_cmds.py +++ b/tests/dhcpv4/kea_only/host_cmds/test_hosts_cmds.py @@ -16,7 +16,7 @@ def test_v4_hosts_cmds_libreload(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') @@ -31,7 +31,7 @@ def test_v4_hosts_cmds_libreload(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"hw-address":"ff:01:02:03:ff:04","ip-address":"192.168.50.100"}}}') misc.test_procedure() @@ -53,10 +53,10 @@ def test_v4_hosts_cmds_libreload(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.100') srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "libreload","arguments": {}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-del","arguments":{"subnet-id":1,"ip-address":"192.168.50.100"}}') misc.test_procedure() @@ -75,7 +75,7 @@ def test_v4_hosts_cmds_reconfigure(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') @@ -90,7 +90,7 @@ def test_v4_hosts_cmds_reconfigure(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"hw-address":"ff:01:02:03:ff:04","ip-address":"192.168.50.100"}}}') misc.test_procedure() @@ -104,14 +104,14 @@ def test_v4_hosts_cmds_reconfigure(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'reconfigured') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"hw-address":"ff:01:02:03:ff:04","ip-address":"192.168.50.100"}}}') misc.test_procedure() @@ -130,7 +130,7 @@ def test_v4_hosts_cmds_add_reservation_mysql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') @@ -145,7 +145,7 @@ def test_v4_hosts_cmds_add_reservation_mysql(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"hw-address":"ff:01:02:03:ff:04","ip-address":"192.168.50.100"}}}') misc.test_procedure() @@ -176,7 +176,7 @@ def test_v4_hosts_cmds_del_reservation_mysql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') @@ -191,7 +191,7 @@ def test_v4_hosts_cmds_del_reservation_mysql(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"hw-address":"ff:01:02:03:ff:04","ip-address":"192.168.50.100"}}}') misc.test_procedure() @@ -202,7 +202,7 @@ def test_v4_hosts_cmds_del_reservation_mysql(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.100') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-del","arguments":{"subnet-id":1,"ip-address":"192.168.50.100"}}') misc.test_procedure() @@ -222,7 +222,7 @@ def test_v4_hosts_cmds_del_reservation_mysql_2(): # address reserved without using command srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') srv_control.new_db_backend_reservation('MySQL', 'hw-address', 'ff:01:02:03:ff:04') @@ -242,7 +242,7 @@ def test_v4_hosts_cmds_del_reservation_mysql_2(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.100') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-del","arguments":{"subnet-id":1,"ip-address":"192.168.50.100"}}') misc.test_procedure() @@ -261,7 +261,7 @@ def test_v4_hosts_cmds_del_reservation_pgsql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('PostgreSQL') @@ -276,7 +276,7 @@ def test_v4_hosts_cmds_del_reservation_pgsql(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"hw-address":"ff:01:02:03:ff:04","ip-address":"192.168.50.100"}}}') misc.test_procedure() @@ -287,7 +287,7 @@ def test_v4_hosts_cmds_del_reservation_pgsql(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.100') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-del","arguments":{"subnet-id":1,"ip-address":"192.168.50.100"}}') misc.test_procedure() @@ -306,7 +306,7 @@ def test_v4_hosts_cmds_del_reservation_pgsql_2(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('PostgreSQL') srv_control.new_db_backend_reservation('PostgreSQL', 'hw-address', 'ff:01:02:03:ff:04') @@ -326,7 +326,7 @@ def test_v4_hosts_cmds_del_reservation_pgsql_2(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.100') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-del","arguments":{"subnet-id":1,"ip-address":"192.168.50.100"}}') misc.test_procedure() @@ -357,7 +357,7 @@ def test_v4_hosts_cmds_add_reservation_pgsql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('PostgreSQL') @@ -372,7 +372,7 @@ def test_v4_hosts_cmds_add_reservation_pgsql(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"hw-address":"ff:01:02:03:ff:04","ip-address":"192.168.50.100"}}}') misc.test_procedure() @@ -403,7 +403,7 @@ def test_v4_hosts_cmds_get_reservation_mysql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') @@ -418,7 +418,7 @@ def test_v4_hosts_cmds_get_reservation_mysql(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"hw-address":"ff:01:02:03:ff:04","ip-address":"192.168.50.100"}}}') misc.test_procedure() @@ -429,7 +429,7 @@ def test_v4_hosts_cmds_get_reservation_mysql(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.100') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "reservation-get","arguments":{"subnet-id":1,"identifier-type": "hw-address","identifier":"ff:01:02:03:ff:04"}}') @@ -441,7 +441,7 @@ def test_v4_hosts_cmds_get_reservation_mysql_2(): # address reserved without using command srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') srv_control.new_db_backend_reservation('MySQL', 'hw-address', 'ff:01:02:03:ff:04') @@ -461,7 +461,7 @@ def test_v4_hosts_cmds_get_reservation_mysql_2(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.100') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "reservation-get","arguments":{"subnet-id":1,"identifier-type": "hw-address","identifier":"ff:01:02:03:ff:04"}}') @@ -472,7 +472,7 @@ def test_v4_hosts_cmds_get_reservation_pgsql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('PostgreSQL') @@ -487,7 +487,7 @@ def test_v4_hosts_cmds_get_reservation_pgsql(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"hw-address":"ff:01:02:03:ff:04","ip-address":"192.168.50.100"}}}') misc.test_procedure() @@ -498,7 +498,7 @@ def test_v4_hosts_cmds_get_reservation_pgsql(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.100') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "reservation-get","arguments":{"subnet-id":1,"identifier-type": "hw-address","identifier":"ff:01:02:03:ff:04"}}') @@ -509,7 +509,7 @@ def test_v4_hosts_cmds_get_reservation_pgsql_2(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('PostgreSQL') srv_control.new_db_backend_reservation('PostgreSQL', 'hw-address', 'ff:01:02:03:ff:04') @@ -529,7 +529,7 @@ def test_v4_hosts_cmds_get_reservation_pgsql_2(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.100') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "reservation-get","arguments":{"subnet-id":1,"identifier-type": "hw-address","identifier":"ff:01:02:03:ff:04"}}') @@ -539,7 +539,7 @@ def test_v4_hosts_cmds_get_reservation_pgsql_2(): def test_v4_hosts_cmds_add_reservation_mysql_flex_id(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_flex_id.so') @@ -560,7 +560,7 @@ def test_v4_hosts_cmds_add_reservation_mysql_flex_id(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"flex-id":"\'docsis3.0\'","ip-address":"192.168.50.100"}}}') misc.test_procedure() @@ -593,7 +593,7 @@ def test_v4_hosts_cmds_add_reservation_mysql_flex_id(): def test_v4_hosts_cmds_add_reservation_mysql_flex_id_nak(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_flex_id.so') @@ -614,7 +614,7 @@ def test_v4_hosts_cmds_add_reservation_mysql_flex_id_nak(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"flex-id":"\'docsis3.0\'","ip-address":"192.168.50.100"}}}') misc.test_procedure() @@ -644,7 +644,7 @@ def test_v4_hosts_cmds_add_reservation_mysql_flex_id_nak(): def test_v4_hosts_cmds_add_reservation_pgsql_flex_id(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_flex_id.so') @@ -665,7 +665,7 @@ def test_v4_hosts_cmds_add_reservation_pgsql_flex_id(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"flex-id":"\'docsis3.0\'","ip-address":"192.168.50.100"}}}') misc.test_procedure() @@ -698,7 +698,7 @@ def test_v4_hosts_cmds_add_reservation_pgsql_flex_id(): def test_v4_hosts_cmds_add_reservation_pgsql_flex_id_nak(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_flex_id.so') @@ -719,7 +719,7 @@ def test_v4_hosts_cmds_add_reservation_pgsql_flex_id_nak(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"flex-id":"\'docsis3.0\'","ip-address":"192.168.50.100"}}}') misc.test_procedure() @@ -750,7 +750,7 @@ def test_v4_hosts_cmds_add_reservation_complex_pgsql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('PostgreSQL') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -763,7 +763,7 @@ def test_v4_hosts_cmds_add_reservation_complex_pgsql(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"client-id":"01:0a:0b:0c:0d:0e:0f","ip-address":"192.0.2.205","next-server":"192.0.2.1","server-hostname":"hal9000","boot-file-name":"/dev/null","option-data":[{"name":"domain-name-servers","data":"10.1.1.202,10.1.1.203"}],"client-classes":["special_snowflake","office"]}}}') misc.test_procedure() @@ -803,7 +803,7 @@ def test_v4_hosts_cmds_add_reservation_complex_mysql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.50-192.168.50.50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -816,7 +816,7 @@ def test_v4_hosts_cmds_add_reservation_complex_mysql(): srv_msg.send_wait_for_message('MUST', None, 'OFFER') srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"client-id":"01:0a:0b:0c:0d:0e:0f","ip-address":"192.0.2.205","next-server":"192.0.2.1","server-hostname":"hal9000","boot-file-name":"/dev/null","option-data":[{"name":"domain-name-servers","data":"10.1.1.202,10.1.1.203"}],"client-classes":["special_snowflake","office"]}}}') misc.test_procedure() diff --git a/tests/dhcpv4/kea_only/leases_cmds/test_leases_cmds.py b/tests/dhcpv4/kea_only/leases_cmds/test_leases_cmds.py index 4c493738..843abf0c 100644 --- a/tests/dhcpv4/kea_only/leases_cmds/test_leases_cmds.py +++ b/tests/dhcpv4/kea_only/leases_cmds/test_leases_cmds.py @@ -18,13 +18,13 @@ def test_hook_v4_lease_cmds_list(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') srv_control.config_srv_another_subnet_no_interface('10.0.0.0/24', '10.0.0.5-10.0.0.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"list-commands","arguments":{}}') @@ -37,7 +37,7 @@ def test_hook_v4_lease_cmds_update(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') srv_control.config_srv_another_subnet_no_interface('10.0.0.0/24', '10.0.0.5-10.0.0.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -67,31 +67,31 @@ def test_hook_v4_lease_cmds_update(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.50.1,ff:01:02:03:ff:04,,') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, ',1,0,0,,0') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', 'NOT ', '192.168.50.1,1a:1b:1c:1d:1e:1f,,4000') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', 'NOT ', '1,0,0,newhostname.example.org,0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease4-get","arguments":{"ip-address": "192.168.50.1"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease4-update","arguments":{"ip-address": "192.168.50.1","hostname": "newhostname.example.org","hw-address": "1a:1b:1c:1d:1e:1f","subnet-id":1}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease4-get","arguments":{"ip-address": "192.168.50.1"}}') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.50.1,1a:1b:1c:1d:1e:1f,,4000') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '1,0,0,newhostname.example.org,0') @@ -105,7 +105,7 @@ def test_hook_v4_lease_cmds_get_1(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') srv_control.config_srv_another_subnet_no_interface('10.0.0.0/24', '10.0.0.5-10.0.0.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -135,7 +135,7 @@ def test_hook_v4_lease_cmds_get_1(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease4-get","arguments":{"ip-address": "192.168.50.1"}}') @@ -148,7 +148,7 @@ def test_hook_v4_lease_cmds_get_2(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') srv_control.config_srv_another_subnet_no_interface('10.0.0.0/24', '10.0.0.5-10.0.0.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -178,7 +178,7 @@ def test_hook_v4_lease_cmds_get_2(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease4-get","arguments":{"identifier-type": "hw-address","identifier": "ff:01:02:03:ff:04","subnet-id":1}}') @@ -190,13 +190,13 @@ def test_hook_v4_lease_cmds_get_2(): def test_hook_v4_lease_cmds_add_notvalid_id(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease4-add","arguments": {"subnet-id": 44,"ip-address": "192.168.50.5","hw-address": "1a:1b:1c:1d:1e:1f"}}') misc.test_procedure() @@ -218,13 +218,13 @@ def test_hook_v4_lease_cmds_add_notvalid_id(): def test_hook_v4_lease_cmds_add_address_from_different_subnet(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease4-add","arguments": {"subnet-id": 1,"ip-address": "192.0.2.202","hw-address": "1a:1b:1c:1d:1e:1f"}}') misc.test_procedure() @@ -246,7 +246,7 @@ def test_hook_v4_lease_cmds_add_address_from_different_subnet(): def test_hook_v4_lease_cmds_add_valid(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -262,7 +262,7 @@ def test_hook_v4_lease_cmds_add_valid(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.5') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease4-add","arguments": {"subnet-id": 1,"ip-address": "192.168.50.5","hw-address": "1a:1b:1c:1d:1e:1f"}}') misc.test_procedure() @@ -282,7 +282,7 @@ def test_hook_v4_lease_cmds_add_valid(): def test_hook_v4_lease_cmds_add_outside_pool(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -298,7 +298,7 @@ def test_hook_v4_lease_cmds_add_outside_pool(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.5') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease4-add","arguments": {"subnet-id": 1,"ip-address": "192.168.50.50","hw-address": "1a:1b:1c:1d:1e:1f"}}') misc.test_procedure() @@ -313,7 +313,7 @@ def test_hook_v4_lease_cmds_add_outside_pool(): srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') # Now we have to check if lease 192.168.50.50 was actually added -- check leases file - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '1a:1b:1c:1d:1e:1f') @@ -326,7 +326,7 @@ def test_hook_v4_lease_cmds_add_outside_pool(): def test_hook_v4_lease_cmds_add_with_additional_values(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -342,21 +342,21 @@ def test_hook_v4_lease_cmds_add_with_additional_values(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.5') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease4-add","arguments": {"subnet-id": 1,"ip-address": "192.168.50.5","hw-address": "1a:1b:1c:1d:1e:1f","valid-lft":7777,"expire":123456789,"hostname":"my.host.some.name","client-id":"aa:bb:cc:dd:11:22"}}') # Now we have to check if lease 192.168.50.50 was actually added -- check leases file - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '1a:1b:1c:1d:1e:1f') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, 'aa:bb:cc:dd:11:22') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', None, '7777') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '7777') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '123456789') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, 'my.host.some.name') @@ -369,7 +369,7 @@ def test_hook_v4_lease_cmds_add_with_additional_values(): def test_hook_v4_lease_cmds_del_using_address(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -407,7 +407,7 @@ def test_hook_v4_lease_cmds_del_using_address(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease4-del","arguments": {"ip-address": "192.168.50.1"}}') misc.test_procedure() @@ -430,7 +430,7 @@ def test_hook_v4_lease_cmds_del_using_address(): def test_hook_v4_lease_cmds_del_using_hw_address(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -468,7 +468,7 @@ def test_hook_v4_lease_cmds_del_using_hw_address(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease4-del","arguments": {"identifier": "ff:01:02:03:ff:04","identifier-type":"hw-address","subnet-id":1}}') misc.test_procedure() @@ -491,7 +491,7 @@ def test_hook_v4_lease_cmds_del_using_hw_address(): def test_hook_v4_lease_cmds_wipe(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.2') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -553,7 +553,7 @@ def test_hook_v4_lease_cmds_wipe(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease4-wipe","arguments": {"subnet-id":1}}') misc.test_procedure() diff --git a/tests/dhcpv4/kea_only/leases_cmds/test_leases_cmds_legal_logging.py b/tests/dhcpv4/kea_only/leases_cmds/test_leases_cmds_legal_logging.py index ef2f1598..4fbf8c9b 100644 --- a/tests/dhcpv4/kea_only/leases_cmds/test_leases_cmds_legal_logging.py +++ b/tests/dhcpv4/kea_only/leases_cmds/test_leases_cmds_legal_logging.py @@ -17,12 +17,12 @@ import srv_msg @pytest.mark.legal_logging def test_hook_v4_lease_cmds_legal_logging_update(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') srv_control.config_srv_another_subnet_no_interface('10.0.0.0/24', '10.0.0.5-10.0.0.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_legal_log.so') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -53,18 +53,18 @@ def test_hook_v4_lease_cmds_legal_logging_update(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.50.1,ff:01:02:03:ff:04,,') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, ',1,0,0,,0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease4-update","arguments":{"ip-address": "192.168.50.1","hostname": "newhostname.example.org","hw-address": "1a:1b:1c:1d:1e:1f","subnet-id":1,"valid-lft":500000}}') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, ' Administrator updated information on the lease of address: 192.168.50.1 to a device with hardware address: 1a:1b:1c:1d:1e:1f for 5 days 18 hrs 53 mins 20 secs') @@ -76,37 +76,37 @@ def test_hook_v4_lease_cmds_legal_logging_update(): @pytest.mark.lease_cmds def test_hook_v4_lease_cmds_legal_logging_add(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_legal_log.so') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease4-add","arguments": {"subnet-id": 1,"ip-address": "192.168.50.5","hw-address": "1a:1b:1c:1d:1e:1f","valid-lft":7777,"expire":123456789,"hostname":"my.host.some.name","client-id":"aa:bb:cc:dd:11:22"}}') # Now we have to check if lease 192.168.50.50 was actually added -- check leases file - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '1a:1b:1c:1d:1e:1f') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, 'aa:bb:cc:dd:11:22') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', None, '7777') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '7777') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '123456789') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, 'my.host.some.name') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, ' Administrator added a lease of address: 192.168.50.5 to a device with hardware address: 1a:1b:1c:1d:1e:1f, client-id: aa:bb:cc:dd:11:22 for 2 hrs 9 mins 37 secs') @@ -118,11 +118,11 @@ def test_hook_v4_lease_cmds_legal_logging_add(): @pytest.mark.lease_cmds def test_hook_v4_lease_cmds_legal_logging_del_using_address(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_legal_log.so') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -161,7 +161,7 @@ def test_hook_v4_lease_cmds_legal_logging_del_using_address(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease4-del","arguments": {"ip-address": "192.168.50.1"}}') misc.test_procedure() @@ -175,8 +175,8 @@ def test_hook_v4_lease_cmds_legal_logging_del_using_address(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Administrator deleted the lease for address: 192.168.50.1') @@ -188,11 +188,11 @@ def test_hook_v4_lease_cmds_legal_logging_del_using_address(): @pytest.mark.lease_cmds def test_hook_v4_lease_cmds_legal_logging_del_using_hw_address(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_legal_log.so') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -231,7 +231,7 @@ def test_hook_v4_lease_cmds_legal_logging_del_using_hw_address(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease4-del","arguments": {"identifier": "ff:01:02:03:ff:04","identifier-type":"hw-address","subnet-id":1}}') misc.test_procedure() @@ -245,8 +245,8 @@ def test_hook_v4_lease_cmds_legal_logging_del_using_hw_address(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Administrator deleted a lease for a device identified by: hw-address of ff:01:02:03:ff:04') @@ -259,11 +259,11 @@ def test_hook_v4_lease_cmds_legal_logging_del_using_hw_address(): @pytest.mark.disabled def test_hook_v4_lease_cmds_legal_logging_wipe(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.2') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_legal_log.so') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -326,7 +326,7 @@ def test_hook_v4_lease_cmds_legal_logging_wipe(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease4-wipe","arguments": {"subnet-id":1}}') misc.test_procedure() @@ -340,6 +340,6 @@ def test_hook_v4_lease_cmds_legal_logging_wipe(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') srv_msg.test_fail() - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt MUST contain line or phrase: + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt MUST contain line or phrase: diff --git a/tests/dhcpv4/kea_only/subnets_cmds/test_network_cmds.py b/tests/dhcpv4/kea_only/subnets_cmds/test_network_cmds.py index 71071ef6..de0e1196 100644 --- a/tests/dhcpv4/kea_only/subnets_cmds/test_network_cmds.py +++ b/tests/dhcpv4/kea_only/subnets_cmds/test_network_cmds.py @@ -39,12 +39,12 @@ def test_hook_v4_network_cmds_list(): srv_control.config_srv('time-servers', '3', '199.199.199.200') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-list","arguments":{}}') @@ -78,11 +78,11 @@ def test_hook_v4_network_cmds_get_by_name(): srv_control.config_srv('time-servers', '3', '199.199.199.200') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-get","arguments":{"name":"name-xyz"}}') @@ -95,7 +95,7 @@ def test_hook_v4_network_cmds_add(): misc.test_setup() srv_control.config_srv_subnet('$(EMPTY)', '$(EMPTY)') srv_control.config_srv_opt('domain-name-servers', '199.199.199.1,100.100.100.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -109,11 +109,11 @@ def test_hook_v4_network_cmds_add(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-add","arguments":{"shared-networks": [{"name": "name-xyz","rebind-timer": 100,"renew-timer": 100,"valid-lifetime": 400,"subnet4": [{"interface": "$(SERVER_IFACE)", "pools": [{"pool": "192.168.50.1/32"}],"rebind-timer": 2000,"renew-timer": 1000,"subnet": "192.168.50.0/24","valid-lifetime": 4000}]}]}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-get","arguments":{"name": "name-xyz"}}') srv_msg.forge_sleep('3', 'seconds') @@ -158,16 +158,16 @@ def test_hook_v4_network_cmds_add_conflict(): srv_control.config_srv('time-servers', '3', '199.199.199.200') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-add","arguments":{"shared-networks": [{"match-client-id": true,"name": "name-xyz","option-data": [],"rebind-timer": 0,"relay": {"ip-address": "0.0.0.0"},"renew-timer": 0,"reservation-mode": "all","subnet4": [{"4o6-interface": "","4o6-interface-id": "","4o6-subnet": "","boot-file-name": "","id": 3,"match-client-id": true,"next-server": "0.0.0.0","option-data": [{"always-send": false,"code": 4,"csv-format": false,"data": "C7C7C764","name": "time-servers","space": "dhcp4"}],"pools": [{"option-data": [],"pool": "192.168.52.1/32"}],"rebind-timer": 2000,"relay": {"ip-address": "192.168.50.249"},"renew-timer": 1000,"reservation-mode": "all","server-hostname": "","subnet": "192.168.52.0/24","valid-lifetime": 4000},{"4o6-interface": "","4o6-interface-id": "","4o6-subnet": "","boot-file-name": "","id": 4,"match-client-id": true,"next-server": "0.0.0.0","option-data": [{"always-send": false,"code": 4,"csv-format": false,"data": "C7C7C7C8","name": "time-servers","space": "dhcp4"}],"pools": [{"option-data": [],"pool": "192.168.53.1/32"}],"rebind-timer": 2000,"relay": {"ip-address": "192.168.50.249"},"renew-timer": 1000,"reservation-mode": "all","server-hostname": "","subnet": "192.168.53.0/24","valid-lifetime": 4000}],"valid-lifetime": 0}]}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-get","arguments":{"name": "name-xyz"}}') @@ -189,7 +189,7 @@ def test_hook_v4_network_cmds_del(): srv_control.config_srv('time-servers', '0', '199.199.199.10') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -203,9 +203,9 @@ def test_hook_v4_network_cmds_del(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-del","arguments":{"name":"name-abc","subnets-action": "delete"}}') misc.test_procedure() @@ -235,7 +235,7 @@ def test_hook_v4_network_cmds_del_keep_subnet(): srv_control.config_srv('time-servers', '0', '199.199.199.10') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -249,9 +249,9 @@ def test_hook_v4_network_cmds_del_keep_subnet(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-del","arguments":{"name":"name-abc","subnets-action": "keep"}}') misc.test_procedure() @@ -263,7 +263,7 @@ def test_hook_v4_network_cmds_del_keep_subnet(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-list","arguments":{}}') @@ -297,14 +297,14 @@ def test_hook_v4_network_cmds_del_non_existing(): srv_control.config_srv('time-servers', '3', '199.199.199.200') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-del","arguments":{"name":"name-xxyz,"subnets-action": "delete""}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-list","arguments":{}}') @@ -324,7 +324,7 @@ def test_hook_v4_network_cmds_del_global_options(): srv_control.set_conf_parameter_shared_subnet('name', '"name-abc"', '0') srv_control.set_conf_parameter_shared_subnet('interface', '"$(SERVER_IFACE)"', '0') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -342,7 +342,7 @@ def test_hook_v4_network_cmds_del_global_options(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.51.1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "network4-del","arguments":{"name":"name-abc","subnets-action": "delete"}}') misc.test_procedure() @@ -375,7 +375,7 @@ def test_hook_v4_network_cmds_add_and_del(): misc.test_setup() srv_control.config_srv_subnet('$(EMPTY)', '$(EMPTY)') srv_control.config_srv_opt('domain-name-servers', '199.199.199.1,100.100.100.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -389,7 +389,7 @@ def test_hook_v4_network_cmds_add_and_del(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network4-add","arguments":{"shared-networks": [{"name": "name-xyz","rebind-timer": 100,"renew-timer": 100,"valid-lifetime": 400,"subnet4": [{"interface": "$(SERVER_IFACE)", "pools": [{"pool": "192.168.50.1/32"}],"rebind-timer": 2000,"renew-timer": 1000,"subnet": "192.168.50.0/24","valid-lifetime": 4000}]}]}}') misc.test_procedure() @@ -404,7 +404,7 @@ def test_hook_v4_network_cmds_add_and_del(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "network4-del","arguments":{"name":"name-xyz","subnets-action": "delete"}}') misc.test_procedure() diff --git a/tests/dhcpv4/kea_only/subnets_cmds/test_subnet_cmds.py b/tests/dhcpv4/kea_only/subnets_cmds/test_subnet_cmds.py index 0b626be0..b3521de8 100644 --- a/tests/dhcpv4/kea_only/subnets_cmds/test_subnet_cmds.py +++ b/tests/dhcpv4/kea_only/subnets_cmds/test_subnet_cmds.py @@ -18,13 +18,13 @@ def test_hook_v4_subnet_cmds_list(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') srv_control.config_srv_another_subnet_no_interface('10.0.0.0/24', '10.0.0.5-10.0.0.5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet4-list","arguments":{}}') @@ -39,13 +39,13 @@ def test_hook_v4_subnet_cmds_get_by_id(): srv_control.config_srv_another_subnet_no_interface('10.0.0.0/24', '10.0.0.5-10.0.0.5') srv_control.config_srv_another_subnet_no_interface('150.0.0.0/24', '150.0.0.5-150.0.0.5') srv_control.config_srv('streettalk-directory-assistance-server', '2', '199.1.1.1,200.1.1.2') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet4-get","arguments":{"id":3}}') @@ -59,13 +59,13 @@ def test_hook_v4_subnet_cmds_get_by_subnet(): srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.5-192.168.50.5') srv_control.config_srv_another_subnet_no_interface('10.0.0.0/24', '10.0.0.5-10.0.0.5') srv_control.config_srv('domain-name-servers', '1', '199.199.199.1,100.100.100.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet4-get","arguments":{"subnet":"10.0.0.0/24"}}') @@ -78,7 +78,7 @@ def test_hook_v4_subnet_cmds_add(): misc.test_setup() srv_control.config_srv_subnet('$(EMPTY)', '$(EMPTY)') srv_control.config_srv_opt('domain-name-servers', '199.199.199.1,100.100.100.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -92,10 +92,10 @@ def test_hook_v4_subnet_cmds_add(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command":"subnet4-list","arguments":{}} - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command":"subnet4-list","arguments":{}} + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet4-add","arguments":{"subnet4":[{"subnet":"192.168.50.0/24","interface":"$(SERVER_IFACE)","id":234,"pools":[{"pool":"192.168.50.1-192.168.50.1"}]}]}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet4-get","arguments":{"id": 234}}') misc.test_procedure() @@ -118,7 +118,7 @@ def test_hook_v4_subnet_cmds_add_with_options(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '$(EMPTY)') srv_control.config_srv_opt('domain-name-servers', '199.199.199.1,100.100.100.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -143,12 +143,12 @@ def test_hook_v4_subnet_cmds_add_with_options(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command":"subnet4-list","arguments":{}} - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command":"subnet4-list","arguments":{}} + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "subnet4-add","arguments": {"subnet4": [{"subnet": "192.168.51.0/24","interface": "$(SERVER_IFACE)","id": 234,"pools": [{"pool": "192.168.51.1-192.168.51.1"}],"option-data": [{"csv-format": true,"code": 6,"data": "19.19.19.1,10.10.10.1","name": "domain-name-servers","space": "dhcp4"}]}]}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet4-get","arguments":{"id": 234}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "subnet4-del","arguments":{"id":1}}') misc.test_procedure() @@ -176,7 +176,7 @@ def test_hook_v4_subnet_cmds_add_conflict(): misc.test_setup() srv_control.config_srv_subnet('192.168.51.0/24', '192.168.51.1-192.168.51.1') srv_control.config_srv_opt('domain-name-servers', '199.199.199.1,100.100.100.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -194,10 +194,10 @@ def test_hook_v4_subnet_cmds_add_conflict(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.51.1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command":"subnet4-list","arguments":{}} - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command":"subnet4-list","arguments":{}} + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "subnet4-add","arguments": {"subnet4": [{"subnet": "192.168.55.0/24","interface": "$(SERVER_IFACE)","id": 1,"pools": [{"pool": "192.168.55.1-192.168.55.1"}],"option-data": [{"csv-format": true,"code": 6,"data": "19.19.19.1,10.10.10.1","name": "domain-name-servers","space": "dhcp4"}]}]}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet4-get","arguments":{"id": 1}}') misc.test_procedure() @@ -222,7 +222,7 @@ def test_hook_v4_subnet_cmds_del(): misc.test_setup() srv_control.config_srv_subnet('192.168.51.0/24', '192.168.51.1-192.168.51.1') srv_control.config_srv_opt('domain-name-servers', '199.199.199.1,100.100.100.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -240,7 +240,7 @@ def test_hook_v4_subnet_cmds_del(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.51.1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "subnet4-del","arguments":{"id":1}}') misc.test_procedure() @@ -261,7 +261,7 @@ def test_hook_v4_subnet_cmds_del_non_existing(): misc.test_setup() srv_control.config_srv_subnet('192.168.51.0/24', '192.168.51.1-192.168.51.1') srv_control.config_srv_opt('domain-name-servers', '199.199.199.1,100.100.100.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -279,7 +279,7 @@ def test_hook_v4_subnet_cmds_del_non_existing(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.51.1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "subnet4-del","arguments":{"id":2}}') misc.test_procedure() @@ -304,7 +304,7 @@ def test_hook_v4_subnet_cmds_del_global_options(): misc.test_setup() srv_control.config_srv_subnet('192.168.51.0/24', '192.168.51.1-192.168.51.1') srv_control.config_srv_opt('domain-name-servers', '199.199.199.1,100.100.100.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -322,7 +322,7 @@ def test_hook_v4_subnet_cmds_del_global_options(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.51.1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "subnet4-del","arguments":{"id":1}}') misc.test_procedure() @@ -355,7 +355,7 @@ def test_hook_v4_subnet_cmds_add_and_del(): misc.test_setup() srv_control.config_srv_subnet('$(EMPTY)', '$(EMPTY)') srv_control.config_srv_opt('domain-name-servers', '199.199.199.1,100.100.100.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -369,7 +369,7 @@ def test_hook_v4_subnet_cmds_add_and_del(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet4-add","arguments":{"subnet4":[{"subnet":"192.168.50.0/24","interface":"$(SERVER_IFACE)","id":66,"pools":[{"pool":"192.168.50.1-192.168.50.1"}]}]}}') misc.test_procedure() @@ -384,7 +384,7 @@ def test_hook_v4_subnet_cmds_add_and_del(): srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "subnet4-del","arguments":{"id":66}}') misc.test_procedure() diff --git a/tests/dhcpv4/kea_only/test_all_hooks.py b/tests/dhcpv4/kea_only/test_all_hooks.py index e034ed54..b805ba5b 100644 --- a/tests/dhcpv4/kea_only/test_all_hooks.py +++ b/tests/dhcpv4/kea_only/test_all_hooks.py @@ -46,19 +46,18 @@ def test_v4_all_hooks_start(): srv_control.add_parameter_to_ha_hook('peers', '{"name":"server2","url":"http://$(MGMT_ADDRESS_2):8080/","role":"secondary","auto-failover":true}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "list-commands","arguments": {}}') @pytest.mark.v4 @pytest.mark.hook def test_v4_all_hooks_test_cooperation(): - - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.10') @@ -91,16 +90,16 @@ def test_v4_all_hooks_test_cooperation(): # To HA hook configuration add peers with value: {"name":"server1","url":"http://$(MGMT_ADDRESS):8080/","role":"primary","auto-failover":true} # To HA hook configuration add peers with value: {"name":"server2","url":"http://$(MGMT_ADDRESS_2):8080/","role":"secondary","auto-failover":true} - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command": "list-commands","arguments": {}} + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command": "list-commands","arguments": {}} # JSON response in arguments MUST include value: build-report # JSON response in arguments MUST include value: cache-clear # JSON response in arguments MUST include value: cache-flush @@ -216,19 +215,19 @@ def test_v4_all_hooks_test_cooperation(): srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') srv_msg.response_check_option_content('Response', '61', None, 'value', '00010203040506') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Address: 192.168.50.1 has been assigned for 1 hrs 6 mins 40') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'to a device with hardware address: hwtype=1 ff:01:02:03:ff:04, client-id: 00:01:02:03:04:05:06') # lease commands - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease4-add","arguments":{"ip-address": "192.168.50.10","hostname": "newhostname.example.org","hw-address": "1a:1b:1c:1d:1e:1f","subnet-id":1,"valid-lft":500000}}') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Administrator added a lease of address: 192.168.50.10 to a device with hardware address: 1a:1b:1c:1d:1e:1f for 5 days 18 hrs 53 mins 20 secs') @@ -244,4 +243,4 @@ def test_v4_all_hooks_test_cooperation(): # Response MUST contain yiaddr 192.168.50.10. # Response MUST include option 54. # Response option 54 MUST contain value $(SRV4_ADDR). - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') diff --git a/tests/dhcpv4/kea_only/test_kea_logging.py b/tests/dhcpv4/kea_only/test_kea_logging.py index f245d35c..fed8b505 100644 --- a/tests/dhcpv4/kea_only/test_kea_logging.py +++ b/tests/dhcpv4/kea_only/test_kea_logging.py @@ -60,7 +60,7 @@ def test_v4_loggers_options_debug(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.options') @@ -116,7 +116,7 @@ def test_v4_loggers_options_info(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp4.options') @@ -151,7 +151,7 @@ def test_v4_loggers_bad_packets_debug(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'NAK') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.bad-packets') @@ -186,7 +186,7 @@ def test_v4_loggers_bad_packets_info(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'NAK') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp4.bad-packets') @@ -240,10 +240,10 @@ def test_v4_loggers_dhcp4(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.dhcp4') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp4.dhcp4') @@ -297,10 +297,10 @@ def test_v4_loggers_dhcp4_info(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp4.dhcp4') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp4.dhcp4') @@ -354,7 +354,7 @@ def test_v4_loggers_alloc_engine(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.alloc-engine') @@ -409,10 +409,10 @@ def test_v4_loggers_dhcpsrv_debug(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp4.dhcpsrv') @@ -467,10 +467,10 @@ def test_v4_loggers_dhcpsrv_info(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp4.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp4.dhcpsrv') @@ -519,10 +519,10 @@ def test_v4_loggers_leases_debug(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp4.leases') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.leases') @@ -576,7 +576,7 @@ def test_v4_loggers_leases_info(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp4.leases') @@ -630,7 +630,7 @@ def test_v4_loggers_packets_debug(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.packets') @@ -684,7 +684,7 @@ def test_v4_loggers_packets_info(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp4.packets') @@ -738,7 +738,7 @@ def test_v4_loggers_hosts_debug(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.hosts') @@ -792,7 +792,7 @@ def test_v4_loggers_hosts_info(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp4.hosts') @@ -891,25 +891,25 @@ def test_v4_loggers_all(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'OFFER') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.packets') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.alloc-engine') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.dhcp4') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.options') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.leases') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp4.leases') @@ -992,28 +992,28 @@ def test_v4_loggers_all_different_levels_same_file(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'NAK') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.packets') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp4.leases') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.alloc-engine') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp4.dhcp4') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp4.dhcp4') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp4.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp4.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp4.options') @@ -1100,34 +1100,34 @@ def test_v4_loggers_all_different_levels_different_file(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'NAK') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log4', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log4', None, r'DEBUG \[kea-dhcp4.packets') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log5', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log5', 'NOT ', r'DEBUG \[kea-dhcp4.leases') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log6', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log6', None, r'DEBUG \[kea-dhcp4.alloc-engine') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log1', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log1', 'NOT ', r'DEBUG \[kea-dhcp4.dhcp4') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log1', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log1', None, r'INFO \[kea-dhcp4.dhcp4') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log2', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log2', 'NOT ', r'DEBUG \[kea-dhcp4.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log8', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log8', 'NOT ', r'DEBUG \[kea-dhcp4.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log8', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log8', None, r'INFO \[kea-dhcp4.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log2', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log2', None, r'INFO \[kea-dhcp4.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log3', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log3', 'NOT ', r'DEBUG \[kea-dhcp4.options') @@ -1185,21 +1185,21 @@ def test_ddns4_logging_all_types_debug(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp-ddns.dhcpddns') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp-ddns.dhcpddns') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp-ddns.libdhcp-ddns') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp-ddns.d2-to-dns') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'ERROR \[kea-dhcp-ddns.d2-to-dns') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp-ddns.dhcp-to-d2') diff --git a/tests/dhcpv4/kea_only/test_legalloghook.py b/tests/dhcpv4/kea_only/test_legalloghook.py index eca5acf4..7447ea5d 100644 --- a/tests/dhcpv4/kea_only/test_legalloghook.py +++ b/tests/dhcpv4/kea_only/test_legalloghook.py @@ -15,7 +15,7 @@ import srv_control @pytest.mark.legal_logging def test_v4_legal_log_assigned_address(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.set_time('renew-timer', '3') @@ -58,11 +58,11 @@ def test_v4_legal_log_assigned_address(): srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') srv_msg.response_check_option_content('Response', '61', None, 'value', '00010203040506') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Address: 192.168.50.1 has been assigned for 0 hrs 10 mins 0 secs') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'to a device with hardware address: hwtype=1 ff:01:02:03:ff:04, client-id: 00:01:02:03:04:05:06') @@ -199,7 +199,7 @@ def test_v4_legal_log_assigned_address_mysql(): @pytest.mark.legal_logging def test_v4_legal_log_assigned_address_without_client_id(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.set_time('renew-timer', '3') @@ -236,14 +236,14 @@ def test_v4_legal_log_assigned_address_without_client_id(): srv_msg.response_check_include_option('Response', None, '54') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Address: 192.168.50.1 has been assigned for 0 hrs 10 mins 0 secs') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'to a device with hardware address: hwtype=1 ff:01:02:03:ff:04') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', 'NOT ', 'client-id:') @@ -370,7 +370,7 @@ def test_v4_legal_log_assigned_address_without_client_id_mysql(): @pytest.mark.legal_logging def test_v4_legal_log_assigned_address_via_relay_pgsql_1(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.set_time('renew-timer', '3') @@ -414,12 +414,12 @@ def test_v4_legal_log_assigned_address_via_relay_pgsql_1(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Address: 192.168.50.2 has been assigned for 0 hrs 10 mins 0 secs to a device with hardware address: hwtype=1 00:00:00:00:00:00,') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'client-id: 00:01:02:03:04:05:77 connected via relay at address: $(GIADDR4)') @@ -558,7 +558,7 @@ def test_v4_legal_log_assigned_address_via_relay_mysql(): @pytest.mark.legal_logging def test_v4_legal_log_renewed_address(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.set_time('renew-timer', '3') @@ -620,11 +620,11 @@ def test_v4_legal_log_renewed_address(): srv_msg.response_check_include_option('Response', None, '54') srv_msg.response_check_option_content('Response', '54', None, 'value', '$(SRV4_ADDR)') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Address: 192.168.50.1 has been renewed for 0 hrs 10 mins 0 secs') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'to a device with hardware address: hwtype=1 ff:01:02:03:ff:04 connected via relay at address: $(GIADDR4)') @@ -799,7 +799,7 @@ def test_v4_legal_log_renewed_address_mysql(): @pytest.mark.legal_logging def test_v4_legal_log_rebind_address(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.set_time('renew-timer', '3') @@ -861,11 +861,11 @@ def test_v4_legal_log_rebind_address(): srv_msg.response_check_include_option('Response', None, '54') srv_msg.response_check_option_content('Response', '54', None, 'value', '$(SRV4_ADDR)') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Address: 192.168.50.1 has been renewed for 0 hrs 10 mins 0 secs') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'to a device with hardware address: hwtype=1 ff:01:02:03:ff:04 connected via relay at address: $(GIADDR4)') diff --git a/tests/dhcpv4/kea_only/test_shared_networks.py b/tests/dhcpv4/kea_only/test_shared_networks.py index 2d691116..3491aaaf 100644 --- a/tests/dhcpv4/kea_only/test_shared_networks.py +++ b/tests/dhcpv4/kea_only/test_shared_networks.py @@ -240,10 +240,10 @@ def test_v4_sharednetworks_single_shared_subnet_with_two_subnets_based_on_iface( srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.50.1,00:00:00:00:00:22') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.51.1,00:00:00:00:00:33') @@ -310,7 +310,7 @@ def test_v4_sharednetworks_single_shared_subnet_with_tree_subnets_based_on_iface srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.200') srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.50.1,00:00:00:00:00:22') @@ -350,7 +350,7 @@ def test_v4_sharednetworks_single_shared_subnet_with_tree_subnets_based_on_iface srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.200') srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.51.1,00:00:00:00:00:33') @@ -390,7 +390,7 @@ def test_v4_sharednetworks_single_shared_subnet_with_tree_subnets_based_on_iface srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.100') srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.52.1,00:00:00:00:00:44') @@ -466,7 +466,7 @@ def test_v4_sharednetworks_single_shared_subnet_with_three_subnets_based_on_rela srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.200') srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.50.1,00:00:00:00:00:11') @@ -514,7 +514,7 @@ def test_v4_sharednetworks_single_shared_subnet_with_three_subnets_based_on_rela srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.200') srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.51.1,00:00:00:00:00:22') @@ -562,7 +562,7 @@ def test_v4_sharednetworks_single_shared_subnet_with_three_subnets_based_on_rela srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.100') srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.52.1,00:00:00:00:00:33') @@ -662,10 +662,10 @@ def test_v4_sharednetworks_two_shared_subnet_with_two_subnets_based_on_relay_add srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.50.1,00:00:00:00:00:aa') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.51.1,00:00:00:00:00:bb') @@ -712,7 +712,7 @@ def test_v4_sharednetworks_two_shared_subnet_with_two_subnets_based_on_relay_add srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.200') srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.52.1,00:00:00:00:00:22') @@ -760,7 +760,7 @@ def test_v4_sharednetworks_two_shared_subnet_with_two_subnets_based_on_relay_add srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.100') srv_msg.response_check_option_content('Response', '4', 'NOT ', 'value', '199.199.199.1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv', None, '192.168.53.1,00:00:00:00:00:33') @@ -832,7 +832,7 @@ def test_v4_sharednetworks_single_shared_subnet_with_three_subnets_client_classi srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv MUST contain line or phrase: 192.168.50.1,00:00:00:00:00:22 + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv MUST contain line or phrase: 192.168.50.1,00:00:00:00:00:22 misc.test_procedure() srv_msg.client_sets_value('Client', 'chaddr', '00:00:00:00:00:33') srv_msg.client_does_include_with_value('client_id', 'ff:01:02:03:ff:04:f2:f2') @@ -861,7 +861,7 @@ def test_v4_sharednetworks_single_shared_subnet_with_three_subnets_client_classi srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv MUST contain line or phrase: 192.168.51.1,00:00:00:00:00:33 + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv MUST contain line or phrase: 192.168.51.1,00:00:00:00:00:33 @pytest.mark.v4 @@ -935,7 +935,7 @@ def test_v4_sharednetworks_single_shared_subnet_with_three_subnets_client_classi srv_msg.response_check_option_content('Response', '54', 'NOT ', 'value', '44.44.44.222') srv_msg.response_check_option_content('Response', '54', None, 'value', '11.22.33.123') - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv MUST contain line or phrase: 192.168.50.1,00:00:00:00:00:22 + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv MUST contain line or phrase: 192.168.50.1,00:00:00:00:00:22 misc.test_procedure() srv_msg.client_sets_value('Client', 'chaddr', '00:00:00:00:00:33') srv_msg.client_does_include_with_value('client_id', 'ff:01:02:03:ff:04:f2:f2') @@ -1005,7 +1005,7 @@ def test_v4_sharednetworks_single_shared_subnet_with_three_subnets_client_classi srv_msg.response_check_option_content('Response', '54', 'NOT ', 'value', '11.22.33.123') srv_msg.response_check_option_content('Response', '54', 'NOT ', 'value', '44.44.44.222') srv_msg.response_check_option_content('Response', '54', None, 'value', '$(SRV4_ADDR)') - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv MUST contain line or phrase: 192.168.51.1,00:00:00:00:00:33 + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv MUST contain line or phrase: 192.168.51.1,00:00:00:00:00:33 @pytest.mark.v4 @@ -1081,7 +1081,7 @@ def test_v4_sharednetworks_single_shared_subnet_with_three_subnets_client_classi srv_msg.response_check_option_content('Response', '54', 'NOT ', 'value', '44.44.44.222') srv_msg.response_check_option_content('Response', '54', None, 'value', '11.22.33.123') - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv MUST contain line or phrase: 192.168.50.1,00:00:00:00:00:22 + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv MUST contain line or phrase: 192.168.50.1,00:00:00:00:00:22 misc.test_procedure() srv_msg.client_sets_value('Client', 'chaddr', '00:00:00:00:00:33') srv_msg.client_does_include_with_value('client_id', 'ff:01:02:03:ff:04:f2:f2') @@ -1151,5 +1151,5 @@ def test_v4_sharednetworks_single_shared_subnet_with_three_subnets_client_classi srv_msg.response_check_option_content('Response', '54', 'NOT ', 'value', '11.22.33.123') srv_msg.response_check_option_content('Response', '54', 'NOT ', 'value', '44.44.44.222') srv_msg.response_check_option_content('Response', '54', None, 'value', '$(SRV4_ADDR)') - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases4.csv MUST contain line or phrase: + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases4.csv MUST contain line or phrase: # 192.168.51.1,00:00:00:00:00:33 diff --git a/tests/dhcpv4/kea_only/test_statistics.py b/tests/dhcpv4/kea_only/test_statistics.py index f4e74da1..a5fe1317 100644 --- a/tests/dhcpv4/kea_only/test_statistics.py +++ b/tests/dhcpv4/kea_only/test_statistics.py @@ -13,7 +13,7 @@ import srv_control def test_stats_4(): misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.10') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -46,9 +46,9 @@ def test_stats_4(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "list-commands","arguments": {}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"statistic-get-all","arguments":{}}') misc.test_procedure() @@ -80,7 +80,7 @@ def test_stats_4(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"statistic-get-all","arguments":{}}') misc.test_procedure() @@ -116,31 +116,31 @@ def test_stats_4(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'ACK') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-discover-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-offer-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-request-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-ack-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-nak-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-release-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-decline-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-inform-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-unknown-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-sent"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-offer-sent"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-ack-sent"}}') misc.test_procedure() @@ -170,19 +170,19 @@ def test_stats_4(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'NAK') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-nak-sent"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-parse-failed"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-receive-drop"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "subnet[1].total-addresses"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "subnet[1].assigned-addresses"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-remove","arguments": {"name": "pkt4-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-received"}}') misc.test_procedure() @@ -201,11 +201,11 @@ def test_stats_4(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'NAK') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-reset","arguments": {"name": "pkt4-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-received"}}') misc.test_procedure() @@ -224,31 +224,31 @@ def test_stats_4(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'NAK') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt4-received"}}') misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') srv_control.config_srv_another_subnet_no_interface('192.168.51.0/24', '192.168.51.1-192.168.51.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'reconfigured') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"statistic-get-all","arguments":{}}') misc.test_setup() srv_control.config_srv_subnet('192.168.50.0/24', '192.168.50.1-192.168.50.1') srv_control.config_srv_another_subnet_no_interface('192.168.51.0/24', '192.168.51.1-192.168.51.1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'reconfigured') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2', '{"command":"statistic-get-all","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"statistic-get-all","arguments":{}}') misc.test_setup() @@ -258,7 +258,7 @@ def test_stats_4(): srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'reconfigured') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"statistic-get-all","arguments":{}}') @@ -269,11 +269,11 @@ def test_X(): srv_control.config_srv_another_subnet_no_interface('3000:100::/64', '3000:100::5-3000:100::ff') srv_control.config_srv_prefix('3000::', '0', '90', '92') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'reconfigured') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2', '{"command":"statistic-get-all","arguments":{}}') misc.test_setup() @@ -282,20 +282,20 @@ def test_X(): srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'reconfigured') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"statistic-get-all","arguments":{}}') misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::ff') srv_control.config_srv_prefix('3000::', '0', '90', '92') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'reconfigured') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2', '{"command":"statistic-get-all","arguments":{}}') srv_control.start_srv('DHCP', 'restarted') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2', '{"command":"statistic-get-all","arguments":{}}') diff --git a/tests/dhcpv4/kea_only/user_chk/test_v4_user_check_general_logs.py b/tests/dhcpv4/kea_only/user_chk/test_v4_user_check_general_logs.py index 0a48f9d7..0cce78e2 100644 --- a/tests/dhcpv4/kea_only/user_chk/test_v4_user_check_general_logs.py +++ b/tests/dhcpv4/kea_only/user_chk/test_v4_user_check_general_logs.py @@ -49,9 +49,9 @@ def test_user_check_IA_NA_no_registry_logging(): # Server MUST respond with ACK message. # Client download file from server stored in: /tmp/user_chk_outcome.txt. # Client download file from server stored in: /tmp/user_chk_registry.txt. - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea.log MUST NOT contain line or phrase: DEBUG \[kea-dhcp4.hooks - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea.log MUST contain line or phrase: ERROR \[kea-dhcp4.hooks - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea.log MUST NOT contain line or phrase: DEBUG \[kea-dhcp4.callouts + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log MUST NOT contain line or phrase: DEBUG \[kea-dhcp4.hooks + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log MUST contain line or phrase: ERROR \[kea-dhcp4.hooks + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log MUST NOT contain line or phrase: DEBUG \[kea-dhcp4.callouts @pytest.mark.v4 @@ -88,10 +88,10 @@ def test_user_check_IA_NA_with_registry_unknown_user_logging(): # Check the outcome file for correct content srv_msg.copy_remote('/tmp/user_chk_outcome.txt') srv_msg.compare_file('tests/dhcpv4/kea_only/user_chk/outcome_1.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp4.hooks') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp4.callouts') @@ -130,8 +130,8 @@ def test_user_check_IA_NA_with_registry_unknown_user_logging_2(): # Check the outcome file for correct content srv_msg.copy_remote('/tmp/user_chk_outcome.txt') srv_msg.compare_file('tests/dhcpv4/kea_only/user_chk/outcome_1.txt') - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea.log MUST contain line or phrase: INFO \[kea-dhcp4.hooks - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea.log MUST contain line or phrase: DEBUG \[kea-dhcp4.callouts + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log MUST contain line or phrase: INFO \[kea-dhcp4.hooks + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log MUST contain line or phrase: DEBUG \[kea-dhcp4.callouts misc.test_setup() srv_msg.send_file_to_server('tests/dhcpv4/kea_only/user_chk/registry_1.txt', @@ -159,5 +159,5 @@ def test_user_check_IA_NA_with_registry_unknown_user_logging_2(): # Check the outcome file for correct content srv_msg.copy_remote('/tmp/user_chk_outcome.txt') srv_msg.compare_file('tests/dhcpv4/kea_only/user_chk/outcome_1.txt') - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea.log MUST contain line or phrase: INFO \[kea-dhcp4.hooks - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea.log MUST contain line or phrase: DEBUG \[kea-dhcp4.callouts + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log MUST contain line or phrase: INFO \[kea-dhcp4.hooks + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log MUST contain line or phrase: DEBUG \[kea-dhcp4.callouts diff --git a/tests/dhcpv6/kea_only/HA/test_ha_states.py b/tests/dhcpv6/kea_only/HA/test_ha_states.py index c9dbebb1..dee73618 100644 --- a/tests/dhcpv6/kea_only/HA/test_ha_states.py +++ b/tests/dhcpv6/kea_only/HA/test_ha_states.py @@ -18,11 +18,11 @@ def test_v6_hooks_HA_state_hold_lb_always(): # HA SERVER 1 misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') @@ -53,11 +53,11 @@ def test_v6_hooks_HA_state_hold_lb_always(): # HA SERVER 2 misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS_2)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL2') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') @@ -447,11 +447,11 @@ def test_v6_hooks_HA_state_hold_lb_once(): # HA SERVER 1 misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') @@ -482,11 +482,11 @@ def test_v6_hooks_HA_state_hold_lb_once(): # HA SERVER 2 misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS_2)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL2') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') @@ -817,11 +817,11 @@ def test_v6_hooks_HA_state_hold_hs_once(): # HA SERVER 1 misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL') @@ -853,11 +853,11 @@ def test_v6_hooks_HA_state_hold_hs_once(): # HA SERVER 2 misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS_2)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL2') @@ -1190,11 +1190,11 @@ def test_v6_hooks_HA_state_hold_hs_always(): # HA SERVER 1 misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL') @@ -1226,11 +1226,11 @@ def test_v6_hooks_HA_state_hold_hs_always(): # HA SERVER 2 misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS_2)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL2') diff --git a/tests/dhcpv6/kea_only/HA/test_ha_sync.py b/tests/dhcpv6/kea_only/HA/test_ha_sync.py index 7ee13f30..45cbe07f 100644 --- a/tests/dhcpv6/kea_only/HA/test_ha_sync.py +++ b/tests/dhcpv6/kea_only/HA/test_ha_sync.py @@ -19,11 +19,11 @@ def test_v6_hooks_HA_page_size_sync(): # HA SERVER 1 misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::ffff') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6.dhcpsrv', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-dhcp6.ha-hooks', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL') @@ -52,11 +52,11 @@ def test_v6_hooks_HA_page_size_sync(): # HA SERVER 2 misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::ffff') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS_2)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6.dhcpsrv', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-dhcp6.ha-hooks', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL2') @@ -90,15 +90,15 @@ def test_v6_hooks_HA_page_size_sync(): srv_msg.forge_sleep('10', 'seconds') misc.pass_criteria() - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'DHCPSRV_MEMFILE_GET_PAGE6 obtaining at most 10 IPv6 leases starting from address 2001:db8:1::5b') srv_msg.remote_log_includes_line('$(MGMT_ADDRESS_2)', - '$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + '$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'HA_LEASES_SYNC_LEASE_PAGE_RECEIVED received 10 leases from server1') srv_msg.remote_log_includes_line('$(MGMT_ADDRESS_2)', - '$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + '$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'DHCPSRV_MEMFILE_GET_ADDR6 obtaining IPv6 lease for address 2001:db8:1::65 and lease type IA_NA') @@ -113,11 +113,11 @@ def test_v6_hooks_HA_page_size_sync_2(): # HA SERVER 1 misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::ffff') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6.dhcpsrv', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-dhcp6.ha-hooks', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL') @@ -146,11 +146,11 @@ def test_v6_hooks_HA_page_size_sync_2(): # HA SERVER 2 misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::ffff') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS_2)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6.dhcpsrv', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-dhcp6.ha-hooks', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL2') @@ -185,27 +185,27 @@ def test_v6_hooks_HA_page_size_sync_2(): srv_msg.forge_sleep('10', 'seconds') misc.pass_criteria() - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'DHCPSRV_MEMFILE_GET_PAGE6 obtaining at most 15 IPv6 leases starting from address 2001:db8:1::5') srv_msg.remote_log_includes_line('$(MGMT_ADDRESS_2)', - '$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + '$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'HA_LEASES_SYNC_LEASE_PAGE_RECEIVED received 15 leases from server1') srv_msg.remote_log_includes_line('$(MGMT_ADDRESS_2)', - '$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + '$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'DHCPSRV_MEMFILE_GET_ADDR6 obtaining IPv6 lease for address 2001:db8:1::65 and lease type IA_NA') srv_msg.remote_log_includes_line('$(MGMT_ADDRESS_2)', - '$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + '$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', 'DHCPSRV_MEMFILE_GET_PAGE6 obtaining at most 10 IPv6 leases starting from address 2001:') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', 'HA_LEASES_SYNC_LEASE_PAGE_RECEIVED received 10 leases from') srv_msg.remote_log_includes_line('$(MGMT_ADDRESS_2)', - '$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + '$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'HA_SYNC_SUCCESSFUL lease database synchronization with server1 completed successfully') @@ -224,7 +224,7 @@ def test_v6_hooks_HA_page_size_sync_2(): srv_msg.forge_sleep('10', 'seconds') misc.pass_criteria() - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'DHCPSRV_MEMFILE_ADD_ADDR6 adding IPv6 lease with address 2001:db8:1::c9') @@ -240,11 +240,11 @@ def test_v6_hooks_HA_page_size_sync_large(): # HA SERVER 1 misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::ffff') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6.dhcpsrv', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-dhcp6.ha-hooks', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL') @@ -271,11 +271,11 @@ def test_v6_hooks_HA_page_size_sync_large(): # HA SERVER 2 misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::ffff') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(MGMT_ADDRESS_2)', '8080', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6', 'DEBUG', '99', 'kea.log') srv_control.configure_loggers('kea-ctrl-agent', 'DEBUG', '99', 'kea.log-CTRL2') diff --git a/tests/dhcpv6/kea_only/control_channel/test_command_control_http.py b/tests/dhcpv6/kea_only/control_channel/test_command_control_http.py index ad3a3c89..1ee82404 100644 --- a/tests/dhcpv6/kea_only/control_channel/test_command_control_http.py +++ b/tests/dhcpv6/kea_only/control_channel/test_command_control_http.py @@ -15,11 +15,11 @@ import srv_control def test_control_channel_http_dhcp_disable_timer(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -76,11 +76,11 @@ def test_control_channel_http_dhcp_disable_timer(): def test_control_channel_http_dhcp_disable(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -121,11 +121,11 @@ def test_control_channel_http_dhcp_disable(): def test_control_channel_http_dhcp_disable_and_enable(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -184,11 +184,11 @@ def test_control_channel_http_dhcp_disable_and_enable(): def test_control_channel_http_config_set_basic(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -210,7 +210,7 @@ def test_control_channel_http_config_set_basic(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - # Server has control agent configured on HTTP connection with address $(SRV4_ADDR):8000 and socket unix path: $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket. + # Server has control agent configured on HTTP connection with address $(SRV4_ADDR):8000 and socket unix path: $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket. srv_control.generate_config_files() srv_msg.send_through_http('$(SRV4_ADDR)', @@ -247,11 +247,11 @@ def test_control_channel_http_change_socket_during_reconfigure(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -272,11 +272,11 @@ def test_control_channel_http_change_socket_during_reconfigure(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2') srv_control.generate_config_files() srv_msg.send_through_http('$(SRV4_ADDR)', @@ -315,11 +315,11 @@ def test_control_channel_http_after_restart_load_config_file(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -343,7 +343,7 @@ def test_control_channel_http_after_restart_load_config_file(): srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.generate_config_files() srv_msg.send_through_http('$(SRV4_ADDR)', @@ -396,11 +396,11 @@ def test_control_channel_http_after_restart_load_config_file(): def test_control_channel_http_get_config(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -416,11 +416,11 @@ def test_control_channel_http_get_config(): def test_control_channel_http_test_config(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -446,7 +446,7 @@ def test_control_channel_http_test_config(): srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket_ANOTHER_ONE') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket_ANOTHER_ONE') srv_control.config_srv_id('LLT', '00:01:00:02:52:7b:a8:f0:08:00:27:58:f1:e8') srv_control.config_srv_opt('sip-server-addr', '2001:db8::1,2001:db8::2') srv_control.config_srv_opt('new-posix-timezone', r'EST5EDT4\\,M3.2.0/02:00\\,M11.1.0/02:00') @@ -482,7 +482,7 @@ def test_control_channel_http_test_config(): srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket_ANOTHER_ONE') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket_ANOTHER_ONE') srv_control.config_srv_id('LLT', '00:01:00:02:52:7b:a8:f0:08:00:27:58:f1:e8') srv_control.config_srv_opt('sip-server-addr', '2001:db8::1,2001:db8::2') srv_control.config_srv_opt('new-posix-timezone', r'EST5EDT4\\,M3.2.0/02:00\\,M11.1.0/02:00') @@ -521,11 +521,11 @@ def test_control_channel_http_config_write(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -555,10 +555,10 @@ def test_control_channel_http_config_write(): srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.generate_config_files() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-set", "service": ["dhcp6"],"arguments": $(SERVER_CONFIG) }') srv_msg.forge_sleep('$(SLEEP_TIME_2)', 'seconds') @@ -608,11 +608,11 @@ def test_control_channel_http_reload_config(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -633,11 +633,11 @@ def test_control_channel_http_reload_config(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_msg.send_through_http('$(SRV4_ADDR)', diff --git a/tests/dhcpv6/kea_only/control_channel/test_command_control_keashell.py b/tests/dhcpv6/kea_only/control_channel/test_command_control_keashell.py index b1c56b35..670e5fb1 100644 --- a/tests/dhcpv6/kea_only/control_channel/test_command_control_keashell.py +++ b/tests/dhcpv6/kea_only/control_channel/test_command_control_keashell.py @@ -15,11 +15,11 @@ import srv_control def test_control_channel_keashell_dhcp_disable_timer(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -76,11 +76,11 @@ def test_control_channel_keashell_dhcp_disable_timer(): def test_control_channel_keashell_dhcp_disable(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -121,11 +121,11 @@ def test_control_channel_keashell_dhcp_disable(): def test_control_channel_keashell_dhcp_disable_and_enable(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -183,11 +183,11 @@ def test_control_channel_keashell_dhcp_disable_and_enable(): def test_control_channel_keashell_set_config_basic(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -211,7 +211,7 @@ def test_control_channel_keashell_set_config_basic(): # this command is with new configuration srv_msg.execute_shell_with_args('python', '$(SOFTWARE_INSTALL_DIR)/sbin/kea-shell', - '--host 127.0.0.1 --port 8000 --service dhcp6 config-set <<<\'"Dhcp6": { "control-socket": { "socket-name": "$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket", "socket-type": "unix" }, "decline-probation-period": 86400, "dhcp-ddns": { "always-include-fqdn": false, "enable-updates": false, "generated-prefix": "myhost", "max-queue-size": 1024, "ncr-format": "JSON", "ncr-protocol": "UDP", "override-client-update": false, "override-no-update": false, "qualifying-suffix": "", "replace-client-name": "never", "sender-ip": "0.0.0.0", "sender-port": 0, "server-ip": "127.0.0.1", "server-port": 53001 }, "dhcp4o6-port": 0, "expired-leases-processing": { "flush-reclaimed-timer-wait-time": 25, "hold-reclaimed-time": 3600, "max-reclaim-leases": 100, "max-reclaim-time": 250, "reclaim-timer-wait-time": 10, "unwarned-reclaim-cycles": 5 }, "hooks-libraries": [ ], "host-reservation-identifiers": [ "hw-address", "duid" ], "interfaces-config": { "interfaces": [ "$(SERVER_IFACE)" ], "re-detect": true }, "lease-database": { "type": "memfile" }, "mac-sources": [ "any" ], "option-data": [ ], "option-def": [ ], "relay-supplied-options": [ "65" ], "server-id": { "enterprise-id": 0, "htype": 0, "identifier": "", "persist": true, "time": 0, "type": "LLT" }, "shared-networks": [ ], "subnet6": [ { "id": 1, "interface": "$(SERVER_IFACE)", "option-data": [ ], "pd-pools": [ ], "pools": [ { "option-data": [ ], "pool": "2001:db8:1::1-2001:db8:1::1" } ], "preferred-lifetime": 3000, "rapid-commit": false, "rebind-timer": 2000, "relay": { "ip-address": "::" }, "renew-timer": 1000, "reservation-mode": "all", "reservations": [ ], "subnet": "2001:db8:1::/64", "valid-lifetime": 4000 } ] }\'') + '--host 127.0.0.1 --port 8000 --service dhcp6 config-set <<<\'"Dhcp6": { "control-socket": { "socket-name": "$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket", "socket-type": "unix" }, "decline-probation-period": 86400, "dhcp-ddns": { "always-include-fqdn": false, "enable-updates": false, "generated-prefix": "myhost", "max-queue-size": 1024, "ncr-format": "JSON", "ncr-protocol": "UDP", "override-client-update": false, "override-no-update": false, "qualifying-suffix": "", "replace-client-name": "never", "sender-ip": "0.0.0.0", "sender-port": 0, "server-ip": "127.0.0.1", "server-port": 53001 }, "dhcp4o6-port": 0, "expired-leases-processing": { "flush-reclaimed-timer-wait-time": 25, "hold-reclaimed-time": 3600, "max-reclaim-leases": 100, "max-reclaim-time": 250, "reclaim-timer-wait-time": 10, "unwarned-reclaim-cycles": 5 }, "hooks-libraries": [ ], "host-reservation-identifiers": [ "hw-address", "duid" ], "interfaces-config": { "interfaces": [ "$(SERVER_IFACE)" ], "re-detect": true }, "lease-database": { "type": "memfile" }, "mac-sources": [ "any" ], "option-data": [ ], "option-def": [ ], "relay-supplied-options": [ "65" ], "server-id": { "enterprise-id": 0, "htype": 0, "identifier": "", "persist": true, "time": 0, "type": "LLT" }, "shared-networks": [ ], "subnet6": [ { "id": 1, "interface": "$(SERVER_IFACE)", "option-data": [ ], "pd-pools": [ ], "pools": [ { "option-data": [ ], "pool": "2001:db8:1::1-2001:db8:1::1" } ], "preferred-lifetime": 3000, "rapid-commit": false, "rebind-timer": 2000, "relay": { "ip-address": "::" }, "renew-timer": 1000, "reservation-mode": "all", "reservations": [ ], "subnet": "2001:db8:1::/64", "valid-lifetime": 4000 } ] }\'') misc.test_procedure() srv_msg.client_sets_value('Client', 'DUID', '00:03:00:01:66:55:44:33:22:11') @@ -241,11 +241,11 @@ def test_control_channel_keashell_after_restart_load_config_file(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') srv_msg.forge_sleep('2', 'seconds') @@ -267,7 +267,7 @@ def test_control_channel_keashell_after_restart_load_config_file(): srv_msg.execute_shell_with_args('python', '$(SOFTWARE_INSTALL_DIR)/sbin/kea-shell', - '--host 127.0.0.1 --port 8000 --service dhcp6 config-set <<<\'"Dhcp6": { "control-socket": { "socket-name": "$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket", "socket-type": "unix" }, "decline-probation-period": 86400, "dhcp-ddns": { "always-include-fqdn": false, "enable-updates": false, "generated-prefix": "myhost", "max-queue-size": 1024, "ncr-format": "JSON", "ncr-protocol": "UDP", "override-client-update": false, "override-no-update": false, "qualifying-suffix": "", "replace-client-name": "never", "sender-ip": "0.0.0.0", "sender-port": 0, "server-ip": "127.0.0.1", "server-port": 53001 }, "dhcp4o6-port": 0, "expired-leases-processing": { "flush-reclaimed-timer-wait-time": 25, "hold-reclaimed-time": 3600, "max-reclaim-leases": 100, "max-reclaim-time": 250, "reclaim-timer-wait-time": 10, "unwarned-reclaim-cycles": 5 }, "hooks-libraries": [ ], "host-reservation-identifiers": [ "hw-address", "duid" ], "interfaces-config": { "interfaces": [ "$(SERVER_IFACE)" ], "re-detect": true }, "lease-database": { "type": "memfile" }, "mac-sources": [ "any" ], "option-data": [ ], "option-def": [ ], "relay-supplied-options": [ "65" ], "server-id": { "enterprise-id": 0, "htype": 0, "identifier": "", "persist": true, "time": 0, "type": "LLT" }, "shared-networks": [ ], "subnet6": [ { "id": 1, "interface": "$(SERVER_IFACE)", "option-data": [ ], "pd-pools": [ ], "pools": [ { "option-data": [ ], "pool": "2001:db8:1::1-2001:db8:1::1" } ], "preferred-lifetime": 3000, "rapid-commit": false, "rebind-timer": 2000, "relay": { "ip-address": "::" }, "renew-timer": 1000, "reservation-mode": "all", "reservations": [ ], "subnet": "2001:db8:1::/64", "valid-lifetime": 4000 } ] }\'') + '--host 127.0.0.1 --port 8000 --service dhcp6 config-set <<<\'"Dhcp6": { "control-socket": { "socket-name": "$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket", "socket-type": "unix" }, "decline-probation-period": 86400, "dhcp-ddns": { "always-include-fqdn": false, "enable-updates": false, "generated-prefix": "myhost", "max-queue-size": 1024, "ncr-format": "JSON", "ncr-protocol": "UDP", "override-client-update": false, "override-no-update": false, "qualifying-suffix": "", "replace-client-name": "never", "sender-ip": "0.0.0.0", "sender-port": 0, "server-ip": "127.0.0.1", "server-port": 53001 }, "dhcp4o6-port": 0, "expired-leases-processing": { "flush-reclaimed-timer-wait-time": 25, "hold-reclaimed-time": 3600, "max-reclaim-leases": 100, "max-reclaim-time": 250, "reclaim-timer-wait-time": 10, "unwarned-reclaim-cycles": 5 }, "hooks-libraries": [ ], "host-reservation-identifiers": [ "hw-address", "duid" ], "interfaces-config": { "interfaces": [ "$(SERVER_IFACE)" ], "re-detect": true }, "lease-database": { "type": "memfile" }, "mac-sources": [ "any" ], "option-data": [ ], "option-def": [ ], "relay-supplied-options": [ "65" ], "server-id": { "enterprise-id": 0, "htype": 0, "identifier": "", "persist": true, "time": 0, "type": "LLT" }, "shared-networks": [ ], "subnet6": [ { "id": 1, "interface": "$(SERVER_IFACE)", "option-data": [ ], "pd-pools": [ ], "pools": [ { "option-data": [ ], "pool": "2001:db8:1::1-2001:db8:1::1" } ], "preferred-lifetime": 3000, "rapid-commit": false, "rebind-timer": 2000, "relay": { "ip-address": "::" }, "renew-timer": 1000, "reservation-mode": "all", "reservations": [ ], "subnet": "2001:db8:1::/64", "valid-lifetime": 4000 } ] }\'') misc.test_procedure() srv_msg.client_sets_value('Client', 'DUID', '00:03:00:01:66:55:44:33:22:11') @@ -313,11 +313,11 @@ def test_control_channel_keashell_after_restart_load_config_file(): def test_control_channel_keashell_get_config(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -334,11 +334,11 @@ def test_control_channel_keashell_get_config(): def test_control_channel_keashell_test_config(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -364,7 +364,7 @@ def test_control_channel_keashell_test_config(): srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket_ANOTHER_ONE') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket_ANOTHER_ONE') srv_control.config_srv_id('LLT', '00:01:00:02:52:7b:a8:f0:08:00:27:58:f1:e8') srv_control.config_srv_opt('sip-server-addr', '2001:db8::1,2001:db8::2') srv_control.config_srv_opt('new-posix-timezone', r'EST5EDT4\\,M3.2.0/02:00\\,M11.1.0/02:00') @@ -400,7 +400,7 @@ def test_control_channel_keashell_test_config(): srv_control.agent_control_channel('$(SRV4_ADDR)', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket_ANOTHER_ONE') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket_ANOTHER_ONE') srv_control.config_srv_id('LLT', '00:01:00:02:52:7b:a8:f0:08:00:27:58:f1:e8') srv_control.config_srv_opt('sip-server-addr', '2001:db8::1,2001:db8::2') srv_control.config_srv_opt('new-posix-timezone', r'EST5EDT4\\,M3.2.0/02:00\\,M11.1.0/02:00') @@ -440,11 +440,11 @@ def test_control_channel_keashell_write_config(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') srv_msg.forge_sleep('2', 'seconds') @@ -468,12 +468,12 @@ def test_control_channel_keashell_write_config(): srv_control.agent_control_channel('localhost', '8000', 'UNIX', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.generate_config_files() srv_msg.execute_shell_with_args('python', '$(SOFTWARE_INSTALL_DIR)/sbin/kea-shell', - '--host 127.0.0.1 --port 8000 --service dhcp6 config-set <<<\'"Dhcp6": { "control-socket": { "socket-name": "$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket", "socket-type": "unix" }, "decline-probation-period": 86400, "dhcp-ddns": { "always-include-fqdn": false, "enable-updates": false, "generated-prefix": "myhost", "max-queue-size": 1024, "ncr-format": "JSON", "ncr-protocol": "UDP", "override-client-update": false, "override-no-update": false, "qualifying-suffix": "", "replace-client-name": "never", "sender-ip": "0.0.0.0", "sender-port": 0, "server-ip": "127.0.0.1", "server-port": 53001 }, "dhcp4o6-port": 0, "expired-leases-processing": { "flush-reclaimed-timer-wait-time": 25, "hold-reclaimed-time": 3600, "max-reclaim-leases": 100, "max-reclaim-time": 250, "reclaim-timer-wait-time": 10, "unwarned-reclaim-cycles": 5 }, "hooks-libraries": [ ], "host-reservation-identifiers": [ "hw-address", "duid" ], "interfaces-config": { "interfaces": [ "$(SERVER_IFACE)" ], "re-detect": true }, "lease-database": { "type": "memfile" }, "mac-sources": [ "any" ], "option-data": [ ], "option-def": [ ], "relay-supplied-options": [ "65" ], "server-id": { "enterprise-id": 0, "htype": 0, "identifier": "", "persist": true, "time": 0, "type": "LLT" }, "shared-networks": [ ], "subnet6": [ { "id": 1, "interface": "$(SERVER_IFACE)", "option-data": [ ], "pd-pools": [ ], "pools": [ { "option-data": [ ], "pool": "2001:db8:1::1-2001:db8:1::1" } ], "preferred-lifetime": 3000, "rapid-commit": false, "rebind-timer": 2000, "relay": { "ip-address": "::" }, "renew-timer": 1000, "reservation-mode": "all", "reservations": [ ], "subnet": "2001:db8:1::/64", "valid-lifetime": 4000 } ] }\'') + '--host 127.0.0.1 --port 8000 --service dhcp6 config-set <<<\'"Dhcp6": { "control-socket": { "socket-name": "$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket", "socket-type": "unix" }, "decline-probation-period": 86400, "dhcp-ddns": { "always-include-fqdn": false, "enable-updates": false, "generated-prefix": "myhost", "max-queue-size": 1024, "ncr-format": "JSON", "ncr-protocol": "UDP", "override-client-update": false, "override-no-update": false, "qualifying-suffix": "", "replace-client-name": "never", "sender-ip": "0.0.0.0", "sender-port": 0, "server-ip": "127.0.0.1", "server-port": 53001 }, "dhcp4o6-port": 0, "expired-leases-processing": { "flush-reclaimed-timer-wait-time": 25, "hold-reclaimed-time": 3600, "max-reclaim-leases": 100, "max-reclaim-time": 250, "reclaim-timer-wait-time": 10, "unwarned-reclaim-cycles": 5 }, "hooks-libraries": [ ], "host-reservation-identifiers": [ "hw-address", "duid" ], "interfaces-config": { "interfaces": [ "$(SERVER_IFACE)" ], "re-detect": true }, "lease-database": { "type": "memfile" }, "mac-sources": [ "any" ], "option-data": [ ], "option-def": [ ], "relay-supplied-options": [ "65" ], "server-id": { "enterprise-id": 0, "htype": 0, "identifier": "", "persist": true, "time": 0, "type": "LLT" }, "shared-networks": [ ], "subnet6": [ { "id": 1, "interface": "$(SERVER_IFACE)", "option-data": [ ], "pd-pools": [ ], "pools": [ { "option-data": [ ], "pool": "2001:db8:1::1-2001:db8:1::1" } ], "preferred-lifetime": 3000, "rapid-commit": false, "rebind-timer": 2000, "relay": { "ip-address": "::" }, "renew-timer": 1000, "reservation-mode": "all", "reservations": [ ], "subnet": "2001:db8:1::/64", "valid-lifetime": 4000 } ] }\'') srv_msg.forge_sleep('5', 'seconds') misc.test_procedure() @@ -532,11 +532,11 @@ def test_control_channel_socket_reload_config(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -557,11 +557,11 @@ def test_control_channel_socket_reload_config(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.agent_control_channel('127.0.0.1', '8000', 'unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_msg.execute_shell_with_args('python', diff --git a/tests/dhcpv6/kea_only/control_channel/test_command_control_socket.py b/tests/dhcpv6/kea_only/control_channel/test_command_control_socket.py index eb2aa5f2..5523beb1 100644 --- a/tests/dhcpv6/kea_only/control_channel/test_command_control_socket.py +++ b/tests/dhcpv6/kea_only/control_channel/test_command_control_socket.py @@ -15,7 +15,7 @@ import srv_control def test_control_channel_socket_dhcp_disable_timer(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -35,7 +35,7 @@ def test_control_channel_socket_dhcp_disable_timer(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '3000::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "dhcp-disable", "arguments": {"max-period": 5}}') misc.test_procedure() @@ -71,7 +71,7 @@ def test_control_channel_socket_dhcp_disable_timer(): def test_control_channel_socket_dhcp_disable(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -90,7 +90,7 @@ def test_control_channel_socket_dhcp_disable(): srv_msg.response_check_include_option('Response', None, '3') srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '3000::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "dhcp-disable" }') misc.test_procedure() @@ -110,7 +110,7 @@ def test_control_channel_socket_dhcp_disable(): def test_control_channel_socket_dhcp_disable_and_enable(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -130,7 +130,7 @@ def test_control_channel_socket_dhcp_disable_and_enable(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '3000::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "dhcp-disable" }') misc.test_procedure() @@ -143,7 +143,7 @@ def test_control_channel_socket_dhcp_disable_and_enable(): misc.pass_criteria() srv_msg.send_dont_wait_for_message() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "dhcp-enable" }') misc.test_procedure() @@ -167,7 +167,7 @@ def test_control_channel_socket_dhcp_disable_and_enable(): def test_control_channel_socket_config_set_basic(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -188,10 +188,10 @@ def test_control_channel_socket_config_set_basic(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.generate_config_files() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-set","arguments": $(SERVER_CONFIG) }') misc.test_procedure() @@ -220,7 +220,7 @@ def test_control_channel_socket_config_set_basic(): def test_control_channel_socket_change_socket_during_reconfigure(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -240,10 +240,10 @@ def test_control_channel_socket_change_socket_during_reconfigure(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2') srv_control.generate_config_files() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-set","arguments": $(SERVER_CONFIG) }') misc.test_procedure() @@ -265,10 +265,10 @@ def test_control_channel_socket_change_socket_during_reconfigure(): 'addr', '2001:db8:1::1') # this should fail - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "list-commands","arguments": {}}') # - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2', '{"command": "list-commands","arguments": {}}') srv_msg.json_response_parsing('arguments', None, 'leases-reclaim') @@ -280,7 +280,7 @@ def test_control_channel_socket_after_restart_load_config_file(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -300,10 +300,10 @@ def test_control_channel_socket_after_restart_load_config_file(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.generate_config_files() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-set","arguments": $(SERVER_CONFIG) }') misc.test_procedure() @@ -349,7 +349,7 @@ def test_control_channel_socket_after_restart_load_config_file(): def test_control_channel_socket_big_config_file(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -1127,7 +1127,7 @@ def test_control_channel_socket_big_config_file(): 'time-servers', '2001:558:ff18:16:10:253:175:76') srv_control.config_srv_opt_space('vendor-4491', 'time-offset', '-10000') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.configure_loggers('kea-dhcp6.dhcp6', 'INFO', 'None', 'kea.log') srv_control.configure_loggers('kea-dhcp6.dhcpsrv', 'INFO', 'None', 'kea.log') @@ -1139,7 +1139,7 @@ def test_control_channel_socket_big_config_file(): srv_control.configure_loggers('kea-dhcp6.options', 'INFO', 'None', 'kea.log') srv_control.generate_config_files() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-set","arguments": $(SERVER_CONFIG) }') misc.test_procedure() diff --git a/tests/dhcpv6/kea_only/control_channel/test_command_control_socket_2.py b/tests/dhcpv6/kea_only/control_channel/test_command_control_socket_2.py index 28e7d8d5..c4acb630 100644 --- a/tests/dhcpv6/kea_only/control_channel/test_command_control_socket_2.py +++ b/tests/dhcpv6/kea_only/control_channel/test_command_control_socket_2.py @@ -15,15 +15,15 @@ import srv_control def test_control_channel_socket_config_get(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-get","arguments": {}}') - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command": "list-commands","arguments": {}} + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command": "list-commands","arguments": {}} # compare json result with config file @@ -33,7 +33,7 @@ def test_control_channel_socket_config_get(): def test_control_channel_socket_config_test(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') # To global section of the config add file line: "expired-leases-processing":{"flush-reclaimed-timer-wait-time": 0,"hold-reclaimed-time": 0,"max-reclaim-leases": 100,"max-reclaim-time": 0,"reclaim-timer-wait-time": 0,"unwarned-reclaim-cycles": 5} # To global section of the config add file line: "expired-leases-processing":{"flush-reclaimed-timer-wait-time": 0,"hold-reclaimed-time": 0,"max-reclaim-leases": 100,"max-reclaim-time": 0,"reclaim-timer-wait-time": 0,"unwarned-reclaim-cycles": 5} @@ -45,7 +45,7 @@ def test_control_channel_socket_config_test(): srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') srv_control.config_srv_prefix('2001:db8:1::', '0', '90', '96') srv_control.open_control_channel('unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket_ANOTHER_ONE') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket_ANOTHER_ONE') srv_control.config_srv_id('LLT', '00:01:00:02:52:7b:a8:f0:08:00:27:58:f1:e8') srv_control.config_srv_opt('sip-server-addr', '2001:db8::1,2001:db8::2') srv_control.config_srv_opt('new-posix-timezone', r'EST5EDT4\\,M3.2.0/02:00\\,M11.1.0/02:00') @@ -57,7 +57,7 @@ def test_control_channel_socket_config_test(): srv_control.generate_config_files() # Sleep for 10 seconds. - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-test","arguments": $(SERVER_CONFIG) }') # should be ok @@ -65,7 +65,7 @@ def test_control_channel_socket_config_test(): srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') srv_control.config_srv_prefix('2001:db8:1::', '0', '90', '96') srv_control.open_control_channel('unix', - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket_ANOTHER_ONE') + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket_ANOTHER_ONE') srv_control.config_srv_id('LLT', '00:01:00:02:52:7b:a8:f0:08:00:27:58:f1:e8') srv_control.config_srv_opt('sip-server-addr', '2001:db8::1,2001:db8::2') srv_control.config_srv_opt('new-posix-timezone', r'EST5EDT4\\,M3.2.0/02:00\\,M11.1.0/02:00') @@ -77,7 +77,7 @@ def test_control_channel_socket_config_test(): '00:03:00:01:f6:f5:f4:f3:f2:01') srv_control.generate_config_files() # - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-test","arguments": $(SERVER_CONFIG) }') # should NOT be ok @@ -89,7 +89,7 @@ def test_control_channel_socket_config_write(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -109,12 +109,12 @@ def test_control_channel_socket_config_write(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.generate_config_files() - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-set","arguments": $(SERVER_CONFIG) }') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-write","arguments": { "filename": "$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.conf"} }') misc.test_procedure() @@ -136,10 +136,10 @@ def test_control_channel_socket_config_write(): 'addr', '2001:db8:1::1') - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command": "list-commands","arguments": {}} - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command": "config-write","parameters": { "filename": "abc"} } - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command": "config-write","arguments": { "filename": "whatever"} } - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command": "config-write","arguments": { "filename": "installed/git/etc/kea/kea.conf"} } + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command": "list-commands","arguments": {}} + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command": "config-write","parameters": { "filename": "abc"} } + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command": "config-write","arguments": { "filename": "whatever"} } + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command": "config-write","arguments": { "filename": "installed/git/etc/kea/kea.conf"} } # Pause the Test. srv_control.start_srv('DHCP', 'restarted') @@ -170,7 +170,7 @@ def test_control_channel_socket_config_reload(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::f') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -188,16 +188,16 @@ def test_control_channel_socket_config_reload(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '3000::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "list-commands","arguments": {}}') misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') # Generate server configuration file. srv_control.build_and_send_config_files('SSH', 'config-file') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-reload","arguments": {} }') misc.test_procedure() diff --git a/tests/dhcpv6/kea_only/flexid/test_flex_id.py b/tests/dhcpv6/kea_only/flexid/test_flex_id.py index bda30c15..2e77052e 100644 --- a/tests/dhcpv6/kea_only/flexid/test_flex_id.py +++ b/tests/dhcpv6/kea_only/flexid/test_flex_id.py @@ -73,7 +73,7 @@ def test_v6_hooks_flexid_libreload(): srv_control.add_parameter_to_hook('1', 'identifier-expression', 'substring(relay6[0].option[18].hex,0,8)') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -103,7 +103,7 @@ def test_v6_hooks_flexid_libreload(): 'addr', '3000::f') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "libreload","arguments": {}}') # if reload works - classification should work without changes @@ -151,7 +151,7 @@ def test_v6_hooks_flexid_reconfigure_1(): srv_control.add_parameter_to_hook('1', 'identifier-expression', 'substring(relay6[0].option[18].hex,0,8)') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -194,7 +194,7 @@ def test_v6_hooks_flexid_reconfigure_1(): srv_control.add_parameter_to_hook('1', 'identifier-expression', 'substring(relay6[0].option[18].hex,0,8)') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'reconfigured') @@ -243,7 +243,7 @@ def test_v6_hooks_flexid_reconfigure_2(): srv_control.add_parameter_to_hook('1', 'identifier-expression', 'substring(relay6[0].option[18].hex,0,8)') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -286,7 +286,7 @@ def test_v6_hooks_flexid_reconfigure_2(): srv_control.add_parameter_to_hook('1', 'identifier-expression', 'substring(relay6[0].option[18].hex,0,8)') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'reconfigured') @@ -360,7 +360,7 @@ def test_v6_hooks_flexid_2(): srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command": "config-reload","arguments": {} } + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command": "config-reload","arguments": {} } misc.test_procedure() srv_msg.client_does_include('Client', None, 'client-id') srv_msg.client_does_include('Client', None, 'IA-NA') @@ -968,8 +968,8 @@ def test_v6_hooks_flexid_replace_duid_release_failed(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '3') - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv MUST contain line or phrase: 3000::f,01:02:03:04:05:06,4000, - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv MUST NOT contain line or phrase: 3000::f,01:02:03:04:05:06,0, + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv MUST contain line or phrase: 3000::f,01:02:03:04:05:06,4000, + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv MUST NOT contain line or phrase: 3000::f,01:02:03:04:05:06,0, @pytest.mark.v6 diff --git a/tests/dhcpv6/kea_only/host_cmds/test_hosts_cmds.py b/tests/dhcpv6/kea_only/host_cmds/test_hosts_cmds.py index 295c9246..73a1f46b 100644 --- a/tests/dhcpv6/kea_only/host_cmds/test_hosts_cmds.py +++ b/tests/dhcpv6/kea_only/host_cmds/test_hosts_cmds.py @@ -16,7 +16,7 @@ def test_v6_hosts_cmds_librelaod(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::50-2001:db8:1::50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -39,7 +39,7 @@ def test_v6_hosts_cmds_librelaod(): 'addr', '2001:db8:1::50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"duid":"00:03:00:01:f6:f5:f4:f3:f2:01","ip-addresses":["2001:db8:1::100"]}}}') misc.test_procedure() @@ -60,11 +60,11 @@ def test_v6_hosts_cmds_librelaod(): 'addr', '2001:db8:1::100') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "libreload","arguments": {}}') # TODO This is cool, but we need to actually check that reload is happening. - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-del","arguments":{"subnet-id":1,"ip-address":"2001:db8:1::100"}}') misc.test_procedure() @@ -93,7 +93,7 @@ def test_v6_hosts_cmds_reconfigure(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::50-2001:db8:1::50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -116,7 +116,7 @@ def test_v6_hosts_cmds_reconfigure(): 'addr', '2001:db8:1::50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"duid":"00:03:00:01:f6:f5:f4:f3:f2:01","ip-addresses":["2001:db8:1::100"]}}}') misc.test_procedure() @@ -140,13 +140,13 @@ def test_v6_hosts_cmds_reconfigure(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::50-2001:db8:1::50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'reconfigured') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"duid":"00:03:00:01:f6:f5:f4:f3:f2:01","ip-addresses":["2001:db8:1::100"]}}}') misc.test_procedure() @@ -175,7 +175,7 @@ def test_v6_hosts_cmds_add_reservation_mysql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::50-2001:db8:1::50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -198,7 +198,7 @@ def test_v6_hosts_cmds_add_reservation_mysql(): 'addr', '2001:db8:1::50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"duid":"00:03:00:01:f6:f5:f4:f3:f2:01","ip-addresses":["2001:db8:1::100"]}}}') misc.test_procedure() @@ -227,7 +227,7 @@ def test_v6_hosts_cmds_del_reservation_mysql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::50-2001:db8:1::50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -250,7 +250,7 @@ def test_v6_hosts_cmds_del_reservation_mysql(): 'addr', '2001:db8:1::50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"duid":"00:03:00:01:f6:f5:f4:f3:f2:01","ip-addresses":["2001:db8:1::100"]}}}') misc.test_procedure() @@ -271,7 +271,7 @@ def test_v6_hosts_cmds_del_reservation_mysql(): 'addr', '2001:db8:1::100') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-del","arguments":{"subnet-id":1,"ip-address":"2001:db8:1::100"}}') misc.test_procedure() @@ -300,7 +300,7 @@ def test_v6_hosts_cmds_del_reservation_pgsql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::50-2001:db8:1::50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('PostgreSQL') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -323,7 +323,7 @@ def test_v6_hosts_cmds_del_reservation_pgsql(): 'addr', '2001:db8:1::50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"duid":"00:03:00:01:f6:f5:f4:f3:f2:01","ip-addresses":["2001:db8:1::100"]}}}') misc.test_procedure() @@ -344,7 +344,7 @@ def test_v6_hosts_cmds_del_reservation_pgsql(): 'addr', '2001:db8:1::100') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-del","arguments":{"subnet-id":1,"ip-address":"2001:db8:1::100"}}') misc.test_procedure() @@ -373,7 +373,7 @@ def test_v6_hosts_cmds_add_reservation_pgsql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::50-2001:db8:1::50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('PostgreSQL') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -396,7 +396,7 @@ def test_v6_hosts_cmds_add_reservation_pgsql(): 'addr', '2001:db8:1::50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"duid":"00:03:00:01:f6:f5:f4:f3:f2:01","ip-addresses":["2001:db8:1::100"]}}}') misc.test_procedure() @@ -425,7 +425,7 @@ def test_v6_hosts_cmds_get_reservation_mysql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::50-2001:db8:1::50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -448,7 +448,7 @@ def test_v6_hosts_cmds_get_reservation_mysql(): 'addr', '2001:db8:1::50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"duid":"00:03:00:01:f6:f5:f4:f3:f2:01","ip-addresses":["2001:db8:1::100"]}}}') misc.test_procedure() @@ -469,7 +469,7 @@ def test_v6_hosts_cmds_get_reservation_mysql(): 'addr', '2001:db8:1::100') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "reservation-get","arguments":{"subnet-id":1,"identifier-type": "duid","identifier":"00:03:00:01:f6:f5:f4:f3:f2:01"}}') @@ -480,7 +480,7 @@ def test_v6_hosts_cmds_get_reservation_pgsql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::50-2001:db8:1::50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('PostgreSQL') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -503,7 +503,7 @@ def test_v6_hosts_cmds_get_reservation_pgsql(): 'addr', '2001:db8:1::50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"duid":"00:03:00:01:f6:f5:f4:f3:f2:01","ip-addresses":["2001:db8:1::100"]}}}') misc.test_procedure() @@ -524,7 +524,7 @@ def test_v6_hosts_cmds_get_reservation_pgsql(): 'addr', '2001:db8:1::100') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "reservation-get","arguments":{"subnet-id":1,"identifier-type": "duid","identifier":"00:03:00:01:f6:f5:f4:f3:f2:01"}}') @@ -539,7 +539,7 @@ def test_v6_hosts_cmds_add_reservation_mysql_flex_id(): srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_flex_id.so') srv_control.add_parameter_to_hook('2', 'identifier-expression', 'relay6[0].option[18].hex') srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::50-2001:db8:1::50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('MySQL') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -571,7 +571,7 @@ def test_v6_hosts_cmds_add_reservation_mysql_flex_id(): 'addr', '2001:db8:1::50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"flex-id":"\'port1234\'","ip-addresses":["2001:db8:1::100"]}}}') misc.test_procedure() @@ -612,7 +612,7 @@ def test_v6_hosts_cmds_add_reservation_pgsql_flex_id(): srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_flex_id.so') srv_control.add_parameter_to_hook('2', 'identifier-expression', 'relay6[0].option[18].hex') srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::50-2001:db8:1::50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('PostgreSQL') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -645,7 +645,7 @@ def test_v6_hosts_cmds_add_reservation_pgsql_flex_id(): 'addr', '2001:db8:1::50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"flex-id":"\'port1234\'","ip-addresses":["2001:db8:1::100"]}}}') misc.test_procedure() @@ -683,7 +683,7 @@ def test_v6_hosts_cmds_add_reservation_complex_pgsql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::50-2001:db8:1::50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('PostgreSQL') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -710,7 +710,7 @@ def test_v6_hosts_cmds_add_reservation_complex_pgsql(): srv_msg.response_check_option_content('Response', '25', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '25', None, 'statuscode', '6') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"duid":"00:03:00:01:f6:f5:f4:f3:f2:01","ip-addresses":["2001:db8:1:0:cafe::1"],"prefixes":["2001:db8:2:abcd::/64"],"hostname":"foo.example.com","option-data":[{"name":"vendor-opts","data":"4491"},{"name":"tftp-servers","space":"vendor-4491","data":"3000:1::234"}]}}}') misc.test_procedure() srv_msg.client_sets_value('Client', 'DUID', '00:03:00:01:f6:f5:f4:f3:f2:01') @@ -746,7 +746,7 @@ def test_v6_hosts_cmds_add_reservation_complex_mysql(): misc.test_setup() srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::50-2001:db8:1::50') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.enable_db_backend_reservation('PostgreSQL') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -773,7 +773,7 @@ def test_v6_hosts_cmds_add_reservation_complex_mysql(): srv_msg.response_check_option_content('Response', '25', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '25', None, 'statuscode', '6') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-add","arguments":{"reservation":{"subnet-id":1,"duid":"00:03:00:01:f6:f5:f4:f3:f2:01","ip-addresses":["2001:db8:1:0:cafe::1"],"prefixes":["2001:db8:2:abcd::/64"],"hostname":"foo.example.com","option-data":[{"name":"vendor-opts","data":"4491"},{"name":"tftp-servers","space":"vendor-4491","data":"3000:1::234"}]}}}') misc.test_procedure() srv_msg.client_sets_value('Client', 'DUID', '00:03:00:01:f6:f5:f4:f3:f2:01') @@ -809,7 +809,7 @@ def test_v6_hosts_cmds_reservation_get_all(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::ff') srv_control.config_srv_another_subnet_no_interface('3001::/64', '3001::1-3001::ff') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.host_reservation_in_subnet('hostname', 'reserved-hostname1', @@ -839,7 +839,7 @@ def test_v6_hosts_cmds_reservation_get_all(): srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-get-all","arguments":{"subnet-id":1}}') srv_msg.json_response_parsing('arguments', None, 'reserved-hostname1') srv_msg.json_response_parsing('arguments', None, 'reserved-hostname2') @@ -856,7 +856,7 @@ def test_v6_hosts_cmds_reservation_get_all_mysql(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::ff') srv_control.config_srv_another_subnet_no_interface('3001::/64', '3001::1-3001::ff') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.enable_db_backend_reservation('MySQL') srv_control.new_db_backend_reservation('MySQL', 'hw-address', 'f6:f5:f4:f3:f2:01') @@ -878,7 +878,7 @@ def test_v6_hosts_cmds_reservation_get_all_mysql(): srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-get-all","arguments":{"subnet-id":1}}') srv_msg.json_response_parsing('arguments', None, 'reserved-hostname1') srv_msg.json_response_parsing('arguments', None, 'reserved-hostname2') @@ -895,7 +895,7 @@ def test_v6_hosts_cmds_reservation_get_all_pgsql(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::ff') srv_control.config_srv_another_subnet_no_interface('3001::/64', '3001::1-3001::ff') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.enable_db_backend_reservation('PostgreSQL') srv_control.new_db_backend_reservation('PostgreSQL', 'hw-address', 'f6:f5:f4:f3:f2:01') @@ -917,7 +917,7 @@ def test_v6_hosts_cmds_reservation_get_all_pgsql(): srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-get-all","arguments":{"subnet-id":1}}') srv_msg.json_response_parsing('arguments', None, 'reserved-hostname1') @@ -935,7 +935,7 @@ def test_v6_hosts_cmds_reservation_get_page(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::ff') srv_control.config_srv_another_subnet_no_interface('3001::/64', '3001::1-3001::ff') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.host_reservation_in_subnet('hostname', 'reserved-hostname1', @@ -975,7 +975,7 @@ def test_v6_hosts_cmds_reservation_get_page(): srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-get-page","arguments":{"subnet-id":1,"limit":3}}') srv_msg.json_response_parsing('arguments', None, 'reserved-hostname1') srv_msg.json_response_parsing('arguments', None, 'reserved-hostname2') @@ -986,7 +986,7 @@ def test_v6_hosts_cmds_reservation_get_page(): srv_msg.json_response_parsing('arguments', 'NOT ', 'reserved-hostname7') srv_msg.json_response_parsing('text', None, '3 IPv6 host(s) found.') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-get-page","arguments":{"subnet-id":1,"limit":3,"from":3}}') srv_msg.json_response_parsing('arguments', None, 'reserved-hostname6') srv_msg.json_response_parsing('arguments', None, 'reserved-hostname7') @@ -1000,7 +1000,7 @@ def test_v6_hosts_cmds_reservation_get_all_page_mysql(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::ff') srv_control.config_srv_another_subnet_no_interface('3001::/64', '3001::1-3001::ff') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.enable_db_backend_reservation('MySQL') srv_control.new_db_backend_reservation('MySQL', 'hw-address', 'f6:f5:f4:f3:f2:01') @@ -1030,7 +1030,7 @@ def test_v6_hosts_cmds_reservation_get_all_page_mysql(): srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-get-page","arguments":{"subnet-id":1,"limit":3}}') srv_msg.json_response_parsing('arguments', None, 'reserved-hostname7') srv_msg.json_response_parsing('arguments', None, 'reserved-hostname6') @@ -1049,7 +1049,7 @@ def test_v6_hosts_cmds_reservation_get_all_page_pgsql(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::ff') srv_control.config_srv_another_subnet_no_interface('3001::/64', '3001::1-3001::ff') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_host_cmds.so') srv_control.enable_db_backend_reservation('PostgreSQL') srv_control.new_db_backend_reservation('PostgreSQL', 'hw-address', 'f6:f5:f4:f3:f2:01') @@ -1079,7 +1079,7 @@ def test_v6_hosts_cmds_reservation_get_all_page_pgsql(): srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"reservation-get-page","arguments":{"subnet-id":1,"limit":3}}') srv_msg.json_response_parsing('arguments', None, 'reserved-hostname6') srv_msg.json_response_parsing('arguments', None, 'reserved-hostname7') diff --git a/tests/dhcpv6/kea_only/leases_cmds/test_leases_cmds.py b/tests/dhcpv6/kea_only/leases_cmds/test_leases_cmds.py index 01999e4f..54a6f501 100644 --- a/tests/dhcpv6/kea_only/leases_cmds/test_leases_cmds.py +++ b/tests/dhcpv6/kea_only/leases_cmds/test_leases_cmds.py @@ -19,13 +19,13 @@ def test_hook_v6_lease_cmds_list(): srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') srv_control.config_srv_another_subnet_no_interface('1000::/32', '1000::5-1000::5') srv_control.config_srv_another_subnet_no_interface('3000::/100', '3000::5-3000::5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"list-commands","arguments":{}}') @@ -39,7 +39,7 @@ def test_hook_v6_lease_cmds_add_notvalid_id(): srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') srv_control.config_srv_opt('preference', '123') srv_control.config_srv_opt('domain-search', 'domain1.example.com,domain2.isc.org') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -64,7 +64,7 @@ def test_hook_v6_lease_cmds_add_notvalid_id(): 'addr', '2001:db8:1::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease6-add","arguments": {"subnet-id": 11,"ip-address": "2001:db8:1::1","duid": "1a:1b:1c:1d:1e:1f:20:21:22:23:24","iaid": 1234}}') misc.test_procedure() @@ -97,7 +97,7 @@ def test_hook_v6_lease_cmds_add_address_from_different_subnet(): srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') srv_control.config_srv_opt('preference', '123') srv_control.config_srv_opt('domain-search', 'domain1.example.com,domain2.isc.org') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -122,7 +122,7 @@ def test_hook_v6_lease_cmds_add_address_from_different_subnet(): 'addr', '2001:db8:1::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease6-add","arguments": {"subnet-id": 1,"ip-address": "2001:db8:2::1","duid": "1a:1b:1c:1d:1e:1f:20:21:22:23:24","iaid": 1234}}') misc.test_procedure() @@ -155,7 +155,7 @@ def test_hook_v6_lease_cmds_add_valid(): srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') srv_control.config_srv_opt('preference', '123') srv_control.config_srv_opt('domain-search', 'domain1.example.com,domain2.isc.org') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -180,7 +180,7 @@ def test_hook_v6_lease_cmds_add_valid(): 'addr', '2001:db8:1::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease6-add","arguments": {"subnet-id": 1,"ip-address": "2001:db8:1::1","duid": "1a:1b:1c:1d:1e:1f:20:21:22:23:24","iaid": 1234}}') misc.test_procedure() @@ -208,7 +208,7 @@ def test_hook_v6_lease_cmds_add_expired_with_options(): srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') srv_control.config_srv_opt('preference', '123') srv_control.config_srv_opt('domain-search', 'domain1.example.com,domain2.isc.org') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -233,9 +233,9 @@ def test_hook_v6_lease_cmds_add_expired_with_options(): 'addr', '2001:db8:1::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease6-add","arguments": {"subnet-id": 1,"ip-address": "2001:db8:1::1","duid": "1a:1b:1c:1d:1e:1f:20:21:22:23:24","iaid": 1234,"hw-address": "1a:2b:3c:4d:5e:6f","preferred-lft": 500,"valid-lft": 11111,"expire": 123456789,"fqdn-fwd": true,"fqdn-rev": true,"hostname": "urania.example.org"}}') - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command":"lease6-get","arguments":{"ip-address": "2001:db8:1::1"}} + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command":"lease6-get","arguments":{"ip-address": "2001:db8:1::1"}} misc.test_procedure() srv_msg.client_sets_value('Client', 'DUID', '00:03:00:01:66:55:44:33:22:11') @@ -256,17 +256,17 @@ def test_hook_v6_lease_cmds_add_expired_with_options(): 'addr', '2001:db8:1::1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '1a:2b:3c:4d:5e:6f') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '1a:1b:1c:1d:1e:1f:20:21:22:23:24') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', None, '11111') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '11111') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '123456789') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, 'urania.example.org') @@ -281,7 +281,7 @@ def test_hook_v6_lease_cmds_add_valid_with_options(): srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') srv_control.config_srv_opt('preference', '123') srv_control.config_srv_opt('domain-search', 'domain1.example.com,domain2.isc.org') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -306,7 +306,7 @@ def test_hook_v6_lease_cmds_add_valid_with_options(): 'addr', '2001:db8:1::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease6-add","arguments": {"subnet-id": 1,"ip-address": "2001:db8:1::1","duid": "1a:1b:1c:1d:1e:1f:20:21:22:23:24","iaid": 1234,"hw-address": "1a:2b:3c:4d:5e:6f","preferred-lft": 500,"valid-lft": 11111,"fqdn-fwd": true,"fqdn-rev": true,"hostname": "urania.example.org"}}') misc.test_procedure() @@ -323,14 +323,14 @@ def test_hook_v6_lease_cmds_add_valid_with_options(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '1a:2b:3c:4d:5e:6f') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '1a:1b:1c:1d:1e:1f:20:21:22:23:24') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', None, '11111') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '11111') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, 'urania.example.org') @@ -343,7 +343,7 @@ def test_hook_v6_lease_cmds_add_valid_with_options(): def test_hook_v6_lease_cmds_del_using_address(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -394,7 +394,7 @@ def test_hook_v6_lease_cmds_del_using_address(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease6-del","arguments":{"ip-address": "2001:db8:1::1"}}') misc.test_procedure() @@ -425,7 +425,7 @@ def test_hook_v6_lease_cmds_del_using_address(): def test_hook_v6_lease_cmds_del_using_duid(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -477,9 +477,9 @@ def test_hook_v6_lease_cmds_del_using_duid(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease6-del","arguments":{"subnet-id":1,"identifier": "00:03:00:01:66:55:44:33:22:11","identifier-type": "duid","iaid":666}}') - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command":"lease6-get","arguments":{"ip-address": "2001:db8:1::1"}} + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command":"lease6-get","arguments":{"ip-address": "2001:db8:1::1"}} misc.test_procedure() srv_msg.client_sets_value('Client', 'DUID', '00:03:00:01:11:22:33:44:55:66') @@ -509,7 +509,7 @@ def test_hook_v6_lease_cmds_del_using_duid(): def test_hook_v6_lease_cmds_get_using_address(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -560,7 +560,7 @@ def test_hook_v6_lease_cmds_get_using_address(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease6-get","arguments":{"ip-address": "2001:db8:1::1"}}') @@ -572,7 +572,7 @@ def test_hook_v6_lease_cmds_get_using_address(): def test_hook_v6_lease_cmds_get_using_duid(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -610,7 +610,7 @@ def test_hook_v6_lease_cmds_get_using_duid(): 'addr', '2001:db8:1::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease6-get","arguments":{"subnet-id":1,"identifier": "00:03:00:01:66:55:44:33:22:11","identifier-type": "duid","iaid":666}}') @@ -622,7 +622,7 @@ def test_hook_v6_lease_cmds_get_using_duid(): def test_hook_v6_lease_cmds_wipe(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::2') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -696,7 +696,7 @@ def test_hook_v6_lease_cmds_wipe(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease6-wipe", "arguments": {"subnet-id":1}}') misc.test_procedure() @@ -788,7 +788,7 @@ def test_hook_v6_lease_cmds_wipe(): def test_hook_v6_lease_cmds_update(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::2') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -820,25 +820,25 @@ def test_hook_v6_lease_cmds_update(): srv_msg.response_check_include_option('Response', None, '3') srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:1::1,00:03:00:01:66:55:44:33:22:11,4000,') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',1,3000,0,666,128,0,0,,66:55:44:33:22:11,0') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', 'NOT ', '2001:db8:1::1,01:02:03:04:05:06:07:08') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', 'NOT ', ',urania.example.org,1a:1b:1c:1d:1e:1f,') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease6-update", "arguments":{"subnet-id": 1,"ip-address": "2001:db8:1::1","duid": "01:02:03:04:05:06:07:08","iaid": 1234,"hw-address": "1a:1b:1c:1d:1e:1f","preferred-lft": 500,"valid-lft": 1000,"hostname": "urania.example.org"}}') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',1,500,0,1234,128,0,0,urania.example.org,1a:1b:1c:1d:1e:1f,0') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:1::1,01:02:03:04:05:06:07:08,1000') diff --git a/tests/dhcpv6/kea_only/leases_cmds/test_leases_cmds_legal_logging.py b/tests/dhcpv6/kea_only/leases_cmds/test_leases_cmds_legal_logging.py index 828d940d..1cc0ff9f 100644 --- a/tests/dhcpv6/kea_only/leases_cmds/test_leases_cmds_legal_logging.py +++ b/tests/dhcpv6/kea_only/leases_cmds/test_leases_cmds_legal_logging.py @@ -17,13 +17,13 @@ import misc @pytest.mark.legal_logging def test_hook_v6_lease_cmds_legal_logging_add(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') srv_control.config_srv_opt('preference', '123') srv_control.config_srv_opt('domain-search', 'domain1.example.com,domain2.isc.org') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_legal_log.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -49,7 +49,7 @@ def test_hook_v6_lease_cmds_legal_logging_add(): 'addr', '2001:db8:1::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "lease6-add","arguments": {"subnet-id": 1,"ip-address": "2001:db8:1::1","duid": "1a:1b:1c:1d:1e:1f:20:21:22:23:24","iaid": 1234}}') misc.test_procedure() @@ -66,8 +66,8 @@ def test_hook_v6_lease_cmds_legal_logging_add(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Administrator added a lease of address: 2001:db8:1::1 to a device with DUID: 1a:1b:1c:1d:1e:1f:20:21:22:23:24') @@ -80,11 +80,11 @@ def test_hook_v6_lease_cmds_legal_logging_add(): @pytest.mark.legal_logging def test_hook_v6_lease_cmds_legal_logging_del_using_address(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_legal_log.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -136,7 +136,7 @@ def test_hook_v6_lease_cmds_legal_logging_del_using_address(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease6-del","arguments":{"ip-address": "2001:db8:1::1"}}') misc.test_procedure() @@ -158,8 +158,8 @@ def test_hook_v6_lease_cmds_legal_logging_del_using_address(): 'addr', '2001:db8:1::1') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Administrator deleted the lease for address: 2001:db8:1::1') @@ -172,11 +172,11 @@ def test_hook_v6_lease_cmds_legal_logging_del_using_address(): @pytest.mark.legal_logging def test_hook_v6_lease_cmds_legal_logging_del_using_duid(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_legal_log.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -229,7 +229,7 @@ def test_hook_v6_lease_cmds_legal_logging_del_using_duid(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease6-del","arguments":{"subnet-id":1,"identifier": "00:03:00:01:66:55:44:33:22:11","identifier-type": "duid","iaid":666}}') misc.test_procedure() @@ -251,8 +251,8 @@ def test_hook_v6_lease_cmds_legal_logging_del_using_duid(): 'addr', '2001:db8:1::1') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Administrator deleted a lease for a device identified by: duid of 00:03:00:01:66:55:44:33:22:11') @@ -266,11 +266,11 @@ def test_hook_v6_lease_cmds_legal_logging_del_using_duid(): @pytest.mark.disabled def test_hook_v6_lease_cmds_legal_logging_wipe(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::2') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_legal_log.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -343,12 +343,12 @@ def test_hook_v6_lease_cmds_legal_logging_wipe(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease6-wipe", "arguments": {"subnet-id":1}}') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') srv_msg.test_fail() - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt MUST contain line or phrase: Address:3000::5 has been assigned for 0 hrs 10 mins 0 secs to a device with DUID: 00:03:00:01:f6:f5:f4:f3:f2:04 and hardware address: hwtype=1 f6:f5:f4:f3:f2:04 (from DUID) + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt MUST contain line or phrase: Address:3000::5 has been assigned for 0 hrs 10 mins 0 secs to a device with DUID: 00:03:00:01:f6:f5:f4:f3:f2:04 and hardware address: hwtype=1 f6:f5:f4:f3:f2:04 (from DUID) @pytest.mark.v6 @@ -359,11 +359,11 @@ def test_hook_v6_lease_cmds_legal_logging_wipe(): @pytest.mark.legal_logging def test_hook_v6_lease_cmds_legal_logging_update(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::2') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_legal_log.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -396,30 +396,30 @@ def test_hook_v6_lease_cmds_legal_logging_update(): srv_msg.response_check_include_option('Response', None, '3') srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:1::1,00:03:00:01:66:55:44:33:22:11,4000,') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',1,3000,0,666,128,0,0,,66:55:44:33:22:11,0') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', 'NOT ', '2001:db8:1::1,01:02:03:04:05:06:07:08') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', 'NOT ', ',urania.example.org,1a:1b:1c:1d:1e:1f,') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease6-update", "arguments":{"subnet-id": 1,"ip-address": "2001:db8:1::1","duid": "01:02:03:04:05:06:07:08","iaid": 1234,"hw-address": "1a:1b:1c:1d:1e:1f","preferred-lft": 500,"valid-lft": 1000,"hostname": "urania.example.org"}}') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',1,500,0,1234,128,0,0,urania.example.org,1a:1b:1c:1d:1e:1f,0') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:1::1,01:02:03:04:05:06:07:08,1000') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Administrator updated information on the lease of address: 2001:db8:1::1 to a device with DUID: 01:02:03:04:05:06:07:08, hardware address: 1a:1b:1c:1d:1e:1f for 0 hrs 16 mins 40 secs') diff --git a/tests/dhcpv6/kea_only/subnets_cmds/test_network_cmds.py b/tests/dhcpv6/kea_only/subnets_cmds/test_network_cmds.py index f522ee4d..23166085 100644 --- a/tests/dhcpv6/kea_only/subnets_cmds/test_network_cmds.py +++ b/tests/dhcpv6/kea_only/subnets_cmds/test_network_cmds.py @@ -43,12 +43,12 @@ def test_hook_v6_network_cmds_list(): srv_control.set_conf_parameter_shared_subnet('name', '"name-something"', '2') srv_control.set_conf_parameter_shared_subnet('relay', '{"ip-address":"2001:db8::1234"}', '2') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-list","arguments":{}}') @@ -86,12 +86,12 @@ def test_hook_v6_network_cmds_get_by_name(): srv_control.set_conf_parameter_shared_subnet('name', '"name-something"', '2') srv_control.set_conf_parameter_shared_subnet('relay', '{"ip-address":"2001:db8::1234"}', '2') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-get","arguments":{"name":"name-xyz"}}') @@ -105,7 +105,7 @@ def test_hook_v6_network_cmds_add_on_interface(): srv_control.config_srv_subnet('$(EMPTY)', '$(EMPTY)') srv_control.config_srv_opt('preference', '123') # Server is configured with domain-search option with value domain1.example.com,domain2.isc.org. - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -125,10 +125,10 @@ def test_hook_v6_network_cmds_add_on_interface(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "network6-add","arguments": {"shared-networks": [{"name": "name-abc","preferred-lifetime": 3000,"rebind-timer": 2000,"renew-timer": 1000,"valid-lifetime": 4000,"subnet6":[{"subnet":"2001:db8:a::/64","interface": "$(SERVER_IFACE)","pools":[{"pool":"2001:db8:a::1-2001:db8:a::1"}]}]}]}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-get","arguments":{"name": "name-abc"}}') srv_msg.forge_sleep('5', 'seconds') misc.test_procedure() @@ -155,7 +155,7 @@ def test_hook_v6_network_cmds_add_on_interface_id(): srv_control.config_srv_subnet('$(EMPTY)', '$(EMPTY)') srv_control.config_srv_opt('preference', '123') srv_control.config_srv_opt('domain-search', 'domain1.example.com,domain2.isc.org') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -175,9 +175,9 @@ def test_hook_v6_network_cmds_add_on_interface_id(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-add","arguments":{"shared-networks":[{"name": "name-abc","interface-id": "interface-abc","preferred-lifetime": 3000,"rebind-timer": 2000,"renew-timer": 1000,"valid-lifetime": 4000,"subnet6":[{"id":1,"pools": [{"pool": "2001:db8:1::1-2001:db8:1::10"}],"preferred-lifetime": 3000,"rebind-timer": 2000,"renew-timer": 1000,"reservation-mode": "all","subnet": "2001:db8:1::/64","valid-lifetime": 4000}]}]}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-get","arguments":{"name": "name-abc"}}') srv_msg.forge_sleep('5', 'seconds') @@ -212,7 +212,7 @@ def test_hook_v6_network_cmds_add_on_relay_addr(): srv_control.config_srv_subnet('$(EMPTY)', '$(EMPTY)') srv_control.config_srv_opt('preference', '123') srv_control.config_srv_opt('domain-search', 'domain1.example.com,domain2.isc.org') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -232,9 +232,9 @@ def test_hook_v6_network_cmds_add_on_relay_addr(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-add","arguments":{"shared-networks":[{"name": "name-abc","relay":{"ip-address":"2001:db8::abcd"},"preferred-lifetime": 3000,"rebind-timer": 2000,"renew-timer": 1000,"valid-lifetime": 4000,"subnet6":[{"id":1,"pools": [{"pool": "2001:db8:1::1-2001:db8:1::10"}],"preferred-lifetime": 3000,"rebind-timer": 2000,"renew-timer": 1000,"reservation-mode": "all","subnet": "2001:db8:1::/64","valid-lifetime": 4000}]}]}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-get","arguments":{"name": "name-abc"}}') srv_msg.forge_sleep('5', 'seconds') @@ -275,15 +275,15 @@ def test_hook_v6_network_cmds_add_conflict(): srv_control.shared_subnet('1', '0') srv_control.set_conf_parameter_shared_subnet('name', '"name-xyz"', '0') srv_control.set_conf_parameter_shared_subnet('interface', '"$(SERVER_IFACE)"', '0') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-add","arguments":{"shared-networks": [{"interface": "$(SERVER_IFACE)","name": "name-xyz","option-data": [],"preferred-lifetime": 0,"rapid-commit": false,"rebind-timer": 0,"relay": {"ip-address": "::"},"renew-timer": 0,"reservation-mode": "all","subnet6": [{"id": 3,"interface": "$(SERVER_IFACE)","option-data": [],"pd-pools": [],"pools": [{"option-data": [],"pool": "2001:db8:c::1/128"}],"preferred-lifetime": 3000,"rapid-commit": false,"rebind-timer": 2000,"relay": {"ip-address": "::"},"renew-timer": 1000,"reservation-mode": "all","subnet": "2001:db8:c::/64","valid-lifetime": 4000},{"id": 4,"interface": "$(SERVER_IFACE)","option-data": [],"pd-pools": [],"pools": [{"option-data": [],"pool": "2001:db8:d::1/128"}],"preferred-lifetime": 3000,"rapid-commit": false,"rebind-timer": 2000,"relay": {"ip-address": "::"},"renew-timer": 1000,"reservation-mode": "all","subnet": "2001:db8:d::/64","valid-lifetime": 4000}],"valid-lifetime": 0}]}}') misc.test_procedure() @@ -390,17 +390,17 @@ def test_hook_v6_network_cmds_del(): srv_control.set_conf_parameter_shared_subnet('name', '"name-something"', '2') srv_control.set_conf_parameter_shared_subnet('relay', '{"ip-address":"2001:db8::1234"}', '2') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "network6-del","arguments":{"name":"name-xyz","subnets-action": "delete"}}') - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command": "network6-add","arguments":{"subnet6":[{"id": 234,"interface":"$(SERVER_IFACE)","subnet": "2001:db8:1::/64","pools":[{"pool":"2001:db8:1::1-2001:db8:1::2"}]}]}} - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command": "network6-add","arguments":{"subnet6":[{"id": 234,"interface":"$(SERVER_IFACE)","subnet": "2001:db8:1::/64","pools":[{"pool":"2001:db8:1::1-2001:db8:1::2"}]}]}} + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-list","arguments":{}}') @@ -416,7 +416,7 @@ def test_hook_v6_network_cmds_del_2(): srv_control.shared_subnet('0', '0') srv_control.set_conf_parameter_shared_subnet('name', '"name-abc"', '0') srv_control.set_conf_parameter_shared_subnet('interface', '"$(SERVER_IFACE)"', '0') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -435,11 +435,11 @@ def test_hook_v6_network_cmds_del_2(): srv_msg.response_check_include_option('Response', None, '3') srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "network6-del","arguments":{"name":"name-abc","subnets-action": "delete"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-list","arguments":{}}') srv_msg.forge_sleep('5', 'seconds') @@ -492,16 +492,16 @@ def test_hook_v6_network_cmds_del_non_existing(): srv_control.set_conf_parameter_shared_subnet('name', '"name-something"', '2') srv_control.set_conf_parameter_shared_subnet('relay', '{"ip-address":"2001:db8::1234"}', '2') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "network6-del","arguments":{"name":"name-xyzc"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-list","arguments":{}}') @@ -515,7 +515,7 @@ def test_hook_v6_network_cmds_add_and_del(): srv_control.config_srv_subnet('$(EMPTY)', '$(EMPTY)') srv_control.config_srv_opt('preference', '123') srv_control.config_srv_opt('domain-search', 'domain1.example.com,domain2.isc.org') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -535,7 +535,7 @@ def test_hook_v6_network_cmds_add_and_del(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "network6-add","arguments": {"shared-networks": [{"name": "name-abc","preferred-lifetime": 3000,"rebind-timer": 2000,"renew-timer": 1000,"valid-lifetime": 4000,"subnet6":[{"subnet":"2001:db8:a::/64","interface": "$(SERVER_IFACE)","pools":[{"pool":"2001:db8:a::1-2001:db8:a::1"}]}]}]}}') srv_msg.forge_sleep('5', 'seconds') @@ -558,9 +558,9 @@ def test_hook_v6_network_cmds_add_and_del(): 'addr', '2001:db8:a::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "network6-del","arguments":{"name":"name-abc","subnets-action": "delete"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"network6-list","arguments":{}}') misc.test_procedure() diff --git a/tests/dhcpv6/kea_only/subnets_cmds/test_subnet_cmds.py b/tests/dhcpv6/kea_only/subnets_cmds/test_subnet_cmds.py index 955b671f..65d81ed5 100644 --- a/tests/dhcpv6/kea_only/subnets_cmds/test_subnet_cmds.py +++ b/tests/dhcpv6/kea_only/subnets_cmds/test_subnet_cmds.py @@ -19,13 +19,13 @@ def test_hook_v6_subnet_cmds_list(): srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') srv_control.config_srv_another_subnet_no_interface('1000::/32', '1000::5-1000::5') srv_control.config_srv_another_subnet_no_interface('3000::/100', '3000::5-3000::5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-list","arguments":{}}') @@ -39,13 +39,13 @@ def test_hook_v6_subnet_cmds_get_by_id(): srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') srv_control.config_srv_another_subnet_no_interface('1000::/32', '1000::5-1000::5') srv_control.config_srv_another_subnet_no_interface('3000::/100', '3000::5-3000::5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-get","arguments":{"id":2}}') @@ -59,13 +59,13 @@ def test_hook_v6_subnet_cmds_get_by_subnet(): srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') srv_control.config_srv_another_subnet_no_interface('1000::/32', '1000::5-1000::5') srv_control.config_srv_another_subnet_no_interface('3000::/100', '3000::5-3000::5') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-get","arguments":{"subnet":"3000::/100"}}') @@ -79,7 +79,7 @@ def test_hook_v6_subnet_cmds_add(): srv_control.config_srv_subnet('$(EMPTY)', '$(EMPTY)') srv_control.config_srv_opt('preference', '123') srv_control.config_srv_opt('domain-search', 'domain1.example.com,domain2.isc.org') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -99,11 +99,11 @@ def test_hook_v6_subnet_cmds_add(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-add","arguments":{"subnet6":[{"id": 234,"interface":"$(SERVER_IFACE)","subnet": "2001:db8:1::/64","pools":[{"pool":"2001:db8:1::1-2001:db8:1::2"}]}]}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-get","arguments":{"id": 234}}') misc.test_procedure() @@ -136,7 +136,7 @@ def test_hook_v6_subnet_cmds_add_with_options(): srv_control.config_srv_subnet('$(EMPTY)', '$(EMPTY)') srv_control.config_srv_opt('preference', '123') srv_control.config_srv_opt('domain-search', 'domain1.example.com,domain2.isc.org') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -172,11 +172,11 @@ def test_hook_v6_subnet_cmds_add_with_options(): 'domains', 'domain1.example.com.,domain2.isc.org.') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "subnet6-add","arguments":{"subnet6":[{"id": 234,"interface":"$(SERVER_IFACE)","subnet": "2001:db8:1::/64","pools":[{"pool":"2001:db8:1::1-2001:db8:1::2"}],"option-data":[{"csv-format":true,"code":7,"data":"55","name":"preference","space":"dhcp6"}]}]}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-get","arguments":{"id": 234}}') misc.test_procedure() @@ -219,7 +219,7 @@ def test_hook_v6_subnet_cmds_add_conflict(): srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') srv_control.config_srv_opt('preference', '123') srv_control.config_srv_opt('domain-search', 'domain1.example.com,domain2.isc.org') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -244,11 +244,11 @@ def test_hook_v6_subnet_cmds_add_conflict(): 'addr', '2001:db8:1::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "subnet6-add","arguments":{"subnet6":[{"id": 1,"interface":"$(SERVER_IFACE)","subnet": "2001:db8:1::/64","pools":[{"pool":"2001:db8:1::10-2001:db8:1::20"}]}]}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-get","arguments":{}}') misc.test_procedure() @@ -279,7 +279,7 @@ def test_hook_v6_subnet_cmds_add_conflict(): def test_hook_v6_subnet_cmds_del(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -304,12 +304,12 @@ def test_hook_v6_subnet_cmds_del(): 'addr', '2001:db8:1::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "subnet6-del","arguments":{"id":1}}') - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command": "subnet6-add","arguments":{"subnet6":[{"id": 234,"interface":"$(SERVER_IFACE)","subnet": "2001:db8:1::/64","pools":[{"pool":"2001:db8:1::1-2001:db8:1::2"}]}]}} - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command": "subnet6-add","arguments":{"subnet6":[{"id": 234,"interface":"$(SERVER_IFACE)","subnet": "2001:db8:1::/64","pools":[{"pool":"2001:db8:1::1-2001:db8:1::2"}]}]}} + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-get","arguments":{}}') misc.test_procedure() @@ -335,7 +335,7 @@ def test_hook_v6_subnet_cmds_del(): def test_hook_v6_subnet_cmds_del_non_existing(): misc.test_setup() srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -360,12 +360,12 @@ def test_hook_v6_subnet_cmds_del_non_existing(): 'addr', '2001:db8:1::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "subnet6-del","arguments":{"id":2}}') - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command": "subnet6-add","arguments":{"subnet6":[{"id": 234,"interface":"$(SERVER_IFACE)","subnet": "2001:db8:1::/64","pools":[{"pool":"2001:db8:1::1-2001:db8:1::2"}]}]}} - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command": "subnet6-add","arguments":{"subnet6":[{"id": 234,"interface":"$(SERVER_IFACE)","subnet": "2001:db8:1::/64","pools":[{"pool":"2001:db8:1::1-2001:db8:1::2"}]}]}} + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-get","arguments":{}}') misc.test_procedure() @@ -398,7 +398,7 @@ def test_hook_v6_subnet_cmds_del_global_options(): srv_control.config_srv_subnet('2001:db8:1::/64', '2001:db8:1::1-2001:db8:1::1') srv_control.config_srv_opt('preference', '123') srv_control.config_srv_opt('domain-search', 'domain1.example.com,domain2.isc.org') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -426,12 +426,12 @@ def test_hook_v6_subnet_cmds_del_global_options(): srv_msg.response_check_include_option('Response', None, '7') srv_msg.response_check_option_content('Response', '7', None, 'value', '123') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "subnet6-del","arguments":{"id":1}}') - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command": "subnet6-add","arguments":{"subnet6":[{"id": 234,"interface":"$(SERVER_IFACE)","subnet": "2001:db8:1::/64","pools":[{"pool":"2001:db8:1::1-2001:db8:1::2"}]}]}} - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command": "subnet6-add","arguments":{"subnet6":[{"id": 234,"interface":"$(SERVER_IFACE)","subnet": "2001:db8:1::/64","pools":[{"pool":"2001:db8:1::1-2001:db8:1::2"}]}]}} + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-get","arguments":{}}') misc.test_procedure() @@ -468,7 +468,7 @@ def test_hook_v6_subnet_cmds_add_and_del(): srv_control.config_srv_subnet('$(EMPTY)', '$(EMPTY)') srv_control.config_srv_opt('preference', '123') srv_control.config_srv_opt('domain-search', 'domain1.example.com,domain2.isc.org') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_subnet_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -488,11 +488,11 @@ def test_hook_v6_subnet_cmds_add_and_del(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-list","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "subnet6-add","arguments":{"subnet6":[{"id": 234,"interface":"$(SERVER_IFACE)","subnet": "2001:db8:1::/64","pools":[{"pool":"2001:db8:1::1-2001:db8:1::2"}]}]}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-get","arguments":{"id": 234}}') misc.test_procedure() @@ -514,10 +514,10 @@ def test_hook_v6_subnet_cmds_add_and_del(): 'addr', '2001:db8:1::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "subnet6-del","arguments":{"id":234}}') - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command": "subnet6-add","arguments":{"subnet6":[{"id": 234,"interface":"$(SERVER_IFACE)","subnet": "2001:db8:1::/64","pools":[{"pool":"2001:db8:1::1-2001:db8:1::2"}]}]}} - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command": "subnet6-add","arguments":{"subnet6":[{"id": 234,"interface":"$(SERVER_IFACE)","subnet": "2001:db8:1::/64","pools":[{"pool":"2001:db8:1::1-2001:db8:1::2"}]}]}} + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"subnet6-get","arguments":{}}') misc.test_procedure() diff --git a/tests/dhcpv6/kea_only/test_kea_logging.py b/tests/dhcpv6/kea_only/test_kea_logging.py index 57d5f05c..87ebfb5c 100644 --- a/tests/dhcpv6/kea_only/test_kea_logging.py +++ b/tests/dhcpv6/kea_only/test_kea_logging.py @@ -48,7 +48,7 @@ def test_v6_loggers_options_debug(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.options') @@ -93,7 +93,7 @@ def test_v6_loggers_options_info(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp6.options') @@ -114,7 +114,7 @@ def test_v6_loggers_bad_packets_debug(): srv_msg.client_send_msg('SOLICIT') srv_msg.send_dont_wait_for_message() - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.bad-packets') @@ -135,7 +135,7 @@ def test_v6_loggers_bad_packets_info(): srv_msg.client_send_msg('SOLICIT') srv_msg.send_dont_wait_for_message() - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp6.bad-packets') @@ -181,7 +181,7 @@ def test_v6_loggers_dhcp6(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.dhcp6') @@ -228,10 +228,10 @@ def test_v6_loggers_dhcp6_info(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp6.dhcp6') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp6.dhcp6') @@ -275,7 +275,7 @@ def test_v6_loggers_alloc_engine(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.alloc-engine') @@ -319,7 +319,7 @@ def test_v6_loggers_dhcpsrv_debug(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.dhcpsrv') @@ -363,10 +363,10 @@ def test_v6_loggers_dhcpsrv_info(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp6.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp6.dhcpsrv') @@ -410,7 +410,7 @@ def test_v6_loggers_leases_debug(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.leases') @@ -454,7 +454,7 @@ def test_v6_loggers_leases_info(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp6.leases') @@ -498,7 +498,7 @@ def test_v6_loggers_packets_debug(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.packets') @@ -542,7 +542,7 @@ def test_v6_loggers_packets_info(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp6.packets') @@ -586,7 +586,7 @@ def test_v6_loggers_hosts_debug(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.hosts') @@ -630,7 +630,7 @@ def test_v6_loggers_hosts_info(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp6.hosts') @@ -674,22 +674,22 @@ def test_v6_loggers_all(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.packets') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.leases') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.alloc-engine') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.dhcp6') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.options') @@ -749,28 +749,28 @@ def test_v6_loggers_all_different_levels_same_file(): srv_msg.send_dont_wait_for_message() - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.packets') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp6.leases') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.alloc-engine') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp6.dhcp6') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp6.dhcp6') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp6.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp6.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', 'NOT ', r'DEBUG \[kea-dhcp6.options') @@ -829,28 +829,28 @@ def test_v6_loggers_all_different_levels_different_file(): srv_msg.send_dont_wait_for_message() - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log4', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log4', None, r'DEBUG \[kea-dhcp6.packets') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log5', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log5', 'NOT ', r'DEBUG \[kea-dhcp6.leases') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log6', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log6', None, r'DEBUG \[kea-dhcp6.alloc-engine') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log1', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log1', 'NOT ', r'DEBUG \[kea-dhcp6.dhcp6') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log1', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log1', None, r'INFO \[kea-dhcp6.dhcp6') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log2', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log2', 'NOT ', r'DEBUG \[kea-dhcp6.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log2', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log2', None, r'INFO \[kea-dhcp6.dhcpsrv') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log3', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log3', 'NOT ', r'DEBUG \[kea-dhcp6.options') @@ -912,21 +912,21 @@ def test_ddns6_logging_all_types_debug(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp-ddns.dhcpddns') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp-ddns.dhcpddns') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp-ddns.libdhcp-ddns') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp-ddns.d2-to-dns') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'ERROR \[kea-dhcp-ddns.d2-to-dns') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp-ddns.dhcp-to-d2') diff --git a/tests/dhcpv6/kea_only/test_legalloghook.py b/tests/dhcpv6/kea_only/test_legalloghook.py index dbbd8f2b..90a1eeb4 100644 --- a/tests/dhcpv6/kea_only/test_legalloghook.py +++ b/tests/dhcpv6/kea_only/test_legalloghook.py @@ -16,7 +16,7 @@ import srv_msg def test_v6_loggers_legal_log_hook_address_assigned_duid(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.set_time('renew-timer', '100') @@ -170,7 +170,7 @@ def test_v6_loggers_legal_log_hook_address_assigned_duid_pgsql(): def test_v6_loggers_legal_log_hook_address_renewed_duid(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.set_time('renew-timer', '100') @@ -222,11 +222,11 @@ def test_v6_loggers_legal_log_hook_address_renewed_duid(): srv_msg.response_check_include_option('Response', None, '3') srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Address:3000::5 has been assigned for 0 hrs 10 mins 0 secs to a device with DUID: 00:03:00:01:f6:f5:f4:f3:f2:04 and hardware address: hwtype=1 f6:f5:f4:f3:f2:04 (from DUID)') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Address:3000::5 has been renewed for 0 hrs 10 mins 0 secs to a device with DUID: 00:03:00:01:f6:f5:f4:f3:f2:04 and hardware address: hwtype=1 f6:f5:f4:f3:f2:04 (from DUID)') @@ -384,7 +384,7 @@ def test_v6_loggers_legal_log_hook_address_renewed_duid_pgsql(): def test_v6_loggers_legal_log_hook_address_rebind_duid(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.set_time('renew-timer', '100') @@ -435,12 +435,12 @@ def test_v6_loggers_legal_log_hook_address_rebind_duid(): srv_msg.response_check_include_option('Response', None, '3') srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Address:3000::5 has been assigned for 0 hrs 10 mins 0 secs to a device with DUID: 00:03:00:01:f6:f5:f4:f3:f2:04 and hardware address: hwtype=1 f6:f5:f4:f3:f2:04 (from DUID)') # Spec says that when we are rebinding address it will be logged 'renewed', misleading :/ - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Address:3000::5 has been renewed for 0 hrs 10 mins 0 secs to a device with DUID: 00:03:00:01:f6:f5:f4:f3:f2:04 and hardware address: hwtype=1 f6:f5:f4:f3:f2:04 (from DUID)') @@ -598,7 +598,7 @@ def test_v6_loggers_legal_log_hook_address_rebind_duid_mysql(): def test_v6_loggers_legal_log_hook_address_assigned_docsis_modem(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.set_time('renew-timer', '100') @@ -641,8 +641,8 @@ def test_v6_loggers_legal_log_hook_address_assigned_docsis_modem(): srv_msg.response_check_include_option('Response', None, '3') srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Address:3000::5 has been assigned for 0 hrs 10 mins 0 secs to a device with DUID: 00:03:00:01:f6:f5:f4:f3:f2:04 and hardware address: hwtype=1 f6:f5:f4:f3:f2:01 (from DOCSIS MODEM)') @@ -774,7 +774,7 @@ def test_v6_loggers_legal_log_hook_address_assigned_docsis_modem_mysql(): def test_v6_loggers_legal_log_hook_address_assigned_docsis_cmts(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.set_time('renew-timer', '100') @@ -814,8 +814,8 @@ def test_v6_loggers_legal_log_hook_address_assigned_docsis_cmts(): srv_msg.send_wait_for_message('MUST', None, 'RELAYREPLY') srv_msg.response_check_include_option('Response', None, '18') srv_msg.response_check_include_option('Response', None, '9') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Address:3000::5 has been assigned for 0 hrs 10 mins 0 secs to a device with DUID: 00:03:00:01:f6:f5:f4:f3:f2:01 and hardware address: hwtype=1 00:f5:f4:00:f2:01 (from DOCSIS CMTS)') @@ -943,7 +943,7 @@ def test_v6_loggers_legal_log_hook_address_assigned_docsis_cmts_mysql(): def test_v6_loggers_legal_log_hook_address_assigned_relay(): misc.test_procedure() - srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') + srv_msg.remove_file_from_server('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') misc.test_setup() srv_control.set_time('renew-timer', '100') @@ -987,14 +987,14 @@ def test_v6_loggers_legal_log_hook_address_assigned_relay(): srv_msg.send_wait_for_message('MUST', None, 'RELAYREPLY') srv_msg.response_check_include_option('Response', None, '18') srv_msg.response_check_include_option('Response', None, '9') - srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.copy_remote('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt') + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'Address:3000::5 has been assigned for 0 hrs 10 mins 0 secs to a device with DUID: 00:01:00:01:52:7b:a8:f0:f6:f5:f4:f3:f2:01 and hardware address: hwtype=1 f6:f5:f4:f3:f2:01 (from DUID) connected via relay') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'connected via relay at address:') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-legal*.txt', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-legal*.txt', None, 'for client on link address: 3000::1005, hop count: 5') diff --git a/tests/dhcpv6/kea_only/test_mac_in_dhcp6.py b/tests/dhcpv6/kea_only/test_mac_in_dhcp6.py index c96e228c..85e1847c 100644 --- a/tests/dhcpv6/kea_only/test_mac_in_dhcp6.py +++ b/tests/dhcpv6/kea_only/test_mac_in_dhcp6.py @@ -37,10 +37,10 @@ def test_v6_mac_in_dhcp6_duid_type3(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',f6:f5:f4:f3:f2:01,0') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'Hardware addr: f6:f5:f4:f3:f2:01') @@ -74,10 +74,10 @@ def test_v6_mac_in_dhcp6_duid_type1(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',08:00:27:58:f1:e8') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'Hardware addr: 08:00:27:58:f1:e8') @@ -110,10 +110,10 @@ def test_v6_mac_in_dhcp6_any(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'Hardware addr: f6:f5:f4:f3:f2:01') @@ -146,10 +146,10 @@ def test_v6_mac_in_dhcp6_ipv6_link_local(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',$(CLI_MAC)') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'Hardware addr: $(CLI_MAC)') @@ -189,10 +189,10 @@ def test_v6_mac_in_dhcp6_client_link_addr_1(): srv_msg.send_wait_for_message('MUST', None, 'RELAYREPLY') srv_msg.response_check_include_option('Response', None, '18') srv_msg.response_check_include_option('Response', None, '9') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',$(CLI_MAC)') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'Hardware addr: $(CLI_MAC)') @@ -231,10 +231,10 @@ def test_v6_mac_in_dhcp6_client_link_addr_2(): srv_msg.send_wait_for_message('MUST', None, 'RELAYREPLY') srv_msg.response_check_include_option('Response', None, '18') srv_msg.response_check_include_option('Response', None, '9') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',$(CLI_MAC)') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'Hardware addr: $(CLI_MAC)') @@ -274,10 +274,10 @@ def test_v6_mac_in_dhcp6_remote_id_1(): srv_msg.send_wait_for_message('MUST', None, 'RELAYREPLY') srv_msg.response_check_include_option('Response', None, '18') srv_msg.response_check_include_option('Response', None, '9') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',0a:00:27:00:00:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'Hardware addr: 0a:00:27:00:00:01') @@ -317,10 +317,10 @@ def test_v6_mac_in_dhcp6_remote_id_2(): srv_msg.send_wait_for_message('MUST', None, 'RELAYREPLY') srv_msg.response_check_include_option('Response', None, '18') srv_msg.response_check_include_option('Response', None, '9') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',0a:00:27:00:00:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'Hardware addr: 0a:00:27:00:00:01') @@ -361,10 +361,10 @@ def test_v6_mac_in_dhcp6_subscriber_id_1(): srv_msg.send_wait_for_message('MUST', None, 'RELAYREPLY') srv_msg.response_check_include_option('Response', None, '18') srv_msg.response_check_include_option('Response', None, '9') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',0a:00:27:00:00:02') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'Hardware addr: 0a:00:27:00:00:02') @@ -405,10 +405,10 @@ def test_v6_mac_in_dhcp6_subscriber_id_2(): srv_msg.send_wait_for_message('MUST', None, 'RELAYREPLY') srv_msg.response_check_include_option('Response', None, '18') srv_msg.response_check_include_option('Response', None, '9') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',0a:00:27:00:00:02') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'Hardware addr: 0a:00:27:00:00:02') @@ -444,10 +444,10 @@ def test_v6_mac_in_dhcp6_docsis_modem(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'Hardware addr: f6:f5:f4:f3:f2:01') @@ -488,9 +488,9 @@ def test_v6_mac_in_dhcp6_docsic_cmts(): srv_msg.send_wait_for_message('MUST', None, 'RELAYREPLY') srv_msg.response_check_include_option('Response', None, '18') srv_msg.response_check_include_option('Response', None, '9') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, ',00:f5:f4:00:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'Hardware addr: 00:f5:f4:00:f2:01') diff --git a/tests/dhcpv6/kea_only/test_shared_networks.py b/tests/dhcpv6/kea_only/test_shared_networks.py index df6328fe..04f961aa 100644 --- a/tests/dhcpv6/kea_only/test_shared_networks.py +++ b/tests/dhcpv6/kea_only/test_shared_networks.py @@ -207,7 +207,7 @@ def test_v6_sharednetworks_single_shared_subnet_with_one_subnet_based_on_relay_a srv_msg.response_check_include_option('Relayed Message', None, '3') srv_msg.response_check_option_content('Relayed Message', '3', None, 'sub-option', '13') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:a::1,00:03:00:01:f6:f5:f4:f3:f2:01') @@ -303,7 +303,7 @@ def test_v6_sharednetworks_single_shared_subnet_with_one_subnet_based_on_id(): srv_msg.response_check_include_option('Relayed Message', None, '3') srv_msg.response_check_option_content('Relayed Message', '3', None, 'sub-option', '13') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:a::1,00:03:00:01:f6:f5:f4:f3:f2:01') @@ -380,10 +380,10 @@ def test_v6_sharednetworks_single_shared_subnet_with_two_subnets_based_on_iface( srv_msg.response_check_include_option('Response', None, '3') srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:a::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:b::1,00:03:00:01:f6:f5:f4:f3:f2:02') @@ -743,10 +743,10 @@ def test_v6_sharednetworks_single_shared_subnet_with_two_subnets_based_on_id(): srv_msg.response_check_include_option('Relayed Message', None, '3') srv_msg.response_check_option_content('Relayed Message', '3', None, 'sub-option', '5') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:a::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:b::1,00:03:00:01:f6:f5:f4:f3:f2:02') @@ -1017,10 +1017,10 @@ def test_v6_sharednetworks_single_shared_subnet_with_two_subnets_based_on_relay_ srv_msg.response_check_include_option('Relayed Message', None, '3') srv_msg.response_check_option_content('Relayed Message', '3', None, 'sub-option', '5') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:a::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:b::1,00:03:00:01:f6:f5:f4:f3:f2:02') @@ -1160,10 +1160,10 @@ def test_v6_sharednetworks_three_shared_subnet_with_two_subnets_based_on_id_and_ srv_msg.response_check_include_option('Relayed Message', None, '3') srv_msg.response_check_option_content('Relayed Message', '3', None, 'sub-option', '5') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:e::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:f::1,00:03:00:01:f6:f5:f4:f3:f2:02') @@ -1249,10 +1249,10 @@ def test_v6_sharednetworks_three_shared_subnet_with_two_subnets_based_on_id_and_ srv_msg.response_check_include_option('Relayed Message', None, '3') srv_msg.response_check_option_content('Relayed Message', '3', None, 'sub-option', '5') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:a::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:b::1,00:03:00:01:f6:f5:f4:f3:f2:02') @@ -1311,10 +1311,10 @@ def test_v6_sharednetworks_three_shared_subnet_with_two_subnets_based_on_id_and_ srv_msg.response_check_include_option('Response', None, '3') srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:c::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:d::1,00:03:00:01:f6:f5:f4:f3:f2:02') @@ -1810,10 +1810,10 @@ def test_v6_sharednetworks_two_shared_subnet_with_two_subnets_based_on_relay_add srv_msg.response_check_include_option('Relayed Message', None, '3') srv_msg.response_check_option_content('Relayed Message', '3', None, 'sub-option', '5') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:a::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:b::1,00:03:00:01:f6:f5:f4:f3:f2:02') @@ -1903,10 +1903,10 @@ def test_v6_sharednetworks_two_shared_subnet_with_two_subnets_based_on_relay_add srv_msg.response_check_include_option('Relayed Message', None, '3') srv_msg.response_check_option_content('Relayed Message', '3', None, 'sub-option', '5') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:c::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:d::1,00:03:00:01:f6:f5:f4:f3:f2:02') @@ -2082,10 +2082,10 @@ def test_v6_sharednetworks_two_shared_subnet_with_two_subnets_based_on_id(): srv_msg.response_check_include_option('Relayed Message', None, '3') srv_msg.response_check_option_content('Relayed Message', '3', None, 'sub-option', '5') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:a::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:b::1,00:03:00:01:f6:f5:f4:f3:f2:02') @@ -2171,10 +2171,10 @@ def test_v6_sharednetworks_two_shared_subnet_with_two_subnets_based_on_id(): srv_msg.response_check_include_option('Relayed Message', None, '3') srv_msg.response_check_option_content('Relayed Message', '3', None, 'sub-option', '5') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:c::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:d::1,00:03:00:01:f6:f5:f4:f3:f2:02') @@ -2349,10 +2349,10 @@ def test_v6_sharednetworks_single_shared_subnet_with_three_subnets_classificatio srv_msg.response_check_include_option('Response', None, '23') srv_msg.response_check_option_content('Response', '23', None, 'addresses', '2001:db8::1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:b::1,00:03:00:01:f6:f5:f4:f3:f2:f1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:c::1,00:03:00:01:f6:f5:f4:f3:f2:f2') diff --git a/tests/dhcpv6/kea_only/test_subnet_id_sanity_check.py b/tests/dhcpv6/kea_only/test_subnet_id_sanity_check.py index eab6ab29..6a1ad8f7 100644 --- a/tests/dhcpv6/kea_only/test_subnet_id_sanity_check.py +++ b/tests/dhcpv6/kea_only/test_subnet_id_sanity_check.py @@ -18,7 +18,7 @@ def test_v6_sanity_check_subnet_id_fix_able(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '666', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -53,10 +53,10 @@ def test_v6_sanity_check_subnet_id_fix_able(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '2001:db8::1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '666,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') @@ -67,12 +67,12 @@ def test_v6_sanity_check_subnet_id_fix_able(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '999', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'DHCPSRV_LEASE_SANITY_FIXED The lease 2001:db8::1 with subnet-id 666 failed subnet-id checks, but was corrected to subnet-id 999.') @@ -115,7 +115,7 @@ def test_v6_sanity_check_subnet_id_fix_able_double_restart(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '666', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -150,10 +150,10 @@ def test_v6_sanity_check_subnet_id_fix_able_double_restart(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '2001:db8::1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '666,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') @@ -164,12 +164,12 @@ def test_v6_sanity_check_subnet_id_fix_able_double_restart(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '999', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'DHCPSRV_LEASE_SANITY_FIXED The lease 2001:db8::1 with subnet-id 666 failed subnet-id checks, but was corrected to subnet-id 999.') @@ -181,7 +181,7 @@ def test_v6_sanity_check_subnet_id_fix_able_double_restart(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '999', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') @@ -227,7 +227,7 @@ def test_v6_sanity_check_subnet_id_fix_unable(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '666', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -262,10 +262,10 @@ def test_v6_sanity_check_subnet_id_fix_unable(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '2001:db8::1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '666,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') @@ -277,7 +277,7 @@ def test_v6_sanity_check_subnet_id_fix_unable(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '999', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -322,7 +322,7 @@ def test_v6_sanity_check_subnet_id_fix_del_unable(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '666', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix-del"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -357,10 +357,10 @@ def test_v6_sanity_check_subnet_id_fix_del_unable(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '2001:db8::1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '666,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') @@ -372,7 +372,7 @@ def test_v6_sanity_check_subnet_id_fix_del_unable(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '999', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix-del"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -388,7 +388,7 @@ def test_v6_sanity_check_subnet_id_fix_del_able(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '666', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix-del"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -423,10 +423,10 @@ def test_v6_sanity_check_subnet_id_fix_del_able(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '2001:db8::1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '666,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') @@ -434,7 +434,7 @@ def test_v6_sanity_check_subnet_id_fix_del_able(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '999', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix-del"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -450,7 +450,7 @@ def test_v6_sanity_check_subnet_id_warn(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '666', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"warn"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -485,10 +485,10 @@ def test_v6_sanity_check_subnet_id_warn(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '2001:db8::1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '666,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') @@ -496,7 +496,7 @@ def test_v6_sanity_check_subnet_id_warn(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '999', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"warn"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -504,7 +504,7 @@ def test_v6_sanity_check_subnet_id_warn(): srv_msg.forge_sleep('2', 'seconds') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'DHCPSRV_LEASE_SANITY_FAIL The lease 2001:db8::1 with subnet-id 666 failed subnet-id checks.') @@ -533,7 +533,7 @@ def test_v6_sanity_check_subnet_id_del_renew(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '666', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"del"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -568,10 +568,10 @@ def test_v6_sanity_check_subnet_id_del_renew(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '2001:db8::1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '666,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') @@ -583,14 +583,14 @@ def test_v6_sanity_check_subnet_id_del_renew(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '999', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"del"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') srv_msg.forge_sleep('2', 'seconds') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'DHCPSRV_LEASE_SANITY_FAIL_DISCARD The lease 2001:db8::1 with subnet-id 666 failed subnet-id checks and was dropped.') @@ -624,24 +624,24 @@ def test_v6_sanity_check_subnet_id_del_renew(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '13') srv_msg.response_check_suboption_content('Response', '13', '3', None, 'statuscode', '2') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '666,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '999,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', 'NOT ', '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:22') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', 'NOT ', '999,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:22') @@ -655,7 +655,7 @@ def test_v6_sanity_check_subnet_id_del(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '666', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"del"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -690,10 +690,10 @@ def test_v6_sanity_check_subnet_id_del(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '2001:db8::1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '666,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') @@ -705,14 +705,14 @@ def test_v6_sanity_check_subnet_id_del(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '999', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"del"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.add_hooks('$(SOFTWARE_INSTALL_DIR)/lib/kea/hooks/libdhcp_lease_cmds.so') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') srv_msg.forge_sleep('2', 'seconds') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, 'DHCPSRV_LEASE_SANITY_FAIL_DISCARD The lease 2001:db8::1 with subnet-id 666 failed subnet-id checks and was dropped.') @@ -745,20 +745,20 @@ def test_v6_sanity_check_subnet_id_del(): srv_msg.response_check_include_option('Response', None, '3') srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '2001:db8::1') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease6-get","arguments":{"ip-address": "2001:db8::1"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"lease6-get","arguments":{"subnet-id":666,"identifier-type":"duid", "identifier": "00:03:00:01:f6:f5:f4:f3:f2:01"}}') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '666,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') # Pause the Test. - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv MUST contain line or phrase: 2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:22 - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv MUST contain line or phrase: 999,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:22 + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv MUST contain line or phrase: 2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:22 + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv MUST contain line or phrase: 999,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:22 @pytest.mark.v6 @@ -770,7 +770,7 @@ def test_v6_sanity_check_subnet_id_none(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '666', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"none"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -805,10 +805,10 @@ def test_v6_sanity_check_subnet_id_none(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '2001:db8::1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '666,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') @@ -816,16 +816,16 @@ def test_v6_sanity_check_subnet_id_none(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '999', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"none"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'reconfigured') srv_msg.forge_sleep('2', 'seconds') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '666,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') @@ -839,15 +839,15 @@ def test_v6_sanity_check_subnet_id(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::1') srv_control.set_conf_parameter_subnet('id', '666', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-get","arguments": {} }') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "list-commands","arguments": {} }') misc.test_procedure() @@ -879,10 +879,10 @@ def test_v6_sanity_check_subnet_id(): srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '2001:db8::1') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '666,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') @@ -892,7 +892,7 @@ def test_v6_sanity_check_subnet_id(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::2') srv_control.set_conf_parameter_subnet('id', '888', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix-del"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') @@ -904,14 +904,14 @@ def test_v6_sanity_check_subnet_id(): srv_control.config_srv_subnet('2001:db8::/64', '2001:db8::1-2001:db8::2') srv_control.set_conf_parameter_subnet('id', '999', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix-del"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'reconfigured') srv_msg.forge_sleep('12', 'seconds') - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command": "config-get","arguments": {} } + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command": "config-get","arguments": {} } misc.test_procedure() srv_msg.client_sets_value('Client', 'DUID', '00:03:00:01:f6:f5:f4:f3:f2:22') srv_msg.client_does_include('Client', None, 'client-id') @@ -942,7 +942,7 @@ def test_v6_sanity_check_subnet_id(): srv_msg.response_check_suboption_content('Response', '5', '3', None, 'addr', '2001:db8::2') srv_msg.forge_sleep('10', 'seconds') - # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/var/kea/control_socket send {"command": "config-get","arguments": {} } + # Using UNIX socket on server in path $(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket send {"command": "config-get","arguments": {} } misc.test_procedure() srv_msg.client_sets_value('Client', 'DUID', '00:03:00:01:f6:f5:f4:f3:f2:33') srv_msg.client_does_include('Client', None, 'client-id') @@ -979,12 +979,12 @@ def test_v6_sanity_check_shared_subnet_id(): srv_control.set_conf_parameter_shared_subnet('name', '"name-abc"', '0') srv_control.set_conf_parameter_shared_subnet('interface', '"$(SERVER_IFACE)"', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix-del"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'started') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "config-get","arguments": {} }') misc.test_procedure() @@ -1044,16 +1044,16 @@ def test_v6_sanity_check_shared_subnet_id(): srv_msg.response_check_include_option('Response', None, '3') srv_msg.response_check_option_content('Response', '3', None, 'sub-option', '5') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:a::1,00:03:00:01:f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '666,3000,0,1234567,128,0,0,,f6:f5:f4:f3:f2:01') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '2001:db8:b::1,00:03:00:01:f6:f5:f4:f3:f2:02') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea-leases6.csv', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea-leases6.csv', None, '777,3000,0,7654321,128,0,0,,f6:f5:f4:f3:f2:02') @@ -1068,7 +1068,7 @@ def test_v6_sanity_check_shared_subnet_id(): srv_control.set_conf_parameter_shared_subnet('name', '"name-abc"', '0') srv_control.set_conf_parameter_shared_subnet('interface', '"$(SERVER_IFACE)"', '0') srv_control.set_conf_parameter_global('sanity-checks', '{"lease-checks":"fix"}') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.build_and_send_config_files('SSH', 'config-file') srv_control.start_srv('DHCP', 'reconfigured') diff --git a/tests/dhcpv6/kea_only/user_chk/test_v6_user_check_general_logs.py b/tests/dhcpv6/kea_only/user_chk/test_v6_user_check_general_logs.py index 5d62b76a..6df6753a 100644 --- a/tests/dhcpv6/kea_only/user_chk/test_v6_user_check_general_logs.py +++ b/tests/dhcpv6/kea_only/user_chk/test_v6_user_check_general_logs.py @@ -43,9 +43,9 @@ def test_user_check_hook_IA_NA_no_registry_logging(): # Response MUST include option 3. # Response option 3 MUST contain sub-option 5. # Response sub-option 5 from option 3 MUST contain address 3000::5. - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea.log MUST NOT contain line or phrase: DEBUG \[kea-dhcp6.hooks - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea.log MUST contain line or phrase: ERROR \[kea-dhcp6.hooks - # File stored in $(SOFTWARE_INSTALL_DIR)/var/kea/kea.log MUST NOT contain line or phrase: DEBUG \[kea-dhcp6.callouts + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log MUST NOT contain line or phrase: DEBUG \[kea-dhcp6.hooks + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log MUST contain line or phrase: ERROR \[kea-dhcp6.hooks + # File stored in $(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log MUST NOT contain line or phrase: DEBUG \[kea-dhcp6.callouts @pytest.mark.v6 @@ -86,10 +86,10 @@ def test_user_check_hook_IA_NA_with_registry_unknown_user_logging(): # Check the outcome file for correct content srv_msg.copy_remote('/tmp/user_chk_outcome.txt') srv_msg.compare_file('tests/dhcpv6/kea_only/user_chk/outcome_1.txt') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'INFO \[kea-dhcp6.hooks') - srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/var/kea/kea.log', + srv_msg.file_contains_line('$(SOFTWARE_INSTALL_DIR)/etc/kea/kea.log', None, r'DEBUG \[kea-dhcp6.callouts') diff --git a/tests/other_tests/v6/test_statistics.py b/tests/other_tests/v6/test_statistics.py index 891b86ca..b192e6fb 100644 --- a/tests/other_tests/v6/test_statistics.py +++ b/tests/other_tests/v6/test_statistics.py @@ -14,7 +14,7 @@ def test_stats_6(): misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::ff') srv_control.config_srv_prefix('3001::', '0', '90', '92') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket') srv_control.start_srv('DHCP', 'started') misc.test_procedure() @@ -34,14 +34,14 @@ def test_stats_6(): srv_msg.loops('SOLICIT', 'ADVERTISE', '50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "list-commands","arguments": {}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"statistic-get-all","arguments":{}}') srv_msg.loops('SOLICIT', 'ADVERTISE', '50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"statistic-get-all","arguments":{}}') srv_msg.loops('SOLICIT', 'ADVERTISE', '50') @@ -73,21 +73,21 @@ def test_stats_6(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-receive-drop"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-parse-failed"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-solicit-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-confirm-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-advertise-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-request-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-reply-received"}}') misc.test_procedure() @@ -122,7 +122,7 @@ def test_stats_6(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-renew-received"}}') misc.test_procedure() @@ -153,11 +153,11 @@ def test_stats_6(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-rebind-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-release-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-decline-received"}}') misc.test_procedure() @@ -166,23 +166,23 @@ def test_stats_6(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-infrequest-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-unknown-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-sent"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-advertise-sent"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-reply-sent"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "subnet[1].total-nas"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "subnet[1].assigned-nas"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "subnet[1].total-pds"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "subnet[1].assigned-pds"}}') srv_msg.loops('REQUEST', 'REPLY', '50') @@ -213,56 +213,56 @@ def test_stats_6(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-request-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-advertise-sent"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-reply-sent"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "subnet[1].total-nas"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "subnet[1].assigned-nas"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "subnet[1].total-pds"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "subnet[1].assigned-pds"}}') srv_msg.loops('REQUEST', 'REPLY', '50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get-all","arguments":{}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "subnet[1].total-nas"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "subnet[1].assigned-nas"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-reset","arguments": {"name": "pkt6-request-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-request-received"}}') srv_msg.loops('SOLICIT', 'ADVERTISE', '50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-request-received"}}') srv_msg.loops('REQUEST', 'REPLY', '50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-request-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-remove","arguments": {"name": "pkt6-request-received"}}') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-request-received"}}') srv_msg.loops('SOLICIT', 'ADVERTISE', '50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-request-received"}}') srv_msg.loops('REQUEST', 'REPLY', '50') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-request-received"}}') misc.test_procedure() @@ -293,7 +293,7 @@ def test_stats_6(): misc.pass_criteria() srv_msg.send_wait_for_message('MUST', None, 'REPLY') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command": "statistic-get","arguments": {"name": "pkt6-decline-received"}}') misc.test_setup() @@ -301,10 +301,10 @@ def test_stats_6(): srv_control.config_srv_another_subnet_no_interface('3000:100::/64', '3000:100::5-3000:100::ff') srv_control.config_srv_prefix('2001:db8:1::', '0', '90', '92') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2') srv_control.start_srv('DHCP', 'reconfigured') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2', '{"command":"statistic-get-all","arguments":{}}') misc.test_setup() @@ -312,19 +312,19 @@ def test_stats_6(): srv_control.config_srv_prefix('2001:db8:1::', '0', '90', '92') srv_control.start_srv('DHCP', 'reconfigured') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', '{"command":"statistic-get-all","arguments":{}}') misc.test_setup() srv_control.config_srv_subnet('3000::/64', '3000::1-3000::ff') srv_control.config_srv_prefix('2001:db8:1::', '0', '90', '92') - srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2') + srv_control.open_control_channel('unix', '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2') srv_control.start_srv('DHCP', 'reconfigured') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2', '{"command":"statistic-get-all","arguments":{}}') srv_control.start_srv('DHCP', 'restarted') - srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket2', + srv_msg.send_through_socket_server_site('$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket2', '{"command":"statistic-get-all","arguments":{}}') diff --git a/tests/softwaresupport/configuration.py b/tests/softwaresupport/configuration.py index b5bed861..a705cfdb 100644 --- a/tests/softwaresupport/configuration.py +++ b/tests/softwaresupport/configuration.py @@ -376,8 +376,8 @@ class KeaConfiguration: from kea6_server.functions import set_kea_ctrl_config, start_srv # set_kea_ctrl_config() - # cfg4 = '{"Dhcp4":{"control-socket":{"socket-type":"unix","socket-name":"'+world.f_cfg.software_install_path+'var/kea/control_socket"}},"Logging":{"loggers":[{"name":"kea-dhcp4","output_options":[{"output":"'+world.f_cfg.software_install_path+'var/kea/kea.log"}],"debuglevel":99,"severity":"DEBUG"}]}}' - # netconfdaemoncfg = '{"Dhcp4":{"control-socket":{"socket-type":"unix","socket-name":"'+world.f_cfg.software_install_path+'var/kea/control_socket"}}}' + # cfg4 = '{"Dhcp4":{"control-socket":{"socket-type":"unix","socket-name":"'+world.f_cfg.software_install_path+'etc/kea/control_socket"}},"Logging":{"loggers":[{"name":"kea-dhcp4","output_options":[{"output":"'+world.f_cfg.software_install_path+'etc/kea/kea.log"}],"debuglevel":99,"severity":"DEBUG"}]}}' + # netconfdaemoncfg = '{"Dhcp4":{"control-socket":{"socket-type":"unix","socket-name":"'+world.f_cfg.software_install_path+'etc/kea/control_socket"}}}' # config = open(world.cfg["cfg_file"], 'w') # config.write(cfg4) # config.close() @@ -558,7 +558,7 @@ class ConfigurationGlobalParameters: self.value_name = value_name self.value = value # maybe this won't be needed: - self.socket_name = os.path.join(world.f_cfg.software_install_path, 'var/kea/control_socket') + self.socket_name = os.path.join(world.f_cfg.software_install_path, 'etc/kea/control_socket') self.socket_type = "unix" self.decline_probation_period = "" self.re_detect = "" @@ -580,7 +580,7 @@ class ConfigurationGlobalParameters: # leases: self.db_leases_type = "memfile" self.lfc_interval = 0 - self.file_name = os.path.join(world.f_cfg.software_install_path, 'var/kea/kea-leases4.csv') + self.file_name = os.path.join(world.f_cfg.software_install_path, 'etc/kea/kea-leases4.csv') self.persist = "" self.db_name = "" self.db_host = "" @@ -632,7 +632,7 @@ class ConfigurationLogging: self.flush = "true" self.maxsize = "" self.maxver = "" - self.output = os.path.join(world.f_cfg.software_install_path, "var/kea/kea.log") + self.output = os.path.join(world.f_cfg.software_install_path, "etc/kea/kea.log") def __getitem__(self, item): return getattr(self, item) diff --git a/tests/softwaresupport/kea.py b/tests/softwaresupport/kea.py index fb851998..8b5b6288 100644 --- a/tests/softwaresupport/kea.py +++ b/tests/softwaresupport/kea.py @@ -77,7 +77,7 @@ def _write_cfg2(cfg): def build_and_send_config_files2(cfg, connection_type, configuration_type="config-file", destination_address=world.f_cfg.mgmt_address): if configuration_type == "config-file" and connection_type == "SSH": - world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, 'var/kea/kea-leases4.csv') + world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, 'etc/kea/kea-leases4.csv') set_kea_ctrl_config() _write_cfg2(cfg) fabric_send_file(world.cfg["cfg_file"], @@ -91,7 +91,7 @@ def build_and_send_config_files2(cfg, connection_type, configuration_type="confi remove_local_file(world.cfg["cfg_file"]) remove_local_file(world.cfg["cfg_file_2"]) elif configuration_type == "config-file" and connection_type is None: - world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, 'var/kea/kea-leases4.csv') + world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, 'etc/kea/kea-leases4.csv') set_kea_ctrl_config() cfg_write() copy_configuration_file(world.cfg["cfg_file"], destination_host=destination_address) @@ -99,7 +99,7 @@ def build_and_send_config_files2(cfg, connection_type, configuration_type="confi def clear_logs(destination_address=world.f_cfg.mgmt_address): - fabric_remove_file_command(os.path.join(world.f_cfg.software_install_path, 'var/kea/kea.log*'), + fabric_remove_file_command(os.path.join(world.f_cfg.software_install_path, 'etc/kea/kea.log*'), destination_host=destination_address) diff --git a/tests/softwaresupport/kea4_server/functions.py b/tests/softwaresupport/kea4_server/functions.py index 5e323c6f..cfbfbe89 100644 --- a/tests/softwaresupport/kea4_server/functions.py +++ b/tests/softwaresupport/kea4_server/functions.py @@ -169,7 +169,8 @@ def build_and_send_config_files(connection_type, configuration_type="config-file """ if configuration_type == "config-file" and connection_type == "SSH": - world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, 'var/kea/kea-leases%s.csv' % world.proto[1]) + world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, + 'etc/kea/kea-leases%s.csv' % world.proto[1]) add_defaults() set_kea_ctrl_config() cfg_write() @@ -184,7 +185,8 @@ def build_and_send_config_files(connection_type, configuration_type="config-file remove_local_file(world.cfg["cfg_file"]) remove_local_file(world.cfg["cfg_file_2"]) elif configuration_type == "config-file" and connection_type is None: - world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, 'var/kea/kea-leases%s.csv' % world.proto[1]) + world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, + 'etc/kea/kea-leases%s.csv' % world.proto[1]) add_defaults() set_kea_ctrl_config() cfg_write() @@ -387,7 +389,7 @@ def start_srv(start, process, destination_address=world.f_cfg.mgmt_address): """ Start kea with generated config """ - world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, 'var/kea/kea-leases4.csv') + world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, 'etc/kea/kea-leases4.csv') v6, v4 = check_kea_status(destination_address) if process is None: diff --git a/tests/softwaresupport/kea6_server/functions.py b/tests/softwaresupport/kea6_server/functions.py index 829095ac..73a816ef 100644 --- a/tests/softwaresupport/kea6_server/functions.py +++ b/tests/softwaresupport/kea6_server/functions.py @@ -156,7 +156,8 @@ def build_and_send_config_files(connection_type, configuration_type="config-file """ if configuration_type == "config-file" and connection_type == "SSH": - world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, 'var/kea/kea-leases%s.csv' % world.proto[1]) + world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, + 'etc/kea/kea-leases%s.csv' % world.proto[1]) add_defaults() set_kea_ctrl_config() cfg_write() @@ -171,7 +172,8 @@ def build_and_send_config_files(connection_type, configuration_type="config-file remove_local_file(world.cfg["cfg_file"]) remove_local_file(world.cfg["cfg_file_2"]) elif configuration_type == "config-file" and connection_type is None: - world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, 'var/kea/kea-leases%s.csv' % world.proto[1]) + world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, + 'etc/kea/kea-leases%s.csv' % world.proto[1]) add_defaults() set_kea_ctrl_config() cfg_write() @@ -552,7 +554,7 @@ def add_logger(log_type, severity, severity_level, logging_file): else: if len(world.cfg["logger"]) > 20: world.cfg["logger"] += ',' - logging_file_path = os.path.join(world.f_cfg.software_install_path, 'var/kea', logging_file) + logging_file_path = os.path.join(world.f_cfg.software_install_path, 'etc/kea', logging_file) if severity_level != "None": world.cfg["logger"] += '{"name": "' + log_type + '","output_options": [{"output": "' + logging_file_path + '"' \ '}],"debuglevel": ' + severity_level + ',"severity": ' \ @@ -796,7 +798,7 @@ def cfg_write(): cfg_file.write(',' + world.cfg["agent"]) del world.cfg["agent"] - logging_file = os.path.join(world.f_cfg.software_install_path, 'var/kea/kea.log') + logging_file = os.path.join(world.f_cfg.software_install_path, 'etc/kea/kea.log') log_type = '' if "kea6" in world.cfg["dhcp_under_test"]: @@ -856,7 +858,7 @@ def start_kea(destination_host): # - display these logs to screen using cat so forge can catch errors in the logs start_cmd = 'nohup ' + os.path.join(world.f_cfg.software_install_path, 'sbin/keactrl') start_cmd += " start < /dev/null > /tmp/keactrl.log 2>&1; SECONDS=0; while (( SECONDS < 4 ));" - start_cmd += " do tail /usr/local/var/kea/kea.log 2>/dev/null | grep 'server version .* started' 2>/dev/null;" + start_cmd += " do tail /usr/local/etc/kea/kea.log 2>/dev/null | grep 'server version .* started' 2>/dev/null;" start_cmd += " if [ $? -eq 0 ]; then break; fi done;" start_cmd += " sync; cat /tmp/keactrl.log" return fabric_sudo_command(start_cmd, destination_host=destination_host) @@ -878,7 +880,7 @@ def start_srv(start, process, destination_address=world.f_cfg.mgmt_address): """ # build_and_send_config_files() it's now separate step v6, v4 = check_kea_status(destination_address) - world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, 'var/kea/kea-leases6.csv') + world.cfg['leases'] = os.path.join(world.f_cfg.software_install_path, 'etc/kea/kea-leases6.csv') if process is None: process = "starting" @@ -959,7 +961,7 @@ def save_leases(tmp_db_type=None, destination_address=world.f_cfg.mgmt_address): def save_logs(destination_address=world.f_cfg.mgmt_address): - fabric_download_file(os.path.join(world.f_cfg.software_install_path, 'var/kea/kea.log*'), + fabric_download_file(os.path.join(world.f_cfg.software_install_path, 'etc/kea/kea.log*'), check_local_path_for_downloaded_files(world.cfg["dir_name"], '.', destination_address), diff --git a/tests/srv_msg.py b/tests/srv_msg.py index a0ce79ed..2a5117f8 100644 --- a/tests/srv_msg.py +++ b/tests/srv_msg.py @@ -643,7 +643,7 @@ def send_request(dhcp_version, cmd, channel='http'): response = response[0] elif channel == 'socket': response = send_through_socket_server_site( - '$(SOFTWARE_INSTALL_DIR)/var/kea/control_socket', + '$(SOFTWARE_INSTALL_DIR)/etc/kea/control_socket', cmd_str) else: raise ValueError('unsupported channel type: %s' % str(channel)) -- GitLab