trex_astf_client: use proper to_json_str call

The profile object returned from ASTFProfile.load can be of type ASTFProfileLight if the passed "profile" is a path to a json profile file. ASTFProfileLight has a different to_json_str signature, and calling the method assuming the returned profile object is of type ASTFProfile will lead to failures in this case. Signed-off-by: bzalkilani <[email protected]>
cisco-system-traffic-generator · Aug 22, 2023 · 909fec4 · 909fec4
1 parent c38790f
commit 909fec4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/scripts/automation/trex_control_plane/interactive/trex/astf/trex_astf_client.py b/scripts/automation/trex_control_plane/interactive/trex/astf/trex_astf_client.py
@@ -20,7 +20,7 @@
 from ..stl.trex_stl_client import STLClient
 
 from .trex_astf_port import ASTFPort
-from .trex_astf_profile import ASTFProfile
+from .trex_astf_profile import ASTFProfile, ASTFProfileLight
 from .topo import ASTFTopologyManager
 from .tunnels_topo import TunnelsTopo
 from .stats.traffic import CAstfTrafficStats
@@ -614,7 +614,10 @@ def load_profile(self, profile, tunables = {}, pid_input = DEFAULT_PROFILE_ID):
             if profile is None:
                 return
 
-        profile_json = profile.to_json_str(pretty = False, sort_keys = True)
+        if isinstance(profile, ASTFProfileLight):
+            profile_json = profile.to_json_str()
+        else:
+            profile_json = profile.to_json_str(pretty = False, sort_keys = True)
 
         self.ctx.logger.pre_cmd('Loading traffic at acquired ports.')
         rc = self._upload_fragmented('profile_fragment', profile_json, pid_input = pid_input)