added some profile naming fixes

Signed-off-by: shivamcandela <shivam.thakur@candelatech.com>

libs/apnos/apnos.py

@@ -59,6 +59,17 @@ class APNOS:
 
         return client
 
+    def reboot(self):
+        client = self.ssh_cli_connect()
+        cmd = "reboot"
+        if self.mode:
+            cmd = f"cd ~/cicd-git/ && ./openwrt_ctl.py {self.owrt_args} -t {self.tty} --action " \
+                  f"cmd --value \"{cmd}\" "
+        stdin, stdout, stderr = client.exec_command(cmd)
+        output = stdout.read()
+        client.close()
+        return output
+
     # Method to get the iwinfo status of AP using AP-CLI/ JUMPHOST-CLI
     def iwinfo_status(self):
         client = self.ssh_cli_connect()

libs/controller/controller.py

@@ -835,3 +835,15 @@ class FirmwareUtility(JFrogUtility):
             firmware_version = False
             print("firmware not available: ", firmware_version)
         return firmware_version
+
+# data = {
+#     'url': "https://wlan-portal-svc-nola-01.cicd.lab.wlan.tip.build",  # API base url for the controller
+#     'username': 'support@example.com',
+#     'password': 'support',
+#     'version': '1.0.0-SNAPSHOT',
+#     'commit_date': '2021-03-01'
+# }
+# sdk_client = Controller(controller_data=data)
+# profile = ProfileUtility(sdk_client=sdk_client)
+# profile.cleanup_profiles()
+# sdk_client.disconnect_Controller()

tests/conftest.py

