Merge "implementation for bug 1008180"

diff --cc quantum/api/v2/attributes.py
Simple merge

diff --cc quantum/api/v2/base.py
Simple merge

diff --cc quantum/db/db_base_plugin_v2.py
Simple merge

diff --cc quantum/db/models_v2.py
index 32605af27e0ac3981322bbb015caa4ad2231d03b,e93f99d148f14a258494ad6cb3f03aa0d659db63..6e9dc20454d617897a76d97b01a695051d55120b
--- 1/quantum/db/models_v2.py
--- 2/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.
  

diff --cc quantum/tests/unit/test_db_plugin.py
Simple merge