changed peer functions to comply with ossbss data structures

etc/admin.conf

@@ -3,6 +3,7 @@
         peering_features="1"
         voicemail_features="1"
         fax_features="1"
+        li_features="0"
         cc_dial_prefix="00"
         ac_dial_prefix="0"
        >
@@ -13,7 +14,8 @@
           audiofile_features="1"
           vsc_features="1"
         />
-  <default_admin_settings is_master="1" is_active="1" read_only="0" show_passwords="1" />
+  <default_admin_settings is_master="0" is_active="1" read_only="0"
+                          show_passwords="1" call_data="0" lawful_intercept="0" />
   <fees_csv>
     <element_order>destination</element_order>
     <element_order>zone</element_order>

lib/admin/Controller/peering.pm

@@ -159,7 +159,7 @@ sub edit_grp : Local {
     my %messages;
     my %settings;
 
-    $settings{id} = $c->request->params->{grpid};
+    my $grpid = $c->request->params->{grpid};
     $settings{priority} = $c->request->params->{priority};
     $settings{description} = $c->request->params->{grpdesc};
     $settings{peering_contract_id} = $c->request->params->{peering_contract_id} || undef;
@@ -168,7 +168,9 @@ sub edit_grp : Local {
 
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'update_peer_group',
-                                                 \%settings,
+                                                 { id   => $grpid,
+                                                   data => \%settings,
+                                                 },
                                                  undef
                                                ))
         {
@@ -213,7 +215,7 @@ sub create_rule : Local {
 
     my $grpid = $c->request->params->{grpid};
     my $callee_prefix = $c->request->params->{callee_prefix};
-    my $caller_pattern = $c->request->params->{caller_pattern};
+    my $caller_prefix = $c->request->params->{caller_prefix};
     my $description = $c->request->params->{description};
 
 #    $messages{crulerr} = 'Client.Syntax.MalformedPeerGroupName'
@@ -222,9 +224,11 @@ sub create_rule : Local {
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'create_peer_rule',
                                                  { group_id => $grpid,
-												   callee_prefix => $callee_prefix,
-												   caller_pattern => $caller_pattern,
-												   description => $description
+                                                   data     => {
+                                                       callee_prefix  => $callee_prefix,
+                                                       caller_prefix  => $caller_prefix,
+                                                       description    => $description
+                                                   },
                                                  },
                                                  undef
                                                ))
@@ -304,7 +308,7 @@ sub edit_rule : Local {
     my $grpid = $c->request->params->{grpid};
     my $ruleid = $c->request->params->{ruleid};
     my $callee_prefix = $c->request->params->{callee_prefix};
-    my $caller_pattern = $c->request->params->{caller_pattern};
+    my $caller_prefix = $c->request->params->{caller_prefix};
     my $description = $c->request->params->{description};
 
 #    $messages{crulerr} = 'Client.Syntax.MalformedPeerGroupName'
@@ -312,10 +316,12 @@ sub edit_rule : Local {
 
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'update_peer_rule',
-                                                 { id => $ruleid,
-												   callee_prefix => $callee_prefix,
-												   caller_pattern => $caller_pattern,
-												   description => $description
+                                                 { id   => $ruleid,
+                                                   data => {
+                                                       callee_prefix => $callee_prefix,
+                                                       caller_prefix => $caller_prefix,
+                                                       description   => $description
+                                                   },
                                                  },
                                                  undef
                                                ))
@@ -362,7 +368,6 @@ sub create_peer : Local {
     my $ip = $c->request->params->{ip};
     my $port = $c->request->params->{port};
     my $weight = $c->request->params->{weight};
-    my $via_lb = defined $c->request->params->{via_lb} ? 1 : 0;
 
 #TODO: add syntax checks here
 
@@ -373,12 +378,13 @@ sub create_peer : Local {
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'create_peer_host',
                                                  { group_id => $grpid,
-												   name => $name,
-												   domain => $domain,
-												   ip => $ip,
-												   port => $port,
-												   weight => $weight,
-												   via_lb => $via_lb
+                                                   data => {
+                                                       name => $name,
+                                                       domain => $domain,
+                                                       ip => $ip,
+                                                       port => $port,
+                                                       weight => $weight,
+                                                   },
                                                  },
                                                  undef
                                                ))
@@ -462,7 +468,6 @@ sub edit_peer : Local {
     my $ip = $c->request->params->{ip};
     my $port = $c->request->params->{port};
     my $weight = $c->request->params->{weight};
-    my $via_lb = defined $c->request->params->{via_lb} ? 1 : 0;
 
 #    $messages{crulerr} = 'Client.Syntax.MalformedPeerGroupName'
 #        unless $callee_prefix =~ /^[a-zA-Z0-9_\.\-\@\:]+/;
@@ -470,12 +475,13 @@ sub edit_peer : Local {
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'update_peer_host',
                                                  { id => $peerid,
-												   name => $name,
-												   domain => $domain,
-												   ip => $ip,
-												   port => $port,
-												   weight => $weight,
-												   via_lb => $via_lb
+                                                   data => {
+                                                       name => $name,
+                                                       domain => $domain,
+                                                       ip => $ip,
+                                                       port => $port,
+                                                       weight => $weight,
+                                                   },
                                                  },
                                                  undef
                                                ))
@@ -522,7 +528,7 @@ sub rewrite : Local {
                                                       );
 	my $all_peer_details;
     return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'get_peer_group_details',
-														{ id => $$peer_details{group_id} },
+														{ id => $$peer_details{peer_host}{group_id} },
                                                         \$all_peer_details
                                                       );
 	my $all_peers = $$all_peer_details{peers};
@@ -578,12 +584,14 @@ sub create_rewrite : Local {
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'create_peer_rewrite',
                                                  { peer_id => $peerid,
-												   match_pattern => $match_pattern,
-												   replace_pattern => $replace_pattern,
-												   description => $description,
-												   direction => $direction,
-												   field => $field,
-												   priority => $priority,
+                                                   data => {
+                                                       match_pattern => $match_pattern,
+                                                       replace_pattern => $replace_pattern,
+                                                       description => $description,
+                                                       direction => $direction,
+                                                       field => $field,
+                                                       priority => $priority,
+                                                   },
                                                  },
                                                  undef
                                                ))
