x/vmware-nsx
Code Issues Proposed changes

Making a check for the presence of UCS/Nexus plugin (earlier it was not in certain cases). With this change, if the UCS/Nexus plugins are not enabled, the core API tests can be run even on Ubuntu (and RHEL without the requirement of any specific network hardware).

Browse Source
This commit is contained in:
Sumit Naiksatam
2011-08-08 11:54:19 -07:00
parent fce016efbe
commit 115a5c6b80
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
quantum/plugins/cisco/README
View File

@@ -60,9 +60,9 @@ mysql -uroot -p<mysql_password_here> nova -e 'create table ports (port_id VARCHA
** Execute the Test cases
* The unit tests are located at quantum/plugins/cisco/tests/unit. They are executed from quantum/plugins/cisco/ using the runtests.py script. (Note that to execute the test cases one currently requires the environment setup as outlined in the pre-requisites.)
* Execution of the runtests.py script.
* Execution of the run_tests.py script.
All unit tests
python runtests.py unit
python run_tests.py unit
Specific Plugin unit test
python runtests.py unit.<name_of_the file>
e.g. python run_tests.py unit.test_coreApi
python run_tests.py unit.<name_of_the file>
e.g. python run_tests.py unit.test_l2networkApi

10
quantum/plugins/cisco/l2network_model.py
View File

@@ -47,12 +47,14 @@ class L2NetworkModel(L2NetworkModelBase):
getattr(pluginObjRef, function_name)(*args, **kwargs)
def _invokeUCSPlugin(self, function_name, args, kwargs):
getattr(self._plugins[const.UCS_PLUGIN],
function_name)(*args, **kwargs)
if const.UCS_PLUGIN in self._plugins.keys():
getattr(self._plugins[const.UCS_PLUGIN],
function_name)(*args, **kwargs)
def _invokeNexusPlugin(self, function_name, args, kwargs):
getattr(self._plugins[const.NEXUS_PLUGIN],
function_name)(*args, **kwargs)
if const.NEXUS_PLUGIN in self._plugins.keys():
getattr(self._plugins[const.NEXUS_PLUGIN],
function_name)(*args, **kwargs)
def get_all_networks(self, args):
pass