From cbf4eb2787e94e2eda3e51b1b4813ec0a2b359d3 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Tue, 30 Aug 2016 16:32:41 +0100 Subject: [PATCH 1/2] Install ClusterHQ fork of mimic --- flocker/node/agents/cinder.py | 2 +- requirements/flocker-dev.txt | 3 ++- requirements/flocker-dev.txt.in | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/flocker/node/agents/cinder.py b/flocker/node/agents/cinder.py index 3670768b51..811e4d13b6 100644 --- a/flocker/node/agents/cinder.py +++ b/flocker/node/agents/cinder.py @@ -530,7 +530,7 @@ def list_volumes(self): http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getVolumesDetail_v1__tenant_id__volumes_detail_volumes.html """ flocker_volumes = [] - for cinder_volume in self.cinder_volume_manager.list(detailed=False): + for cinder_volume in self.cinder_volume_manager.list(detailed=True): if _is_cluster_volume(self.cluster_id, cinder_volume): flocker_volume = _blockdevicevolume_from_cinder_volume( cinder_volume diff --git a/requirements/flocker-dev.txt b/requirements/flocker-dev.txt index f17ef1f144..e423ffdf2b 100644 --- a/requirements/flocker-dev.txt +++ b/requirements/flocker-dev.txt @@ -1,4 +1,5 @@ -mimic==2.1.0 +--find-links git+https://github.com/ClusterHQ/mimic@2.1.0+chq2#egg=mimic-2.1.0+chq2 +mimic==2.1.0+chq2 # The test suite uses network namespaces # nomenclature can only be installed on Linux # The "linux2" marker value is specific to Python2 diff --git a/requirements/flocker-dev.txt.in b/requirements/flocker-dev.txt.in index 4de5698160..ffb1647f92 100644 --- a/requirements/flocker-dev.txt.in +++ b/requirements/flocker-dev.txt.in @@ -1,3 +1,4 @@ +--find-links git+https://github.com/ClusterHQ/mimic@2.1.0+chq2#egg=mimic-2.1.0+chq2 mimic # The test suite uses network namespaces # nomenclature can only be installed on Linux From 84bb3b7dbf5213525691c0987e65275505fc5e22 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Fri, 2 Sep 2016 15:30:10 +0100 Subject: [PATCH 2/2] The updated mimic is detected as a cinder v2 endpoint so we need to update the cleanup --- flocker/node/agents/functional/test_cinder.py | 1 + 1 file changed, 1 insertion(+) diff --git a/flocker/node/agents/functional/test_cinder.py b/flocker/node/agents/functional/test_cinder.py index 0c23b20ce7..bdeeaaeebd 100644 --- a/flocker/node/agents/functional/test_cinder.py +++ b/flocker/node/agents/functional/test_cinder.py @@ -868,6 +868,7 @@ def _build_and_test_api(self, listening_port): (api .cinder_volume_manager ._original + ._client_v2 ._cinder_volumes .api .client