← Back to branch summary

~mdragon/nova/multi-tenant-accounting

« back to all changes in this revision

Viewing changes to nova/network/manager.py

  • Committer: Monsyne Dragon
  • Date: 2011-03-03 15:50:34 UTC
  • mfrom: (752.2.6 nova)
  • Revision ID: mdragon@rackspace.com-20110303155034-seiumq0o74hynh6i
Remerged trunk, fixed a few conflicts. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/network/manager.py
531
531
                               ' than 4094'))
532
532
 
533
533
        fixed_net = IPy.IP(cidr)
 
534
        if fixed_net.len() < num_networks * network_size:
 
535
            raise ValueError(_('The network range is not big enough to fit '
 
536
                  '%(num_networks)s. Network size is %(network_size)s' %
 
537
                  locals()))
 
538
 
534
539
        fixed_net_v6 = IPy.IP(cidr_v6)
535
540
        network_size_v6 = 1 << 64
536
541
        significant_bits_v6 = 64