From: rohitagarwalla Date: Fri, 12 Aug 2011 17:52:05 +0000 (-0700) Subject: pep8 errors fixed X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=61799587695d2d87d2e59d2a9b5a118b19c341bc;p=openstack-build%2Fneutron-build.git pep8 errors fixed --- diff --git a/quantum/plugins/cisco/db/api.py b/quantum/plugins/cisco/db/api.py index 509583a1d..fc9a69ea2 100644 --- a/quantum/plugins/cisco/db/api.py +++ b/quantum/plugins/cisco/db/api.py @@ -251,4 +251,3 @@ def port_destroy(net_id, port_id): return port except exc.NoResultFound: raise q_exc.PortNotFound(port_id=port_id) - diff --git a/quantum/plugins/cisco/db/l2network_db.py b/quantum/plugins/cisco/db/l2network_db.py index a25179184..b11c65677 100644 --- a/quantum/plugins/cisco/db/l2network_db.py +++ b/quantum/plugins/cisco/db/l2network_db.py @@ -16,7 +16,6 @@ # @author: Rohit Agarwalla, Cisco Systems, Inc. import ConfigParser -from optparse import OptionParser import os import logging as LOG @@ -62,6 +61,7 @@ def initialize(configfile=None): DB_PASS, DB_HOST, DB_NAME)} db.configure_db(options) + def create_vlanids(): """Prepopulates the vlan_bindings table""" session = db.get_session() @@ -77,7 +77,8 @@ def create_vlanids(): session.add(vlanid) start += 1 session.flush() - return + return + def get_all_vlanids(): session = db.get_session() @@ -86,8 +87,9 @@ def get_all_vlanids(): all() return vlanids except exc.NoResultFound: - return [] - + return [] + + def is_vlanid_used(vlan_id): session = db.get_session() try: @@ -97,7 +99,8 @@ def is_vlanid_used(vlan_id): return vlanid["vlan_used"] except exc.NoResultFound: raise Exception("No vlan found with vlan-id = %s" % vlan_id) - + + def release_vlanid(vlan_id): session = db.get_session() try: @@ -110,8 +113,8 @@ def release_vlanid(vlan_id): return vlanid["vlan_used"] except exc.NoResultFound: raise Exception("Vlan id %s not present in table" % vlan_id) - - return + return + def delete_vlanid(vlan_id): session = db.get_session() @@ -124,7 +127,8 @@ def delete_vlanid(vlan_id): return vlanid except exc.NoResultFound: pass - + + def reserve_vlanid(): session = db.get_session() try: @@ -141,7 +145,8 @@ def reserve_vlanid(): return vlanids[0]["vlan_id"] except exc.NoResultFound: raise Exception("All vlan id's are used") - + + def get_all_vlan_bindings(): """Lists all the vlan to network associations""" session = db.get_session() diff --git a/quantum/plugins/cisco/db/l2network_models.py b/quantum/plugins/cisco/db/l2network_models.py index a53c4205a..d04f7dd6f 100644 --- a/quantum/plugins/cisco/db/l2network_models.py +++ b/quantum/plugins/cisco/db/l2network_models.py @@ -60,6 +60,7 @@ class L2NetworkBase(object): local.update(joined) return local.iteritems() + class VlanID(BASE, L2NetworkBase): """Represents a vlan_id usage""" __tablename__ = 'vlan_ids' @@ -74,7 +75,7 @@ class VlanID(BASE, L2NetworkBase): def __repr__(self): return "" % \ (self.vlan_id, self.vlan_used) - + class VlanBinding(BASE, L2NetworkBase): """Represents a binding of vlan_id to network_id"""