Revert "TUN-6010: Add component tests for --edge-ip-version"

This reverts commit 978e01f.

Author: DevinCarr

component-tests/cli.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import os
 import pathlib
+import platform
 import subprocess
 from contextlib import contextmanager
 from pathlib import Path
@@ -9,7 +10,12 @@
 
 import test_logging
 from conftest import CfdModes
-from util import select_platform, start_cloudflared, wait_tunnel_ready, write_config
+from util import start_cloudflared, wait_tunnel_ready, write_config
+
+
+def select_platform(plat):
+    return pytest.mark.skipif(
+        platform.system() != plat, reason=f"Only runs on {plat}")
 
 
 def default_config_dir():

component-tests/test_edge_discovery.py

@@ -1,12 +1,9 @@
 import logging
 import os
-import platform
 import subprocess
 from contextlib import contextmanager
 from time import sleep
 
-import pytest
-
 import requests
 import yaml
 from retrying import retry
@@ -15,10 +12,6 @@
 
 LOGGER = logging.getLogger(__name__)
 
-def select_platform(plat):
-    return pytest.mark.skipif(
-        platform.system() != plat, reason=f"Only runs on {plat}")
-
 
 def write_config(directory, config):
     config_path = directory / "config.yml"
@@ -118,17 +111,6 @@ def check_tunnel_not_connected():
         LOGGER.warning(f"Failed to connect to {url}, error: {e}")
 
 
-def get_tunnel_connector_id():
-    url = f'http://localhost:{METRICS_PORT}/ready'
-
-    try:
-        resp = requests.get(url, timeout=1)
-        return resp.json()["connectorId"]
-    # cloudflared might already terminated
-    except requests.exceptions.ConnectionError as e:
-        LOGGER.warning(f"Failed to connect to {url}, error: {e}")
-
-
 # In some cases we don't need to check response status, such as when sending batch requests to generate logs
 def send_requests(url, count, require_ok=True):
     errors = 0