torrus virtual ports, RT#10574

2 files changed, 16 insertions, 1 deletions

diff --git a/FS/FS/NetworkMonitoringSystem/Torrus_Internal.pm b/FS/FS/NetworkMonitoringSystem/Torrus_Internal.pm
index b55d0aaf7..1cc5d2af5 100644
--- a/FS/FS/NetworkMonitoringSystem/Torrus_Internal.pm
+++ b/FS/FS/NetworkMonitoringSystem/Torrus_Internal.pm
@@ -7,8 +7,9 @@ use IO::File;
 use File::Slurp qw(slurp);
 use Date::Format;
 use XML::Simple;
+use FS::Record qw(qsearch qsearchs dbh);
 use FS::svc_port;
-use FS::Record qw(qsearch dbh);
+use FS::torrus_srvderive_component;
 use Torrus::ConfigTree;
 
 #$DEBUG = 0;
@@ -94,6 +95,14 @@ sub find_svc {
     return $svc_port[0];
 }
 
+sub find_torrus_srvderive_component {
+    my $self = shift;
+    my $serviceid = shift;
+    return '' unless $serviceid =~ /^[0-9A-Za-z_\-.\\\/ ]+$/;
+  
+    qsearchs('torrus_srvderive_component', { 'serviceid' => $serviceid });
+}
+
 sub report {
   my $self = shift;
 
diff --git a/FS/FS/torrus_srvderive_component.pm b/FS/FS/torrus_srvderive_component.pm
index 046b6748b..b244d064e 100644
--- a/FS/FS/torrus_srvderive_component.pm
+++ b/FS/FS/torrus_srvderive_component.pm
@@ -3,6 +3,7 @@ package FS::torrus_srvderive_component;
 use strict;
 use base qw( FS::Record );
 use FS::Record qw( qsearch qsearchs );
+use FS::torrus_srvderive;
 
 =head1 NAME
 
@@ -113,6 +114,11 @@ sub check {
   $self->SUPER::check;
 }
 
+sub torrus_srvderive {
+  my $self = shift;
+  qsearchs('torrus_srvderive', { 'derivenum' => $self->derivenum } );
+}
+
 =back
 
 =head1 BUGS