diff --git a/libs/perfecto_interop/android_libs.py b/libs/perfecto_interop/android_libs.py index 4c2da38fb..06fc0a576 100644 --- a/libs/perfecto_interop/android_libs.py +++ b/libs/perfecto_interop/android_libs.py @@ -1,31 +1,26 @@ import logging -import os -import re import time import warnings import allure import pytest import urllib3 +from appium import webdriver from appium.webdriver import webdriver -from perfecto.model.model import Job, Project -from perfecto import (PerfectoExecutionContext, PerfectoReportiumClient, TestContext, TestResultFactory) -from selenium.webdriver.support.wait import WebDriverWait -from selenium.common.exceptions import NoSuchElementException, TimeoutException -from selenium.webdriver.common.by import By -from selenium.webdriver.support.ui import WebDriverWait from appium.webdriver.common.mobileby import MobileBy +from perfecto import (PerfectoExecutionContext, PerfectoReportiumClient, TestContext) +from perfecto.model.model import Job, Project +from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.support import expected_conditions as EC -from appium import webdriver -from perfecto_interop import perfecto_interop -from appium import webdriver +from selenium.webdriver.support.ui import WebDriverWait -class android_libs(perfecto_interop): + +class android_libs: global driver, perfecto_execution_context def __init__(self, perfecto_data=None, dut_data=None): - super().__init__(perfecto_data=perfecto_data, dut_data=dut_data) + # super().__init__(perfecto_data=perfecto_data, dut_data=dut_data) self.perfecto_data = perfecto_data self.dut_data = dut_data self.connData = self.get_ToggleAirplaneMode_data(self.android_devices["Galaxy S10.*"]) @@ -886,9 +881,9 @@ class android_libs(perfecto_interop): if device_model_name != "Pixel 4": logging.info("Selected Model is not Pixel 4") report.step_start("Getting IP address") - # Get into Additional Details - # To Get an IP Address - # ------------------------------------------------------- + # Get into Additional Details + # To Get an IP Address + # ------------------------------------------------------- if self.get_phone_information(setup_perfectoMobile, search_this="osVersion") != "12": try: @@ -1498,7 +1493,7 @@ class android_libs(perfecto_interop): # Verify if WiFi is connected # ------------------------------------------------------- if self.get_phone_information(setup_perfectoMobile=setup_perfectoMobile, - search_this="osVersion") != "12": + search_this="osVersion") != "12": try: report.step_start("Verify if Wifi is Connected") wifi_internet_err_msg = WebDriverWait(driver, 35).until( @@ -1644,6 +1639,7 @@ class android_libs(perfecto_interop): self.closeApp(connData["appPackage-android"], setup_perfectoMobile) return ssid_with_internet + if __name__ == '__main__': perfecto_data = { "securityToken": "eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI3NzkzZGM0Ni1jZmU4LTQ4ODMtYjhiOS02ZWFlZGU2OTc2MDkifQ.eyJpYXQiOjE2MzI4Mzc2NDEsImp0aSI6IjAwZGRiYWY5LWQwYjMtNDRjNS1hYjVlLTkyNzFlNzc5ZGUzNiIsImlzcyI6Imh0dHBzOi8vYXV0aDIucGVyZmVjdG9tb2JpbGUuY29tL2F1dGgvcmVhbG1zL3RpcC1wZXJmZWN0b21vYmlsZS1jb20iLCJhdWQiOiJodHRwczovL2F1dGgyLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy90aXAtcGVyZmVjdG9tb2JpbGUtY29tIiwic3ViIjoiODNkNjUxMWQtNTBmZS00ZWM5LThkNzAtYTA0ZjBkNTdiZDUyIiwidHlwIjoiT2ZmbGluZSIsImF6cCI6Im9mZmxpbmUtdG9rZW4tZ2VuZXJhdG9yIiwibm9uY2UiOiI2ZjE1YzYxNy01YTU5LTQyOWEtODc2Yi1jOTQxMTQ1ZDFkZTIiLCJzZXNzaW9uX3N0YXRlIjoiYmRjZTFmYTMtMjlkYi00MmFmLWI5YWMtYjZjZmJkMDEyOTFhIiwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBvZmZsaW5lX2FjY2VzcyBlbWFpbCJ9.5R85_1R38ZFXv_wIjjCIsj8NJm1p66dCsLJI5DBEmks", diff --git a/libs/perfecto_interop/androidtests.py b/libs/perfecto_interop/android_tests.py similarity index 93% rename from libs/perfecto_interop/androidtests.py rename to libs/perfecto_interop/android_tests.py index 23907f1d9..ec6f5e8ee 100644 --- a/libs/perfecto_interop/androidtests.py +++ b/libs/perfecto_interop/android_tests.py @@ -1,15 +1,3 @@ -import time -from telnetlib import EC -import pytest -import logging -import re -from selenium.common.exceptions import NoSuchElementException, TimeoutException -from selenium.webdriver.common.by import By -from selenium.webdriver.support.ui import WebDriverWait -from appium.webdriver.common.mobileby import MobileBy -from selenium.webdriver.support import expected_conditions as EC -from appium import webdriver - from android_libs import android_libs diff --git a/libs/perfecto_interop/ios_lib.py b/libs/perfecto_interop/ios_lib.py index 680996f95..b918811b5 100644 --- a/libs/perfecto_interop/ios_lib.py +++ b/libs/perfecto_interop/ios_lib.py @@ -4,22 +4,15 @@ 1. controller_data/sdk_base_url 2. login credentials """ -from ast import Str -from logging import exception -import unittest -import warnings -from _pytest.outcomes import fail -from perfecto.test import TestResultFactory -import pytest -import sys import time -from selenium.common.exceptions import NoSuchElementException, TimeoutException -from selenium.webdriver.common.by import By -from selenium.common.exceptions import NoSuchElementException -from selenium.webdriver.support.ui import WebDriverWait -from appium.webdriver.common.mobileby import MobileBy -from selenium.webdriver.support import expected_conditions as EC + import allure +from appium.webdriver.common.mobileby import MobileBy +from perfecto.test import TestResultFactory +from selenium.common.exceptions import NoSuchElementException +from selenium.common.exceptions import TimeoutException +from selenium.webdriver.support import expected_conditions as EC +from selenium.webdriver.support.ui import WebDriverWait def openApp(appName, setup_perfectoMobile): diff --git a/libs/perfecto_interop/ios_libs.py b/libs/perfecto_interop/ios_libs.py index 5f652eddd..c6aecef45 100644 --- a/libs/perfecto_interop/ios_libs.py +++ b/libs/perfecto_interop/ios_libs.py @@ -1,32 +1,24 @@ import logging -import os -import re -from ast import Str -from logging import exception -import unittest +import time import warnings -import urllib3 -from _pytest.outcomes import fail -from appium.webdriver import webdriver -from perfecto.model.model import Job, Project -from perfecto import (PerfectoExecutionContext, PerfectoReportiumClient, TestContext, TestResultFactory) -import pytest -import sys -import time -from appium import webdriver -from selenium.common.exceptions import NoSuchElementException, TimeoutException -from selenium.webdriver.common.by import By -from selenium.common.exceptions import NoSuchElementException -from selenium.webdriver.support.ui import WebDriverWait -from appium.webdriver.common.mobileby import MobileBy -from selenium.webdriver.support import expected_conditions as EC import allure -from perfecto_interop import perfecto_interop -class ios_libs(perfecto_interop): +import pytest +import urllib3 +from appium import webdriver +from appium.webdriver import webdriver +from appium.webdriver.common.mobileby import MobileBy +from perfecto import (PerfectoExecutionContext, PerfectoReportiumClient, TestContext) +from perfecto.model.model import Job, Project +from selenium.common.exceptions import NoSuchElementException +from selenium.webdriver.support import expected_conditions as EC +from selenium.webdriver.support.ui import WebDriverWait + + + +class ios_libs: global driver, perfecto_execution_context, deviceModel def __init__(self, perfecto_data=None, dut_data=None): - super().__init__(perfecto_data=perfecto_data, dut_data=dut_data) self.perfecto_data = perfecto_data self.dut_data = dut_data pass diff --git a/libs/perfecto_interop/ios_tests.py b/libs/perfecto_interop/ios_tests.py index 7eb853ec3..e0b597c38 100644 --- a/libs/perfecto_interop/ios_tests.py +++ b/libs/perfecto_interop/ios_tests.py @@ -1,38 +1,23 @@ -import logging -from ast import Str -from logging import exception -import unittest -import warnings -from _pytest.outcomes import fail -from perfecto.test import TestResultFactory -import pytest -import sys -import time -from selenium.common.exceptions import NoSuchElementException, TimeoutException -from selenium.webdriver.common.by import By -from selenium.common.exceptions import NoSuchElementException -from selenium.webdriver.support.ui import WebDriverWait -from appium.webdriver.common.mobileby import MobileBy -from selenium.webdriver.support import expected_conditions as EC -import allure from ios_libs import ios_libs + class ios_tests(ios_libs): ios_devices = { "iPhone-11": { - "model-iOS": "iPhone-11", - "bundleId-iOS": "com.apple.Preferences", - "platformName-iOS": "iOS", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Ping": "com.deftapps.ping", - "browserType-iOS": "Safari", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "platformName-android": "Android", - "appPackage-android": "com.android.settings", - "jobName": "Interop-iphone-11", - "jobNumber": 38 - } + "model-iOS": "iPhone-11", + "bundleId-iOS": "com.apple.Preferences", + "platformName-iOS": "iOS", + "bundleId-iOS-Settings": "com.apple.Preferences", + "bundleId-iOS-Ping": "com.deftapps.ping", + "browserType-iOS": "Safari", + "bundleId-iOS-Safari": "com.apple.mobilesafari", + "platformName-android": "Android", + "appPackage-android": "com.android.settings", + "jobName": "Interop-iphone-11", + "jobNumber": 38 + } } + def __init__(self, perfecto_data=None, dut_data=None): super().__init__(perfecto_data=perfecto_data, dut_data=dut_data) self.perfecto_data = perfecto_data @@ -44,7 +29,7 @@ class ios_tests(ios_libs): global ip_address setup_perfecto_mobile = self.setup_perfectoMobile[0] ssid_with_internet, setup = self.wifi_connect(ssid=ssid, passkey=passkey, setup_perfectoMobile= - setup_perfecto_mobile, connData=self.connData) + setup_perfecto_mobile, connData=self.connData) try: if ssid_with_internet is True: ip_address = self.get_ip_address(ssid, setup, self.connData) @@ -61,7 +46,7 @@ class ios_tests(ios_libs): def client_connectivity(self, ssid, passkey): setup_perfecto_mobile = self.setup_perfectoMobile[0] ssid_with_internet, setup = self.wifi_connect(ssid=ssid, passkey=passkey, setup_perfectoMobile= - setup_perfecto_mobile, connData=self.connData) + setup_perfecto_mobile, connData=self.connData) try: if ssid_with_internet is True: self.closeApp(self.connData["bundleId-iOS-Settings"], setup) @@ -75,6 +60,7 @@ class ios_tests(ios_libs): print(e) self.teardown() + if __name__ == '__main__': perfecto_data = { "securityToken": "eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI3NzkzZGM0Ni1jZmU4LTQ4ODMtYjhiOS02ZWFlZGU2OTc2MDkifQ.eyJpYXQiOjE2MzI4Mzc2NDEsImp0aSI6IjAwZGRiYWY5LWQwYjMtNDRjNS1hYjVlLTkyNzFlNzc5ZGUzNiIsImlzcyI6Imh0dHBzOi8vYXV0aDIucGVyZmVjdG9tb2JpbGUuY29tL2F1dGgvcmVhbG1zL3RpcC1wZXJmZWN0b21vYmlsZS1jb20iLCJhdWQiOiJodHRwczovL2F1dGgyLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy90aXAtcGVyZmVjdG9tb2JpbGUtY29tIiwic3ViIjoiODNkNjUxMWQtNTBmZS00ZWM5LThkNzAtYTA0ZjBkNTdiZDUyIiwidHlwIjoiT2ZmbGluZSIsImF6cCI6Im9mZmxpbmUtdG9rZW4tZ2VuZXJhdG9yIiwibm9uY2UiOiI2ZjE1YzYxNy01YTU5LTQyOWEtODc2Yi1jOTQxMTQ1ZDFkZTIiLCJzZXNzaW9uX3N0YXRlIjoiYmRjZTFmYTMtMjlkYi00MmFmLWI5YWMtYjZjZmJkMDEyOTFhIiwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBvZmZsaW5lX2FjY2VzcyBlbWFpbCJ9.5R85_1R38ZFXv_wIjjCIsj8NJm1p66dCsLJI5DBEmks", @@ -83,18 +69,18 @@ if __name__ == '__main__': "reportTags": "TestTag", "perfectoURL": "tip", "iPhone-11": { - "model-iOS": "iPhone-11", - "bundleId-iOS": "com.apple.Preferences", - "platformName-iOS": "iOS", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Ping": "com.deftapps.ping", - "browserType-iOS": "Safari", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "platformName-android": "Android", - "appPackage-android": "com.android.settings", - "jobName": "Interop-iphone-11", - "jobNumber": 38 - } + "model-iOS": "iPhone-11", + "bundleId-iOS": "com.apple.Preferences", + "platformName-iOS": "iOS", + "bundleId-iOS-Settings": "com.apple.Preferences", + "bundleId-iOS-Ping": "com.deftapps.ping", + "browserType-iOS": "Safari", + "bundleId-iOS-Safari": "com.apple.mobilesafari", + "platformName-android": "Android", + "appPackage-android": "com.android.settings", + "jobName": "Interop-iphone-11", + "jobNumber": 38 + } } access_point = [{ "model": "edgecore_eap101", @@ -126,4 +112,4 @@ if __name__ == '__main__': "firmware_version": "next-latest" }] obj = ios_tests(perfecto_data=perfecto_data, dut_data=access_point) - print(obj.client_connectivity("ssid_wpa2_2g_RL_E3V2240", "something")) \ No newline at end of file + print(obj.client_connectivity("ssid_wpa2_2g_RL_E3V2240", "something")) diff --git a/libs/perfecto_interop/perfecto_interop.py b/libs/perfecto_interop/perfecto_interop.py index 79dd03ec9..930c89598 100644 --- a/libs/perfecto_interop/perfecto_interop.py +++ b/libs/perfecto_interop/perfecto_interop.py @@ -1,17 +1,20 @@ +import importlib import logging -import os -import re +import time import warnings -from perfecto.model.model import Job, Project -from perfecto import (PerfectoExecutionContext, PerfectoReportiumClient, TestContext, TestResultFactory) -import allure +from time import gmtime, strftime +from xml.etree import ElementTree as ET + import pytest import requests import urllib3 -from time import gmtime, strftime -import time -from xml.etree import ElementTree as ET -from appium import webdriver +from perfecto import (PerfectoExecutionContext, PerfectoReportiumClient, TestContext, TestResultFactory) +from perfecto.model.model import Job, Project + +android_tests = importlib.import_module("android_tests") +ios_tests = importlib.import_module("ios_tests") + + class perfecto_interop: dut_data = list() security_token = None @@ -56,58 +59,59 @@ class perfecto_interop: } ios_devices = { "iPhone-11": { - "model-iOS": "iPhone-11", - "bundleId-iOS": "com.apple.Preferences", - "platformName-iOS": "iOS", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Ping": "com.deftapps.ping", - "browserType-iOS": "Safari", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "platformName-android": "Android", - "appPackage-android": "com.android.settings", - "jobName": "Interop-iphone-11", - "jobNumber": 38 - }, + "model-iOS": "iPhone-11", + "bundleId-iOS": "com.apple.Preferences", + "platformName-iOS": "iOS", + "bundleId-iOS-Settings": "com.apple.Preferences", + "bundleId-iOS-Ping": "com.deftapps.ping", + "browserType-iOS": "Safari", + "bundleId-iOS-Safari": "com.apple.mobilesafari", + "platformName-android": "Android", + "appPackage-android": "com.android.settings", + "jobName": "Interop-iphone-11", + "jobNumber": 38 + }, "iPhone-12": { - "model-iOS": "iPhone-12", - "bundleId-iOS": "com.apple.Preferences", - "platformName-iOS": "iOS", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Ping": "com.deftapps.ping", - "browserType-iOS": "Safari", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "platformName-android": "Android", - "appPackage-android": "com.android.settings", - "jobName": "Interop-iphone-12", - "jobNumber": 38 - }, + "model-iOS": "iPhone-12", + "bundleId-iOS": "com.apple.Preferences", + "platformName-iOS": "iOS", + "bundleId-iOS-Settings": "com.apple.Preferences", + "bundleId-iOS-Ping": "com.deftapps.ping", + "browserType-iOS": "Safari", + "bundleId-iOS-Safari": "com.apple.mobilesafari", + "platformName-android": "Android", + "appPackage-android": "com.android.settings", + "jobName": "Interop-iphone-12", + "jobNumber": 38 + }, "iPhone-7": { - "model-iOS": "iPhone-7", - "bundleId-iOS": "com.apple.Preferences", - "platformName-iOS": "iOS", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Ping": "com.deftapps.ping", - "browserType-iOS": "Safari", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "platformName-android": "Android", - "appPackage-android": "com.android.settings", - "jobName": "Interop-iphone-7", - "jobNumber": 38 - }, + "model-iOS": "iPhone-7", + "bundleId-iOS": "com.apple.Preferences", + "platformName-iOS": "iOS", + "bundleId-iOS-Settings": "com.apple.Preferences", + "bundleId-iOS-Ping": "com.deftapps.ping", + "browserType-iOS": "Safari", + "bundleId-iOS-Safari": "com.apple.mobilesafari", + "platformName-android": "Android", + "appPackage-android": "com.android.settings", + "jobName": "Interop-iphone-7", + "jobNumber": 38 + }, "iPhone-XR": { - "model-iOS": "iPhone-XR", - "bundleId-iOS": "com.apple.Preferences", - "platformName-iOS": "iOS", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Ping": "com.deftapps.ping", - "browserType-iOS": "Safari", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "platformName-android": "Android", - "appPackage-android": "com.android.settings", - "jobName": "Interop-iphone-XR", - "jobNumber": 38 - } + "model-iOS": "iPhone-XR", + "bundleId-iOS": "com.apple.Preferences", + "platformName-iOS": "iOS", + "bundleId-iOS-Settings": "com.apple.Preferences", + "bundleId-iOS-Ping": "com.deftapps.ping", + "browserType-iOS": "Safari", + "bundleId-iOS-Safari": "com.apple.mobilesafari", + "platformName-android": "Android", + "appPackage-android": "com.android.settings", + "jobName": "Interop-iphone-XR", + "jobNumber": 38 + } } + def __init__(self, perfecto_data=None, dut_data=None): if perfecto_data is None: logging.error("Perfecto data is not provided") @@ -118,11 +122,12 @@ class perfecto_interop: self.perfecto_data = perfecto_data self.dut_data = dut_data - def setup_metadata(self): pass + def get_device_configuration(self): return self.perfecto_data["iPhone-11"] + # def get_PassPointConniOS_data(self, get_device_configuration): # passPoint_data = { # "netAnalyzer-inter-Con-Xpath": "//*[@label='Network Connected']/parent::*/XCUIElementTypeButton", @@ -180,7 +185,6 @@ class perfecto_interop: # } # yield passPoint_data - def report_client(self, value): global reporting_client # declare a to be a global reporting_client = value # this sets the global value of a @@ -271,7 +275,7 @@ class perfecto_interop: except: print(f"Unable to get value of {attribute} from response") return "" - + # Checks to see if a particular handset is available def is_device_available(self, model): try: @@ -327,6 +331,7 @@ class perfecto_interop: attribute_value = False return attribute_value + if __name__ == '__main__': perfecto_data = { "securityToken": "eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI3NzkzZGM0Ni1jZmU4LTQ4ODMtYjhiOS02ZWFlZGU2OTc2MDkifQ.eyJpYXQiOjE2MzI4Mzc2NDEsImp0aSI6IjAwZGRiYWY5LWQwYjMtNDRjNS1hYjVlLTkyNzFlNzc5ZGUzNiIsImlzcyI6Imh0dHBzOi8vYXV0aDIucGVyZmVjdG9tb2JpbGUuY29tL2F1dGgvcmVhbG1zL3RpcC1wZXJmZWN0b21vYmlsZS1jb20iLCJhdWQiOiJodHRwczovL2F1dGgyLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy90aXAtcGVyZmVjdG9tb2JpbGUtY29tIiwic3ViIjoiODNkNjUxMWQtNTBmZS00ZWM5LThkNzAtYTA0ZjBkNTdiZDUyIiwidHlwIjoiT2ZmbGluZSIsImF6cCI6Im9mZmxpbmUtdG9rZW4tZ2VuZXJhdG9yIiwibm9uY2UiOiI2ZjE1YzYxNy01YTU5LTQyOWEtODc2Yi1jOTQxMTQ1ZDFkZTIiLCJzZXNzaW9uX3N0YXRlIjoiYmRjZTFmYTMtMjlkYi00MmFmLWI5YWMtYjZjZmJkMDEyOTFhIiwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBvZmZsaW5lX2FjY2VzcyBlbWFpbCJ9.5R85_1R38ZFXv_wIjjCIsj8NJm1p66dCsLJI5DBEmks", @@ -335,48 +340,48 @@ if __name__ == '__main__': "reportTags": "TestTag", "perfectoURL": "tip", "iPhone-11": { - "model-iOS": "iPhone-11", - "bundleId-iOS": "com.apple.Preferences", - "platformName-iOS": "iOS", - "bundleId-iOS-Settings": "com.apple.Preferences", - "bundleId-iOS-Ping": "com.deftapps.ping", - "browserType-iOS": "Safari", - "bundleId-iOS-Safari": "com.apple.mobilesafari", - "platformName-android": "Android", - "appPackage-android": "com.android.settings", - "jobName": "Interop-iphone-11", - "jobNumber": 38 - } + "model-iOS": "iPhone-11", + "bundleId-iOS": "com.apple.Preferences", + "platformName-iOS": "iOS", + "bundleId-iOS-Settings": "com.apple.Preferences", + "bundleId-iOS-Ping": "com.deftapps.ping", + "browserType-iOS": "Safari", + "bundleId-iOS-Safari": "com.apple.mobilesafari", + "platformName-android": "Android", + "appPackage-android": "com.android.settings", + "jobName": "Interop-iphone-11", + "jobNumber": 38 + } } access_point = [{ - "model": "edgecore_eap101", - "supported_bands": ["2G", "5G"], - "upstream_port": "1.1.eth1", - "supported_modes": ["BRIDGE", "NAT", "VLAN"], - "ssid": { - "2g-ssid": "OpenWifi", - "5g-ssid": "OpenWifi", - "6g-ssid": "candela6ghz", - "2g-password": "OpenWifi", - "5g-password": "OpenWifi", - "6g-password": "hello123", - "2g-encryption": "WPA2", - "5g-encryption": "open", - "6g-encryption": "WPA3", - "2g-bssid": "68:7d:b4:5f:5c:31 ", - "5g-bssid": "68:7d:b4:5f:5c:3c", - "6g-bssid": "68:7d:b4:5f:5c:38" - }, - "mode": "wifi6", - "identifier": "903cb36ae255", - "serial_port": True, - "host_ip": "10.28.3.102", - "host_username": "lanforge", - "host_password": "pumpkin77", - "host_ssh_port": 22, - "serial_tty": "/dev/ttyAP5", - "firmware_version": "next-latest" - }] + "model": "edgecore_eap101", + "supported_bands": ["2G", "5G"], + "upstream_port": "1.1.eth1", + "supported_modes": ["BRIDGE", "NAT", "VLAN"], + "ssid": { + "2g-ssid": "OpenWifi", + "5g-ssid": "OpenWifi", + "6g-ssid": "candela6ghz", + "2g-password": "OpenWifi", + "5g-password": "OpenWifi", + "6g-password": "hello123", + "2g-encryption": "WPA2", + "5g-encryption": "open", + "6g-encryption": "WPA3", + "2g-bssid": "68:7d:b4:5f:5c:31 ", + "5g-bssid": "68:7d:b4:5f:5c:3c", + "6g-bssid": "68:7d:b4:5f:5c:38" + }, + "mode": "wifi6", + "identifier": "903cb36ae255", + "serial_port": True, + "host_ip": "10.28.3.102", + "host_username": "lanforge", + "host_password": "pumpkin77", + "host_ssh_port": 22, + "serial_tty": "/dev/ttyAP5", + "firmware_version": "next-latest" + }] obj = perfecto_interop(perfecto_data=perfecto_data, dut_data=access_point) x = obj.get_device_configuration() diff --git a/setup_env.bash b/setup_env.bash index 74f59b4de..d436b923a 100644 --- a/setup_env.bash +++ b/setup_env.bash @@ -128,7 +128,31 @@ except ImportError as e: sys.exit(\"Python Import Error: \" + str(e)) " >> tests/imports.py echo -e "########################################################################################################################" >> tests/imports.py - # TODO Create a perfecto pip module baseline method + cd libs/perfecto_interop + $PYTHON setup.py bdist_wheel + $PIP install dist/*.whl --force-reinstall + cd ../../ + echo -e "########################################################################################################################" >> tests/imports.py + echo -e "\"\"\" + Target Name:perfecto_interop + Author Name:$author + Organization:$org + Register ID:2 + Email:$email + description:Perfecto Based Interop Library +\"\"\"" >> tests/imports.py + echo -e " +try: + perfecto_interop = importlib.import_module(\"perfecto_interop\") + android_tests = perfecto_interop.android_tests + ios_tests = perfecto_interop.ios_tests +except ImportError as e: + print(e) + sys.exit(\"Python Import Error: \" + str(e)) +" >> tests/imports.py + echo -e "########################################################################################################################" >> tests/imports.py + + fi fi WLAN_TESTING_PATH=$(pwd)"/tests/"