From f76d1ee4dd812f56988f4886f183fa7a837cc254 Mon Sep 17 00:00:00 2001 From: xiaoxi_chen Date: Tue, 9 Jul 2013 10:18:30 +0800 Subject: [PATCH] Consist terminate_connection function signature Clean up the "force=False" in function signature for terminate_connection since it already accept **kwargs. Thus make all function signature for terminate_connection consist to def terminate_connection(self, volume, connector, **kwargs) Fixes: bug #1190419 Change-Id: I8765cb8f2aa3cfbb49ff57ae034b148aee35a8c4 --- cinder/volume/driver.py | 2 +- cinder/volume/drivers/scality.py | 2 +- cinder/volume/drivers/xenapi/sm.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py index bb29fe5c1..b82410e21 100644 --- a/cinder/volume/driver.py +++ b/cinder/volume/driver.py @@ -159,7 +159,7 @@ class VolumeDriver(object): """Allow connection to connector and return connection info.""" raise NotImplementedError() - def terminate_connection(self, volume, connector, force=False, **kwargs): + def terminate_connection(self, volume, connector, **kwargs): """Disallow connection from connector""" raise NotImplementedError() diff --git a/cinder/volume/drivers/scality.py b/cinder/volume/drivers/scality.py index 0d4f2141c..03e97fe63 100644 --- a/cinder/volume/drivers/scality.py +++ b/cinder/volume/drivers/scality.py @@ -206,7 +206,7 @@ class ScalityDriver(driver.VolumeDriver): } } - def terminate_connection(self, volume, connector, force=False, **kwargs): + def terminate_connection(self, volume, connector, **kwargs): """Disallow connection from connector.""" pass diff --git a/cinder/volume/drivers/xenapi/sm.py b/cinder/volume/drivers/xenapi/sm.py index 92cd583e7..85dcb57b1 100644 --- a/cinder/volume/drivers/xenapi/sm.py +++ b/cinder/volume/drivers/xenapi/sm.py @@ -118,7 +118,7 @@ class XenAPINFSDriver(driver.VolumeDriver): ) ) - def terminate_connection(self, volume, connector, force=False, **kwargs): + def terminate_connection(self, volume, connector, **kwargs): pass def check_for_setup_error(self): -- 2.45.2