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

diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py
index bb29fe5c1f990ded3c7d0d64571af99d882fda35..b82410e21a5a6a7ea6f1ceb0e96d29c6a4dde8e7 100644 (file)
--- 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 0d4f2141c588b224b9c219d7122a79ec465c03d9..03e97fe63b9e46e8c840c61211425dca2b94a9ba 100644 (file)
--- 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 92cd583e710cb3e61adc210e1ad400876365f1da..85dcb57b1c038a430bc4987cb92e1d62acd25072 100644 (file)
--- 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):