John Griffith [Mon, 18 Aug 2014 21:52:29 +0000 (15:52 -0600)]
Provide a quick way to run flake8
"run_tests.sh -p" always checks every file for errors even though you
have probably only changed a handful. This patch adds "run_tests.sh -8"
which only checks the files that were modified in the HEAD commit or
the current working tree.
Copied from Matthew's work in Nova here:
https://review.openstack.org/#/c/110746/15
Change-Id: I84f6a522da5352a703caa59975643043ec1911fe
Co-Authored-By: Matthew Gilliard <matthew.gilliard@gmail.com>
Jenkins [Mon, 18 Aug 2014 19:12:33 +0000 (19:12 +0000)]
Merge "Change the froce delete volume flage to True"
Jenkins [Mon, 18 Aug 2014 18:22:35 +0000 (18:22 +0000)]
Merge "Fix LOG string formatting in image_utils"
Jenkins [Mon, 18 Aug 2014 11:38:32 +0000 (11:38 +0000)]
Merge "VMware: Update default task_poll_interval value"
Jenkins [Mon, 18 Aug 2014 07:26:04 +0000 (07:26 +0000)]
Merge "Add iSCSI Target objects as independent objects"
Jenkins [Mon, 18 Aug 2014 07:07:00 +0000 (07:07 +0000)]
Merge "fix atom link in XML Version API"
Jenkins [Mon, 18 Aug 2014 02:41:34 +0000 (02:41 +0000)]
Merge "Catch vol not found in SolidFire transfer"
Jenkins [Sun, 17 Aug 2014 20:01:33 +0000 (20:01 +0000)]
Merge "Catch DBDuplicateEntry instead of IntegrityError"
Jenkins [Sun, 17 Aug 2014 19:57:34 +0000 (19:57 +0000)]
Merge "Put result in quotes"
John Griffith [Fri, 15 Aug 2014 23:26:15 +0000 (17:26 -0600)]
Catch vol not found in SolidFire transfer
The accept_transfer call in SolidFire wasn't catching
the volume_not found exception like it should be (and
like other methods do).
This patch just adds a check for volume is None on the
get_volume call during accept_transfer and raises an
appropriate exception if we run into that case.
While we're at it, add some more detail to the "NotFound"
error messages to include the driver operation as per
request of reviewers.
Change-Id: Ie6b56953028865eb06ebdaae3416339b8a371351
Closes-Bug: #
1357261
John Griffith [Sat, 16 Aug 2014 15:11:54 +0000 (15:11 +0000)]
Fix LOG string formatting in image_utils
My recent change to report stats on image fetch and
conversion used an incorrectly formatted log message.
The result is Trace messages with Key errors in the c-vol
log files.
This change fixes those messages and gets rid of the key error
exception messages in the Logs.
Change-Id: Id8377dd7761d93fd854f5f7871c997418c6e4554
Closes-Bug:
1357726
Rick Chen [Sat, 16 Aug 2014 03:56:01 +0000 (11:56 +0800)]
Change the froce delete volume flage to True
The ProphetStor storage volume unable to remove if this has
assignee on other service or application. We make sure the volume
created by the cinder, and the cinder has the privileges to delete
volume.
Change-Id: I06fa7097f4c2320c346e286b0e0fc73ada1c7f8e
Closes-Bug:
1357629
Jenkins [Sat, 16 Aug 2014 15:34:13 +0000 (15:34 +0000)]
Merge "Update ref used for notifications"
Jenkins [Sat, 16 Aug 2014 07:04:23 +0000 (07:04 +0000)]
Merge "Use abstract class for the backup driver interface"
Jenkins [Sat, 16 Aug 2014 04:48:35 +0000 (04:48 +0000)]
Merge "Ignore HTTP_PROXY during test requests"
Jenkins [Sat, 16 Aug 2014 04:47:42 +0000 (04:47 +0000)]
Merge "Fixes wrong usage of mock.assert_not_called()"
John Griffith [Tue, 29 Jul 2014 13:37:07 +0000 (07:37 -0600)]
Update ref used for notifications
When we update a volume status in the db, we need to
use the newly updated volume-ref object in the following
notification method call. Otherwise we're sending a
notification message with the old/outdated status
information.
Change-Id: I4d92b340cf5e20aaa885377dfb6bd6fc4ed87d69
Closes-Bug: #
1349808
John Griffith [Thu, 10 Jul 2014 00:00:31 +0000 (00:00 +0000)]
Add iSCSI Target objects as independent objects
This patch is a step in decoupling the target
methods and the Volume Driver's Control methods.
This adds the targets directory and the new target objects
that we use with the exception of IET (follow up for that later).
TgtAdm and LIO drivers have been tested with the new LVM object.
All existing drivers are still able to be specified and use the
same objects and code-path they were using previously. New
connector objects are only used when specifying the new driver.
Next step will be mapping current ref LVM driver to the new
LVM object and target model and working on the unit-tests.
After that mark the "old" methods and objects as deprecated
and we can then begin working on some other improvements.
Partial-Bug: #
1329139
Change-Id: Iaa55e31e3dadc7dcb58112302c3807a8f92bcada
Jenkins [Fri, 15 Aug 2014 18:59:39 +0000 (18:59 +0000)]
Merge "Implement import/export for SolidFire Driver"
Marc Koderer [Tue, 22 Jul 2014 11:53:45 +0000 (13:53 +0200)]
Use abstract class for the backup driver interface
Instead of using NotImplementedError exceptions to define the interface
it's better to use python abc class [1]. The advantage that it fails
faster if a class doesn't implement the needed interface.
See also [2].
[1]: http://legacy.python.org/dev/peps/pep-3119/
[2]: http://dbader.org/blog/abstract-base-classes-in-python
Change-Id: I625a73f70ac5c6ca68ee38a70c98d999454a817e
Partial-Bug: #
1346797
Joshua Harlow [Fri, 15 Aug 2014 00:02:32 +0000 (17:02 -0700)]
Put result in quotes
When a result is the empty string is is hard/confusing
to look at the logs and determine what the task result
was, to avoid this put the result in quotes so that it
is clear in the log message what is the result and what
is not.
Change-Id: I6f9c30e30999dcd8d7f0df26f8066d9f392fe1b9
Jenkins [Thu, 14 Aug 2014 20:21:10 +0000 (20:21 +0000)]
Merge "Fix unit test test_import_record_with_verify"
Jenkins [Thu, 14 Aug 2014 17:09:37 +0000 (17:09 +0000)]
Merge "Sync latest oslo-incubator log for debug fixes"
Ivan Kolodyazhny [Mon, 4 Aug 2014 15:16:10 +0000 (18:16 +0300)]
Catch DBDuplicateEntry instead of IntegrityError
'iscsi_target_create_safe' method didn't catch DB exceptions
correct.
Need to catch both db_exc.DBError and db_exc.DBDuplicateEntry
due to current oslo.db limitations: it doesn't handle correct
DBDuplicateEntry with different SQLite versions
Related-Bug: #
1187367
Change-Id: Ie412ecabd3cbcac301340c82b4275adb7a7206c3
Jenkins [Thu, 14 Aug 2014 07:59:47 +0000 (07:59 +0000)]
Merge "Enable import group hacking rule"
Jenkins [Thu, 14 Aug 2014 06:26:40 +0000 (06:26 +0000)]
Merge "VMware: Check snapshot and rename backing"
Zhiteng Huang [Fri, 27 Jun 2014 10:32:01 +0000 (18:32 +0800)]
Enable import group hacking rule
This change enables H305, H307 included in newly updated hacking 0.9
all violations are fixed.
H305, H307 will check if imports are grouped in stdlib, 3rd libs and
OpenStack components.
Change-Id: I612cae64982450a9be5207dbe26a2b52da49dac6
Jenkins [Thu, 14 Aug 2014 04:40:59 +0000 (04:40 +0000)]
Merge "Actually encode the SolidFire json dump result"
Jenkins [Thu, 14 Aug 2014 01:03:10 +0000 (01:03 +0000)]
Merge "Enable F402 checks and fix violations"
John Griffith [Wed, 13 Aug 2014 21:25:49 +0000 (15:25 -0600)]
Actually encode the SolidFire json dump result
The SolidFire driver intends to do a encode on the json data to utf-8,
unfortunatly it's not really doing anything because the syntax of the
calls is wrong.
This patch changes things to actually perform the encoding.
Change-Id: I2bc94ed1fdc1dd5f9a6371ae5f63a955f213bc15
Closes-Bug: #
1355622
Jay S. Bryant [Wed, 13 Aug 2014 17:16:49 +0000 (12:16 -0500)]
Sync latest oslo-incubator log for debug fixes
This patch pulls in the changes in openstack/common/log.py that
fix the problems that popped up after we removed _() from
around LOG.debug messages. The change in log ensures that any
text that is not of six.text_type is converted to six.text_type.
Current HEAD in OSLO:
---------------------
commit
759bd8791ec6a4b0e89f649a4179d177530e7536
Merge:
71d072f 631f880
Author: Jenkins <jenkins@review.openstack.org>
Date: Wed Aug 13 13:37:27 2014 +0000
Merge "Set keystonemiddleware and routes.middleware to log on WARN level"
---------------------
Additional changes being merged (newest to oldest):
---------------------
759bd879 -
Merge "Set keystonemiddleware and routes.middleware to log on WARN level
71d072f1 -
Merge "Except socket.error if syslog isn't running"
37c00918 -
Add unicode coercion of logged messages to ContextFormatter
66144135 -
Correct coercion of logged message to unicode
1188d88a -
Except socket.error if syslog isn't running
ac995bec -
Fix E126 pep8 errors
Note that this change required an update to config.sample due to change
759bd879 - Merge "Set keystonemiddleware and routes.middleware to log
on WARN level"
Change-Id: I4b849981c65300b327076d68fbf8601d46ec61f0
Closes-Bug:
1348244
Jenkins [Wed, 13 Aug 2014 19:30:28 +0000 (19:30 +0000)]
Merge "Make manage.py usable"
Jenkins [Wed, 13 Aug 2014 18:38:24 +0000 (18:38 +0000)]
Merge "Fix bad indentation in netapp and san.hp volume drivers"
Jenkins [Wed, 13 Aug 2014 18:37:55 +0000 (18:37 +0000)]
Merge "Add timer info for copy operations"
Zhiteng Huang [Wed, 30 Jul 2014 04:44:05 +0000 (12:44 +0800)]
Enable F402 checks and fix violations
This change enables F402 hacking check and fixes all violations found.
[F402] import module from line N shadowed by loop variable
Basically this rule tries to avoid loop variables using the same name as
imported module, for example:
from cinder import volume
...
for volume in volumes:
...
Change-Id: Ie3010616ca87fda113d452fe684e6cff3d5fd978
Vipin Balachandran [Fri, 8 Aug 2014 05:23:02 +0000 (10:53 +0530)]
VMware: Check snapshot and rename backing
This patch adds methods for: a) checking existence of backing VM snapshots;
and b) rename backing.
Change-Id: Iede168e28d9569a5a3331479c8096c3cca5140e9
Partial-Bug: #
1275682
Implements: blueprint vmdk-backup
Danny Al-Gaaf [Wed, 13 Aug 2014 07:49:06 +0000 (09:49 +0200)]
Fix bad indentation in netapp and san.hp volume drivers
Closes-Bug: #
1356223
Change-Id: I4e9fb3c6b3e098998f41e266b2cfc51a4af1fc65
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Angus Lees [Wed, 13 Aug 2014 02:13:48 +0000 (12:13 +1000)]
Ignore HTTP_PROXY during test requests
urllib2 follows http_proxy/HTTP_PROXY by default. If a (non-local)
proxy is set and a test tries to connect to localhost:$port, it will
instead attempt to connect to $port on the proxy and (presumably) fail.
This change forces the two tests that failed in the presence of
HTTP_PROXY to connect directly.
Change-Id: Ia12c91b356f0ccebf874933ff459aa2faa190655
Angus Lees [Wed, 13 Aug 2014 01:59:18 +0000 (11:59 +1000)]
Issue one SQL statement per execute() call
Some sqlalchemy drivers don't support multiple SQL statements in a
single execute() call. The sqlalchemy author has confirmed that one
statement per execute() is the intended API.
Change-Id: I527780765371dcc9645a721d60ed9ac67ddde29f
Jenkins [Tue, 12 Aug 2014 19:15:29 +0000 (19:15 +0000)]
Merge "Add ProphetStor DPL Storage server volume driver for Cinder"
Rick Chen [Mon, 11 Aug 2014 02:55:28 +0000 (10:55 +0800)]
Add ProphetStor DPL Storage server volume driver for Cinder
ProphetStor DPL Storage server enables x86 commodity hardware as
enterprise-grade storage systems.
*[2014/07/14] Remove roll-back function.
*[2014/07/16] Add decorate fiber zone manage utils in initialize_connection and
terminate_connection.
Use mock instead of mox in tests.
*[2014/07/21] Update cinder volume certification report.
*[2014/07/29] Openstack continuous integration platform test.
Retry: 27
*[2014/07/31] Rebase
*[2014/08/06] Refine code
*[2014/08/11] Rebase and enhance to support thin/thick volume
Implements: blueprint prophetstor-dpl-driver
cinder-cert-results: https://bugs.launchpad.net/cinder/+bug/
1354066
Change-Id: Iced5e45362aef4286bb7f1c848ab7cb3573b5c02
John Griffith [Thu, 7 Aug 2014 04:17:44 +0000 (22:17 -0600)]
Add timer info for copy operations
This is just an add of some useful info to monitor
how much time we spend on various operations during
clear volume and copy image_to_volume.
Change-Id: Ie9d199769e63f5a91270e3fc2e5f58766d1bd41c
Jenkins [Mon, 11 Aug 2014 22:33:32 +0000 (22:33 +0000)]
Merge "Enable Swift backup driver for auth 2.0"
Jenkins [Mon, 11 Aug 2014 17:43:36 +0000 (17:43 +0000)]
Merge "Enable H104, F841 hacking rule and fix violations"
Jenkins [Mon, 11 Aug 2014 16:53:07 +0000 (16:53 +0000)]
Merge "Update help strings"
Mathieu Gagné [Thu, 7 Aug 2014 23:21:49 +0000 (19:21 -0400)]
Make manage.py usable
It's not possible to use manage.py in its current state due to
an exception thrown by oslo.config:
oslo.config.cfg.ArgsAlreadyParsedError:
arguments already parsed: cannot register CLI option
This exception is a side-effect of including
cinder.openstack.common.logging in most of the migration scripts.
This change therefore suggests removing oslo.config and other imports
from manage.py to make it usable again.
It is now possible to use manage.py:
tox -evenv -- python cinder/db/sqlalchemy/migrate_repo/manage.py \
version_control --url=sqlite:///./cinder.db
tox -evenv -- python cinder/db/sqlalchemy/migrate_repo/manage.py \
upgrade --url=sqlite:///./cinder.db
Closes-bug: #
1355297
Change-Id: I843cfa9a4e4758a6bc8e5c04f064e9d3107b01fa
Jenkins [Mon, 11 Aug 2014 16:08:07 +0000 (16:08 +0000)]
Merge "Do not translate debug messages"
Zhiteng Huang [Wed, 30 Jul 2014 06:06:37 +0000 (14:06 +0800)]
Enable H104, F841 hacking rule and fix violations
This change enables hacking check H104 and F841, and fixes all
violations.
[H104] Files with no code shouldn’t contain any license header nor
comments, and must be left completely empty.
[F841] local variable name is assigned to but never used
Change-Id: If7fcb737d121fd13b2b103d63f5f26dfaa79c59b
Ronen Kat [Thu, 7 Aug 2014 14:00:53 +0000 (17:00 +0300)]
Enable Swift backup driver for auth 2.0
This patch adds support for Swift auth 2.0 to the cinder-backup
Swift driver.
DocImpact
Change-Id: I99585661792420e363b5259c9ed45a853a939a74
Closes-Bug: #
1354801
Jay S. Bryant [Sun, 3 Aug 2014 17:46:45 +0000 (12:46 -0500)]
Updated HACKING.rst so that it is accurate
We haven't been very good at enforcing putting new hacking checks
into HACKING.rst. This change brings the file up to date.
Change-Id: I95ef533d031d333da5615ead997b54c6506c2c2a
Jenkins [Sat, 9 Aug 2014 18:46:35 +0000 (18:46 +0000)]
Merge "Add hacking check for use of LOG.audit"
Andreas Jaeger [Mon, 21 Jul 2014 19:42:14 +0000 (21:42 +0200)]
Update help strings
Fix capitalization of help strings to make help strings consistent.
Change-Id: I04341c31cbb21b01229916cef7bc8ccb199614a2
Jenkins [Sat, 9 Aug 2014 15:57:53 +0000 (15:57 +0000)]
Merge "Update ref used for notifications"
Jenkins [Sat, 9 Aug 2014 15:57:45 +0000 (15:57 +0000)]
Merge "Fix snapshot id for snapshot_destroy"
Jay S. Bryant [Fri, 1 Aug 2014 20:43:51 +0000 (15:43 -0500)]
Add hacking check for use of LOG.audit
Commit
4dc37abc removes the few instances of LOG.audit that
were in Cinder. Given that the plan is to remove LOG.audit messages
from OpenStack, I am adding this hacking check to ensure that such
messages do not sneak their way back into Cinder.
Unit tests are included with this change.
Change-Id: Icc416a68f958f60260f1c55af0d8605c95913bf1
Jenkins [Sat, 9 Aug 2014 15:05:17 +0000 (15:05 +0000)]
Merge "Imported Translations from Transifex"
Jenkins [Sat, 9 Aug 2014 15:04:13 +0000 (15:04 +0000)]
Merge "Use oslo.i18n"
OpenStack Proposal Bot [Sat, 9 Aug 2014 06:08:19 +0000 (06:08 +0000)]
Imported Translations from Transifex
Change-Id: I39d60d1cc7d6c37455852de24356e3e262da8a86
Jenkins [Sat, 9 Aug 2014 02:30:37 +0000 (02:30 +0000)]
Merge "VMware: Volume from non-streamOptimized image"
Jenkins [Sat, 9 Aug 2014 01:07:45 +0000 (01:07 +0000)]
Merge "Enable checks for E711, E712 and E713"
Jenkins [Sat, 9 Aug 2014 00:48:49 +0000 (00:48 +0000)]
Merge "Add CHAP support for 3PAR ISCSI"
Jenkins [Sat, 9 Aug 2014 00:26:05 +0000 (00:26 +0000)]
Merge "EMC: Fix minor issue in VNX driver and unit tests"
James Carey [Thu, 7 Aug 2014 04:45:39 +0000 (04:45 +0000)]
Use oslo.i18n
oslo.i18n provides the i18n function that were provided by
oslo-incubator's gettextutils module.
Change-Id: I1f361a8321fb02f03b4f3f3e2ef688fcf19514a3
Jenkins [Fri, 8 Aug 2014 19:15:46 +0000 (19:15 +0000)]
Merge "Improve regex for _ import hacking check"
Anthony Lee [Tue, 22 Jul 2014 18:40:21 +0000 (11:40 -0700)]
Add CHAP support for 3PAR ISCSI
Adds CHAP support to 3PAR ISCSI. Volume metadata will store
CHAP credentials to allow volumes to be attached to hosts on
a 3PAR backend. Credentials are generated when the first volume
is attached. Subsequent volumes lookup the CHAP credentials
from an existing volume already attached to the host.
Implements: blueprint add-chap-support-3par-iscsi
DocImpact
Change-Id: I45d77c4243339e8fc76969042634c6c45899fbae
Jenkins [Fri, 8 Aug 2014 11:11:56 +0000 (11:11 +0000)]
Merge "Fixing LeftHand live migration error"
Jeegn Chen [Fri, 8 Aug 2014 08:27:38 +0000 (16:27 +0800)]
EMC: Fix minor issue in VNX driver and unit tests
There were some minor issues in initial commit of VNX Direct Driver
Juno Update (https://review.openstack.org/#/c/104413/), such as typo,
unclear config option help message and missing period.
This change fix these issues.
Change-Id: I82bac9695c8138cff858013b3affeb0557dfcc02
Closes-Bug: #
1354272
Jenkins [Fri, 8 Aug 2014 10:52:06 +0000 (10:52 +0000)]
Merge "VMware:Disk type conversion during clone backing"
Jenkins [Fri, 8 Aug 2014 10:51:57 +0000 (10:51 +0000)]
Merge "VMware:Support for attaching disk to backing"
Thang Pham [Thu, 7 Aug 2014 21:41:11 +0000 (17:41 -0400)]
Do not translate debug messages
LOG.debug messages do not need to be translated. The rdb driver
has a couple of debug messages that are translated. This patch
removes those debug translations.
Also, logging exception.ImageUnacceptable can contain non-ascii
characters. This patch fixes this by using six.text_type to
properly translate the exception.
Change-Id: I4ed36173f42b7bf487463f148ae94bd061f6bebb
Jenkins [Fri, 8 Aug 2014 01:08:18 +0000 (01:08 +0000)]
Merge "General cleanup of unused objects"
Jenkins [Thu, 7 Aug 2014 21:48:46 +0000 (21:48 +0000)]
Merge "RPC client lazy initialization"
Anthony Lee [Thu, 7 Aug 2014 20:58:34 +0000 (13:58 -0700)]
Fixing LeftHand live migration error
Fixed a bug in the LeftHand driver that was causing an error to occur during
live migration of an instance that is attached to a volume. The solution was
to make sure server access is only requested for a volume if the iSCSI
session doesn't already have access enabled on the LeftHand backend.
Change-Id: I41046beb66f2a6138659ec3e4d1d3f37b37859b8
Closes-Bug:
1311350
Jay S. Bryant [Sat, 2 Aug 2014 23:06:38 +0000 (18:06 -0500)]
Improve regex for _ import hacking check
Commit
3e2b1117 added a check to make sure that the _
function was being explicitly imported so that translation would
work properly.
I have discovered that those regexes/code would not work in some cases.
Particularly if the import line imported multiple things from
gettextutils or i18n. Also the check being used to find lines using
the _ function was not right.
This commit fixes the issues and adds appropriate tests. It also
adds the hacking check to HACKING.rst which should have been done the
first time around.
Change-Id: I7227bb0051836e537bff2f0f97662c06452d5af6
Wu Wenxiang [Sun, 2 Mar 2014 14:20:49 +0000 (22:20 +0800)]
General cleanup of unused objects
* Remove unused function fake_get_remote_image_service
* Remove unused local function fake_execute2
* stub_out_key_pair_funcs() does nothing, remove it.
* Removed usage of enumerate()
Closes-Bug: #
1286714
Closes-Bug: #
1286712
Closes-Bug: #
1286742
Closes-Bug: #
1286809
Change-Id: I76413c886f6903df2adcf4a4ceb8990486a2ff2f
Jenkins [Thu, 7 Aug 2014 08:51:51 +0000 (08:51 +0000)]
Merge "EMC VNX Direct Driver Update for Juno"
Jenkins [Thu, 7 Aug 2014 02:06:08 +0000 (02:06 +0000)]
Merge "Change the exception type for Storwize/SVC driver"
Jenkins [Thu, 7 Aug 2014 01:16:43 +0000 (01:16 +0000)]
Merge "Use auth_token from keystonemiddleware"
Jenkins [Wed, 6 Aug 2014 23:48:58 +0000 (23:48 +0000)]
Merge "Add retry_on_deadlock to db update methods"
Ivan Kolodyazhny [Wed, 6 Aug 2014 10:58:43 +0000 (13:58 +0300)]
RPC client lazy initialization
All *Command classes are instantiating for each cinder-manage command
execution. RPC client should be initialized for VolumeCommands usage.
Some custom RPC clients (oslo.messaging backends) could init RPC
connection after client initialization so it is no need to create RPC
client for every cinder-manage command invoke.
Related-Bug: #
1348787
Change-Id: I7b3388dded6eeec972d9949538e1608c3a538734
Xing Yang [Sun, 3 Aug 2014 13:33:28 +0000 (09:33 -0400)]
Fix snapshot id for snapshot_destroy
The id passed to snapshot_destroy should be snapshot['id'],
not volume['id'].
CCLA SCHEDULE B SUBMISSION
Change-Id: I1d84f1d596ebf014c0e3ea4202902ff515b3172a
Closes-Bug:
1351997
Brant Knudson [Tue, 24 Jun 2014 21:32:54 +0000 (16:32 -0500)]
Use auth_token from keystonemiddleware
auth_token middleware in python-keystoneclient is deprecated and has
been moved to the keystonemiddleware repo.
Closes-Bug: #
1342274
Change-Id: I1aadbe24db63eb2507b088cd53886d7f2e192cab
ChangBo Guo(gcb) [Wed, 6 Aug 2014 07:07:06 +0000 (15:07 +0800)]
Fixes wrong usage of mock.assert_not_called()
There is no method assert_not_called in mock, use
assertFalse(mock.called) instead of that.
Change-Id: I1b37c49e0a624de42d89890b44458ec6bd4239ee
Jenkins [Wed, 6 Aug 2014 01:51:22 +0000 (01:51 +0000)]
Merge "Fix error log level in restore-backup routine"
Jenkins [Tue, 5 Aug 2014 19:13:42 +0000 (19:13 +0000)]
Merge "Change 3PAR delete message when volume is busy"
ling-yun [Mon, 7 Jul 2014 08:51:24 +0000 (16:51 +0800)]
Fix error log level in restore-backup routine
When doing backup-restore operation, it needs volume's size is not less
than backup's size.
But in backup-restore routine, when volume's size is bigger than backup's
size, it logs the the info of volume's size and backup's size to warn
level, which I think it should log the info to info level.
This bug fix it.
Change-Id: Ic7210e3b018053be7a6f567cd0a7b20d51d403b8
Closes-Bug: #
1338481
John Griffith [Fri, 1 Aug 2014 23:10:55 +0000 (17:10 -0600)]
Add retry_on_deadlock to db update methods
There's some known races that have been addressed in
Nova via a retry_on_deadlock deocrator. Some known
cases in Cinder exist as well when dealing with updates
to quotas and reservations_expire.
This patch introduces the decorator to Cinder and hits
the methods known to be susceptible to deadlock as well
as some others that seem as though they'd fall into the
same category.
Leverages work that's already been done in Nova
Co-Authored-By: Vish Ishaya <vishvananda@gmail.com>
Change-Id: Ic807f4f8a333e4d5477f86e41eea40191637087c
Partial-bug: #
1350466
Marc Koderer [Thu, 31 Jul 2014 08:10:17 +0000 (10:10 +0200)]
Fix unit test test_import_record_with_verify
The test case test_import_record_with_verify is intended to call a
backup service class with a defined verify function. This verify
function wasn't overloaded by the fake service.
Change-Id: Ib5738e9c463856dd71a47717b7abb8dff785b3b1
Closes-bug: #
1350699
Jenkins [Tue, 5 Aug 2014 07:54:31 +0000 (07:54 +0000)]
Merge "Add note that some checks are disabled on purpose"
Li Min Liu [Tue, 5 Aug 2014 03:39:09 +0000 (11:39 +0800)]
Change the exception type for Storwize/SVC driver
When create a volume from snapshot or clone a volume,
Storwize/SVC require the same size for the source volume
and target, if not, will raise VolumeDriverException.
For this case, InvalidInput is more appropriate.
Change-Id: I4383c2eb8758077b3029b862dd8b6f982e1850a7
Jenkins [Tue, 5 Aug 2014 00:54:58 +0000 (00:54 +0000)]
Merge "Fixes migrate_volume_completion"
Jenkins [Mon, 4 Aug 2014 23:14:21 +0000 (23:14 +0000)]
Merge "Introduce iSCSI driver for Pure Storage FlashArray"
Jenkins [Mon, 4 Aug 2014 22:20:34 +0000 (22:20 +0000)]
Merge "Bump oslo.rootwrap to 1.3.0.0a1 for Cinder"
Jenkins [Mon, 4 Aug 2014 08:03:42 +0000 (08:03 +0000)]
Merge "Storwize/SVC can not get the right host"
Vipin Balachandran [Fri, 18 Jul 2014 10:38:02 +0000 (16:08 +0530)]
VMware: Update default task_poll_interval value
The task_poll_interval option is used as the polling interval of vCenter/ESX
task status. This patch updates the default value to 0.5s in order to reduce
the wait time for task completion. Similar change has been done in nova and
this change is needed to keep the driver config values consistent.
DocImpact
Updated default value of task_poll_interval to 0.5 seconds.
Change-Id: I66b80c629e255d61047592455ca42632f93051b2
Closes-bug: #
1278028
Jenkins [Sun, 3 Aug 2014 22:21:18 +0000 (22:21 +0000)]
Merge "Avoid OSError in get_blkdev_major_minor with network filesystems"
Jenkins [Sun, 3 Aug 2014 22:17:59 +0000 (22:17 +0000)]
Merge "Add return of updated object on update from DB"
Jenkins [Sun, 3 Aug 2014 22:10:37 +0000 (22:10 +0000)]
Merge "Move generate_password into volume utils"
Jenkins [Sun, 3 Aug 2014 21:30:18 +0000 (21:30 +0000)]
Merge "Move SSHPool into ssh_utils.py"
Jenkins [Sat, 2 Aug 2014 05:50:58 +0000 (05:50 +0000)]
Merge "Fix solidfire accept_transfer"