FOGL-8175: Updated the system test that requires stats collection “per asset & service” #1193

Mohit04tomar · 2023-10-11T07:36:52Z

Below are the jobs that I run with the changes:

fledge_packages_pair_system_test_c_north_service_ub1804/515/
fledge_packages_pair_system_test_python_north_service_ub1804/539/
fledge_packages_pair_system_test_python_north_service_ub20x86_ub18aarch64/598/
fledge_packages_pi_web_api/611/
fledge_packages_pi_web_api_2021sp2/220/
fledge_packages_system_test_north_service_ub1804/452/
fledge_packages_system_test_north_service_ub1804_piwebapi2021sp2/217/
fledge_packages_system_test_OMF_naming_scheme_ub2004/430/
fledge_packages_system_test_pi_web_api_2021sp3_linked_data_type/143/
fledge_nightly_build_ub1804/1732/
fledge_nightly_build_ub2004/1047/
fledge_nightly_build_ubuntu18_aarch64/158/
fledge_packages_system_test_stats_history_notification_rule/82/
fledge_packages_system_test_eds/568/

Signed-off-by: Mohit Singh Tomar <[email protected]>

… FOGL-8175

Signed-off-by: Mohit Singh Tomar <[email protected]>

ashish-jabble · 2023-10-12T09:51:34Z

tests/system/python/smoke/test_smoke.py

