smoketest: dhcp-relay: T3095: remove non referenced function from unittest

2 files changed, 1 insertions, 9 deletions

diff --git a/data/templates/dhcp-relay/dhcrelay.conf.tmpl b/data/templates/dhcp-relay/dhcrelay.conf.tmpl
index df990207b..a9d17ed9a 100644
--- a/data/templates/dhcp-relay/dhcrelay.conf.tmpl
+++ b/data/templates/dhcp-relay/dhcrelay.conf.tmpl
@@ -2,5 +2,5 @@
 
 {% set max_size = '-A ' + relay_options.max_size if relay_options.max_size is defined and relay_options.max_size is not none %}
 {# hop_count and relay_agents_packets is a default option, thus it is always present #}
-OPTIONS="-4 -c {{ relay_options.hop_count }} -a -m {{ relay_options.relay_agents_packets }} {{ max_size }} -i {{ interface | join(' -i ') }} {{ server | join(' ') }}"
+OPTIONS="-c {{ relay_options.hop_count }} -a -m {{ relay_options.relay_agents_packets }} {{ max_size }} -i {{ interface | join(' -i ') }} {{ server | join(' ') }}"
 
diff --git a/smoketest/scripts/cli/test_service_dhcp-relay.py b/smoketest/scripts/cli/test_service_dhcp-relay.py
index d56f6aa16..4b020db72 100755
--- a/smoketest/scripts/cli/test_service_dhcp-relay.py
+++ b/smoketest/scripts/cli/test_service_dhcp-relay.py
@@ -29,17 +29,9 @@ PROCESS_NAME = 'dhcrelay'
 RELAY_CONF = '/run/dhcp-relay/dhcrelay.conf'
 base_path = ['service', 'dhcp-relay']
 
-def get_config_value(key):
-    tmp = read_file(SSHD_CONF)
-    tmp = re.findall(f'\n?{key}\s+(.*)', tmp)
-    return tmp
-
 class TestServiceDHCPRelay(unittest.TestCase):
     def setUp(self):
         self.session = ConfigSession(os.getpid())
-        # ensure we can also run this test on a live system - so lets clean
-        # out the current configuration :)
-        self.session.delete(base_path)
 
     def tearDown(self):
         self.session.delete(base_path)