Changeset 442 for trunk


Ignore:
Timestamp:
07/21/10 16:08:10 (14 years ago)
Author:
Kris Deugau
Message:

/trunk

Remove some ViaNet-isms (reference to city names with primary POPs).
See #26.
Update alloctypes.html to reflect current preseeded alloctypes

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/alloctypes.html

    r413 r442  
    1111<table class="regular">
    1212
    13 <tr><td colspan=2 class="heading">Allocation Types:</td><tr>
    14 
    15 <tr class="color1">
    16 <td>Customer netblock (default)</td><td>A direct allocation /30 or larger to a
    17 customer.  Note that this does NOT include RADIUS-routed "netblocks".  Internal systems
    18 should use the "End-use netblock" type.</td>
    19 </tr>
    20 
    21 <tr class="color2">
    22 <td>Static IP - Server pool</td><td>A single IP from a pool designated for
    23 servers</td>
    24 </tr><tr class="color1">
    25 <td>Static IP - Cable</td><td>A single IP address from a designated pool
    26 on the cable network.</td>
    27 </tr><tr class="color2">
    28 <td>Static IP - DSL</td><td>A single IP address from a designated pool
    29 on the DSL network.  Note that these are nominally in Sudbury or North Bay,
    30 even if the customer isn't.</td>
    31 </tr><tr class="color1">
    32 <td>Static IP - Dialup</td><td>A single IP address from a designated pool
    33 on a dialup RAS.</td>
    34 </tr><tr class="color2">
    35 <td>Static IP - Wireless</td><td>A single IP address from a designated pool
    36 on one of our wireless networks.</td>
    37 </tr>
    38 
    39 <tr class="color1">
    40 <td>Static pool - Servers</td><td>A pool of IP addresses available for one-by-one
    41 assignment to servers in a POP.  This will usually only be in Sudbury.</td>
    42 </tr><tr class="color2">
    43 <td>Static pool - Cable</td><td>A pool of IP addresses available for one-by-one assignment
    44 to customers on cable.</td>
    45 </tr><tr class="color1">
    46 <td>Static pool - DSL</td><td>A pool of IP addresses available for one-by-one assignment to
    47 customers on DSL.  Note that individual IPs will be "assigned" to the customer's
    48 city, but the pool they are a part of will normally be "assigned" to Sudbury or
    49 North Bay.</td>
    50 </tr><tr class="color2">
    51 <td>Static pool - Dialup</td><td>A pool of IP addresses available for one-by-one
    52 assignment to dialup customers.</td>
    53 </tr><tr class="color1">
    54 <td>Static pool - Wireless</td><td>A pool of IP addresses available for one-by-one
    55 assignment to customers on one of our wireless networks.</td>
    56 </tr>
    57 
    58 <tr class="color2">
    59 <td>End-use netblock</td><td>A /30 or larger allocation for arbitrary services (LAN
    60 management, servers we want fully subnet-isolated, etc)</td>
    61 
    62 </tr><tr class="color1">
    63 <td>Dialup netblock</td><td>Netblock assigned to one or more RAS units in a POP</td>
    64 </tr><tr class="color2">
    65 <td>Dynamic DSL block</td><td>Netblock for (mostly residential) PPPoE DSL.  Nominally
    66 "assigned" to Sudbury</td>
    67 </tr><tr class="color1">
    68 <td>Dynamic cable block</td><td>Netblock for (mostly residential) DHCP cable.</td>
    69 </tr><tr class="color2">
    70 <td>Dynamic WiFi block</td><td>Netblock for (mostly residential) (mostly) PPPoE wireless.</td>
    71 </tr><tr class="color1">
    72 <td>Dynamic VoIP block</td><td>Netblock for DHCP-assigned VoIP services.</td>
    73 
    74 </tr><tr class="color2">
    75 <td>Static IP - LAN/POP</td><td>A single IP address from a designated pool for our
    76 internal LANs - either at a single POP or for a VPN.</td>
    77 </tr><tr class="color1">
    78 <td>Static pool - LAN/POP</td><td>A pool of IP addresses available for one-by-one
    79 assignment to our internal LAN systems or VPNs.</td>
    80 
    81 </tr><tr class="color2">
    82 <td>Reserve for WAN blocks</td><td>Reserve a chunk of IP space for core routers/etc.</td>
    83 </tr><tr class="color1">
    84 <td>Reserve for dynamic-route DSL netblocks</td><td>Reserve a chunk of IP space for
    85 RADIUS-assigned "netblocks" from a PPPoE pool.  Note that this is similar to the static DSL
    86 pool, but IP space is to be allocated as /30 and larger netblocks, not single static IPs.</td>
    87 </tr><tr class="color2">
    88 <td>Reserve for ATM</td><td>Reserve a chunk of IP space for allocation to customers on ATM</td>
    89 </tr><tr class="color1">
    90 <td>WAN block</td><td>Individual netblock assignment for a core router.  Always taken from a
     13<tr><td colspan=2 class="heading">Preseeded Allocation Types:</td><tr>
     14
     15<tr class="color1">
     16<td>Customer netblock (default)</td>
     17<td>A direct allocation /30 or larger to a customer.  Note that this does NOT
     18include RADIUS-routed "netblocks".  Non-customer systems should use the
     19"End-use netblock" type.</td>
     20</tr>
     21
     22<tr class="color2">
     23<td>Static IP - Server pool</td>
     24<td>A single IP from a pool designated for servers</td>
     25</tr>
     26
     27<tr class="color1">
     28<td>Static IP - Cable</td>
     29<td>A single IP address from a designated pool on the cable network.</td>
     30</tr>
     31
     32<tr class="color2">
     33<td>Static IP - DSL</td>
     34<td>A single IP address from a designated pool on the DSL network.</td>
     35</tr>
     36
     37<tr class="color1">
     38<td>Static IP - Dialup</td>
     39<td>A single IP address from a designated pool on a dialup RAS.</td>
     40</tr>
     41
     42<tr class="color2">
     43<td>Static IP - Wireless</td>
     44<td>A single IP address from a designated pool on a wireless connection.</td>
     45</tr>
     46
     47<tr class="color1">
     48<td>Static pool - Servers</td>
     49<td>A pool of IP addresses available for one-by-one assignment to servers in a
     50POP.</td>
     51</tr>
     52
     53<tr class="color2">
     54<td>Static pool - Cable</td>
     55<td>A pool of IP addresses available for one-by-one assignment to customers on
     56cable.</td>
     57</tr>
     58
     59<tr class="color1">
     60<td>Static pool - DSL</td>
     61<td>A pool of IP addresses available for one-by-one assignment to customers on
     62DSL.  Individual IPs will be "assigned" to the customer's city, but the pool
     63will remain assigned to its nominal origin.</td>
     64</tr>
     65
     66<tr class="color2">
     67<td>Static pool - Dialup</td>
     68<td>A pool of IP addresses available for one-by-one assignment to dialup
     69customers.</td>
     70</tr>
     71
     72<tr class="color1">
     73<td>Static pool - Wireless</td>
     74<td>A pool of IP addresses available for one-by-one assignment to customers on a
     75wireless connection.</td>
     76</tr>
     77
     78<tr class="color2">
     79<td>End-use netblock</td>
     80<td>A /30 or larger allocation for arbitrary services - note this should not
     81be used for customer connections.  Use this if exact tracking of IP
     82usage in the block is not required.</td>
     83</tr>
     84
     85<tr class="color1">
     86<td>Dialup netblock</td>
     87<td>Netblock assigned to one or more RAS units in a POP</td>
     88</tr>
     89
     90<tr class="color2">
     91<td>Dynamic DSL block</td>
     92<td>Netblock for (mostly residential) PPPoE DSL.</td>
     93</tr>
     94
     95<tr class="color1">
     96<td>Dynamic cable block</td>
     97<td>Netblock for (mostly residential) DHCP cable.</td>
     98</tr>
     99
     100<tr class="color2">
     101<td>Dynamic WiFi block</td>
     102<td>Netblock for (mostly residential) (mostly) PPPoE wireless.</td>
     103</tr>
     104
     105<tr class="color1">
     106<td>Dynamic VoIP block</td>
     107<td>Netblock for DHCP-assigned VoIP services.</td>
     108</tr>
     109
     110<tr class="color2">
     111<td>Static IP - LAN/POP</td>
     112<td>A single IP address from a designated pool for internal LANs - either at a
     113single POP or for a VPN.</td>
     114</tr>
     115
     116<tr class="color1">
     117<td>Static IP - Managment</td>
     118<td>A single IP address from a designated pool for managed devices.</td>
     119</tr>
     120
     121<tr class="color2">
     122<td>Static IP - Wifi CPE</td>
     123<td>A single IP address from a designated pool for wireless CPE devices.</td>
     124</tr>
     125
     126<tr class="color1">
     127<td>Static pool - LAN/POP</td>
     128<td>A pool of IP addresses available for one-by-one assignment to internal LAN
     129systems or VPNs.</td>
     130</tr>
     131
     132<tr class="color2">
     133<td>Static Pool - Managment</td>
     134<td>A pool of IP addresses available for assignment to managed devices.</td>
     135</tr>
     136
     137<tr class="color1">
     138<td>Static pool - Wifi CPE</td>
     139<td>A pool of IP addresses available for assignment to wireless CPE devices.</td>
     140</tr>
     141
     142<tr class="color2">
     143<td>Reserve for WAN blocks</td>
     144<td>Reserve a chunk of IP space for core routers/etc.</td>
     145</tr>
     146
     147<tr class="color1">
     148<td>Reserve for dynamic-route DSL netblocks</td>
     149<td>Reserve a chunk of IP space for netblocks configured on the customer end via
     150PPPoE/RADIUS.  Note that this is similar to the static DSL pool, but IP space is
     151to be allocated as /30 and larger netblocks, not single static IPs.</td>
     152</tr>
     153
     154<tr class="color2">
     155<td>Reserve for ATM</td>
     156<td>Reserve a chunk of IP space for allocation to customers on ATM.</td>
     157</tr>
     158
     159<tr class="color1">
     160<td>Reserve for fibre</td>
     161<td>Reserve a chunk of IP space for customers on a fibre connection.</td>
     162</tr>
     163
     164<tr class="color2">
     165<td>WAN block</td>
     166<td>Individual netblock assignment for a core router.  Always taken from a
    91167block which has previously been reserved for such assignments.</td>
    92 </tr><tr class="color2">
    93 <td>Dynamic-route DSL netblock</td><td>Customer assignment for a RADIUS-assigned PPPoE
    94 "netblock".  Always taken from a block which has previously been reserved for such
    95 assignments.</td>
    96 </tr><tr class="color1">
    97 <td>ATM block</td><td>Customer assignment for a customer on ATM.  Always taken from a
     168</tr>
     169
     170<tr class="color1">
     171<td>Dynamic-route DSL netblock</td>
     172<td>Customer assignment for a netblock configured on the customer end via
     173PPPoE/RADIUS.  Always taken from a block which has previously been reserved for
     174such assignments.</td>
     175</tr>
     176
     177<tr class="color2">
     178<td>ATM block</td>
     179<td>Customer assignment for a customer on ATM.  Always taken from a
    98180block which has previously been reserved for such assignments.</td>
    99 
    100 </tr><tr class="color2">
    101 <td>Routing</td><td>Blocks not actually assigned to a service on their own, but which
     181</tr>
     182
     183<tr class="color1">
     184<td>Fibre</td>
     185<td>Customer assignment for a customer on fibre. Always taken from a block
     186which has previously been reserved for such assignments.</td>
     187</tr>
     188
     189<tr class="color2">
     190<td>Routing</td>
     191<td>Blocks not actually assigned to a service on their own, but which
    102192have been routed to individual POPs- typically /24, /23, /22</td>
    103 
    104 </tr><tr class="color1">
    105 <td>Master block</td><td>Our allocations from ARIN</td>
     193</tr>
     194
     195<tr class="color1">
     196<td>Master block</td>
     197<td>Allocations provided by the regional registry (ARIN, RIPE, LACNIC, AfriNIC,
     198or APNIC)</td>
    106199</tr>
    107200

  • trunk/cgi-bin/main.cgi

    r435 r442  
    685685  if ($webvar{alloctype} =~ /^.i$/) {
    686686    my ($base,undef) = split //, $webvar{alloctype};    # split into individual chars
    687     my ($sql,$city);
    688     # Check for pools in Subury, North Bay, or Toronto if DSL or server pool.
    689     # Anywhere else is invalid and shouldn't be in the db in the first place.
    690     # ... aside from #^%#$%#@#^%^^!!!! legacy data.  GRRR.
    691     # Note that we want to retain the requested city to relate to customer info.
    692     if ($base =~ /^[ds]$/) {
    693       $city = "(allocations.city='Sudbury' or allocations.city='North Bay' or ".
    694         "allocations.city='Toronto')";
    695     } else {
    696       $city = "allocations.city='$webvar{pop}'";
    697     }
    698687
    699688# Ewww.  But it works.
    700689    $sth = $ip_dbh->prepare("SELECT (SELECT city FROM allocations WHERE cidr=poolips.pool), ".
    701690        "poolips.pool, COUNT(*) FROM poolips,allocations WHERE poolips.available='y' AND ".
    702         "poolips.pool=allocations.cidr AND $city AND poolips.type LIKE '".$base."_' ".
     691        "poolips.pool=allocations.cidr AND allocations.city='$webvar{pop}' AND poolips.type LIKE '".$base."_' ".
    703692        "GROUP BY pool");
    704693    $sth->execute;
    … …  
    754743        # This does NOT include cable pools.
    755744        if ($webvar{alloctype} =~ /^.[pc]$/) {
    756           if (($webvar{city} !~ /^(Sudbury|North Bay|Toronto)$/) && ($webvar{alloctype} eq 'dp')) {
    757             printError("You must chose Sudbury, North Bay, or Toronto for DSL pools.");
    758             return;
    759           }
    760745          $city = $webvar{city};
    761746          $failmsg = "No suitable free block found.<br>\nYou will have to route another".
    762             " superblock from one of the<br>\nmaster blocks in Sudbury or chose a smaller".
     747            " superblock from one of the<br>\nmaster blocks or chose a smaller".
    763748            " block size for the pool.";
    764749        } else {
    765750          $city = $webvar{pop};
    766751          $failmsg = "No suitable free block found.<br>\nYou will have to route another".
    767             " superblock to $webvar{pop}<br>\nfrom one of the master blocks in Sudbury or".
     752            " superblock to $webvar{pop}<br>\nfrom one of the master blocks or".
    768753            " chose a smaller blocksize.";
    769754        }
    … …  
    986971  } else {
    987972    $flag = 'n';
    988     if ($webvar{alloctype} =~ /[wp][cr]|[ds][pi]/) {
    989       # Set this forcibly rather than messing around elsewhere.  Yes, this *is* a hack.  PTHBTT!!
    990       $webvar{pop} = 'Sudbury';
    991     }
     973##fixme:  hook to force-set POP or city on certain alloctypes
     974# if ($webvar{alloctype =~ /foo,bar,bz/ { $webvar{pop} = 'blah'; }
    992975    if ($webvar{pop} =~ /^-$/) {
    993976      $flag = 'to route the block from/through';
Note: See TracChangeset for help on using the changeset viewer.