@@ -72,7 +72,7 @@ def start_south_coap(reset_and_start_fledge, add_south, remove_data_file, remove
    remove_directories("/tmp/fledge-south-{}".format(south_plugin))


-def test_smoke(start_south_coap, fledge_url, wait_time, asset_name="smoke"):
+def test_smoke(start_south_coap, update_stat_collection, fledge_url, wait_time, asset_name="smoke"):


For smoke tests - I suggest we should verify with default configuration setup.

ashish-jabble · 2023-10-12T09:55:25Z

tests/system/python/conftest.py

+
+@pytest.fixture
+def update_stat_collection(fledge_url, wait_time):
+    """Update the Stat colectioin of all south service to per asset & service"""


Statistics Collection

Also this fixture should provide facility for a single south service as well.

ashish-jabble · 2023-10-12T09:56:16Z

tests/system/python/conftest.py

+    """Update the Stat colectioin of all south service to per asset & service"""
+
+    # Wait for the south service to be created
+    time.sleep(wait_time)


Remove extra delay from here. This fixture should call when service is up

We can call once added in disable mode as well; and advance category is available? So not necessarily when up.

This sleep is used to wait for the creation of the advanced category. Since this fixture is called immediately after the South service is created, the sleep is added here to prevent failures caused by delays in the creation of the advanced category, even in disabled mode.

ashish-jabble · 2023-10-12T09:58:08Z

tests/system/python/e2e/test_e2e_kafka.py

@@ -83,7 +83,7 @@ def _configure_and_start_north_kafka(self, north_branch, fledge_url, host, port,
                "schedule_type": 3,
                "schedule_day": 0,
                "schedule_time": 0,
-                "schedule_repeat": 0,
+                "schedule_repeat": 5,


This means that task never runs/execute before as its type is INTERVAL?
For nightly system tests, Are we running with skip_verify_north_interface?

ashish-jabble · 2023-10-12T10:17:14Z

tests/system/python/pair/test_c_north_service_pair.py

@@ -15,6 +15,7 @@
 import time
 import urllib.parse
 from pathlib import Path
+from urllib.parse import quote


We already have import in L#16

ashish-jabble · 2023-10-12T10:18:02Z

tests/system/python/pair/test_c_north_service_pair.py

+    for service in response["services"]:
+        put_url = "/fledge/category/{}Advanced".format(service["name"])
+        payload = {"statistics": "per asset & service"}
+        res = utils.put_request(fledge_url, quote(put_url), payload)


Use with - urllib.parse.quote(put_url)

ashish-jabble · 2023-10-12T10:18:24Z

tests/system/python/pair/test_c_north_service_pair.py

@@ -44,6 +45,22 @@
 AF_HIERARCHY_LEVEL = "Cservicepair/Cservicepairlvl1/Cservicepairlvl2"


+def update_stat_collection_remote(fledge_url, wait_time):
+    """Update the Stat colectioin of all south service to per asset & service"""


Statistics Collection

ashish-jabble · 2023-10-12T10:18:32Z

tests/system/python/pair/test_c_north_service_pair.py

+    """Update the Stat colectioin of all south service to per asset & service"""
+
+    # Wait for the south service to be created
+    time.sleep(wait_time)


ashish-jabble · 2023-10-12T10:19:06Z

tests/system/python/pair/test_e2e_fledge_pair.py

@@ -36,6 +36,22 @@

 class TestE2eFogPairPi:

+    def update_stat_collection_remote(fledge_url, wait_time):
+        """Update the Stat colectioin of all south service to per asset & service"""


Statistics Collection

ashish-jabble · 2023-10-12T10:19:30Z

tests/system/python/pair/test_pyton_north_service_pair.py

@@ -15,6 +15,7 @@
 import time
 import urllib.parse
 from pathlib import Path
+from urllib.parse import quote


ashish-jabble · 2023-10-12T10:19:55Z

tests/system/python/pair/test_pyton_north_service_pair.py

+    for service in response["services"]:
+        put_url = "/fledge/category/{}Advanced".format(service["name"])
+        payload = {"statistics": "per asset & service"}
+        res = utils.put_request(fledge_url, quote(put_url), payload)


Use urllib.parse.quote(put_url)

ashish-jabble · 2023-10-12T10:20:05Z

tests/system/python/pair/test_pyton_north_service_pair.py

@@ -44,6 +45,22 @@
 AF_HIERARCHY_LEVEL = "pythonnorthservicepair/pythonnorthservicepairlvl2/pythonnorthservicepairlvl3"


+def update_stat_collection_remote(fledge_url, wait_time):
+    """Update the Stat colectioin of all south service to per asset & service"""


Statistics Collection

Signed-off-by: Mohit Singh Tomar <[email protected]>

ashish-jabble · 2023-10-13T13:11:58Z

fyi, FOGL-8190 Temporarily change the default statistics collection back to per asset

Mohit04tomar and others added 8 commits October 10, 2023 17:22

Added fixture to update statistics collection of south services

1af0703

Signed-off-by: Mohit Singh Tomar <[email protected]>

Updated package based tests

2aeba35

Signed-off-by: Mohit Singh Tomar <[email protected]>

Updated pair based system test

eb6bb2d

Signed-off-by: Mohit Singh Tomar <[email protected]>

Updated nightly test

c95e656

Signed-off-by: Mohit Singh Tomar <[email protected]>

Updated e2e/test_e2e_coap_PI.py test

7b89fe1

Signed-off-by: Mohit Singh Tomar <[email protected]>

Added code for updating stat collection of remote system properly

2ffdbf7

Signed-off-by: Mohit Singh Tomar <[email protected]>

Minor fix

40817d5

Signed-off-by: Mohit Singh Tomar <[email protected]>

Merge branch 'develop' into FOGL-8175

7253125

Mohit04tomar marked this pull request as ready for review October 12, 2023 06:52

Mohit04tomar added 3 commits October 12, 2023 14:06

Refactored Code

d34b7d4

Signed-off-by: Mohit Singh Tomar <[email protected]>

Merge branch 'FOGL-8175' of https://github.com/fledge-iot/fledge into…

485a0e2

… FOGL-8175

Refactored Code -2

61a096a

Signed-off-by: Mohit Singh Tomar <[email protected]>

Mohit04tomar requested review from ashish-jabble, praveen-garg and YashTatkondawar and removed request for ashish-jabble and praveen-garg October 12, 2023 09:48

Mohit04tomar changed the title ~~FOGL-8175~~ FOGL-8175: Updated the system test that requires stats collection “per asset & service” Oct 12, 2023

ashish-jabble reviewed Oct 12, 2023

View reviewed changes

Mohit04tomar added 3 commits October 12, 2023 16:41

Feedback changes

92a53d0

Signed-off-by: Mohit Singh Tomar <[email protected]>

Feedback changes

923582a

Signed-off-by: Mohit Singh Tomar <[email protected]>

Minor fix

35fe197

Signed-off-by: Mohit Singh Tomar <[email protected]>

Mohit04tomar requested a review from ashish-jabble October 13, 2023 09:16

ashish-jabble mentioned this pull request Oct 13, 2023

FOGL-8190 Temporarily revert to statistics collection per asset and #1196

Merged

ashish-jabble added the hold on hold label Oct 16, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FOGL-8175: Updated the system test that requires stats collection “per asset & service” #1193

FOGL-8175: Updated the system test that requires stats collection “per asset & service” #1193

Mohit04tomar commented Oct 11, 2023 •

edited

Loading

ashish-jabble Oct 12, 2023

ashish-jabble Oct 12, 2023

ashish-jabble Oct 12, 2023

praveen-garg Oct 12, 2023

Mohit04tomar Oct 13, 2023

ashish-jabble Oct 12, 2023 •

edited

Loading

ashish-jabble Oct 12, 2023

ashish-jabble Oct 12, 2023

ashish-jabble Oct 12, 2023

ashish-jabble Oct 12, 2023

ashish-jabble Oct 12, 2023

ashish-jabble Oct 12, 2023

ashish-jabble Oct 12, 2023

ashish-jabble Oct 12, 2023

ashish-jabble commented Oct 13, 2023

FOGL-8175: Updated the system test that requires stats collection “per asset & service” #1193

Are you sure you want to change the base?

FOGL-8175: Updated the system test that requires stats collection “per asset & service” #1193

Conversation

Mohit04tomar commented Oct 11, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ashish-jabble Oct 12, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ashish-jabble commented Oct 13, 2023

Mohit04tomar commented Oct 11, 2023 •

edited

Loading

ashish-jabble Oct 12, 2023 •

edited

Loading