Pull request #27: update function based on id

Merge in ISGAPPSEC/cyperf-api-wrapper from bugfix/ISGAPPSEC2-34434-fix-update-function to main

Squashed commit of the following:

commit 9a3ded61b2726e0b255ccc5ee49a3ca85de112fc
Author: iustmitu <iustin.mitu@keysight.com>
Date:   Fri May 23 13:06:25 2025 +0300

    commit after regenerate the wrapper

commit 91110c1e966908ed71d194cf08f493f557321353
Author: iustmitu <iustin.mitu@keysight.com>
Date:   Fri May 23 12:55:26 2025 +0300

    sample tests fixed and update function

commit bb87904e4e29413059dc9d256c28b72755149cee
Author: iustmitu <iustin.mitu@keysight.com>
Date:   Thu May 22 13:12:39 2025 +0300

    remove hassatr()

commit e838f0ed10fc089649b8c820f640c9b1b706d124
Author: iustmitu <iustin.mitu@keysight.com>
Date:   Wed May 21 13:58:14 2025 +0300

    fixed some issues

commit c465e89fc2ab8a157a0fe2a801893542311a17a9
Author: iustmitu <iustin.mitu@keysight.com>
Date:   Mon May 19 12:21:09 2025 +0300

    fix update function

commit 588ee3448f08c80d5c807d1457e00a55a758698e
Author: iustmitu <iustin.mitu@keysight.com>
Date:   Fri May 16 10:57:52 2025 +0300

    update function based on id

Author: Iustin-Mitu

cyperf/dynamic_model_meta.py

@@ -128,18 +128,41 @@ def refresh(self):
 
     def update(self):
         lst = self.__get_base_data()
-        items_to_add = [item for item in self.data if item not in lst]
-        items_to_remove = [item for item in lst if item not in self.data]
+
+        server_hrefs = {
+            link.href for item in lst
+            for link in getattr(item, "links", [])
+            if getattr(link, "type", None) == "self"
+        }
+
+        local_hrefs = set()
+        href_to_item = {}
+        items_to_add = []
+
+        for item in self.dyn_data:
+            link = item.get_self_link()
+            if link is None or link.href is None:
+                items_to_add.append(item)
+            else:
+                local_hrefs.add(link.href)
+                href_to_item[link.href] = item
+
+        items_to_add.extend(
+            href_to_item[href] for href in local_hrefs - server_hrefs
+        )
+        items_to_remove = [
+            item for item in lst
+            for link in getattr(item, "links", [])
+            if getattr(link, "type", None) == "self" and link.href not in local_hrefs
+        ]
+
         if items_to_add:
-            try:
+            for item in items_to_add:
                 DynamicModel.link_based_request(self, self.link.name, "POST",
-                                                body=items_to_add, href=self.link.href)
-            except ApiException:
-                for item in items_to_add:
-                    DynamicModel.link_based_request(self, self.link.name, "POST",
-                                                    body=item, href=self.link.href)
+                                                body=item, href=self.link.href)
+
         remove_one_by_one = False
-        if len(items_to_remove) > 1 and "id" in dir(items_to_remove[0]):
+        if len(items_to_remove) > 1:
             try:
                 op = DynamicModel.link_based_request(self, self.link.name, "POST",
                                                      body=[{"id": item.id} for item in items_to_remove],
@@ -151,9 +174,10 @@ def update(self):
                 remove_one_by_one = True
         else:
             remove_one_by_one = True
+
         if remove_one_by_one:
             for item in items_to_remove:
-                    DynamicModel.link_based_request(self, self.link.name, "DELETE",
+                DynamicModel.link_based_request(self, self.link.name, "DELETE",
                                                 href=next(link.href for link in item.links if link.rel == "self"))
         self.refresh()
 

cyperf/utils.py

@@ -198,8 +198,11 @@ def add_apps(self, session, appNames):
         if not session.config.config.traffic_profiles:
             session.config.config.traffic_profiles.append(cyperf.ApplicationProfile(name="Application Profile"))
             session.config.config.traffic_profiles.update()
+        
         app_profile = session.config.config.traffic_profiles[0]
-        app_profile.applications += app_info
+        for app in app_info:
+            app_profile.applications.append(app)
+            
         app_profile.applications.update()
 
     def add_app(self, session, appName):

samples/sample_create_save_and_export_config.py

@@ -44,7 +44,7 @@
         # Create a session
         session = None
         print("Creating empty session...")
-        api_session_response = api_session_instance.create_sessions(session=sessions)
+        api_session_response = api_session_instance.create_sessions(sessions=sessions)
         session = api_session_response[0]
         print("Session created.\n")
 

samples/sample_load_and_run_precanned_config.py

@@ -44,7 +44,7 @@
         # Create a session
         session = None
         print("Creating session from config called 'Not Working From Home Traffic Mix' ...")
-        api_session_response = api_session_instance.create_sessions(session=sessions)
+        api_session_response = api_session_instance.create_sessions(sessions=sessions)
         session = api_session_response[0]
         print("Session created.\n")