@@ -159,7 +159,8 @@ def instantiate_project(request, instantiate_testrail, testbed, get_latest_firmw
 
 
 @pytest.fixture(scope="session")
-def setup_lanforge():
+def check_lanforge_connectivity(testbed):
+    # Check port
     yield True
 
 
@@ -182,6 +183,8 @@ def instantiate_access_point(testbed):
 @pytest.fixture(scope="function")
 def test_access_point(testbed, instantiate_access_point):
     ap_ssh = APNOS(CONFIGURATION[testbed]['access_point'][0])
+    ap_ssh.reboot()
+    time.sleep(100)
     status = ap_ssh.get_manager_state()
     if "ACTIVE" not in status:
         time.sleep(30)
@@ -200,10 +203,11 @@ def setup_profile_data(testbed):
             profile_data[mode][security] = {}
             for radio in "2G", "5G":
                 profile_data[mode][security][radio] = {}
-                name_string = f"{'Sanity'}-{model}-{radio}_{security}_{mode}"
+                name_string = f"{'Sanity'}-{testbed}-{model}-{radio}_{security}_{mode}"
+                ssid_name = f"{'Sanity'}-{model}-{radio}_{security}_{mode}"
                 passkey_string = f"{radio}-{security}_{mode}"
                 profile_data[mode][security][radio]["profile_name"] = name_string
-                profile_data[mode][security][radio]["ssid_name"] = name_string
+                profile_data[mode][security][radio]["ssid_name"] = ssid_name
                 if mode == "VLAN":
                     profile_data[mode][security][radio]["vlan"] = 100
                 else:

tests/e2e/basic/_basic_test_setup/setup__e2e_resources.py

@@ -5,6 +5,11 @@
 """
 import pytest
 
+@pytest.mark.configure_lanforge
+def test_configure_lanforge(configure_lanforge):
+
+    assert True
+
 
 @pytest.mark.sanity
 @pytest.mark.bridge

tests/e2e/basic/client_connectivity_test/test_bridge_mode.py

@@ -66,7 +66,7 @@ class TestBridgeModeClientConnectivity(object):
         staConnect.dut_security = "wpa"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_2dot4g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         # staConnect.cleanup()
@@ -112,7 +112,7 @@ class TestBridgeModeClientConnectivity(object):
         staConnect.dut_security = "wpa"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         # staConnect.cleanup()
@@ -158,7 +158,7 @@ class TestBridgeModeClientConnectivity(object):
         staConnect.dut_security = "wpa2"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_2dot4g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         # staConnect.cleanup()
@@ -204,7 +204,7 @@ class TestBridgeModeClientConnectivity(object):
         staConnect.dut_security = "wpa2"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         # staConnect.cleanup()
@@ -351,7 +351,7 @@ class TestBridgeModeClientConnectivity(object):
         staConnect.dut_security = "wpa"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         # staConnect.cleanup()

tests/e2e/basic/client_connectivity_test/test_nat_mode.py

@@ -65,7 +65,7 @@ class TestNatModeClientConnectivity(object):
         staConnect.dut_security = "wpa"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_2dot4g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         # staConnect.cleanup()
@@ -111,7 +111,7 @@ class TestNatModeClientConnectivity(object):
         staConnect.dut_security = "wpa"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         # staConnect.cleanup()
@@ -157,7 +157,7 @@ class TestNatModeClientConnectivity(object):
         staConnect.dut_security = "wpa2"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_2dot4g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         # staConnect.cleanup()
@@ -203,7 +203,7 @@ class TestNatModeClientConnectivity(object):
         staConnect.dut_security = "wpa2"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         # staConnect.cleanup()
@@ -350,7 +350,7 @@ class TestNatModeClientConnectivity(object):
         staConnect.dut_security = "wpa"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         # staConnect.cleanup()

tests/e2e/basic/client_connectivity_test/test_vlan_mode.py

@@ -64,7 +64,7 @@ class TestVlanModeClientConnectivity(object):
         staConnect.dut_security = "wpa"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_2dot4g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         staConnect.setup()
@@ -109,7 +109,7 @@ class TestVlanModeClientConnectivity(object):
         staConnect.dut_security = "wpa"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         # staConnect.cleanup()
@@ -155,7 +155,7 @@ class TestVlanModeClientConnectivity(object):
         staConnect.dut_security = "wpa2"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_2dot4g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         # staConnect.cleanup()
@@ -201,7 +201,7 @@ class TestVlanModeClientConnectivity(object):
         staConnect.dut_security = "wpa2"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         # staConnect.cleanup()
@@ -348,7 +348,7 @@ class TestVlanModeClientConnectivity(object):
         staConnect.dut_security = "wpa"
         staConnect.station_names = station_names
         staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
-        staConnect.runtime_secs = 30
+        staConnect.runtime_secs = 10
         staConnect.bringup_time_sec = 60
         staConnect.cleanup_on_exit = True
         # staConnect.cleanup()

tests/e2e/basic/conftest.py

@@ -23,8 +23,6 @@ Information:
 
 """
 
-
-
 import sys
 import os
 import time
@@ -50,7 +48,6 @@ from configuration import FIRMWARE
 from testrails.testrail_api import APIClient
 from testrails.reporting import Reporting
 
-
 """
 Basic Setup Collector
 """
@@ -172,6 +169,7 @@ def setup_profiles(request, create_profiles, instantiate_profile, get_equipment_
             test_cases[mode + '_vifs'] = True
             break
         time.sleep(10)
+        #
     yield test_cases
 
 
@@ -183,22 +181,24 @@ def create_profiles(request, testbed, get_security_flags, get_markers, instantia
     if mode not in ["BRIDGE", "NAT", "VLAN"]:
         print("Invalid Mode: ", mode)
         yield False
-    instantiate_profile.delete_profile_by_name(profile_name="Equipment-AP-" + mode)
+    instantiate_profile.delete_profile_by_name(profile_name=testbed + "-Equipment-AP-" + mode)
     for i in setup_profile_data[mode]:
         for j in setup_profile_data[mode][i]:
             instantiate_profile.delete_profile_by_name(
                 profile_name=setup_profile_data[mode][i][j]['profile_name'])
-    instantiate_profile.delete_profile_by_name(profile_name="Automation-Radius-Profile-" + mode)
+    instantiate_profile.delete_profile_by_name(profile_name=testbed + "-Automation-Radius-Profile-" + mode)
     instantiate_profile.get_default_profiles()
     profile_data = {
-        "name": "RF-Profile-"+CONFIGURATION[testbed]['access_point'][0]['mode']+CONFIGURATION[testbed]['access_point'][0]['model'] + mode
+        "name": "RF-Profile-" + CONFIGURATION[testbed]['access_point'][0]['mode'] +
+                CONFIGURATION[testbed]['access_point'][0]['model'] + mode
     }
     instantiate_profile.delete_profile_by_name(profile_name=profile_data['name'])
-    instantiate_profile.set_rf_profile(profile_data=profile_data, mode=CONFIGURATION[testbed]['access_point'][0]['mode'])
+    instantiate_profile.set_rf_profile(profile_data=profile_data,
+                                       mode=CONFIGURATION[testbed]['access_point'][0]['mode'])
     # Create RF Profile Here
     if get_markers["radius"]:
         radius_info = RADIUS_SERVER_DATA
-        radius_info["name"] = "Automation-Radius-Profile-" + mode
+        radius_info["name"] = testbed + "-Automation-Radius-Profile-" + mode
         try:
             instantiate_profile.create_radius_profile(radius_info=radius_info)
             test_cases['radius_profile'] = True
@@ -282,7 +282,7 @@ def create_profiles(request, testbed, get_security_flags, get_markers, instantia
 
     # Create Equipment AP Profile Here
     profile_data = {
-        "profile_name": "Equipment-AP-" + mode
+        "profile_name": testbed + "-Equipment-AP-" + mode
     }
     try:
         instantiate_profile.set_ap_profile(profile_data=profile_data)
@@ -304,3 +304,24 @@ def update_ssid(request, instantiate_profile, setup_profile_data):
         requested_profile[3]
     time.sleep(90)
     yield status
+
+
+@pytest.fixture(scope="package")
+def configure_lanforge(instantiate_dut):
+    # Scenario build
+    #
+    scenario_obj = Class()
+    yield scenario_obj
+
+
+@pytest.fixture(scope="package")
+def instantiate_dut():
+    dut_obj = DUT("")
+    dut_obj.update()
+    #
+    yield dut_obj
+
+@pytest.fixture(scope="package")
+def setup_vlan(scenario_obj):
+    scenario_obj.create_vlan()
+    yield scenario_obj

tests/test_connectivity.py

@@ -10,6 +10,9 @@ pytestmark = [pytest.mark.test_connectivity]
 
 
 @pytest.mark.sanity
+@pytest.mark.bridge
+@pytest.mark.nat
+@pytest.mark.vlan
 @pytest.mark.test_controller_connectivity
 def test_controller_connectivity(instantiate_controller, instantiate_testrail, instantiate_project, test_cases):
     try:
@@ -24,6 +27,9 @@ def test_controller_connectivity(instantiate_controller, instantiate_testrail, i
 
 
 @pytest.mark.sanity
+@pytest.mark.bridge
+@pytest.mark.nat
+@pytest.mark.vlan
 @pytest.mark.test_access_points_connectivity
 def test_access_points_connectivity(test_access_point, instantiate_testrail, instantiate_project, test_cases):
     if "ACTIVE" not in test_access_point:
@@ -41,11 +47,19 @@ def test_access_points_connectivity(test_access_point, instantiate_testrail, ins
     assert status
 
 
+@pytest.mark.sanity
+@pytest.mark.bridge
+@pytest.mark.nat
+@pytest.mark.vlan
 @pytest.mark.test_lanforge_connectivity
-def test_lanforge_connectivity(setup_lanforge):
+def test_lanforge_connectivity(check_lanforge_connectivity):
     assert "instantiate_cloudsdk"
 
 
+@pytest.mark.sanity
+@pytest.mark.bridge
+@pytest.mark.nat
+@pytest.mark.vlan
 @pytest.mark.test_perfecto_connectivity
 def test_perfecto_connectivity(setup_perfecto_devices):
     assert "instantiate_cloudsdk"