From fe0fed5fb26f6009c005fd7b32af95cb07ee38d9 Mon Sep 17 00:00:00 2001 From: rohitagarwalla Date: Wed, 17 Aug 2011 12:37:22 -0700 Subject: [PATCH] Fixed indentation and changed file comments --- quantum/plugins/cisco/db/l2network_db.py | 12 ++++++------ quantum/plugins/cisco/run_tests.py | 13 ++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/quantum/plugins/cisco/db/l2network_db.py b/quantum/plugins/cisco/db/l2network_db.py index 0c2907391..b2198c8eb 100644 --- a/quantum/plugins/cisco/db/l2network_db.py +++ b/quantum/plugins/cisco/db/l2network_db.py @@ -101,7 +101,7 @@ def delete_vlanid(vlan_id): session.flush() return vlanid except exc.NoResultFound: - pass + pass def reserve_vlanid(): @@ -173,7 +173,7 @@ def remove_vlan_binding(netid): session.flush() return binding except exc.NoResultFound: - pass + pass def update_vlan_binding(netid, newvlanid=None, newvlanname=None): @@ -245,10 +245,10 @@ def remove_portprofile(tenantid, ppid): session.flush() return pp except exc.NoResultFound: - pass + pass -def update_portprofile(tenantid, ppid, newppname=None, newvlanid=None, \ +def update_portprofile(tenantid, ppid, newppname=None, newvlanid=None, newqos=None): """Updates port profile""" session = db.get_session() @@ -322,10 +322,10 @@ def remove_pp_binding(tenantid, portid, ppid): session.flush() return binding except exc.NoResultFound: - pass + pass -def update_pp_binding(tenantid, ppid, newtenantid=None, newportid=None, \ +def update_pp_binding(tenantid, ppid, newtenantid=None, newportid=None, newdefault=None): """Updates port profile binding""" session = db.get_session() diff --git a/quantum/plugins/cisco/run_tests.py b/quantum/plugins/cisco/run_tests.py index 0b9d98f61..690e61ba8 100644 --- a/quantum/plugins/cisco/run_tests.py +++ b/quantum/plugins/cisco/run_tests.py @@ -17,7 +17,7 @@ # limitations under the License. -"""Unittest runner for quantum OVS plugin +"""Unittest runner for quantum Cisco plugin This file should be run from the top dir in the quantum directory @@ -28,22 +28,22 @@ To run all unit tests:: python quantum/plugins/cisco/run_tests.py quantum.plugins.cisco.tests.unit To run all functional tests:: - python quantum/plugins/openvswitch/run_tests.py functional + python quantum/plugins/cisco/run_tests.py functional To run a single unit test:: - python quantum/plugins/openvswitch/run_tests.py \ + python quantum/plugins/cisco/run_tests.py \ quantum.plugins.cisco.tests.unit.test_stores:TestSwiftBackend.test_get To run a single functional test:: - python quantum/plugins/openvswitch/run_tests.py \ + python quantum/plugins/cisco/run_tests.py \ quantum.plugins.cisco.tests.functional.test_service \ :TestController.test_create To run a single unit test module:: - python quantum/plugins/openvswitch/run_tests.py unit.test_stores + python quantum/plugins/cisco/run_tests.py unit.test_stores To run a single functional test module:: - python quantum/plugins/openvswitch/run_tests.py functional.test_stores + python quantum/plugins/cisco/run_tests.py functional.test_stores """ import gettext @@ -57,7 +57,6 @@ from nose import config sys.path.append(os.getcwd()) from quantum.common.test_lib import run_tests, test_config -#from quantum.plugins.openvswitch.tests.test_vlan_map import VlanMapTest if __name__ == '__main__': exit_status = False -- 2.45.2