MT#13815 split dialogic MGM and SIP interface

to different subnets. 3 subnets are required now.
And improve status modal.

Change-Id: Ia33530fd1548a21b121af48cebfff0d335e7f59c

lib/NGCP/Panel/Controller/Peering.pm

@@ -428,16 +428,21 @@ sub servers_flash_dialogic :Chained('servers_base') :PathPart('flash/dialogic')
 
             if ($config->{mode} eq 'sipsip') {
                 $resp = $api->create_all_sipsip($config, sub {
-                    my ($shortlog, $resp) = @_;
-                    $c->write($shortlog);
+                        my ($shortlog, $resp) = @_;
+                        $c->write($shortlog);
                     });
 
             } elsif ($config->{mode} eq 'sipisdn') {
-                $resp = $api->create_all_sipisdn($config, 1);
+                $resp = $api->create_all_sipisdn($config, sub {
+                        my ($shortlog, $resp) = @_;
+                        $c->write($shortlog);
+                    });
 
             } elsif ($config->{mode} eq 'sipss7') {
-                $resp = $api->create_all_sipss7($config, 1);
-
+                $resp = $api->create_all_sipss7($config, sub {
+                        my ($shortlog, $resp) = @_;
+                        $c->write($shortlog);
+                    });
             }
         }
         NGCP::Panel::Utils::Message->info(

lib/NGCP/Panel/Utils/DialogicImg.pm

@@ -852,10 +852,11 @@ sub _create_generic {
 
 # log: 0: none, 1: short, 2: everything
 # necessary keys: ip_sip, ip_rtp, ip_client, out_codecs
-# optional: in_codecs
+# optional: in_codecs, ip_sip_subnet, ip_rtp_subnet
 # for nfs: ip_nfs_server, nfs_path
 # for snmp: snmp_system_name, snmp_system_location, snmp_system_contact, snmp_community_name
 # for snmp optional: ip_snmp_manager, snmp_version
+# The management IP, the SIP IP and the RTP IP have to be in different subnets
 sub create_general_part_schedule {
     my ($self, $settings, $log) = @_;
 
@@ -919,15 +920,18 @@ sub create_general_part_schedule {
     my $schedule = [
         {name => 'network', options => undef},
         {name => 'interface_collection', options => undef},
-        {name => 'interface', options => undef},
+        {name => 'interface', options => undef}, # Control
+        {name => 'interface', options => undef}, # Data A
         {name => 'ip_address', options => {
             NIIPAddress => $settings->{ip_sip},
             NIIPPhy => 'Services',
+            NIIPSubnet => $settings->{ip_sip_subnet} || '24',
             }},
-        {name => 'interface', options => undef},
+        {name => 'interface', options => undef}, # Data B
         {name => 'ip_address', options => {
             NIIPAddress => $settings->{ip_rtp},
             NIIPPhy => 'Media 0',
+            NIIPSubnet => $settings->{ip_rtp_subnet} || '24',
             }},
         {name => 'facility', options => undef},
         {name => 'packet_facility_collection', options => undef},

share/templates/peering/preferences.tt

@@ -25,8 +25,7 @@
 <script type="text/javascript">
 	function call_flash_dialogic (url) {
 		console.log("calling", url);
-
-
+        $("#ngcp-livelog").text('');
 
         var last_response_len = false;
         $.ajax(url, {
@@ -45,6 +44,7 @@
                         last_response_len = response.length;
                     }
                     $("#ngcp-livelog").append(this_response);
+                    $("#ngcp-livelog")[0].scrollIntoView(false);
                     //console.log(this_response);
                 }
             }
@@ -52,11 +52,14 @@
         .done(function(data)
         {
             console.log('Done');
-            $("#ngcp-livelog").append("\nDone.")
+            $("#ngcp-livelog").append("\nDone.\nYou can close this window now.");
+            $("#ngcp-livelog")[0].scrollIntoView(false);
         })
         .fail(function(data)
         {
             console.log('Error: ', data);
+            $("#ngcp-livelog").append("\nError.");
+            $("#ngcp-livelog")[0].scrollIntoView(false);
         });
         console.log('Request Sent');
         $("#ngcp-test-modal").modal('show');
@@ -64,7 +67,7 @@
 	}
 </script>
 
-<div id="ngcp-test-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div id="ngcp-test-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
     <h3 id="myModalLabel">Flashing Dialogic ...</h3>

share/tools/dialogic-test-client.pl

@@ -21,8 +21,8 @@ p $resp->code;
 print "LOGGED IN, LOCK OBTAINED ############################\n";
 
 my $result = $test->create_all_sipsip({
-    ip_sip => '10.15.20.92',
-    ip_rtp => '10.15.21.10',
+    ip_sip => '10.15.21.92',
+    ip_rtp => '10.15.22.11',
     ip_client => '10.15.20.144',
     in_codecs => ['G711 ulaw', 'G711 alaw', 'G729', 'AMR'],
     out_codecs => ['G711 ulaw', 'G711 alaw', 'G729', 'AMR'],