From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 13 Aug 2012 23:58:14 +0000 (+0000)
Subject: Merge "implementation for bug 1008180"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d562f6b67c189136d647485c612b497ce2ad3142;p=openstack-build%2Fneutron-build.git

Merge "implementation for bug 1008180"
---

d562f6b67c189136d647485c612b497ce2ad3142
diff --cc quantum/db/models_v2.py
index 32605af27,e93f99d14..6e9dc2045
--- a/quantum/db/models_v2.py
+++ b/quantum/db/models_v2.py
@@@ -96,9 -96,27 +96,28 @@@ class Port(model_base.BASEV2, HasId, Ha
      admin_state_up = sa.Column(sa.Boolean(), nullable=False)
      status = sa.Column(sa.String(16), nullable=False)
      device_id = sa.Column(sa.String(255), nullable=False)
 +    device_owner = sa.Column(sa.String(255), nullable=False)
  
  
+ class DNSNameServer(model_base.BASEV2):
+     """Internal representation of a DNS nameserver."""
+     address = sa.Column(sa.String(128), nullable=False, primary_key=True)
+     subnet_id = sa.Column(sa.String(36),
+                           sa.ForeignKey('subnets.id',
+                                         ondelete="CASCADE"),
+                           primary_key=True)
+ 
+ 
+ class Route(model_base.BASEV2):
+     """Represents a route for a subnet or port."""
+     destination = sa.Column(sa.String(64), nullable=False, primary_key=True)
+     nexthop = sa.Column(sa.String(64), nullable=False, primary_key=True)
+     subnet_id = sa.Column(sa.String(36),
+                           sa.ForeignKey('subnets.id',
+                                         ondelete="CASCADE"),
+                           primary_key=True)
+ 
+ 
  class Subnet(model_base.BASEV2, HasId, HasTenant):
      """Represents a quantum subnet.