x/gantt
Code Issues Proposed changes

trunk merge and ec2 tests fixed

Browse Source
This commit is contained in:
Sandy Walsh
2011-06-09 16:16:55 -07:00
parent 2f93ff547f d89dda1e00
commit ea9bac0d8f
7 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Authors
View File

@@ -31,6 +31,7 @@ Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Hisaki Ohara <hisaki.ohara@intel.com> Hisaki Ohara <hisaki.ohara@intel.com>
Ilya Alekseyev <ialekseev@griddynamics.com> Ilya Alekseyev <ialekseev@griddynamics.com>
Isaku Yamahata <yamahata@valinux.co.jp> Isaku Yamahata <yamahata@valinux.co.jp>
Jason Cannavale <jason.cannavale@rackspace.com>
Jason Koelker <jason@koelker.net> Jason Koelker <jason@koelker.net>
Jay Pipes <jaypipes@gmail.com> Jay Pipes <jaypipes@gmail.com>
Jesse Andrews <anotherjesse@gmail.com> Jesse Andrews <anotherjesse@gmail.com>

2
nova/auth/ldapdriver.py
View File

@@ -139,7 +139,7 @@ class LdapDriver(object):
self.__cache = None self.__cache = None
return False return False
def __local_cache(key_fmt): def __local_cache(key_fmt): # pylint: disable=E0213
"""Wrap function to cache it's result in self.__cache. """Wrap function to cache it's result in self.__cache.
Works only with functions with one fixed argument. Works only with functions with one fixed argument.
""" """

1
nova/auth/novarc.template
View File

@@ -14,4 +14,5 @@ alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_P
alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}" alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
export NOVA_API_KEY="%(access)s" export NOVA_API_KEY="%(access)s"
export NOVA_USERNAME="%(user)s" export NOVA_USERNAME="%(user)s"
export NOVA_PROJECT_ID="%(project)s"
export NOVA_URL="%(os)s" export NOVA_URL="%(os)s"

4
nova/scheduler/manager.py
View File

@@ -89,8 +89,8 @@ class SchedulerManager(manager.Manager):
host = getattr(self.driver, driver_method)(elevated, *args, host = getattr(self.driver, driver_method)(elevated, *args,
**kwargs) **kwargs)
except AttributeError, e: except AttributeError, e:
LOG.exception(_("Driver Method %(driver_method)s missing: %(e)s") LOG.warning(_("Driver Method %(driver_method)s missing: %(e)s."
% locals()) "Reverting to schedule()") % locals())
host = self.driver.schedule(elevated, topic, *args, **kwargs) host = self.driver.schedule(elevated, topic, *args, **kwargs)
if not host: if not host:

2
nova/tests/test_vmwareapi.py
View File

@@ -69,7 +69,7 @@ class VMWareAPIVMTestCase(test.TestCase):
'instance_type': 'm1.large', 'instance_type': 'm1.large',
'mac_address': 'aa:bb:cc:dd:ee:ff', 'mac_address': 'aa:bb:cc:dd:ee:ff',
} }
self.instance = db.instance_create(values) self.instance = db.instance_create(None, values)
def _create_vm(self): def _create_vm(self):
"""Create and spawn the VM.""" """Create and spawn the VM."""

2
nova/tests/vmwareapi/db_fakes.py
View File

@@ -52,7 +52,7 @@ def stub_out_db_instance_api(stubs):
else: else:
raise NotImplementedError() raise NotImplementedError()
def fake_instance_create(values): def fake_instance_create(context, values):
"""Stubs out the db.instance_create method.""" """Stubs out the db.instance_create method."""
type_data = INSTANCE_TYPES[values['instance_type']] type_data = INSTANCE_TYPES[values['instance_type']]

14
run_tests.sh
View File

@@ -67,14 +67,11 @@ function run_pep8 {
srcfiles=`find bin -type f ! -name "nova.conf*"` srcfiles=`find bin -type f ! -name "nova.conf*"`
srcfiles+=" `find tools/*`" srcfiles+=" `find tools/*`"
srcfiles+=" nova setup.py plugins/xenserver/xenapi/etc/xapi.d/plugins/glance" srcfiles+=" nova setup.py plugins/xenserver/xenapi/etc/xapi.d/plugins/glance"
pep8 --repeat --show-pep8 --show-source --exclude=vcsversion.py ${srcfiles} # Just run PEP8 in current environment
${wrapper} pep8 --repeat --show-pep8 --show-source \
--exclude=vcsversion.py ${srcfiles}
} }
if [ $just_pep8 -eq 1 ]; then
run_pep8
exit
fi
NOSETESTS="python run_tests.py $noseargs" NOSETESTS="python run_tests.py $noseargs"
if [ $never_venv -eq 0 ] if [ $never_venv -eq 0 ]
@@ -103,6 +100,11 @@ then
fi fi
fi fi
if [ $just_pep8 -eq 1 ]; then
run_pep8
exit
fi
run_tests || exit run_tests || exit
# Also run pep8 if no options were provided. # Also run pep8 if no options were provided.