@@ -691,12 +699,14 @@ sub edit_rewrite : Local {
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'update_peer_rewrite',
                                                  { id => $rewriteid,
-												   match_pattern => $match_pattern,
-												   replace_pattern => $replace_pattern,
-												   description => $description,
-												   direction => $direction,
-												   field => $field,
-												   priority => $priority,
+                                                   data => {
+                                                       match_pattern => $match_pattern,
+                                                       replace_pattern => $replace_pattern,
+                                                       description => $description,
+                                                       direction => $direction,
+                                                       field => $field,
+                                                       priority => $priority,
+                                                   },
                                                  },
                                                  undef
                                                ))
@@ -741,7 +751,7 @@ sub copy_rewrite : Local {
     my $rpeerid = $c->request->params->{rpeerid};
     my $policy= $c->request->params->{policy};
     my $grpid = $c->request->params->{grpid};
-	my $delete_old = $policy eq "delete" ? 1 : 0;
+    my $delete_existing = $policy eq "delete" ? 1 : 0;
 
 	unless(defined $peerid && defined $rpeerid)
 	{
@@ -751,8 +761,8 @@ sub copy_rewrite : Local {
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'copy_peer_rewrites',
                                                  { from_peer_id => $rpeerid,
-												   to_peer_id => $peerid,
-												   delete_old => $delete_old
+                                                   to_peer_id => $peerid,
+                                                   delete_existing => $delete_existing
                                                  },
                                                  undef
                                                ))

root/layout/menu

@@ -19,6 +19,9 @@
           [% END %]
           <li [% 'class="active_menu"' IF menu.active == "account" %]><a href="/account">Accounts</a></li>
           <li [% 'class="active_menu"' IF menu.active == "subscriber" %]><a href="/subscriber">Subscribers</a></li>
+          [% IF Catalyst.config.li_features %]
+          <li [% 'class="active_menu"' IF menu.active == "intercept" %]><a href="/intercept">Lawful Intercept</a></li>
+          [% END %]
 [%#          <li><a href="/registration">Devices</a></li> %]
 [%#          <li><a href="/registration">Registrations</a></li> %]
         </ul>

root/tt/admin.tt

@@ -13,7 +13,7 @@
               <td> r/o </td>
               <td> PW </td>
               <td> CDR </td>
-            [% IF Catalyst.config.lawful_intercept %]
+            [% IF Catalyst.config.li_features %]
               <td> LI </td>
             [% END %]
               <td />
@@ -58,7 +58,7 @@
                              [% IF erefill.call_data or !erefill && admin.call_data %]checked="checked" [% END %]
                              title="if checked, the administrator may view call detail records" />
                     </td>
-                  [% IF Catalyst.config.lawful_intercept %]
+                  [% IF Catalyst.config.li_features %]
                     <td class="tdcenter">
                       <input type="checkbox" class="checkbox" name="lawful_intercept"
                              [% IF admin.login == Catalyst.session.admin.login %]disabled="disabled"[% END %]
@@ -101,7 +101,7 @@
                            [% IF admin.call_data %] checked="checked"[% END %]
                            title="if checked, the administrator may view call detail records" />
                   </td>
-                [% IF Catalyst.config.lawful_intercept %]
+                [% IF Catalyst.config.li_features %]
                   <td class="tdcenter">
                     <input type="checkbox" class="checkbox" disabled="disabled"
                            [% IF admin.lawful_intercept %] checked="checked"[% END %]
@@ -203,7 +203,7 @@
                          title="if checked, the new administrator may view call detail records" />
                 </td>
               </tr>
-            [% IF Catalyst.config.lawful_intercept %]
+            [% IF Catalyst.config.li_features %]
               <tr>
                 <td>lawful intercepts:</td>
                 <td>

root/tt/peering_detail.tt

@@ -1,6 +1,6 @@
         <h2> SIP Peering Group
-          <a class="noarrow" href="detail?group_id=[% grp.id %]">
-            [% grp.name %]</a>
+          <a class="noarrow" href="detail?group_id=[% grp.group.id %]">
+            [% grp.group.name %]</a>
         </h2>
 
 		<a href="/peering" class="aaction">back</a>
@@ -24,7 +24,7 @@
               <tr>
                 [% IF rule.id == reditid && !Catalyst.session.admin.read_only %]
                   <form action="/peering/edit_rule" method="post">
-                    <input type="hidden" name="grpid" value="[% grp.id %]" />
+                    <input type="hidden" name="grpid" value="[% grp.group.id %]" />
                     <input type="hidden" name="ruleid" value="[% rule.id %]" />
                     <td>
                       <input type="text" size="15 id="addtxt" title="string, callee prefix"
@@ -32,7 +32,7 @@
                     </td>
                     <td>
                       <input type="text" size="15" id="addtxt" title="string, caller pattern"
-                             name="caller_pattern" value="[% rule.caller_pattern %]" />
+                             name="caller_prefix" value="[% rule.caller_prefix %]" />
                     </td>
                     <td>
                       <input type="text" size="15" id="addtxt" title="string, rule description"
@@ -45,18 +45,18 @@
                       </div>
                     </td>
                   </form>
-                  <td><a href="/peering/detail?group_id=[% grp.id %]" class="aaction">cancel</a></td>
+                  <td><a href="/peering/detail?group_id=[% grp.group.id %]" class="aaction">cancel</a></td>
                 [% ELSE %]
                   <td>[% rule.callee_prefix %]</td>
-                  <td>[% rule.caller_pattern %]</td>
+                  <td>[% rule.caller_prefix %]</td>
                   <td>[% rule.description %]</td>
                   <td>
                   [% UNLESS Catalyst.session.admin.read_only %]
-                    <a href="/peering/detail?group_id=[% grp.id %]&reditid=[% rule.id %]" class="aaction">edit</a>
+                    <a href="/peering/detail?group_id=[% grp.group.id %]&reditid=[% rule.id %]" class="aaction">edit</a>
                   [% END %]
                   </td>
                   <form action="/peering/delete_rule" method="post">
-                    <input type="hidden" name="grpid" value="[% grp.id %]" />
+                    <input type="hidden" name="grpid" value="[% grp.group.id %]" />
                     <input type="hidden" name="ruleid" value="[% rule.id %]" />
                     <td>
                     [% UNLESS Catalyst.session.admin.read_only %]
@@ -74,14 +74,14 @@
             [% UNLESS Catalyst.session.admin.read_only %]
 			<tr>
                   <form action="/peering/create_rule" method="post">
-                    <input type="hidden" name="grpid" value="[% grp.id %]" />
+                    <input type="hidden" name="grpid" value="[% grp.group.id %]" />
                     <td>
                       <input type="text" size="15" id="addtxt" title="string, callee prefix"
                              name="callee_prefix" value="" />
                     </td>
                     <td>
                       <input type="text" size="15" id="addtxt" title="string, caller pattern"
-                             name="caller_pattern" value="" />
+                             name="caller_prefix" value="" />
                     </td>
                     <td>
                       <input type="text" size="15" id="addtxt" title="string, rule description"
@@ -116,7 +116,6 @@
               <td>IP Address</td>
               <td>Port</td>
               <td>Weight</td>
-              <td>Via Loadbalancer</td>
               <td style="width:40px;" />
               <td style="width:60px;" />
             </tr>
@@ -125,7 +124,7 @@
               <tr>
                 [% IF peer.id == peditid && !Catalyst.session.admin.read_only %]
                   <form action="/peering/edit_peer" method="post">
-                    <input type="hidden" name="grpid" value="[% grp.id %]" />
+                    <input type="hidden" name="grpid" value="[% grp.group.id %]" />
                     <input type="hidden" name="peerid" value="[% peer.id %]" />
                     <td>
                       <input type="text" size="15 id="addtxt" title="string, peer name"
@@ -147,10 +146,6 @@
                       <input type="text" size="3" id="addtxt" title="int, peer weight (0-255)"
                              name="weight" value="[% peer.weight %]" />
                     </td>
-                    <td class="tdcenter">
-                      <input type="checkbox" class="checkbox" title="check to route via load balancer "
-                             name="via_lb" [% IF peer.via_lb %]checked="checked"[% END %] />
-                    </td>
                     <td>
                       <div class="postlink">
                         <label for="psave[% id %]">save</label>
@@ -158,24 +153,20 @@
                       </div>
                     </td>
                   </form>
-                  <td><a href="/peering/detail?group_id=[% grp.id %]" class="aaction">cancel</a></td>
+                  <td><a href="/peering/detail?group_id=[% grp.group.id %]" class="aaction">cancel</a></td>
                 [% ELSE %]
                   <td><a href="/peering/rewrite?peer_id=[% peer.id%]" class="aaction">[% peer.name %]</a></td>
                   <td>[% peer.domain %]</td>
                   <td>[% peer.ip %]</td>
                   <td>[% peer.port %]</td>
                   <td>[% peer.weight %]</td>
-                  <td class="tdcenter">
-                    <input type="checkbox" class="checkbox" name="via_lb"
-                       [% IF peer.via_lb %]checked="checked"[% END %] disabled="disabled" />
-                  </td>
                   <td>
                   [% UNLESS Catalyst.session.admin.read_only %]
-                    <a href="/peering/detail?group_id=[% grp.id %]&peditid=[% peer.id %]" class="aaction">edit</a>
+                    <a href="/peering/detail?group_id=[% grp.group.id %]&peditid=[% peer.id %]" class="aaction">edit</a>
                   [% END %]
                   </td>
                   <form action="/peering/delete_peer" method="post">
-                    <input type="hidden" name="grpid" value="[% grp.id %]" />
+                    <input type="hidden" name="grpid" value="[% grp.group.id %]" />
                     <input type="hidden" name="peerid" value="[% peer.id %]" />
                     <td>
                     [% UNLESS Catalyst.session.admin.read_only %]
@@ -193,7 +184,7 @@
             [% UNLESS Catalyst.session.admin.read_only %]
 			<tr>
                   <form action="/peering/create_peer" method="post">
-                    <input type="hidden" name="grpid" value="[% grp.id %]" />
+                    <input type="hidden" name="grpid" value="[% grp.group.id %]" />
                     <td>
                       <input type="text" size="15" id="addtxt" title="string, peer name"
                              name="name" value="" />
@@ -214,10 +205,6 @@
                       <input type="text" size="3" id="addtxt" title="int, peer weight (0-255)"
                              name="weight" value="1" />
                     </td>
-                    <td class="tdcenter">
-                      <input type="checkbox" class="checkbox" title="check to route via load balancer "
-                             name="via_lb" checked="checked" />
-                    </td>
                     <td>
                   		<div class="postlink">
                     		<label for="padd">add</label>

root/tt/peering_rewrite.tt

@@ -1,9 +1,9 @@
         <h2> SIP Peering Rewrite Rules for host 
-          <a class="noarrow" href="rewrite?peer_id=[% peer.id %]">
-            [% peer.name %]</a>
+          <a class="noarrow" href="rewrite?peer_id=[% peer.peer_host.id %]">
+            [% peer.peer_host.name %]</a>
         </h2>
 
-		<a href="detail?group_id=[% peer.group_id %]" class="aaction">back</a>
+		<a href="detail?group_id=[% peer.peer_host.group_id %]" class="aaction">back</a>
 
 		[% IF all_peers.size > 0 %]	
         [% UNLESS Catalyst.session.admin.read_only %]
@@ -14,8 +14,8 @@
 			<table class="domains">
 			<tr>
             <form action="/peering/copy_rewrite" method="post">
-                <input type="hidden" name="peerid" value="[% peer.id %]" />
-                <input type="hidden" name="grpid" value="[% peer.group_id %]" />
+                <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
+                <input type="hidden" name="grpid" value="[% peer.peer_host.group_id %]" />
 				<td>
 				Copy rules from peering host 
             	<select title="string, peering host" size="1" name="rpeerid">
@@ -65,7 +65,7 @@
               <tr>
                 [% IF rule.id == ifeditid && !Catalyst.session.admin.read_only %]
                   <form action="/peering/edit_rewrite" method="post">
-                    <input type="hidden" name="peerid" value="[% peer.id %]" />
+                    <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
                     <input type="hidden" name="rewriteid" value="[% rule.id %]" />
                     <input type="hidden" name="direction" value="[% rule.direction %]" />
                     <input type="hidden" name="field" value="[% rule.field %]" />
@@ -92,7 +92,7 @@
                       </div>
                     </td>
                   </form>
-                  <td><a href="/peering/rewrite?peer_id=[% peer.id %]#icaller" class="aaction">cancel</a></td>
+                  <td><a href="/peering/rewrite?peer_id=[% peer.peer_host.id %]#icaller" class="aaction">cancel</a></td>
                 [% ELSE %]
                   <td>[% rule.match_pattern %]</td>
                   <td>[% rule.replace_pattern %]</td>
@@ -100,11 +100,11 @@
                   <td>[% rule.description %]</td>
                   <td>
                   [% UNLESS Catalyst.session.admin.read_only %]
-                    <a href="/peering/rewrite?peer_id=[% peer.id %]&ifeditid=[% rule.id %]#icallee" class="aaction">edit</a>
+                    <a href="/peering/rewrite?peer_id=[% peer.peer_host.id %]&ifeditid=[% rule.id %]#icallee" class="aaction">edit</a>
                   [% END %]
                   </td>
                   <form action="/peering/delete_rewrite" method="post">
-                    <input type="hidden" name="peerid" value="[% peer.id %]" />
+                    <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
                     <input type="hidden" name="rewriteid" value="[% rule.id %]" />
                     <input type="hidden" name="direction" value="[% rule.direction %]" />
                     <input type="hidden" name="field" value="[% rule.field %]" />
@@ -124,8 +124,8 @@
 			<tr>
             [% UNLESS Catalyst.session.admin.read_only %]
                   <form action="/peering/create_rewrite" method="post">
-                    <input type="hidden" name="grpid" value="[% peer.group_id %]" />
-                    <input type="hidden" name="peerid" value="[% peer.id %]" />
+                    <input type="hidden" name="grpid" value="[% peer.peer_host.group_id %]" />
+                    <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
                     <input type="hidden" name="direction" value="in" />
                     <input type="hidden" name="field" value="caller" />
                     <td>
@@ -180,7 +180,7 @@
               <tr>
                 [% IF rule.id == iteditid && !Catalyst.session.admin.read_only %]
                   <form action="/peering/edit_rewrite" method="post">
-                    <input type="hidden" name="peerid" value="[% peer.id %]" />
+                    <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
                     <input type="hidden" name="rewriteid" value="[% rule.id %]" />
                     <input type="hidden" name="direction" value="[% rule.direction %]" />
                     <input type="hidden" name="field" value="[% rule.field %]" />
@@ -207,7 +207,7 @@
                       </div>
                     </td>
                   </form>
-                  <td><a href="/peering/rewrite?peer_id=[% peer.id %]#icallee" class="aaction">cancel</a></td>
+                  <td><a href="/peering/rewrite?peer_id=[% peer.peer_host.id %]#icallee" class="aaction">cancel</a></td>
                 [% ELSE %]
                   <td>[% rule.match_pattern %]</td>
                   <td>[% rule.replace_pattern %]</td>
@@ -215,11 +215,11 @@
                   <td>[% rule.description %]</td>
                   <td>
                   [% UNLESS Catalyst.session.admin.read_only %]
-                    <a href="/peering/rewrite?peer_id=[% peer.id %]&iteditid=[% rule.id %]#icallee" class="aaction">edit</a>
+                    <a href="/peering/rewrite?peer_id=[% peer.peer_host.id %]&iteditid=[% rule.id %]#icallee" class="aaction">edit</a>
                   [% END %]
                   </td>
                   <form action="/peering/delete_rewrite" method="post">
-                    <input type="hidden" name="peerid" value="[% peer.id %]" />
+                    <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
                     <input type="hidden" name="rewriteid" value="[% rule.id %]" />
                     <input type="hidden" name="direction" value="[% rule.direction %]" />
                     <input type="hidden" name="field" value="[% rule.field %]" />
@@ -239,8 +239,8 @@
             [% UNLESS Catalyst.session.admin.read_only %]
 			<tr>
                   <form action="/peering/create_rewrite" method="post">
-                    <input type="hidden" name="grpid" value="[% peer.group_id %]" />
-                    <input type="hidden" name="peerid" value="[% peer.id %]" />
+                    <input type="hidden" name="grpid" value="[% peer.peer_host.group_id %]" />
+                    <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
                     <input type="hidden" name="direction" value="in" />
                     <input type="hidden" name="field" value="callee" />
                     <td>
@@ -294,7 +294,7 @@
               <tr>
                 [% IF rule.id == ofeditid && !Catalyst.session.admin.read_only %]
                   <form action="/peering/edit_rewrite" method="post">
-                    <input type="hidden" name="peerid" value="[% peer.id %]" />
+                    <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
                     <input type="hidden" name="rewriteid" value="[% rule.id %]" />
                     <input type="hidden" name="direction" value="[% rule.direction %]" />
                     <input type="hidden" name="field" value="[% rule.field %]" />
@@ -321,7 +321,7 @@
                       </div>
                     </td>
                   </form>
-                  <td><a href="/peering/rewrite?peer_id=[% peer.id %]#ocaller" class="aaction">cancel</a></td>
+                  <td><a href="/peering/rewrite?peer_id=[% peer.peer_host.id %]#ocaller" class="aaction">cancel</a></td>
                 [% ELSE %]
                   <td>[% rule.match_pattern %]</td>
                   <td>[% rule.replace_pattern %]</td>
@@ -329,11 +329,11 @@
                   <td>[% rule.description %]</td>
                   <td>
                   [% UNLESS Catalyst.session.admin.read_only %]
-                    <a href="/peering/rewrite?peer_id=[% peer.id %]&ofeditid=[% rule.id %]#ocaller" class="aaction">edit</a>
+                    <a href="/peering/rewrite?peer_id=[% peer.peer_host.id %]&ofeditid=[% rule.id %]#ocaller" class="aaction">edit</a>
                   [% END %]
                   </td>
                   <form action="/peering/delete_rewrite" method="post">
-                    <input type="hidden" name="peerid" value="[% peer.id %]" />
+                    <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
                     <input type="hidden" name="rewriteid" value="[% rule.id %]" />
                     <input type="hidden" name="direction" value="[% rule.direction %]" />
                     <input type="hidden" name="field" value="[% rule.field %]" />
@@ -353,8 +353,8 @@
             [% UNLESS Catalyst.session.admin.read_only %]
 			<tr>
                   <form action="/peering/create_rewrite" method="post">
-                    <input type="hidden" name="grpid" value="[% peer.group_id %]" />
-                    <input type="hidden" name="peerid" value="[% peer.id %]" />
+                    <input type="hidden" name="grpid" value="[% peer.peer_host.group_id %]" />
+                    <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
                     <input type="hidden" name="direction" value="out" />
                     <input type="hidden" name="field" value="caller" />
                     <td>
@@ -408,7 +408,7 @@
               <tr>
                 [% IF rule.id == oteditid && !Catalyst.session.admin.read_only %]
                   <form action="/peering/edit_rewrite" method="post">
-                    <input type="hidden" name="peerid" value="[% peer.id %]" />
+                    <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
                     <input type="hidden" name="rewriteid" value="[% rule.id %]" />
                     <input type="hidden" name="direction" value="[% rule.direction %]" />
                     <input type="hidden" name="field" value="[% rule.field %]" />
@@ -435,7 +435,7 @@
                       </div>
                     </td>
                   </form>
-                  <td><a href="/peering/rewrite?peer_id=[% peer.id %]#ocallee" class="aaction">cancel</a></td>
+                  <td><a href="/peering/rewrite?peer_id=[% peer.peer_host.id %]#ocallee" class="aaction">cancel</a></td>
                 [% ELSE %]
                   <td>[% rule.match_pattern %]</td>
                   <td>[% rule.replace_pattern %]</td>
@@ -443,11 +443,11 @@
                   <td>[% rule.description %]</td>
                   <td>
                   [% UNLESS Catalyst.session.admin.read_only %]
-                    <a href="/peering/rewrite?peer_id=[% peer.id %]&oteditid=[% rule.id %]#ocallee" class="aaction">edit</a>
+                    <a href="/peering/rewrite?peer_id=[% peer.peer_host.id %]&oteditid=[% rule.id %]#ocallee" class="aaction">edit</a>
                   [% END %]
                   </td>
                   <form action="/peering/delete_rewrite" method="post">
-                    <input type="hidden" name="peerid" value="[% peer.id %]" />
+                    <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
                     <input type="hidden" name="rewriteid" value="[% rule.id %]" />
                     <input type="hidden" name="direction" value="[% rule.direction %]" />
                     <input type="hidden" name="field" value="[% rule.field %]" />
@@ -467,8 +467,8 @@
             [% UNLESS Catalyst.session.admin.read_only %]
 			<tr>
                   <form action="/peering/create_rewrite" method="post">
-                    <input type="hidden" name="grpid" value="[% peer.group_id %]" />
-                    <input type="hidden" name="peerid" value="[% peer.id %]" />
+                    <input type="hidden" name="grpid" value="[% peer.peer_host.group_id %]" />
+                    <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
                     <input type="hidden" name="direction" value="out" />
                     <input type="hidden" name="field" value="callee" />
                     <td>