default to None in the method signature

5 files changed, 16 insertions, 14 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index ece63e54d..e97596a54 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -567,7 +567,7 @@ class NetworkCommands(object):
                network_size=None, multi_host=None, vlan_start=None,
                vpn_start=None, fixed_range_v6=None, gateway_v6=None,
                flat_network_bridge=None, bridge_interface=None,
-               dns=None, dns2=None):
+               dns1=None, dns2=None):
         """Creates fixed ips for host by range
         arguments: label, fixed_range, [num_networks=FLAG],
                    [network_size=FLAG], [multi_host=FLAG], [vlan_start=FLAG],
@@ -607,8 +607,8 @@ class NetworkCommands(object):
             bridge_interface = FLAGS.flat_interface or FLAGS.vlan_interface
         if not gateway_v6:
             gateway_v6 = FLAGS.gateway_v6
-        if not dns and FLAGS.flat_network_dns:
-            dns = FLAGS.flat_network_dns
+        if not dns1 and FLAGS.flat_network_dns:
+            dns1 = FLAGS.flat_network_dns
         net_manager = utils.import_object(FLAGS.network_manager)
 
         try:
@@ -624,7 +624,7 @@ class NetworkCommands(object):
                                         gateway_v6=gateway_v6,
                                         bridge=flat_network_bridge,
                                         bridge_interface=bridge_interface,
-                                        dns=dns,
+                                        dns1=dns1,
                                         dns2=dns2)
         except ValueError, e:
             print e
@@ -636,7 +636,7 @@ class NetworkCommands(object):
                                                   _('network'),
                                                   _('netmask'),
                                                   _('start address'),
-                                                  _('DNS'),
+                                                  _('DNS1'),
                                                   _('DNS2'),
                                                   _('VlanID'),
                                                   'project')
@@ -645,7 +645,7 @@ class NetworkCommands(object):
                                         network.cidr,
                                         network.netmask,
                                         network.dhcp_start,
-                                        network.dns,
+                                        network.dns1,
                                         network.dns2,
                                         network.vlan,
                                         network.project_id)
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py b/nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py
index d9f82d796..c938eb716 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py
@@ -26,6 +26,7 @@ def upgrade(migrate_engine):
     meta.bind = migrate_engine
 
     networks = Table('networks', meta, autoload=True)
+    networks.c.dns.alter(Column('dns1', String(255)))
     networks.create_column(dns2)
 
 
@@ -33,4 +34,5 @@ def downgrade(migrate_engine):
     meta.bind = migrate_engine
 
     networks = Table('networks', meta, autoload=True)
+    networks.c.dns1.alter(Column('dns', String(255)))
     networks.drop_column(dns2)
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index cf00177c4..7e35c2cba 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -556,7 +556,7 @@ class Network(BASE, NovaBase):
     bridge_interface = Column(String(255))
     gateway = Column(String(255))
     broadcast = Column(String(255))
-    dns = Column(String(255))
+    dns1 = Column(String(255))
     dns2 = Column(String(255))
 
     vlan = Column(Integer)
diff --git a/nova/network/manager.py b/nova/network/manager.py
index a11d9a5ed..3b3f524c4 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -480,8 +480,8 @@ class NetworkManager(manager.SchedulerDependentManager):
             # TODO(tr3buchet): handle ip6 routes here as well
             if network['gateway_v6']:
                 info['gateway6'] = network['gateway_v6']
-            if network['dns']:
-                info['dns'].append(network['dns'])
+            if network['dns1']:
+                info['dns'].append(network['dns1'])
             if network['dns2']:
                 info['dns'].append(network['dns2'])
 
@@ -595,7 +595,7 @@ class NetworkManager(manager.SchedulerDependentManager):
 
     def create_networks(self, context, label, cidr, multi_host, num_networks,
                         network_size, cidr_v6, gateway_v6, bridge,
-                        bridge_interface, dns, dns2=None, **kwargs):
+                        bridge_interface, dns1=None, dns2=None, **kwargs):
         """Create networks based on parameters."""
         fixed_net = netaddr.IPNetwork(cidr)
         fixed_net_v6 = netaddr.IPNetwork(cidr_v6)
@@ -610,7 +610,7 @@ class NetworkManager(manager.SchedulerDependentManager):
             net = {}
             net['bridge'] = bridge
             net['bridge_interface'] = bridge_interface
-            net['dns'] = dns
+            net['dns1'] = dns1
             net['dns2'] = dns2
             net['cidr'] = cidr
             net['multi_host'] = multi_host
@@ -640,7 +640,7 @@ class NetworkManager(manager.SchedulerDependentManager):
 
             if kwargs.get('vpn', False):
                 # this bit here is for vlan-manager
-                del net['dns']
+                del net['dns1']
                 del net['dns2']
                 vlan = kwargs['vlan_start'] + index
                 net['vpn_private_address'] = str(project_net[2])
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index c37e30c05..fbe7d769e 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -55,7 +55,7 @@ networks = [{'id': 0,
              'bridge_interface': 'fake_fa0',
              'gateway': '192.168.0.1',
              'broadcast': '192.168.0.255',
-             'dns': '192.168.0.1',
+             'dns1': '192.168.0.1',
              'dns2': '192.168.0.2',
              'vlan': None,
              'host': None,
@@ -74,7 +74,7 @@ networks = [{'id': 0,
              'bridge_interface': 'fake_fa1',
              'gateway': '192.168.1.1',
              'broadcast': '192.168.1.255',
-             'dns': '192.168.0.1',
+             'dns1': '192.168.0.1',
              'dns2': '192.168.0.2',
              'vlan': None,
              'host': None,