linux bridge fixes following v1 code removal.

Change-Id: I4ad84421757db271904c8704a12b2e7abdfa8a0e

diff --git a/quantum/api/api_common.py b/quantum/api/api_common.py
index 8debe36f49e210e49dd5bdfa926de9f84f3da454..8f54d353796ded64e586f168001961dd1585da92 100644 (file)
--- a/quantum/api/api_common.py
+++ b/quantum/api/api_common.py
@@ -19,12 +19,15 @@ import logging
 
 from webob import exc
 
-from quantum.api import faults
 from quantum import wsgi
 
 
 LOG = logging.getLogger(__name__)
 
+# Port Status
+PORT_STATUS_UP = "UP"
+PORT_STATUS_DOWN = "DOWN"
+
 
 class QuantumController(object):
     """ Base controller class for Quantum API """

diff --git a/quantum/plugins/linuxbridge/db/l2network_db.py b/quantum/plugins/linuxbridge/db/l2network_db.py
index 25c3aa02f6dfda631d7f680a7c2998356a3f69e8..498fdcb633bdd721065577ecb067701ae8b06670 100644 (file)
--- a/quantum/plugins/linuxbridge/db/l2network_db.py
+++ b/quantum/plugins/linuxbridge/db/l2network_db.py
@@ -303,7 +303,7 @@ def set_port_status(port_id, status):
     try:
         port = session.query(models_v2.Port).filter_by(id=port_id).one()
         port['status'] = status
-        if status == api_common.OperationalStatus.DOWN:
+        if status == api_common.PORT_STATUS_DOWN:
             port['device_id'] = ''
         session.merge(port)
         session.flush()

diff --git a/quantum/plugins/linuxbridge/lb_quantum_plugin.py b/quantum/plugins/linuxbridge/lb_quantum_plugin.py
index 13aaa7d154618d2803bfbe9445d80b4d6cbbdd88..1b0507c8d57788e2295c1343a0e3611b85494cfb 100644 (file)
--- a/quantum/plugins/linuxbridge/lb_quantum_plugin.py
+++ b/quantum/plugins/linuxbridge/lb_quantum_plugin.py
@@ -64,7 +64,7 @@ class LinuxBridgeRpcCallbacks():
                      'port_id': port['id'],
                      'admin_state_up': port['admin_state_up']}
             # Set the port status to UP
-            cdb.set_port_status(port['id'], api_common.OperationalStatus.UP)
+            cdb.set_port_status(port['id'], api_common.PORT_STATUS_UP)
         else:
             entry = {'device': device}
             LOG.debug("%s can not be found in database", device)
@@ -81,7 +81,7 @@ class LinuxBridgeRpcCallbacks():
             entry = {'device': device,
                      'exists': True}
             # Set port status to DOWN
-            cdb.set_port_status(port['id'], api_common.OperationalStatus.DOWN)
+            cdb.set_port_status(port['id'], api_common.PORT_STATUS_UP)
         else:
             entry = {'device': device,
                      'exists': False}