From b425aa0c49aba5d52250d3b7d0cd282464a32141 Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Fri, 10 Jun 2011 14:57:02 -0500 Subject: misc argument alterations --- nova/compute/api.py | 3 +-- nova/db/sqlalchemy/models.py | 28 ++++++++++++++-------------- nova/network/manager.py | 2 +- nova/tests/__init__.py | 6 ++++-- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/nova/compute/api.py b/nova/compute/api.py index d366d96eb..2a2dc6f0e 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -216,8 +216,7 @@ class API(base.Base): groups, MAC address, etc). This will called by create() in the majority of situations, but all-at-once style Schedulers may initiate the call.""" - instance = dict(mac_address=utils.generate_mac(), - launch_index=num, + instance = dict(launch_index=num, **base_options) instance = self.db.instance_create(context, instance) instance_id = instance['id'] diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index d44a91209..9455ed95a 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -517,6 +517,20 @@ class Network(BASE, NovaBase): host = Column(String(255)) # , ForeignKey('hosts.id')) +class VirtualInterface(BASE, NovaBase): + """Represents a virtual interface on an instance""" + __tablename__ = 'virtual_interfaces' + id = Column(Integer, primary_key=True) + address = Column(String(255), unique=True) + network_id = Column(Integer, ForeignKey('networks.id'), nullable=False) + network = relationship(Network, backref=backref('virtual_interfaces')) + port_id = Column(String(255), unique=True, nullable=True) + + # TODO(tr3buchet): cut the cord, removed foreign key and backrefs + instance_id = Column(Integer, ForeignKey('instances.id'), nullable=False) + instance = relationship(Instance, backref=backref('virtual_interfaces')) + + # TODO(vish): can these both come from the same baseclass? class FixedIp(BASE, NovaBase): """Represents a fixed ip for an instance.""" @@ -558,20 +572,6 @@ class FloatingIp(BASE, NovaBase): auto_assigned = Column(Boolean, default=False, nullable=False) -class VirtualInterface(BASE, NovaBase): - """Represents a virtual interface on an instance""" - __tablename__ = 'virtual_interfaces' - id = Column(Integer, primary_key=True) - address = Column(String(255), unique=True) - network_id = Column(Integer, ForeignKey('networks.id'), nullable=False) - network = relationship(Network, backref=backref('virtual_interfaces')) - port_id = Column(String(255), unique=True, nullable=True) - - # TODO(tr3buchet): cut the cord, removed foreign key and backrefs - instance_id = Column(Integer, ForeignKey('instances.id'), nullable=False) - instance = relationship(Instance, backref=backref('virtual_interfaces')) - - class AuthToken(BASE, NovaBase): """Represents an authorization token for all API transactions. diff --git a/nova/network/manager.py b/nova/network/manager.py index f3111fb9c..889cfa59c 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -535,7 +535,7 @@ class NetworkManager(manager.SchedulerDependentManager): def create_networks(self, context, label, cidr, num_networks, network_size, cidr_v6, gateway_v6, bridge, - bridge_interface, *args, **kwargs): + bridge_interface, **kwargs): """Create networks based on parameters.""" fixed_net = IPy.IP(cidr) fixed_net_v6 = IPy.IP(cidr_v6) diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py index 4a2ef830e..b2a0564d4 100644 --- a/nova/tests/__init__.py +++ b/nova/tests/__init__.py @@ -56,11 +56,13 @@ def setup(): ctxt = context.get_admin_context() network = network_manager.VlanManager() bridge_interface = FLAGS.flat_interface or FLAGS.vlan_interface - network.create_networks(ctxt, cidr=FLAGS.fixed_range, + network.create_networks(ctxt, + label='test', + cidr=FLAGS.fixed_range, num_networks=FLAGS.num_networks, network_size=FLAGS.network_size, cidr_v6=FLAGS.fixed_range_v6, - label='test', + gateway_v6=FLAGS.gateway_v6 bridge=FLAGS.flat_network_bridge, bridge_interface=bridge_interface, vpn_start=FLAGS.vpn_start, -- cgit