x/quark
Code Issues Proposed changes

Now sharing the metadata from quantum correctly, and a little cleanup elsewhere

Browse Source
This commit is contained in:
Matt Dietz
2013-01-28 23:12:07 +00:00
parent 5dc4721e17
commit 4434e98d3e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
quark/db/models.py
View File

@@ -3,6 +3,7 @@ from sqlalchemy import orm
from sqlalchemy.ext import declarative
from quantum.db import model_base
from quantum.db import api as db_api
from quantum.db.models_v2 import HasTenant, HasId
@@ -15,11 +16,12 @@ class ModelBase(model_base.QuantumBase, CreatedAt):
def __tablename__(cls):
# NOTE(mdietz): This is to get around the models below already
# existing in the metadata by the time this plugin is loaded
if cls.__name__.endswith(["s", "S"]) :
if cls.__name__.lower().endswith('s'):
return "quark_%ses" % cls.__name__.lower()
return "quark_%ss" % cls.__name__.lower()
QuarkBase = declarative.declarative_base(cls=ModelBase)
QuarkBase = declarative.declarative_base(cls=ModelBase,
metadata=db_api.BASE.metadata)
# TODO(mdietz): discuss any IP reservation policies ala Melange with the nerds
@@ -105,7 +107,7 @@ class Subnet(QuarkBase, HasId, HasTenant):
class MacAddress(QuarkBase, HasTenant):
address = sa.Column(sa.Integer(), primary_key=True)
mac_address_range_id = sa.Column(sa.Integer(),
sa.ForeignKey("quark_mac_address_ranges.id"),
sa.ForeignKey("quark_macaddressranges.id"),
nullable=False)
@@ -121,7 +123,7 @@ class Port(QuarkBase, HasId, HasTenant):
# subnet_id = sa.Column(sa.String(36), sa.ForeignKey("subnets.id"),
# nulllable=False)
mac_address = sa.Column(sa.Integer(),
sa.ForeignKey("mac_adddresses.address"))
sa.ForeignKey("quark_macaddresses.address"))
# device is an ID pertaining to the entity utilizing the port. Could be
# an instance, a load balancer, or any other network capable object

1
quark/plugin.py
View File

@@ -226,7 +226,6 @@ class Plugin(quantum_plugin_base_v2.QuantumPluginBaseV2):
will be returned.
"""
query = context.session.query(models.Network)
network = query.filter(models.Network.id == id)
return self._make_network_dict(network)
def get_networks(self, context, filters=None, fields=None):