← Back to branch summary

~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to nova/network/manager.py

  • Committer: Jason Koelker
  • Date: 2011-07-22 21:47:37 UTC
  • mto: This revision was merged to the branch mainline in revision 1306.
  • Revision ID: jason@koelker.net-20110722214737-xe4mdvhj8671phku
default to None in the method signature

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/network/manager.py
480
480
            # TODO(tr3buchet): handle ip6 routes here as well
481
481
            if network['gateway_v6']:
482
482
                info['gateway6'] = network['gateway_v6']
483
 
            if network['dns']:
484
 
                info['dns'].append(network['dns'])
 
483
            if network['dns1']:
 
484
                info['dns'].append(network['dns1'])
485
485
            if network['dns2']:
486
486
                info['dns'].append(network['dns2'])
487
487
 
595
595
 
596
596
    def create_networks(self, context, label, cidr, multi_host, num_networks,
597
597
                        network_size, cidr_v6, gateway_v6, bridge,
598
 
                        bridge_interface, dns, dns2=None, **kwargs):
 
598
                        bridge_interface, dns1=None, dns2=None, **kwargs):
599
599
        """Create networks based on parameters."""
600
600
        fixed_net = netaddr.IPNetwork(cidr)
601
601
        fixed_net_v6 = netaddr.IPNetwork(cidr_v6)
610
610
            net = {}
611
611
            net['bridge'] = bridge
612
612
            net['bridge_interface'] = bridge_interface
613
 
            net['dns'] = dns
 
613
            net['dns1'] = dns1
614
614
            net['dns2'] = dns2
615
615
            net['cidr'] = cidr
616
616
            net['multi_host'] = multi_host
640
640
 
641
641
            if kwargs.get('vpn', False):
642
642
                # this bit here is for vlan-manager
643
 
                del net['dns']
 
643
                del net['dns1']
644
644
                del net['dns2']
645
645
                vlan = kwargs['vlan_start'] + index
646
646
                net['vpn_private_address'] = str(project_net[2])