x/quark
Code Issues Proposed changes

Fix PEP8 violations

Browse Source
This commit is contained in:
jmeridth
2013-06-21 15:32:12 +00:00
parent a93f2acdaa
commit 2147c9c53e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
quark/drivers/optimized_nvp_driver.py
View File

@@ -18,13 +18,14 @@ Optimized NVP client for Quark
""" """
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy import orm
from quark.db import models
from nvp_driver import NVPDriver from nvp_driver import NVPDriver
from quantum.openstack.common import log as logging from quantum.openstack.common import log as logging
from quark.db import models
from sqlalchemy import orm
LOG = logging.getLogger("quantum.quark.nvplib") LOG = logging.getLogger("quantum.quark.nvplib")
class OptimizedNVPDriver(NVPDriver): class OptimizedNVPDriver(NVPDriver):
def delete_network(self, context, network_id): def delete_network(self, context, network_id):
lswitches = self._lswitches_for_network(context, network_id) lswitches = self._lswitches_for_network(context, network_id)
@@ -143,6 +144,7 @@ class OptimizedNVPDriver(NVPDriver):
all() all()
return switches return switches
class LSwitchPort(models.BASEV2, models.HasId): class LSwitchPort(models.BASEV2, models.HasId):
__tablename__ = "quark_nvp_driver_lswitchport" __tablename__ = "quark_nvp_driver_lswitchport"
port_id = sa.Column(sa.String(36), nullable=False) port_id = sa.Column(sa.String(36), nullable=False)
@@ -150,6 +152,7 @@ class LSwitchPort(models.BASEV2, models.HasId):
sa.ForeignKey("quark_nvp_driver_lswitch.id"), sa.ForeignKey("quark_nvp_driver_lswitch.id"),
nullable=False) nullable=False)
class LSwitch(models.BASEV2, models.HasId): class LSwitch(models.BASEV2, models.HasId):
__tablename__ = "quark_nvp_driver_lswitch" __tablename__ = "quark_nvp_driver_lswitch"
nvp_id = sa.Column(sa.String(36), nullable=False) nvp_id = sa.Column(sa.String(36), nullable=False)

3
quark/tests/test_optimized_nvp_driver.py
View File

@@ -23,7 +23,8 @@ import quark.tests.test_nvp_driver as test_nvp_driver
class TestOptimizedNVPDriver(test_nvp_driver.TestNVPDriver): class TestOptimizedNVPDriver(test_nvp_driver.TestNVPDriver):
def setUp(self): def setUp(self):
if not hasattr(self, 'driver'): if not hasattr(self, 'driver'):
self.driver = quark.drivers.optimized_nvp_driver.OptimizedNVPDriver() self.driver = quark.drivers.optimized_nvp_driver.\
OptimizedNVPDriver()
super(TestOptimizedNVPDriver, self).setUp() super(TestOptimizedNVPDriver, self).setUp()
self.d_pkg = "quark.drivers.optimized_nvp_driver.OptimizedNVPDriver" self.d_pkg = "quark.drivers.optimized_nvp_driver.OptimizedNVPDriver"
self.context.session.add = mock.Mock(return_value=None) self.context.session.add = mock.Mock(return_value=None)