exp: update the patches, refresh the iSCSI patch
Change-Id: I58314077bbe5c218ad38a2179baab16768ea5fef
diff --git a/patches/openstack/cinder/sep-sp-iscsi.patch b/patches/openstack/cinder/sep-sp-iscsi.patch
index 505e7ac..82d9591 100644
--- a/patches/openstack/cinder/sep-sp-iscsi.patch
+++ b/patches/openstack/cinder/sep-sp-iscsi.patch
@@ -1,4 +1,4 @@
-From 6b37214585808aa06af0b1f303966bb22f47dc43 Mon Sep 17 00:00:00 2001
+From 51e163e721378ad280e588a2eb1195d220f6304c Mon Sep 17 00:00:00 2001
From: Peter Penchev <openstack-dev@storpool.com>
Date: Mon, 12 Mar 2018 12:00:10 +0200
Subject: [PATCH] Add iSCSI export support to the StorPool driver
@@ -31,7 +31,7 @@
3 files changed, 464 insertions(+), 9 deletions(-)
diff --git a/cinder/tests/unit/volume/drivers/test_storpool.py b/cinder/tests/unit/volume/drivers/test_storpool.py
-index 65d4ed304..350f8c9bd 100644
+index 95a1ffffd..7e8a17800 100644
--- a/cinder/tests/unit/volume/drivers/test_storpool.py
+++ b/cinder/tests/unit/volume/drivers/test_storpool.py
@@ -32,6 +32,7 @@ fakeStorPool.sptypes = mock.Mock()
@@ -42,7 +42,7 @@
from cinder import exception
from cinder.tests.unit import test
from cinder.volume import configuration as conf
-@@ -219,7 +220,14 @@ class StorPoolTestCase(test.TestCase):
+@@ -222,7 +223,14 @@ class StorPoolTestCase(test.TestCase):
self.cfg.volume_backend_name = 'storpool_test'
self.cfg.storpool_template = None
self.cfg.storpool_replication = 3
@@ -57,7 +57,7 @@
mock_exec = mock.Mock()
mock_exec.return_value = ('', '')
-@@ -228,7 +236,7 @@ class StorPoolTestCase(test.TestCase):
+@@ -231,7 +239,7 @@ class StorPoolTestCase(test.TestCase):
self.driver.check_for_setup_error()
@ddt.data(
@@ -66,7 +66,7 @@
({'no-host': None}, KeyError),
({'host': 'sbad'}, driver.StorPoolConfigurationInvalid),
({'host': 's01'}, None),
-@@ -244,7 +252,7 @@ class StorPoolTestCase(test.TestCase):
+@@ -247,7 +255,7 @@ class StorPoolTestCase(test.TestCase):
conn)
@ddt.data(
@@ -75,7 +75,7 @@
({'no-host': None}, KeyError),
({'host': 'sbad'}, driver.StorPoolConfigurationInvalid),
)
-@@ -635,3 +643,55 @@ class StorPoolTestCase(test.TestCase):
+@@ -644,3 +652,55 @@ class StorPoolTestCase(test.TestCase):
self.driver.get_pool({
'volume_type': volume_type
}))
@@ -132,7 +132,7 @@
+ check({"storpool_wants_iscsi": False}, use_iscsi, expected)
+ check({}, use_iscsi, expected)
diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
-index 418e5750f..abb23865d 100644
+index 5aa30398e..07f61db20 100644
--- a/cinder/volume/drivers/storpool.py
+++ b/cinder/volume/drivers/storpool.py
@@ -15,6 +15,7 @@
@@ -643,5 +643,5 @@
--------------------------------
--
-2.35.1
+2.39.0
diff --git a/patches/series.experimental b/patches/series.experimental
index 1adbdf3..b707700 100644
--- a/patches/series.experimental
+++ b/patches/series.experimental
@@ -4,8 +4,9 @@
openstack/cinder/sep-sp-leave-it-to-brick.patch
openstack/cinder/sep-sp-rm-backup.patch
openstack/cinder/sep-sp-rm-copy-volimg.patch
-openstack/cinder/sep-sp-clone-volume.patch
+openstack/cinder/sep-sp-fix-test-rename.patch
openstack/cinder/sep-sp-retype-vol.patch
+openstack/cinder/sep-sp-clone-volume.patch
openstack/cinder/sep-sp-iscsi.patch
openstack/cinderlib/storpool-test-20190910.patch
openstack/devstack/eatmydata.patch