Changeset 181

Show
Ignore:
Timestamp:
07/28/08 14:32:33 (4 months ago)
Author:
pwh
Message:
  • DS1/E1 Interfaces: Corrected a missing field in the past 24h statistics, and added line type and coding translations
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • nethorus/app/controllers/manage_controller.rb

    r180 r181  
    165165 
    166166       
     167      # Translate the dsx1LineType in to human-readable descriptions 
     168       
     169      @ds1_line_type = Hash.new 
     170      @ds1_line_type['other'] = "undefined" 
     171      @ds1_line_type['dsx1ESF'] = "Extended Superframe DS1 (T1.107)" 
     172      @ds1_line_type['dsx1D4'] = "AT&T D4 format DS1 (T1.107)" 
     173      @ds1_line_type['dsx1E1'] = "ITU-T G.704 (Table 5A)" 
     174      @ds1_line_type['dsx1E1CRC'] = "ITU-T G.704 (Table 5B)" 
     175      @ds1_line_type['dsx1E1MF'] = "ITU-T G.704 (Table 5A) with TS16 multiframing" 
     176      @ds1_line_type['dsx1E1CRCMF'] = "ITU-T G.704 (Table 5B) with TS16 multiframing" 
     177      @ds1_line_type['dsx1Unframed'] = "Unframed DS1" 
     178      @ds1_line_type['dsx1E1Unframed'] = "Unframed E1 (G.703)" 
     179      @ds1_line_type['dsx1DS2M12'] = "DS2 frame format (T1.107)" 
     180      @ds1_line_type['dsx1E2'] = "E2 frame format (G.704)" 
     181      @ds1_line_type['dsx1E1Q50'] = "E1Q50" 
     182      @ds1_line_type['dsx1E1Q50CRC'] = "E1Q50 with CRC" 
     183      @ds1_line_type['dsx1J1ESF'] = "J1 according to JT-G704, JT-G706 and JT-I431" 
     184      @ds1_line_type['dsx1J1Unframed'] = "Unframed J1" 
     185       
     186       
     187      # Translate the dsx1LineEncoding in to human-readable descriptions 
     188       
     189      @ds1_line_coding = Hash.new 
     190      @ds1_line_coding['dsx1JBZS'] = "Jammed Bit Zero Suppression (JBZS)" 
     191      @ds1_line_coding['dsx1B8ZS'] = "Biploar with 8 Zeros Substitution (B8ZS)" 
     192      @ds1_line_coding['dsx1HDB3'] = "High-Density Bipoloar Order of 3 (HDB3)" 
     193      @ds1_line_coding['dsx1ZBTSI'] = "ZBTSI" 
     194      @ds1_line_coding['dsx1AMI'] = "No Zero Code Suppression (AMI)" 
     195      @ds1_line_coding['other'] = "Other" 
     196      @ds1_line_coding['dsx1B6ZS'] = "Bipolar with 6 Zeros Substitution (B6ZS)" 
     197       
     198       
    167199      # Translate the dsx1SignalMode in to human-readable descriptions 
    168200       
    …… 
    240272      # Retrieve the dsx1CurrentTable for this interface 
    241273       
    242       ds1_current_table_oids = [ ['dsx1CurrentESs', @interface.ifindex], ['dsx1CurrentSESs', @interface.ifindex], ['dsx1CurrentSEFSs', @interface.ifindex], ['dsx1CurrentUASs', @interface.ifindex], ['dsx1CurrentCSSs', @interface.ifindex], ['dsx1CurrentPCVs', @interface.ifindex], ['dsx1CurrentLESs', @interface.ifindex], ['dsx1CurrentBESs', @interface.ifindex], ['dsx1CurrentDMs', @interface.ifindex], ['dsx1CurrentLCVs', @interface.ifindex] ] 
     274      ds1_current_table_oids = [ ['dsx1TimeElapsed', @interface.ifindex], ['dsx1CurrentESs', @interface.ifindex], ['dsx1CurrentSESs', @interface.ifindex], ['dsx1CurrentSEFSs', @interface.ifindex], ['dsx1CurrentUASs', @interface.ifindex], ['dsx1CurrentCSSs', @interface.ifindex], ['dsx1CurrentPCVs', @interface.ifindex], ['dsx1CurrentLESs', @interface.ifindex], ['dsx1CurrentBESs', @interface.ifindex], ['dsx1CurrentDMs', @interface.ifindex], ['dsx1CurrentLCVs', @interface.ifindex] ] 
    243275      ds1_total_table_oids = [ ['dsx1TotalESs', @interface.ifindex], ['dsx1TotalSESs', @interface.ifindex], ['dsx1TotalSEFSs', @interface.ifindex], ['dsx1TotalUASs', @interface.ifindex], ['dsx1TotalCSSs', @interface.ifindex], ['dsx1TotalPCVs', @interface.ifindex], ['dsx1TotalLESs', @interface.ifindex], ['dsx1TotalBESs', @interface.ifindex], ['dsx1TotalDMs', @interface.ifindex], ['dsx1TotalLCVs', @interface.ifindex] ] 
    244276       

  • nethorus/app/views/common/_ds1_interface.html.erb

    r179 r181  
    88 <tr> 
    99  <th>Line type/coding</th> 
    10   <td><%=h @ds1_interface['dsx1LineType'] %> using <%=h @ds1_interface['dsx1LineCoding'] %> encoding</td> 
     10  <td><%=h @ds1_line_type[@ds1_interface['dsx1LineType']].capitalize %> using <%=h @ds1_line_coding[@ds1_interface['dsx1LineCoding']] %> encoding</td> 
    1111 </tr> 
    1212 <tr> 
    …… 
    5353</table> 
    5454 
    55 <h2>Alarms</h2> 
     55<h2>Alarms and Errors</h2> 
    5656 
    5757<table class="horiz"> 
    …… 
    7272</table> 
    7373 
    74 <h2>Errors</h2> 
     74<p>The current interval began <strong><%=h value_or_unavailable(@ds1_current_table, 'dsx1TimeElapsed') %></strong> seconds ago.</p> 
    7575 
    7676<table class="vert"> 
    …… 
    103103 <tr> 
    104104  <td>Last 24h</td> 
     105  <td><%=h value_or_unavailable(@ds1_total_table, 'dsx1TotalESs') %></td> 
    105106  <td><%=h value_or_unavailable(@ds1_total_table, 'dsx1TotalSESs') %></td> 
    106107  <td><%=h value_or_unavailable(@ds1_total_table, 'dsx1TotalSEFSs') %></td>