diff --git a/autotests/test2AP/IntelWIFI.conf b/autotests/test2AP/IntelWIFI.conf deleted file mode 100644 index 91d44ae5..00000000 --- a/autotests/test2AP/IntelWIFI.conf +++ /dev/null @@ -1,10 +0,0 @@ -interface=wln0 -driver=nl80211 - -hw_mode=g -channel=1 -ssid=IntelWIFI - -wpa=1 -wpa_pairwise=TKIP -wpa_passphrase=EasilyGuessedPassword diff --git a/autotests/test2AP/PersonalWIFI.conf b/autotests/test2AP/PersonalWIFI.conf deleted file mode 100644 index 15f08e80..00000000 --- a/autotests/test2AP/PersonalWIFI.conf +++ /dev/null @@ -1,10 +0,0 @@ -interface=wln1 -driver=nl80211 - -hw_mode=g -channel=1 -ssid=PersonalWIFI - -wpa=1 -wpa_pairwise=TKIP -wpa_passphrase=EasilyGuessedPassword diff --git a/autotests/test2AP/README.txt b/autotests/test2AP/README.txt deleted file mode 100644 index efcd5126..00000000 --- a/autotests/test2AP/README.txt +++ /dev/null @@ -1,43 +0,0 @@ -twoNetworksTest: connect to network A. disconnect from network A. - connect to network B. disconnect from network B. - -Start with test-runner: - Test-runner looks at the hw.conf file and creates radios using - hwsim and reads the conf file(s) defined under [HOSTAPD] section - -1. Just start test-runner from under /tools directory and it - will automatically run the tests. - cd /tools - sudo ./test-runner -t test2AP - -Run stand-alone: -Pre-requisites: -1. Ensure you have hostapd installed. -2. Verify that the kernel has mac80211_hwsim. - -Setup: -1. Create radios using mac80211_hwsim. For most tests, we need 3 radios. - sudo modprobe mac80211_hwsim radios=3 -2. Enable network interface: - sudo ifconfig wlan2 up - -Run test (e.g. twoNetworksTest test): -1. Start hostapd, with a config file as an argument. - You can use the IntelWIFI.conf and PersonalWIFI.conf - file in autotests/test2AP directory. - sudo ./hostapd - sudo ./hostapd - -Note: You might need to edit the *.conf file and change wln0 and wln1 - to wlan0 and wlan1 respectively. - -2. Start iwd. - sudo iwd -3. Start twoNetworksTest test (inside autotests/test2AP directory). - cd /autotests/test2AP - ./twoNetworksTest.py - -Optional changes: -1. You can provide your own config file to hostapd. If so, then you would need to - change the assert inside the test to the name of the ssid in your test. - self.assertEqual(connectedNetworkName, "IntelWIFI") diff --git a/autotests/test2AP/hw.conf b/autotests/test2AP/hw.conf deleted file mode 100644 index a87a4a88..00000000 --- a/autotests/test2AP/hw.conf +++ /dev/null @@ -1,6 +0,0 @@ -[SETUP] -num_radios=3 - -[HOSTAPD] -rad0=IntelWIFI.conf -rad1=PersonalWIFI.conf diff --git a/autotests/test2AP/twoNetworksTest.py b/autotests/test2AP/twoNetworksTest.py deleted file mode 100755 index 2b05c236..00000000 --- a/autotests/test2AP/twoNetworksTest.py +++ /dev/null @@ -1,124 +0,0 @@ -#!/usr/bin/python3 - -#built-in python libraries -import unittest -from gi.repository import GLib -import dbus -import dbus.service -import dbus.mainloop.glib -import time -import threading -import logging -from subprocess import Popen, PIPE, STDOUT -import sys -import os -sys.path.append('../utility') #needed to import all the utlilty modules -import utility -import pty - -def getSecondNetworkToConnect(objectList, firstNetworkName): - logger.debug(sys._getframe().f_code.co_name) - for path in objectList: - if utility.IWD_NETWORK_INTERFACE not in objectList[path]: - continue - network = objectList[path][utility.IWD_NETWORK_INTERFACE] - # skip the first connected network - if network["Name"] == firstNetworkName: - continue - return path - return "" - -class TestTwoNetworks(unittest.TestCase): - # connect to network A. disconnect from network A. - # connect to network B. disconnect from network B. - def connectToNetwork(self, networkToConnect): - # start simpleAgent - master, slave = pty.openpty() - proc = Popen([sys.executable, '../utility/simpleAgent.py'], - stdin=PIPE, stdout=slave, close_fds=True) - stdout_handle = os.fdopen(master) - if stdout_handle.readline().rstrip() == "AGENT_REGISTERED": - logger.debug("Agent Registered") - else: - logger.debug("Agent failed to register") - - # close the handles - stdout_handle.close() - os.close(slave) - - network = dbus.Interface(bus.get_object(utility.IWD_SERVICE, - networkToConnect), - utility.IWD_NETWORK_INTERFACE) - status = utility.connect(networkToConnect, self, mainloop, bus) - if status == False: - #terminate proc - proc.terminate() - return - - connectedNetworkName = utility.getCurrentlyConnectedNetworkName() - logger.info("Currently connected to: %s", connectedNetworkName) - self.assertIn(connectedNetworkName, networkListToMatch) - # remove the network we just matched from the list - networkListToMatch.remove(connectedNetworkName) - - # wait 2 seconds before initiating disconnect - time.sleep(2) - # retrieve the deviceId form networkToConnect. This will be used - # for checking if we are disconnecting from the right device later. - deviceIdIndex = networkToConnect.rfind("/", 0, - len(networkToConnect)) - deviceIdOfConnectedNetwork = networkToConnect[0:deviceIdIndex] - - deviceIdToDisconnect = utility.getCurrentlyConnectedDevice() - logger.info("Disconnecting from: %s", deviceIdToDisconnect) - self.assertEqual(deviceIdToDisconnect, deviceIdOfConnectedNetwork) - utility.disconnect(deviceIdToDisconnect, mainloop, bus) - #terminate proc - proc.terminate() - return connectedNetworkName - - def doConnectDisconnectTwoNetworks(self): - objectList = utility.getObjectList(bus) - networkToConnect = utility.getNetworkToConnectTo(objectList, "") - - # check if networkToConnect is not null. If yes, restart program - # so that the network list is updated. Alternatively, we can scan - # for networks. - if (networkToConnect == ""): - time.sleep(2) - logger.debug("RESTART PROGRAM") - os.execl(sys.executable, sys.executable, * sys.argv) - - self.assertNotEqual(networkToConnect, "") - # connect to 1st network - connectedNetworkName = self.connectToNetwork(networkToConnect) - - # connect to the 2nd network - secondNetworkToConnect = getSecondNetworkToConnect(objectList, - connectedNetworkName) - connectedNetwork = self.connectToNetwork(secondNetworkToConnect) - - def test_twoNetworks(self): - logger.info(sys._getframe().f_code.co_name) - while (True): - if bus.name_has_owner(utility.IWD_SERVICE) == True: - break - self.doConnectDisconnectTwoNetworks() - - @classmethod - def setUpClass(cls): - global logger, bus, mainloop, networkListToMatch - utility.initLogger() - logger = logging.getLogger(__name__) - mainloop = GLib.MainLoop() - dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) - bus = dbus.SystemBus() - # we should connect to these networks - in any order - networkListToMatch = ["IntelWIFI", "PersonalWIFI"] - - @classmethod - def tearDown(self): - mainloop.quit() - -if __name__ == '__main__': - unittest.main(exit=True)