MT#62053 add "objects" output format for RTP intfs

Change-Id: I3ca14336c3f70bf3f2c1ea3fce3d05122a48bde8
sipwise · Jan 31, 2025 · b5b92ca · b5b92ca
1 parent 3a5c27c
commit b5b92ca
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/lib/get_all_rtp_for_host b/lib/get_all_rtp_for_host
@@ -75,7 +75,16 @@ IF status.item(hosts.$X_host.status);
             X_name = X_name _ ':' _ X_suffix;
             X_suffix = X_suffix + 1;
           END;
-          out.push(X_name _ '/' _ X_ip _ (X_adv_ip ? ('!' _ X_adv_ip) : ''));
+          IF X_format == 'objects';
+            X_obj = {
+              name = X_name
+              address = X_ip
+              adv_addr = X_adv_ip
+            };
+            out.push(X_obj);
+          ELSE;
+            out.push(X_name _ '/' _ X_ip _ (X_adv_ip ? ('!' _ X_adv_ip) : ''));
+          END;
         END;
       END;
 
@@ -98,7 +107,15 @@ IF status.item(hosts.$X_host.status);
             X_name = X_name _ ':' _ X_suffix;
             X_suffix = X_suffix + 1;
           END;
-          out.push(X_name _ '/' _ X_ip);
+          IF X_format == 'objects';
+            X_obj = {
+              name = X_name
+              address = X_ip
+            };
+            out.push(X_obj);
+          ELSE;
+            out.push(X_name _ '/' _ X_ip);
+          END;
         END;
       END;
     END;

diff --git a/lib/get_all_rtp_for_instance b/lib/get_all_rtp_for_instance
@@ -65,7 +65,16 @@ FOREACH X_ifc IN argv.instance.interfaces;
           X_name = X_name _ ':' _ X_suffix;
           X_suffix = X_suffix + 1;
         END;
-        out.push(X_name _ '/' _ X_ip _ (X_adv_ip ? ('!' _ X_adv_ip) : ''));
+        IF X_format == 'objects';
+          X_obj = {
+            name = X_name
+            address = X_ip
+            adv_addr = X_adv_ip
+          };
+          out.push(X_obj);
+        ELSE;
+          out.push(X_name _ '/' _ X_ip _ (X_adv_ip ? ('!' _ X_adv_ip) : ''));
+        END;
       END;
     END;
 
@@ -88,7 +97,15 @@ FOREACH X_ifc IN argv.instance.interfaces;
           X_name = X_name _ ':' _ X_suffix;
           X_suffix = X_suffix + 1;
         END;
-        out.push(X_name _ '/' _ X_ip);
+        IF X_format == 'objects';
+          X_obj = {
+            name = X_name
+            address = X_ip
+          };
+          out.push(X_obj);
+        ELSE;
+          out.push(X_name _ '/' _ X_ip);
+        END;
       END;
     END;
   END;