+++ /dev/null
-Description: Downstream Fix for Genconfig
- This patch adds the opts.py file to the tree as a fix for deployers that
- package cinder. The opts.py file is no longer being deleted right away by
- generate_sample.sh after the cinder.sample.conf is being generated.
- .
- This patch also introduces a pep8 check to make sure that the opts.py file is
- up to date, so that it will catch when new opts get added to Cinder without
- the opts.py being updated.
- .
- To support the ability to keep and check the opts file a number of changes
- were needed in the check_uptodate.sh script as well as the generate_sample.sh
- script:
- - check_uptodate now takes --checkopts instead of --checkonly
- When checkopts is used the opts.py file is generated using the
- current code and the generated file is compared to the existing
- file. The check fails if there are differences.
- - generate_sample now has the --nosamplefile option.
- When this option is used, only the opts.py file is generated.
- The oslo-config-generator code is skipped so no sample file
- is created.
- - generate_sample also has some coding style consistency changes.
- - Added the 'genopts' option to tox so users can generate
- a fresh opts.py without a sample file when necessary.
-Author: Kendall Nelson <kjnelson@us.ibm.com>
-Date: Wed, 7 Oct 2015 13:53:38 +0000 (-0500)
-X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fcinder.git;a=commitdiff_plain;h=54fd32a70f9539703d57bebc4c321452debda01c
-Bug-Ubuntu: https://bugs.launchpad.net/cinder/+bug/1501820
-Co-Author: Jay Bryant <jsbryant@us.ibm.com>
-Change-Id: I1f5494ebb19d5f4e8c651cbeef0acad07ad96829
-Origin: upstream, https://review.openstack.org/#/c/232205/
-Last-Update: 2015-09-08
-
---- /dev/null
-+++ cinder-7.0.0~rc1/cinder/opts.py
-@@ -0,0 +1,330 @@
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+# http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-+# implied.
-+# See the License for the specific language governing permissions and
-+# limitations under the License.
-+
-+import itertools
-+
-+from cinder.api import common as cinder_api_common
-+from cinder.api.middleware import auth as cinder_api_middleware_auth
-+from cinder.api.middleware import sizelimit as cinder_api_middleware_sizelimit
-+from cinder.api.v2 import volumes as cinder_api_v2_volumes
-+from cinder.api.views import versions as cinder_api_views_versions
-+from cinder.backup import chunkeddriver as cinder_backup_chunkeddriver
-+from cinder.backup import driver as cinder_backup_driver
-+from cinder.backup.drivers import ceph as cinder_backup_drivers_ceph
-+from cinder.backup.drivers import glusterfs as cinder_backup_drivers_glusterfs
-+from cinder.backup.drivers import nfs as cinder_backup_drivers_nfs
-+from cinder.backup.drivers import posix as cinder_backup_drivers_posix
-+from cinder.backup.drivers import swift as cinder_backup_drivers_swift
-+from cinder.backup.drivers import tsm as cinder_backup_drivers_tsm
-+from cinder.backup import manager as cinder_backup_manager
-+from cinder.cmd import all as cinder_cmd_all
-+from cinder.cmd import volume as cinder_cmd_volume
-+from cinder.common import config as cinder_common_config
-+import cinder.compute
-+from cinder.compute import nova as cinder_compute_nova
-+from cinder import context as cinder_context
-+from cinder.db import api as cinder_db_api
-+from cinder.db import base as cinder_db_base
-+from cinder import exception as cinder_exception
-+from cinder.image import glance as cinder_image_glance
-+from cinder.image import image_utils as cinder_image_imageutils
-+import cinder.keymgr
-+from cinder.keymgr import conf_key_mgr as cinder_keymgr_confkeymgr
-+from cinder.keymgr import key_mgr as cinder_keymgr_keymgr
-+from cinder import quota as cinder_quota
-+from cinder.scheduler import driver as cinder_scheduler_driver
-+from cinder.scheduler import host_manager as cinder_scheduler_hostmanager
-+from cinder.scheduler import manager as cinder_scheduler_manager
-+from cinder.scheduler import scheduler_options as \
-+ cinder_scheduler_scheduleroptions
-+from cinder.scheduler.weights import capacity as \
-+ cinder_scheduler_weights_capacity
-+from cinder.scheduler.weights import volume_number as \
-+ cinder_scheduler_weights_volumenumber
-+from cinder import service as cinder_service
-+from cinder import ssh_utils as cinder_sshutils
-+from cinder import test as cinder_test
-+from cinder.transfer import api as cinder_transfer_api
-+from cinder.volume import api as cinder_volume_api
-+from cinder.volume import driver as cinder_volume_driver
-+from cinder.volume.drivers import block_device as \
-+ cinder_volume_drivers_blockdevice
-+from cinder.volume.drivers import blockbridge as \
-+ cinder_volume_drivers_blockbridge
-+from cinder.volume.drivers.cloudbyte import options as \
-+ cinder_volume_drivers_cloudbyte_options
-+from cinder.volume.drivers import datera as cinder_volume_drivers_datera
-+from cinder.volume.drivers.dell import dell_storagecenter_common as \
-+ cinder_volume_drivers_dell_dellstoragecentercommon
-+from cinder.volume.drivers.dothill import dothill_common as \
-+ cinder_volume_drivers_dothill_dothillcommon
-+from cinder.volume.drivers import drbdmanagedrv as \
-+ cinder_volume_drivers_drbdmanagedrv
-+from cinder.volume.drivers.emc import emc_vmax_common as \
-+ cinder_volume_drivers_emc_emcvmaxcommon
-+from cinder.volume.drivers.emc import emc_vnx_cli as \
-+ cinder_volume_drivers_emc_emcvnxcli
-+from cinder.volume.drivers.emc import scaleio as \
-+ cinder_volume_drivers_emc_scaleio
-+from cinder.volume.drivers.emc import xtremio as \
-+ cinder_volume_drivers_emc_xtremio
-+from cinder.volume.drivers import eqlx as cinder_volume_drivers_eqlx
-+from cinder.volume.drivers import glusterfs as cinder_volume_drivers_glusterfs
-+from cinder.volume.drivers import hgst as cinder_volume_drivers_hgst
-+from cinder.volume.drivers.hitachi import hbsd_common as \
-+ cinder_volume_drivers_hitachi_hbsdcommon
-+from cinder.volume.drivers.hitachi import hbsd_fc as \
-+ cinder_volume_drivers_hitachi_hbsdfc
-+from cinder.volume.drivers.hitachi import hbsd_horcm as \
-+ cinder_volume_drivers_hitachi_hbsdhorcm
-+from cinder.volume.drivers.hitachi import hbsd_iscsi as \
-+ cinder_volume_drivers_hitachi_hbsdiscsi
-+from cinder.volume.drivers.hitachi import hnas_iscsi as \
-+ cinder_volume_drivers_hitachi_hnasiscsi
-+from cinder.volume.drivers.hitachi import hnas_nfs as \
-+ cinder_volume_drivers_hitachi_hnasnfs
-+from cinder.volume.drivers.huawei import huawei_driver as \
-+ cinder_volume_drivers_huawei_huaweidriver
-+from cinder.volume.drivers.ibm import flashsystem_common as \
-+ cinder_volume_drivers_ibm_flashsystemcommon
-+from cinder.volume.drivers.ibm import flashsystem_fc as \
-+ cinder_volume_drivers_ibm_flashsystemfc
-+from cinder.volume.drivers.ibm import flashsystem_iscsi as \
-+ cinder_volume_drivers_ibm_flashsystemiscsi
-+from cinder.volume.drivers.ibm import gpfs as cinder_volume_drivers_ibm_gpfs
-+from cinder.volume.drivers.ibm import ibmnas as \
-+ cinder_volume_drivers_ibm_ibmnas
-+import cinder.volume.drivers.ibm.storwize_svc
-+from cinder.volume.drivers.ibm import xiv_ds8k as \
-+ cinder_volume_drivers_ibm_xivds8k
-+from cinder.volume.drivers.infortrend.eonstor_ds_cli import common_cli as \
-+ cinder_volume_drivers_infortrend_eonstor_ds_cli_commoncli
-+from cinder.volume.drivers.lenovo import lenovo_common as \
-+ cinder_volume_drivers_lenovo_lenovocommon
-+from cinder.volume.drivers import lvm as cinder_volume_drivers_lvm
-+from cinder.volume.drivers.netapp import options as \
-+ cinder_volume_drivers_netapp_options
-+from cinder.volume.drivers import nfs as cinder_volume_drivers_nfs
-+from cinder.volume.drivers import nimble as cinder_volume_drivers_nimble
-+from cinder.volume.drivers.prophetstor import options as \
-+ cinder_volume_drivers_prophetstor_options
-+from cinder.volume.drivers import pure as cinder_volume_drivers_pure
-+from cinder.volume.drivers import quobyte as cinder_volume_drivers_quobyte
-+from cinder.volume.drivers import rbd as cinder_volume_drivers_rbd
-+from cinder.volume.drivers import remotefs as cinder_volume_drivers_remotefs
-+from cinder.volume.drivers.san.hp import hp_3par_common as \
-+ cinder_volume_drivers_san_hp_hp3parcommon
-+from cinder.volume.drivers.san.hp import hp_lefthand_rest_proxy as \
-+ cinder_volume_drivers_san_hp_hplefthandrestproxy
-+from cinder.volume.drivers.san.hp import hp_xp_opts as \
-+ cinder_volume_drivers_san_hp_hpxpopts
-+from cinder.volume.drivers.san.hp import hpmsa_common as \
-+ cinder_volume_drivers_san_hp_hpmsacommon
-+from cinder.volume.drivers.san import san as cinder_volume_drivers_san_san
-+from cinder.volume.drivers import scality as cinder_volume_drivers_scality
-+from cinder.volume.drivers import sheepdog as cinder_volume_drivers_sheepdog
-+from cinder.volume.drivers import smbfs as cinder_volume_drivers_smbfs
-+from cinder.volume.drivers import solidfire as cinder_volume_drivers_solidfire
-+from cinder.volume.drivers import srb as cinder_volume_drivers_srb
-+from cinder.volume.drivers import tintri as cinder_volume_drivers_tintri
-+from cinder.volume.drivers.violin import v6000_common as \
-+ cinder_volume_drivers_violin_v6000common
-+from cinder.volume.drivers.violin import v7000_common as \
-+ cinder_volume_drivers_violin_v7000common
-+from cinder.volume.drivers.vmware import vmdk as \
-+ cinder_volume_drivers_vmware_vmdk
-+from cinder.volume.drivers import vzstorage as cinder_volume_drivers_vzstorage
-+from cinder.volume.drivers.windows import windows as \
-+ cinder_volume_drivers_windows_windows
-+from cinder.volume.drivers import xio as cinder_volume_drivers_xio
-+from cinder.volume.drivers.zfssa import zfssanfs as \
-+ cinder_volume_drivers_zfssa_zfssanfs
-+from cinder.volume import manager as cinder_volume_manager
-+from cinder.wsgi import eventlet_server as cinder_wsgi_eventletserver
-+from cinder.zonemanager.drivers.brocade import brcd_fabric_opts as \
-+ cinder_zonemanager_drivers_brocade_brcdfabricopts
-+from cinder.zonemanager.drivers.brocade import brcd_fc_zone_driver as \
-+ cinder_zonemanager_drivers_brocade_brcdfczonedriver
-+from cinder.zonemanager.drivers.cisco import cisco_fabric_opts as \
-+ cinder_zonemanager_drivers_cisco_ciscofabricopts
-+from cinder.zonemanager.drivers.cisco import cisco_fc_zone_driver as \
-+ cinder_zonemanager_drivers_cisco_ciscofczonedriver
-+from cinder.zonemanager import fc_zone_manager as \
-+ cinder_zonemanager_fczonemanager
-+
-+
-+def list_opts():
-+ return [
-+ ('DEFAULT',
-+ itertools.chain(
-+ cinder_backup_driver.service_opts,
-+ cinder_api_common.api_common_opts,
-+ cinder_backup_drivers_ceph.service_opts,
-+ cinder_volume_drivers_smbfs.volume_opts,
-+ cinder_backup_chunkeddriver.chunkedbackup_service_opts,
-+ cinder_volume_drivers_san_san.san_opts,
-+ cinder_volume_drivers_hitachi_hnasnfs.NFS_OPTS,
-+ cinder_volume_drivers_violin_v7000common.violin_opts,
-+ cinder_sshutils.ssh_opts,
-+ cinder_volume_drivers_netapp_options.netapp_proxy_opts,
-+ cinder_volume_drivers_netapp_options.netapp_connection_opts,
-+ cinder_volume_drivers_netapp_options.netapp_transport_opts,
-+ cinder_volume_drivers_netapp_options.netapp_basicauth_opts,
-+ cinder_volume_drivers_netapp_options.netapp_cluster_opts,
-+ cinder_volume_drivers_netapp_options.netapp_7mode_opts,
-+ cinder_volume_drivers_netapp_options.netapp_provisioning_opts,
-+ cinder_volume_drivers_netapp_options.netapp_img_cache_opts,
-+ cinder_volume_drivers_netapp_options.netapp_eseries_opts,
-+ cinder_volume_drivers_netapp_options.netapp_nfs_extra_opts,
-+ cinder_volume_drivers_netapp_options.netapp_san_opts,
-+ cinder_backup_drivers_glusterfs.glusterfsbackup_service_opts,
-+ cinder_backup_drivers_tsm.tsm_opts,
-+ cinder_volume_drivers_san_hp_hpxpopts.FC_VOLUME_OPTS,
-+ cinder_volume_drivers_san_hp_hpxpopts.COMMON_VOLUME_OPTS,
-+ cinder_volume_drivers_san_hp_hpxpopts.HORCM_VOLUME_OPTS,
-+ cinder_test.test_opts,
-+ cinder.volume.drivers.ibm.storwize_svc.storwize_svc_opts,
-+ cinder_backup_manager.backup_manager_opts,
-+ cinder_exception.exc_log_opts,
-+ cinder_common_config.global_opts,
-+ cinder_scheduler_weights_capacity.capacity_weight_opts,
-+ cinder_volume_drivers_sheepdog.sheepdog_opts,
-+ cinder_volume_drivers_ibm_gpfs.gpfs_opts,
-+ [cinder_api_middleware_sizelimit.max_request_body_size_opt],
-+ cinder_volume_drivers_solidfire.sf_opts,
-+ cinder_volume_drivers_ibm_ibmnas.platform_opts,
-+ cinder_backup_drivers_swift.swiftbackup_service_opts,
-+ cinder_volume_drivers_cloudbyte_options.
-+ cloudbyte_add_qosgroup_opts,
-+ cinder_volume_drivers_cloudbyte_options.
-+ cloudbyte_create_volume_opts,
-+ cinder_volume_drivers_cloudbyte_options.
-+ cloudbyte_connection_opts,
-+ cinder_service.service_opts,
-+ cinder.compute.compute_opts,
-+ cinder_volume_drivers_drbdmanagedrv.drbd_opts,
-+ cinder_volume_drivers_dothill_dothillcommon.common_opts,
-+ cinder_volume_drivers_dothill_dothillcommon.iscsi_opts,
-+ cinder_volume_drivers_glusterfs.volume_opts,
-+ cinder_volume_drivers_pure.PURE_OPTS,
-+ cinder_context.context_opts,
-+ cinder_scheduler_driver.scheduler_driver_opts,
-+ cinder_volume_drivers_scality.volume_opts,
-+ cinder_volume_drivers_emc_emcvnxcli.loc_opts,
-+ cinder_volume_drivers_vmware_vmdk.vmdk_opts,
-+ cinder_volume_drivers_lenovo_lenovocommon.common_opts,
-+ cinder_volume_drivers_lenovo_lenovocommon.iscsi_opts,
-+ cinder_backup_drivers_posix.posixbackup_service_opts,
-+ cinder_volume_drivers_emc_scaleio.scaleio_opts,
-+ [cinder_db_base.db_driver_opt],
-+ cinder_volume_drivers_eqlx.eqlx_opts,
-+ cinder_transfer_api.volume_transfer_opts,
-+ cinder_db_api.db_opts,
-+ cinder_scheduler_weights_volumenumber.
-+ volume_number_weight_opts,
-+ cinder_volume_drivers_xio.XIO_OPTS,
-+ cinder_wsgi_eventletserver.socket_opts,
-+ cinder_wsgi_eventletserver.eventlet_opts,
-+ cinder_volume_driver.volume_opts,
-+ cinder_volume_driver.iser_opts,
-+ cinder_api_views_versions.versions_opts,
-+ cinder_volume_drivers_nimble.nimble_opts,
-+ cinder_volume_drivers_windows_windows.windows_opts,
-+ cinder_volume_drivers_san_hp_hpmsacommon.common_opts,
-+ cinder_volume_drivers_san_hp_hpmsacommon.iscsi_opts,
-+ cinder_image_glance.glance_opts,
-+ cinder_volume_drivers_lvm.volume_opts,
-+ cinder_volume_drivers_emc_emcvmaxcommon.emc_opts,
-+ cinder_volume_drivers_remotefs.nas_opts,
-+ cinder_volume_drivers_remotefs.volume_opts,
-+ cinder_volume_drivers_violin_v6000common.violin_opts,
-+ cinder_volume_drivers_srb.srb_opts,
-+ cinder_volume_drivers_emc_xtremio.XTREMIO_OPTS,
-+ [cinder_api_middleware_auth.use_forwarded_for_opt],
-+ cinder_volume_drivers_hitachi_hbsdcommon.volume_opts,
-+ cinder_volume_drivers_infortrend_eonstor_ds_cli_commoncli.
-+ infortrend_esds_opts,
-+ cinder_volume_drivers_infortrend_eonstor_ds_cli_commoncli.
-+ infortrend_esds_extra_opts,
-+ cinder_volume_drivers_hitachi_hnasiscsi.iSCSI_OPTS,
-+ cinder_volume_drivers_rbd.rbd_opts,
-+ cinder_volume_drivers_tintri.tintri_opts,
-+ cinder_volume_drivers_hitachi_hbsdhorcm.volume_opts,
-+ cinder_volume_drivers_san_hp_hplefthandrestproxy.
-+ hplefthand_opts,
-+ cinder_volume_drivers_hitachi_hbsdfc.volume_opts,
-+ cinder_quota.quota_opts,
-+ cinder_volume_drivers_huawei_huaweidriver.huawei_opts,
-+ cinder_volume_drivers_dell_dellstoragecentercommon.
-+ common_opts,
-+ cinder_scheduler_hostmanager.host_manager_opts,
-+ [cinder_scheduler_manager.scheduler_driver_opt],
-+ cinder_backup_drivers_nfs.nfsbackup_service_opts,
-+ cinder_volume_drivers_blockbridge.blockbridge_opts,
-+ [cinder_scheduler_scheduleroptions.
-+ scheduler_json_config_location_opt],
-+ cinder_volume_drivers_zfssa_zfssanfs.ZFSSA_OPTS,
-+ cinder_volume_drivers_hgst.hgst_opts,
-+ cinder_image_imageutils.image_helper_opts,
-+ cinder_compute_nova.nova_opts,
-+ cinder_volume_drivers_ibm_flashsystemfc.flashsystem_fc_opts,
-+ cinder_volume_drivers_prophetstor_options.DPL_OPTS,
-+ cinder_volume_drivers_hitachi_hbsdiscsi.volume_opts,
-+ cinder_volume_manager.volume_manager_opts,
-+ cinder_volume_drivers_ibm_flashsystemiscsi.
-+ flashsystem_iscsi_opts,
-+ cinder_volume_drivers_ibm_flashsystemcommon.flashsystem_opts,
-+ [cinder_volume_api.volume_host_opt],
-+ [cinder_volume_api.volume_same_az_opt],
-+ [cinder_volume_api.az_cache_time_opt],
-+ cinder_volume_drivers_san_hp_hp3parcommon.hp3par_opts,
-+ cinder_volume_drivers_ibm_xivds8k.xiv_ds8k_opts,
-+ cinder_volume_drivers_datera.d_opts,
-+ cinder_volume_drivers_blockdevice.volume_opts,
-+ [cinder_api_v2_volumes.query_volume_filters_opt],
-+ cinder_volume_drivers_quobyte.volume_opts,
-+ cinder_volume_drivers_vzstorage.vzstorage_opts,
-+ cinder_volume_drivers_nfs.nfs_opts,
-+ )),
-+ ('profiler',
-+ itertools.chain(
-+ cinder_service.profiler_opts,
-+ )),
-+ ('backend',
-+ itertools.chain(
-+ [cinder_cmd_volume.host_opt],
-+ [cinder_cmd_all.volume_cmd.host_opt],
-+ )),
-+ ('CISCO_FABRIC_EXAMPLE',
-+ itertools.chain(
-+ cinder_zonemanager_drivers_cisco_ciscofabricopts.
-+ cisco_zone_opts,
-+ )),
-+ ('BRCD_FABRIC_EXAMPLE',
-+ itertools.chain(
-+ cinder_zonemanager_drivers_brocade_brcdfabricopts.
-+ brcd_zone_opts,
-+ )),
-+ ('keymgr',
-+ itertools.chain(
-+ cinder_keymgr_keymgr.encryption_opts,
-+ cinder.keymgr.keymgr_opts,
-+ cinder_keymgr_confkeymgr.key_mgr_opts,
-+ )),
-+ ('fc-zone-manager',
-+ itertools.chain(
-+ cinder_zonemanager_fczonemanager.zone_manager_opts,
-+ cinder_zonemanager_drivers_brocade_brcdfczonedriver.brcd_opts,
-+ cinder_zonemanager_drivers_cisco_ciscofczonedriver.cisco_opts,
-+ )),
-+ ]
+++ /dev/null
-Description: Disable the ZFS tests
-Author: Thomsa Goirand <zigo@debian.org>
-Forwarded: not-needed
-Last-Update: 2015-09-07
-
---- a/cinder/tests/unit/test_zfssa.py 2015-09-25 10:05:38.146159244 +0200
-+++ /dev/null 2015-09-21 11:09:20.434834482 +0200
-@@ -1,1394 +0,0 @@
--# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
--#
--# Licensed under the Apache License, Version 2.0 (the "License"); you may
--# not use this file except in compliance with the License. You may obtain
--# a copy of the License at
--#
--# http://www.apache.org/licenses/LICENSE-2.0
--#
--# Unless required by applicable law or agreed to in writing, software
--# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
--# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
--# License for the specific language governing permissions and limitations
--# under the License.
--"""Unit tests for Oracle's ZFSSA Cinder volume driver."""
--
--from datetime import date
--import json
--import math
--
--import mock
--from oslo_utils import units
--import six
--
--from cinder import context
--from cinder import exception
--from cinder import test
--from cinder.tests.unit import fake_utils
--from cinder.volume import configuration as conf
--from cinder.volume import driver
--from cinder.volume.drivers import remotefs
--from cinder.volume.drivers.zfssa import restclient as client
--from cinder.volume.drivers.zfssa import webdavclient
--from cinder.volume.drivers.zfssa import zfssaiscsi as iscsi
--from cinder.volume.drivers.zfssa import zfssanfs
--from cinder.volume.drivers.zfssa import zfssarest as rest
--
--
--nfs_logbias = 'latency'
--nfs_compression = 'off'
--zfssa_cache_dir = 'os-cinder-cache'
--
--no_virtsize_img = {
-- 'id': 'no_virtsize_img_id1234',
-- 'size': 654321,
-- 'updated_at': date(2015, 1, 1),
--}
--
--small_img = {
-- 'id': 'small_id1234',
-- 'size': 654321,
-- 'properties': {'virtual_size': 2361393152},
-- 'updated_at': date(2015, 1, 1),
--}
--
--large_img = {
-- 'id': 'large_id5678',
-- 'size': 50000000,
-- 'properties': {'virtual_size': 11806965760},
-- 'updated_at': date(2015, 2, 2),
--}
--
--fakespecs = {
-- 'prop1': 'prop1_val',
-- 'prop2': 'prop2_val',
--}
--
--small_img_props = {
-- 'size': 3,
--}
--
--img_props_nfs = {
-- 'image_id': small_img['id'],
-- 'updated_at': small_img['updated_at'].isoformat(),
-- 'size': 3,
-- 'name': '%(dir)s/os-cache-vol-%(name)s' % ({'dir': zfssa_cache_dir,
-- 'name': small_img['id']})
--}
--
--fakecontext = 'fakecontext'
--img_service = 'fakeimgservice'
--img_location = 'fakeimglocation'
--
--
--class FakeResponse(object):
-- def __init__(self, statuscode, data='data'):
-- self.status = statuscode
-- self.data = data
--
--
--class FakeSSL(object):
-- def _create_unverified_context(self):
-- return 'fakecontext'
--
--
--class TestZFSSAISCSIDriver(test.TestCase):
--
-- test_vol = {
-- 'name': 'cindervol',
-- 'size': 3,
-- 'id': 1,
-- 'provider_location': 'fake_location 1 2',
-- 'provider_auth': 'fake_auth user pass',
-- }
--
-- test_vol2 = {
-- 'name': 'cindervol2',
-- 'size': 5,
-- 'id': 2,
-- 'provider_location': 'fake_location 3 4',
-- 'provider_auth': 'fake_auth user pass',
-- }
--
-- test_snap = {
-- 'name': 'cindersnap',
-- 'volume_name': test_vol['name']
-- }
--
-- test_vol_snap = {
-- 'name': 'cindersnapvol',
-- 'size': test_vol['size']
-- }
--
-- def __init__(self, method):
-- super(TestZFSSAISCSIDriver, self).__init__(method)
--
-- @mock.patch.object(iscsi, 'factory_zfssa')
-- def setUp(self, _factory_zfssa):
-- super(TestZFSSAISCSIDriver, self).setUp()
-- self._create_fake_config()
-- _factory_zfssa.return_value = mock.MagicMock(spec=rest.ZFSSAApi)
-- iscsi.ZFSSAISCSIDriver._execute = fake_utils.fake_execute
-- self.drv = iscsi.ZFSSAISCSIDriver(configuration=self.configuration)
-- self.drv.do_setup({})
--
-- def _create_fake_config(self):
-- self.configuration = mock.Mock(spec=conf.Configuration)
-- self.configuration.san_ip = '1.1.1.1'
-- self.configuration.san_login = 'user'
-- self.configuration.san_password = 'passwd'
-- self.configuration.zfssa_pool = 'pool'
-- self.configuration.zfssa_project = 'project'
-- self.configuration.zfssa_lun_volblocksize = '8k'
-- self.configuration.zfssa_lun_sparse = 'false'
-- self.configuration.zfssa_lun_logbias = 'latency'
-- self.configuration.zfssa_lun_compression = 'off'
-- self.configuration.zfssa_initiator_group = 'test-init-grp1'
-- self.configuration.zfssa_initiator = \
-- 'iqn.1-0.org.deb:01:d7, iqn.1-0.org.deb:01:d9'
-- self.configuration.zfssa_initiator_user = ''
-- self.configuration.zfssa_initiator_password = ''
-- self.configuration.zfssa_initiator_config = "{'test-init-grp1':[{'iqn':\
-- 'iqn.1-0.org.deb:01:d7','user':'','password':''}],'test-init-grp\
-- 2':[{'iqn':'iqn.1-0.org.deb:01:d9','user':'','password':''}]}"
-- self.configuration.zfssa_target_group = 'test-target-grp1'
-- self.configuration.zfssa_target_user = ''
-- self.configuration.zfssa_target_password = ''
-- self.configuration.zfssa_target_portal = '1.1.1.1:3260'
-- self.configuration.zfssa_target_interfaces = 'e1000g0'
-- self.configuration.zfssa_rest_timeout = 60
-- self.configuration.volume_backend_name = 'fake_zfssa'
-- self.configuration.zfssa_enable_local_cache = True
-- self.configuration.zfssa_cache_project = zfssa_cache_dir
-- self.configuration.safe_get = self.fake_safe_get
-- self.configuration.zfssa_replication_ip = '1.1.1.1'
--
-- def _util_migrate_volume_exceptions(self):
-- self.drv.zfssa.get_lun.return_value = (
-- {'targetgroup': 'test-target-grp1'})
-- self.drv.zfssa.get_asn.return_value = (
-- '9a2b5a0f-e3af-6d14-9578-8825f229dc89')
-- self.drv.tgt_zfssa.get_asn.return_value = (
-- '9a2b5a0f-e3af-6d14-9578-8825f229dc89')
-- targets = {'targets': [{'hostname': '2.2.2.2',
-- 'address': '2.2.2.2:216',
-- 'label': '2.2.2.2',
-- 'asn':
-- '9a2b5a0f-e3af-6d14-9578-8825f229dc89'}]}
--
-- self.drv.zfssa.get_replication_targets.return_value = targets
-- self.drv.zfssa.edit_inherit_replication_flag.return_value = {}
-- self.drv.zfssa.create_replication_action.return_value = 'action-123'
-- self.drv.zfssa.send_repl_update.return_value = True
--
-- def test_migrate_volume(self):
-- self._util_migrate_volume_exceptions()
--
-- volume = self.test_vol
-- volume.update({'host': 'fake_host',
-- 'status': 'available',
-- 'name': 'vol-1',
-- 'source_volid': self.test_vol['id']})
--
-- loc_info = '2.2.2.2:fake_auth:pool2:project2:test-target-grp1:2.2.2.2'
--
-- host = {'host': 'stack@zfssa_iscsi#fake_zfssa',
-- 'capabilities': {'vendor_name': 'Oracle',
-- 'storage_protocol': 'iSCSI',
-- 'location_info': loc_info}}
-- ctxt = context.get_admin_context()
--
-- # Test the normal case
-- result = self.drv.migrate_volume(ctxt, volume, host)
-- self.assertEqual((True, None), result)
--
-- # Test when volume status is not available
-- volume['status'] = 'in-use'
-- result = self.drv.migrate_volume(ctxt, volume, host)
-- self.assertEqual((False, None), result)
-- volume['status'] = 'available'
--
-- # Test when vendor is not Oracle
-- host['capabilities']['vendor_name'] = 'elcarO'
-- result = self.drv.migrate_volume(ctxt, volume, host)
-- self.assertEqual((False, None), result)
-- host['capabilities']['vendor_name'] = 'Oracle'
--
-- # Test when storage protocol is not iSCSI
-- host['capabilities']['storage_protocol'] = 'not_iSCSI'
-- result = self.drv.migrate_volume(ctxt, volume, host)
-- self.assertEqual((False, None), result)
-- host['capabilities']['storage_protocol'] = 'iSCSI'
--
-- # Test when location_info is incorrect
-- host['capabilities']['location_info'] = ''
-- self.assertEqual((False, None), result)
-- host['capabilities']['location_info'] = loc_info
--
-- # Test if replication ip and replication target's address dont match
-- invalid_loc_info = (
-- '2.2.2.2:fake_auth:pool2:project2:test-target-grp1:9.9.9.9')
-- host['capabilities']['location_info'] = invalid_loc_info
-- result = self.drv.migrate_volume(ctxt, volume, host)
-- self.assertEqual((False, None), result)
-- host['capabilities']['location_info'] = loc_info
--
-- # Test if no targets are returned
-- self.drv.zfssa.get_replication_targets.return_value = {'targets': []}
-- result = self.drv.migrate_volume(ctxt, volume, host)
-- self.assertEqual((False, None), result)
--
-- def test_migrate_volume_uninherit_exception(self):
-- self._util_migrate_volume_exceptions()
--
-- volume = self.test_vol
-- volume.update({'host': 'fake_host',
-- 'status': 'available',
-- 'name': 'vol-1',
-- 'source_volid': self.test_vol['id']})
--
-- loc_info = '2.2.2.2:fake_auth:pool2:project2:test-target-grp1:2.2.2.2'
--
-- host = {'host': 'stack@zfssa_iscsi#fake_zfssa',
-- 'capabilities': {'vendor_name': 'Oracle',
-- 'storage_protocol': 'iSCSI',
-- 'location_info': loc_info}}
-- ctxt = context.get_admin_context()
--
-- self.drv.zfssa.edit_inherit_replication_flag.side_effect = (
-- exception.VolumeBackendAPIException(data='uniherit ex'))
-- self.assertRaises(exception.VolumeBackendAPIException,
-- self.drv.migrate_volume, ctxt, volume, host)
--
-- def test_migrate_volume_create_action_exception(self):
-- self._util_migrate_volume_exceptions()
--
-- volume = self.test_vol
-- volume.update({'host': 'fake_host',
-- 'status': 'available',
-- 'name': 'vol-1',
-- 'source_volid': self.test_vol['id']})
--
-- loc_info = '2.2.2.2:fake_auth:pool2:project2:test-target-grp1:2.2.2.2'
--
-- host = {'host': 'stack@zfssa_iscsi#fake_zfssa',
-- 'capabilities': {'vendor_name': 'Oracle',
-- 'storage_protocol': 'iSCSI',
-- 'location_info': loc_info}}
-- ctxt = context.get_admin_context()
--
-- self.drv.zfssa.create_replication_action.side_effect = (
-- exception.VolumeBackendAPIException(data=
-- 'failed to create action'))
-- self.assertRaises(exception.VolumeBackendAPIException,
-- self.drv.migrate_volume, ctxt, volume, host)
--
-- def test_migrate_volume_send_update_exception(self):
-- self._util_migrate_volume_exceptions()
--
-- volume = self.test_vol
-- volume.update({'host': 'fake_host',
-- 'status': 'available',
-- 'name': 'vol-1',
-- 'source_volid': self.test_vol['id']})
--
-- loc_info = '2.2.2.2:fake_auth:pool2:project2:test-target-grp1:2.2.2.2'
--
-- host = {'host': 'stack@zfssa_iscsi#fake_zfssa',
-- 'capabilities': {'vendor_name': 'Oracle',
-- 'storage_protocol': 'iSCSI',
-- 'location_info': loc_info}}
-- ctxt = context.get_admin_context()
--
-- self.drv.zfssa.send_repl_update.side_effect = (
-- exception.VolumeBackendAPIException(data='failed to send update'))
-- self.assertRaises(exception.VolumeBackendAPIException,
-- self.drv.migrate_volume, ctxt, volume, host)
--
-- def test_migrate_volume_sever_repl_exception(self):
-- self._util_migrate_volume_exceptions()
--
-- volume = self.test_vol
-- volume.update({'host': 'fake_host',
-- 'status': 'available',
-- 'name': 'vol-1',
-- 'source_volid': self.test_vol['id']})
--
-- loc_info = '2.2.2.2:fake_auth:pool2:project2:test-target-grp1:2.2.2.2'
--
-- host = {'host': 'stack@zfssa_iscsi#fake_zfssa',
-- 'capabilities': {'vendor_name': 'Oracle',
-- 'storage_protocol': 'iSCSI',
-- 'location_info': loc_info}}
-- ctxt = context.get_admin_context()
-- self.drv.tgt_zfssa.sever_replication.side_effect = (
-- exception.VolumeBackendAPIException(data=
-- 'failed to sever replication'))
-- self.assertRaises(exception.VolumeBackendAPIException,
-- self.drv.migrate_volume, ctxt, volume, host)
--
-- def test_create_delete_volume(self):
-- self.drv.zfssa.get_lun.return_value = {'guid':
-- '00000000000000000000000000000',
-- 'number': 0,
-- 'initiatorgroup': 'default',
-- 'size': 1,
-- 'nodestroy': False}
-- lcfg = self.configuration
-- self.drv.create_volume(self.test_vol)
-- self.drv.zfssa.create_lun.assert_called_once_with(
-- lcfg.zfssa_pool,
-- lcfg.zfssa_project,
-- self.test_vol['name'],
-- six.text_type(self.test_vol['size']) + 'g',
-- lcfg.zfssa_target_group,
-- mock.ANY)
-- self.drv.delete_volume(self.test_vol)
-- self.drv.zfssa.get_lun.assert_called_once_with(lcfg.zfssa_pool,
-- lcfg.zfssa_project,
-- self.test_vol['name'])
-- self.drv.zfssa.delete_lun.assert_called_once_with(
-- pool=lcfg.zfssa_pool,
-- project=lcfg.zfssa_project,
-- lun=self.test_vol['name'])
--
-- @mock.patch.object(iscsi.ZFSSAISCSIDriver, '_check_origin')
-- def test_delete_cache_volume(self, _check_origin):
-- lcfg = self.configuration
-- lun2del = {
-- 'guid': '00000000000000000000000000000',
-- 'number': 0,
-- 'initiatorgroup': 'default',
-- 'size': 1,
-- 'nodestroy': False,
-- 'origin': {
-- 'project': lcfg.zfssa_cache_project,
-- 'snapshot': 'image-%s' % small_img['id'],
-- 'share': 'os-cache-vol-%s' % small_img['id'],
-- }
-- }
-- self.drv.zfssa.get_lun.return_value = lun2del
-- self.drv.delete_volume(self.test_vol)
-- self.drv._check_origin.assert_called_once_with(lun2del,
-- self.test_vol['name'])
--
-- def test_check_origin(self):
-- lcfg = self.configuration
-- lun2del = {
-- 'guid': '00000000000000000000000000000',
-- 'number': 0,
-- 'initiatorgroup': 'default',
-- 'size': 1,
-- 'nodestroy': False,
-- 'origin': {
-- 'project': lcfg.zfssa_cache_project,
-- 'snapshot': 'image-%s' % small_img['id'],
-- 'share': 'os-cache-vol-%s' % small_img['id'],
-- }
-- }
-- cache = lun2del['origin']
-- self.drv.zfssa.num_clones.return_value = 0
-- self.drv._check_origin(lun2del, 'volname')
-- self.drv.zfssa.delete_lun.assert_called_once_with(
-- lcfg.zfssa_pool,
-- lcfg.zfssa_cache_project,
-- cache['share'])
--
-- def test_create_delete_snapshot(self):
-- self.drv.zfssa.num_clones.return_value = 0
-- lcfg = self.configuration
-- self.drv.create_snapshot(self.test_snap)
-- self.drv.zfssa.create_snapshot.assert_called_once_with(
-- lcfg.zfssa_pool,
-- lcfg.zfssa_project,
-- self.test_snap['volume_name'],
-- self.test_snap['name'])
-- self.drv.delete_snapshot(self.test_snap)
-- self.drv.zfssa.delete_snapshot.assert_called_once_with(
-- lcfg.zfssa_pool,
-- lcfg.zfssa_project,
-- self.test_snap['volume_name'],
-- self.test_snap['name'])
--
-- @mock.patch.object(iscsi.ZFSSAISCSIDriver, '_verify_clone_size')
-- def test_create_volume_from_snapshot(self, _verify_clone_size):
-- self.drv._verify_clone_size.return_value = True
-- lcfg = self.configuration
-- self.drv.create_snapshot(self.test_snap)
-- self.drv.zfssa.create_snapshot.assert_called_once_with(
-- lcfg.zfssa_pool,
-- lcfg.zfssa_project,
-- self.test_snap['volume_name'],
-- self.test_snap['name'])
-- self.drv.create_volume_from_snapshot(self.test_vol_snap,
-- self.test_snap)
-- self.drv._verify_clone_size.assert_called_once_with(
-- self.test_snap,
-- self.test_vol_snap['size'] * units.Gi)
-- self.drv.zfssa.clone_snapshot.assert_called_once_with(
-- lcfg.zfssa_pool,
-- lcfg.zfssa_project,
-- self.test_snap['volume_name'],
-- self.test_snap['name'],
-- lcfg.zfssa_project,
-- self.test_vol_snap['name'])
--
-- @mock.patch.object(iscsi.ZFSSAISCSIDriver, '_get_provider_info')
-- def test_volume_attach_detach(self, _get_provider_info):
-- lcfg = self.configuration
-- test_target_iqn = 'iqn.1986-03.com.sun:02:00000-aaaa-bbbb-cccc-ddddd'
-- stub_val = {'provider_location':
-- '%s %s 0' % (lcfg.zfssa_target_portal, test_target_iqn)}
-- self.drv._get_provider_info.return_value = stub_val
--
-- connector = dict(initiator='iqn.1-0.org.deb:01:d7')
-- props = self.drv.initialize_connection(self.test_vol, connector)
-- self.drv._get_provider_info.assert_called_once_with(self.test_vol)
-- self.assertEqual('iscsi', props['driver_volume_type'])
-- self.assertEqual(self.test_vol['id'], props['data']['volume_id'])
-- self.assertEqual(lcfg.zfssa_target_portal,
-- props['data']['target_portal'])
-- self.assertEqual(test_target_iqn, props['data']['target_iqn'])
-- self.assertEqual('0', props['data']['target_lun'])
-- self.assertFalse(props['data']['target_discovered'])
--
-- self.drv.terminate_connection(self.test_vol, '')
-- self.drv.zfssa.set_lun_initiatorgroup.assert_called_once_with(
-- lcfg.zfssa_pool,
-- lcfg.zfssa_project,
-- self.test_vol['name'],
-- '')
--
-- def test_get_volume_stats(self):
-- self.drv.zfssa.get_project_stats.return_value = 2 * units.Gi,\
-- 3 * units.Gi
-- lcfg = self.configuration
-- stats = self.drv.get_volume_stats(refresh=True)
-- self.drv.zfssa.get_project_stats.assert_called_once_with(
-- lcfg.zfssa_pool,
-- lcfg.zfssa_project)
-- self.assertEqual('Oracle', stats['vendor_name'])
-- self.assertEqual(self.configuration.volume_backend_name,
-- stats['volume_backend_name'])
-- self.assertEqual(self.drv.VERSION, stats['driver_version'])
-- self.assertEqual(self.drv.protocol, stats['storage_protocol'])
-- self.assertEqual(0, stats['reserved_percentage'])
-- self.assertFalse(stats['QoS_support'])
-- self.assertEqual(3, stats['total_capacity_gb'])
-- self.assertEqual(2, stats['free_capacity_gb'])
--
-- def test_extend_volume(self):
-- lcfg = self.configuration
-- self.drv.extend_volume(self.test_vol, 3)
-- self.drv.zfssa.set_lun_props.assert_called_once_with(
-- lcfg.zfssa_pool,
-- lcfg.zfssa_project,
-- self.test_vol['name'],
-- volsize= 3 * units.Gi)
--
-- @mock.patch('cinder.volume.volume_types.get_volume_type_extra_specs')
-- def test_get_voltype_specs(self, get_volume_type_extra_specs):
-- volume_type_id = mock.sentinel.volume_type_id
-- volume = {'volume_type_id': volume_type_id}
-- get_volume_type_extra_specs.return_value = {
-- 'zfssa:volblocksize': '128k',
-- 'zfssa:compression': 'gzip'
-- }
-- ret = self.drv._get_voltype_specs(volume)
-- self.assertEqual('128k', ret.get('volblocksize'))
-- self.assertEqual(self.configuration.zfssa_lun_sparse,
-- ret.get('sparse'))
-- self.assertEqual('gzip', ret.get('compression'))
-- self.assertEqual(self.configuration.zfssa_lun_logbias,
-- ret.get('logbias'))
--
-- def tearDown(self):
-- super(TestZFSSAISCSIDriver, self).tearDown()
--
-- def fake_safe_get(self, value):
-- try:
-- val = getattr(self.configuration, value)
-- except AttributeError:
-- val = None
-- return val
--
-- @mock.patch.object(iscsi.ZFSSAISCSIDriver, '_verify_cache_volume')
-- def test_clone_image_negative(self, _verify_cache_volume):
-- # Disabling local cache feature:
-- self.configuration.zfssa_enable_local_cache = False
--
-- self.assertEqual((None, False),
-- self.drv.clone_image(fakecontext, self.test_vol,
-- img_location,
-- small_img,
-- img_service))
--
-- self.configuration.zfssa_enable_local_cache = True
-- # Creating a volume smaller than image:
-- self.assertEqual((None, False),
-- self.drv.clone_image(fakecontext, self.test_vol,
-- img_location,
-- large_img,
-- img_service))
--
-- # The image does not have virtual_size property:
-- self.assertEqual((None, False),
-- self.drv.clone_image(fakecontext, self.test_vol,
-- img_location,
-- no_virtsize_img,
-- img_service))
--
-- # Exception raised in _verify_cache_image
-- self.drv._verify_cache_volume.side_effect = (
-- exception.VolumeBackendAPIException('fakeerror'))
-- self.assertEqual((None, False),
-- self.drv.clone_image(fakecontext, self.test_vol,
-- img_location,
-- small_img,
-- img_service))
--
-- @mock.patch.object(iscsi.ZFSSAISCSIDriver, '_get_voltype_specs')
-- @mock.patch.object(iscsi.ZFSSAISCSIDriver, '_verify_cache_volume')
-- @mock.patch.object(iscsi.ZFSSAISCSIDriver, 'extend_volume')
-- def test_clone_image(self, _extend_vol, _verify_cache, _get_specs):
-- lcfg = self.configuration
-- cache_vol = 'os-cache-vol-%s' % small_img['id']
-- cache_snap = 'image-%s' % small_img['id']
-- self.drv._get_voltype_specs.return_value = fakespecs.copy()
-- self.drv._verify_cache_volume.return_value = cache_vol, cache_snap
-- model, cloned = self.drv.clone_image(fakecontext, self.test_vol2,
-- img_location,
-- small_img,
-- img_service)
-- self.drv._verify_cache_volume.assert_called_once_with(fakecontext,
-- small_img,
-- img_service,
-- fakespecs,
-- small_img_props)
-- self.drv.zfssa.clone_snapshot.assert_called_once_with(
-- lcfg.zfssa_pool,
-- lcfg.zfssa_cache_project,
-- cache_vol,
-- cache_snap,
-- lcfg.zfssa_project,
-- self.test_vol2['name'])
--
-- self.drv.extend_volume.assert_called_once_with(self.test_vol2,
-- self.test_vol2['size'])
--
-- @mock.patch.object(iscsi.ZFSSAISCSIDriver, '_create_cache_volume')
-- def test_verify_cache_vol_no_cache_vol(self, _create_cache_vol):
-- vol_name = 'os-cache-vol-%s' % small_img['id']
-- self.drv.zfssa.get_lun.side_effect = exception.VolumeNotFound(
-- volume_id=vol_name)
-- self.drv._verify_cache_volume(fakecontext, small_img,
-- img_service, fakespecs, small_img_props)
-- self.drv._create_cache_volume.assert_called_once_with(fakecontext,
-- small_img,
-- img_service,
-- fakespecs,
-- small_img_props)
--
-- def test_verify_cache_vol_no_cache_snap(self):
-- snap_name = 'image-%s' % small_img['id']
-- self.drv.zfssa.get_lun_snapshot.side_effect = (
-- exception.SnapshotNotFound(snapshot_id=snap_name))
-- self.assertRaises(exception.VolumeBackendAPIException,
-- self.drv._verify_cache_volume,
-- fakecontext,
-- small_img,
-- img_service,
-- fakespecs,
-- small_img_props)
--
-- def test_verify_cache_vol_stale_vol(self):
-- self.drv.zfssa.get_lun_snapshot.return_value = {'numclones': 5}
-- self.assertRaises(exception.VolumeBackendAPIException,
-- self.drv._verify_cache_volume,
-- fakecontext,
-- small_img,
-- img_service,
-- fakespecs,
-- small_img_props)
--
-- @mock.patch.object(iscsi.ZFSSAISCSIDriver, '_create_cache_volume')
-- def test_verify_cache_vol_updated_vol(self, _create_cache_vol):
-- lcfg = self.configuration
-- updated_vol = {
-- 'updated_at': date(3000, 12, 12),
-- 'image_id': 'updated_id',
-- }
-- cachevol_name = 'os-cache-vol-%s' % small_img['id']
-- self.drv.zfssa.get_lun.return_value = updated_vol
-- self.drv.zfssa.get_lun_snapshot.return_value = {'numclones': 0}
-- self.drv._verify_cache_volume(fakecontext, small_img,
-- img_service, fakespecs, small_img_props)
-- self.drv.zfssa.delete_lun.assert_called_once_with(
-- lcfg.zfssa_pool,
-- lcfg.zfssa_cache_project,
-- cachevol_name)
-- self.drv._create_cache_volume.assert_called_once_with(fakecontext,
-- small_img,
-- img_service,
-- fakespecs,
-- small_img_props)
--
-- @mock.patch.object(driver.BaseVD, 'copy_image_to_volume')
-- def test_create_cache_volume(self, _copy_image):
-- lcfg = self.configuration
-- virtual_size = int(small_img['properties'].get('virtual_size'))
-- volsize = math.ceil(float(virtual_size) / units.Gi)
-- lunsize = "%sg" % six.text_type(int(volsize))
-- volname = 'os-cache-vol-%s' % small_img['id']
-- snapname = 'image-%s' % small_img['id']
-- cachevol_props = {
-- 'cache_name': volname,
-- 'snap_name': snapname,
-- }
-- cachevol_props.update(small_img_props)
-- cache_vol = {
-- 'name': volname,
-- 'id': small_img['id'],
-- 'size': volsize,
-- }
-- lun_props = {
-- 'custom:image_id': small_img['id'],
-- 'custom:updated_at': (
-- six.text_type(small_img['updated_at'].isoformat())),
-- }
-- lun_props.update(fakespecs)
--
-- self.drv._create_cache_volume(fakecontext,
-- small_img,
-- img_service,
-- fakespecs,
-- cachevol_props)
--
-- self.drv.zfssa.create_lun.assert_called_once_with(
-- lcfg.zfssa_pool,
-- lcfg.zfssa_cache_project,
-- cache_vol['name'],
-- lunsize,
-- lcfg.zfssa_target_group,
-- lun_props)
-- _copy_image.assert_called_once_with(fakecontext,
-- cache_vol,
-- img_service,
-- small_img['id'])
-- self.drv.zfssa.create_snapshot.assert_called_once_with(
-- lcfg.zfssa_pool,
-- lcfg.zfssa_cache_project,
-- cache_vol['name'],
-- snapname)
--
-- def test_create_cache_vol_negative(self):
-- lcfg = self.configuration
-- volname = 'os-cache-vol-%s' % small_img['id']
-- snapname = 'image-%s' % small_img['id']
-- cachevol_props = {
-- 'cache_name': volname,
-- 'snap_name': snapname,
-- }
-- cachevol_props.update(small_img)
--
-- self.drv.zfssa.get_lun.side_effect = exception.VolumeNotFound(
-- volume_id=volname)
-- self.assertRaises(exception.VolumeBackendAPIException,
-- self.drv._create_cache_volume,
-- fakecontext,
-- small_img,
-- img_service,
-- fakespecs,
-- cachevol_props)
-- self.drv.zfssa.delete_lun.assert_called_once_with(
-- lcfg.zfssa_pool,
-- lcfg.zfssa_cache_project,
-- volname)
--
--
--class TestZFSSANFSDriver(test.TestCase):
--
-- test_vol = {
-- 'name': 'test-vol',
-- 'id': '1',
-- 'size': 3,
-- 'provider_location': 'fakelocation',
-- }
--
-- test_snap = {
-- 'name': 'cindersnap',
-- 'volume_name': test_vol['name'],
-- 'volume_size': test_vol['size']
-- }
--
-- test_vol_snap = {
-- 'name': 'cindersnapvol',
-- 'size': test_vol['size']
-- }
--
-- def __init__(self, method):
-- super(TestZFSSANFSDriver, self).__init__(method)
--
-- @mock.patch.object(zfssanfs, 'factory_zfssa')
-- def setUp(self, _factory_zfssa):
-- super(TestZFSSANFSDriver, self).setUp()
-- self._create_fake_config()
-- _factory_zfssa.return_value = mock.MagicMock(spec=rest.ZFSSANfsApi)
-- self.drv = zfssanfs.ZFSSANFSDriver(configuration=self.configuration)
-- self.drv._execute = fake_utils.fake_execute
-- self.drv.do_setup({})
--
-- def _create_fake_config(self):
-- self.configuration = mock.Mock(spec=conf.Configuration)
-- self.configuration.reserved_percentage = 0
-- self.configuration.max_over_subscription_ratio = 20.0
-- self.configuration.san_ip = '1.1.1.1'
-- self.configuration.san_login = 'user'
-- self.configuration.san_password = 'passwd'
-- self.configuration.zfssa_data_ip = '2.2.2.2'
-- self.configuration.zfssa_https_port = '443'
-- self.configuration.zfssa_nfs_pool = 'pool'
-- self.configuration.zfssa_nfs_project = 'nfs_project'
-- self.configuration.zfssa_nfs_share = 'nfs_share'
-- self.configuration.zfssa_nfs_share_logbias = nfs_logbias
-- self.configuration.zfssa_nfs_share_compression = nfs_compression
-- self.configuration.zfssa_nfs_mount_options = ''
-- self.configuration.zfssa_rest_timeout = '30'
-- self.configuration.nfs_oversub_ratio = 1
-- self.configuration.nfs_used_ratio = 1
-- self.configuration.zfssa_enable_local_cache = True
-- self.configuration.zfssa_cache_directory = zfssa_cache_dir
--
-- def test_migrate_volume(self):
-- self.drv.zfssa.get_asn.return_value = (
-- '9a2b5a0f-e3af-6d14-9578-8825f229dc89')
-- volume = self.test_vol
-- volume.update({'host': 'fake_host',
-- 'status': 'available',
-- 'name': 'vol-1',
-- 'source_volid': self.test_vol['id']})
--
-- loc_info = '9a2b5a0f-e3af-6d14-9578-8825f229dc89:nfs_share'
--
-- host = {'host': 'stack@zfssa_nfs#fake_zfssa',
-- 'capabilities': {'vendor_name': 'Oracle',
-- 'storage_protocol': 'nfs',
-- 'location_info': loc_info}}
-- ctxt = context.get_admin_context()
--
-- # Test Normal case
-- result = self.drv.migrate_volume(ctxt, volume, host)
-- self.assertEqual((True, None), result)
--
-- # Test when volume status is not available
-- volume['status'] = 'in-use'
-- result = self.drv.migrate_volume(ctxt, volume, host)
-- self.assertEqual((False, None), result)
-- volume['status'] = 'available'
--
-- # Test when Vendor is not Oracle
-- host['capabilities']['vendor_name'] = 'elcarO'
-- result = self.drv.migrate_volume(ctxt, volume, host)
-- self.assertEqual((False, None), result)
-- host['capabilities']['vendor_name'] = 'Oracle'
--
-- # Test when storage protocol is not iSCSI
-- host['capabilities']['storage_protocol'] = 'not_nfs'
-- result = self.drv.migrate_volume(ctxt, volume, host)
-- self.assertEqual((False, None), result)
-- host['capabilities']['storage_protocol'] = 'nfs'
--
-- # Test for exceptions
-- host['capabilities']['location_info'] = ''
-- result = self.drv.migrate_volume(ctxt, volume, host)
-- self.assertEqual((False, None), result)
-- host['capabilities']['location_info'] = loc_info
--
-- # Test case when source and target asn dont match
-- invalid_loc_info = (
-- 'fake_asn*https://2.2.2.2:/shares/export/nfs_share*nfs_share')
-- host['capabilities']['location_info'] = invalid_loc_info
-- result = self.drv.migrate_volume(ctxt, volume, host)
-- self.assertEqual((False, None), result)
--
-- # Test case when source and target shares names are different
-- invalid_loc_info = (
-- '9a2b5a0f-e3af-6d14-9578-8825f229dc89*' +
-- 'https://tgt:/shares/export/nfs_share*nfs_share_1')
-- host['capabilities']['location_info'] = invalid_loc_info
-- result = self.drv.migrate_volume(ctxt, volume, host)
-- self.assertEqual((False, None), result)
--
-- def test_create_delete_snapshot(self):
-- lcfg = self.configuration
-- self.drv.create_snapshot(self.test_snap)
-- self.drv.zfssa.create_snapshot.assert_called_once_with(
-- lcfg.zfssa_nfs_pool,
-- lcfg.zfssa_nfs_project,
-- lcfg.zfssa_nfs_share,
-- mock.ANY)
-- self.drv.zfssa.create_snapshot_of_volume_file.assert_called_once_with(
-- src_file=mock.ANY,
-- dst_file=self.test_snap['name'])
-- self.drv.delete_snapshot(self.test_snap)
-- self.drv.zfssa.delete_snapshot_of_volume_file.assert_called_with(
-- src_file=self.test_snap['name'])
--
-- def test_create_volume_from_snapshot(self):
-- self.drv.create_snapshot(self.test_snap)
-- with mock.patch.object(self.drv, '_ensure_shares_mounted'):
-- self.drv.create_volume_from_snapshot(self.test_vol_snap,
-- self.test_snap,
-- method='COPY')
--
-- self.drv.zfssa.create_volume_from_snapshot_file.\
-- assert_called_once_with(src_file=self.test_snap['name'],
-- dst_file=self.test_vol_snap['name'],
-- method='COPY')
--
-- def test_get_volume_stats(self):
-- self.drv._mounted_shares = ['nfs_share']
-- with mock.patch.object(self.drv, '_ensure_shares_mounted'):
-- with mock.patch.object(self.drv, '_get_share_capacity_info') as \
-- mock_get_share_capacity_info:
-- mock_get_share_capacity_info.return_value = (1073741824,
-- 9663676416)
-- stats = self.drv.get_volume_stats(refresh=True)
-- self.assertEqual(1, stats['free_capacity_gb'])
-- self.assertEqual(10, stats['total_capacity_gb'])
--
-- def tearDown(self):
-- super(TestZFSSANFSDriver, self).tearDown()
--
-- @mock.patch.object(remotefs.RemoteFSDriver, 'delete_volume')
-- @mock.patch.object(zfssanfs.ZFSSANFSDriver, '_check_origin')
-- def test_delete_volume(self, _check_origin, _delete_vol):
-- self.drv.zfssa.get_volume.side_effect = self._get_volume_side_effect
-- self.drv.delete_volume(self.test_vol)
-- _delete_vol.assert_called_once_with(self.test_vol)
-- self.drv._check_origin.assert_called_once_with(img_props_nfs['name'])
--
-- def _get_volume_side_effect(self, *args, **kwargs):
-- lcfg = self.configuration
-- volname = six.text_type(args[0])
-- if volname.startswith(lcfg.zfssa_cache_directory):
-- return {'numclones': 0}
-- else:
-- return {'origin': img_props_nfs['name']}
--
-- def test_check_origin(self):
-- self.drv.zfssa.get_volume.side_effect = self._get_volume_side_effect
-- self.drv._check_origin(img_props_nfs['name'])
-- self.drv.zfssa.delete_file.assert_called_once_with(
-- img_props_nfs['name'])
--
-- @mock.patch.object(zfssanfs.ZFSSANFSDriver, '_verify_cache_volume')
-- @mock.patch.object(zfssanfs.ZFSSANFSDriver, 'create_cloned_volume')
-- def test_clone_image_negative(self, _create_clone, _verify_cache_volume):
-- # Disabling local cache feature:
-- self.configuration.zfssa_enable_local_cache = False
-- self.assertEqual((None, False),
-- self.drv.clone_image(fakecontext, self.test_vol,
-- img_location,
-- small_img,
-- img_service))
--
-- self.configuration.zfssa_enable_local_cache = True
--
-- # Creating a volume smaller than image:
-- self.assertEqual((None, False),
-- self.drv.clone_image(fakecontext, self.test_vol,
-- img_location,
-- large_img,
-- img_service))
--
-- # The image does not have virtual_size property:
-- self.assertEqual((None, False),
-- self.drv.clone_image(fakecontext, self.test_vol,
-- img_location,
-- no_virtsize_img,
-- img_service))
--
-- # Exception raised in _verify_cache_image
-- self.drv._verify_cache_volume.side_effect = (
-- exception.VolumeBackendAPIException('fakeerror'))
-- self.assertEqual((None, False),
-- self.drv.clone_image(fakecontext, self.test_vol,
-- img_location,
-- small_img,
-- img_service))
--
-- @mock.patch.object(zfssanfs.ZFSSANFSDriver, 'create_cloned_volume')
-- @mock.patch.object(zfssanfs.ZFSSANFSDriver, '_verify_cache_volume')
-- @mock.patch.object(zfssanfs.ZFSSANFSDriver, 'extend_volume')
-- def test_clone_image(self, _extend_vol, _verify_cache, _create_clone):
-- self.drv._verify_cache_volume.return_value = img_props_nfs['name']
-- prov_loc = {'provider_location': self.test_vol['provider_location']}
-- self.drv.create_cloned_volume.return_value = prov_loc
-- self.assertEqual((prov_loc, True),
-- self.drv.clone_image(fakecontext, self.test_vol,
-- img_location,
-- small_img,
-- img_service))
-- self.drv._verify_cache_volume.assert_called_once_with(fakecontext,
-- small_img,
-- img_service,
-- img_props_nfs)
-- cache_vol = {
-- 'name': img_props_nfs['name'],
-- 'size': 3,
-- 'id': small_img['id'],
-- }
-- self.drv.create_cloned_volume.assert_called_once_with(self.test_vol,
-- cache_vol)
--
-- @mock.patch.object(zfssanfs.ZFSSANFSDriver, '_create_cache_volume')
-- def test_verify_cache_vol_no_cache_vol(self, _create_cache_vol):
-- self.drv.zfssa.get_volume.side_effect = exception.VolumeNotFound(
-- volume_id=img_props_nfs['name'])
-- self.drv._verify_cache_volume(fakecontext, small_img,
-- img_service, img_props_nfs)
-- self.drv._create_cache_volume.assert_called_once_with(fakecontext,
-- small_img,
-- img_service,
-- img_props_nfs)
--
-- def test_verify_cache_vol_stale_vol(self):
-- self.drv.zfssa.get_volume.return_value = {
-- 'numclones': 5,
-- 'updated_at': small_img['updated_at'].isoformat(),
-- 'image_id': 'wrong_id',
-- }
-- self.assertRaises(exception.VolumeBackendAPIException,
-- self.drv._verify_cache_volume,
-- fakecontext,
-- small_img,
-- img_service,
-- img_props_nfs)
--
-- @mock.patch.object(zfssanfs.ZFSSANFSDriver, '_create_cache_volume')
-- @mock.patch.object(zfssanfs.ZFSSANFSDriver, 'delete_volume')
-- def test_verify_cache_vol_updated_vol(self, _del_vol, _create_cache_vol):
-- updated_vol = {
-- 'updated_at': date(3000, 12, 12),
-- 'image_id': 'updated_id',
-- 'numclones': 0,
-- }
-- self.drv.zfssa.get_volume.return_value = updated_vol
-- self.drv._verify_cache_volume(fakecontext, small_img,
-- img_service, img_props_nfs)
-- cache_vol = {
-- 'provider_location': mock.ANY,
-- 'name': img_props_nfs['name'],
-- }
-- self.drv.delete_volume.assert_called_once_with(cache_vol)
-- self.drv._create_cache_volume.assert_called_once_with(fakecontext,
-- small_img,
-- img_service,
-- img_props_nfs)
--
-- @mock.patch.object(remotefs.RemoteFSDriver, 'copy_image_to_volume')
-- @mock.patch.object(remotefs.RemoteFSDriver, 'create_volume')
-- def test_create_cache_volume(self, _create_vol, _copy_image):
-- virtual_size = int(small_img['properties'].get('virtual_size'))
-- volsize = math.ceil(float(virtual_size) / units.Gi)
-- cache_vol = {
-- 'name': img_props_nfs['name'],
-- 'size': volsize,
-- 'provider_location': mock.ANY,
-- }
-- self.drv._create_cache_volume(fakecontext,
-- small_img,
-- img_service,
-- img_props_nfs)
--
-- _create_vol.assert_called_once_with(cache_vol)
-- _copy_image.assert_called_once_with(fakecontext,
-- cache_vol,
-- img_service,
-- small_img['id'])
--
-- def test_create_cache_vol_negative(self):
-- self.drv.zfssa.get_lun.side_effect = (
-- exception.VolumeBackendAPIException)
-- self.assertRaises(exception.VolumeBackendAPIException,
-- self.drv._create_cache_volume,
-- fakecontext,
-- small_img,
-- img_service,
-- img_props_nfs)
-- self.drv.zfssa.delete_file.assert_called_once_with(
-- img_props_nfs['name'])
--
--
--class TestZFSSAApi(test.TestCase):
--
-- @mock.patch.object(rest, 'factory_restclient')
-- def setUp(self, _restclient):
-- super(TestZFSSAApi, self).setUp()
-- self.host = 'fakehost'
-- self.user = 'fakeuser'
-- self.url = None
-- self.pool = 'fakepool'
-- self.project = 'fakeproject'
-- self.vol = 'fakevol'
-- self.snap = 'fakesnapshot'
-- self.clone = 'fakeclone'
-- self.targetalias = 'fakealias'
-- _restclient.return_value = mock.MagicMock(spec=client.RestClientURL)
-- self.zfssa = rest.ZFSSAApi()
-- self.zfssa.set_host('fakehost')
-- self.pool_url = '/api/storage/v1/pools/'
--
-- def _create_response(self, status, data='data'):
-- response = FakeResponse(status, data)
-- return response
--
-- def test_create_project(self):
-- self.zfssa.rclient.get.return_value = self._create_response(
-- client.Status.OK)
-- self.zfssa.create_project(self.pool, self.project)
-- expected_svc = self.pool_url + self.pool + '/projects/' + self.project
-- self.zfssa.rclient.get.assert_called_with(expected_svc)
--
-- def test_create_initiator(self):
-- self.zfssa.rclient.get.return_value = self._create_response(
-- client.Status.OK)
-- initiator = 'iqn.1986-03.com.sun:02:00000-aaaa-bbbb-cccc-ddddd'
-- alias = 'init-group'
-- self.zfssa.create_initiator(initiator, alias)
-- self.zfssa.rclient.get.assert_called_with(
-- '/api/san/v1/iscsi/initiators/alias=' + alias)
--
-- def test_create_target(self):
-- self.zfssa.rclient.get.return_value = self._create_response(
-- client.Status.NOT_FOUND)
-- ret_val = json.dumps(
-- {'target': {'iqn':
-- 'iqn.1986-03.com.sun:02:00000-aaaa-bbbb-cccc-ddddd'}})
-- self.zfssa.rclient.post.return_value = self._create_response(
-- client.Status.CREATED, ret_val)
-- alias = 'tgt-group'
-- self.zfssa.create_target(alias)
-- self.zfssa.rclient.post.assert_called_with('/api/san/v1/iscsi/targets',
-- {'alias': alias})
--
-- def test_get_target(self):
-- ret_val = json.dumps(
-- {'target': {'href': 'fake_href',
-- 'alias': 'tgt-group',
-- 'iqn':
-- 'iqn.1986-03.com.sun:02:00000-aaaa-bbbb-cccc-ddddd',
-- 'targetchapuser': '',
-- 'targetchapsecret': '',
-- 'interfaces': ['nge0']}})
-- self.zfssa.rclient.get.return_value = self._create_response(
-- client.Status.OK, ret_val)
-- ret = self.zfssa.get_target('tgt-group')
-- self.zfssa.rclient.get.assert_called_once_with(
-- '/api/san/v1/iscsi/targets/alias=tgt-group')
-- self.assertEqual('iqn.1986-03.com.sun:02:00000-aaaa-bbbb-cccc-ddddd',
-- ret)
--
-- def test_verify_pool(self):
-- self.zfssa.rclient.get.return_value = self._create_response(
-- client.Status.OK)
-- self.zfssa.verify_pool(self.pool)
-- self.zfssa.rclient.get.assert_called_with(self.pool_url + self.pool)
--
-- def test_verify_project(self):
-- self.zfssa.rclient.get.return_value = self._create_response(
-- client.Status.NOT_FOUND)
-- self.assertRaises(exception.VolumeBackendAPIException,
-- self.zfssa.verify_project,
-- self.pool,
-- self.project)
--
-- def test_verify_initiator(self):
-- self.zfssa.rclient.get.return_value = self._create_response(
-- client.Status.OK)
-- self.zfssa.verify_initiator('iqn.1-0.org.deb:01:d7')
-- self.zfssa.rclient.get.assert_called_with(
-- '/api/san/v1/iscsi/initiators/iqn.1-0.org.deb:01:d7')
--
-- def test_verify_target(self):
-- self.zfssa.rclient.get.return_value = self._create_response(
-- client.Status.BAD_REQUEST)
-- self.assertRaises(exception.VolumeBackendAPIException,
-- self.zfssa.verify_target,
-- self.targetalias)
--
-- def test_create_delete_lun(self):
-- arg = json.dumps({'name': self.vol,
-- 'initiatorgroup': 'com.sun.ms.vss.hg.maskAll'})
-- self.zfssa.rclient.post.return_value = self._create_response(
-- client.Status.CREATED, data=arg)
-- self.zfssa.create_lun(self.pool, self.project, self.vol, 1, 'tgt-grp',
-- None)
-- expected_arg = {'name': self.vol,
-- 'volsize': 1,
-- 'targetgroup': 'tgt-grp',
-- 'initiatorgroup': 'com.sun.ms.vss.hg.maskAll'}
-- self.zfssa.rclient.post.assert_called_with(
-- self.pool_url + self.pool + '/projects/' + self.project + '/luns',
-- expected_arg)
--
-- self.zfssa.rclient.delete.return_value = self._create_response(
-- client.Status.NO_CONTENT)
-- self.zfssa.delete_lun(self.pool, self.project, self.vol)
-- self.zfssa.rclient.delete.assert_called_with(
-- self.pool_url + self.pool + '/projects/' + self.project +
-- '/luns/' + self.vol)
--
-- def test_create_delete_snapshot(self):
-- self.zfssa.rclient.post.return_value = self._create_response(
-- client.Status.CREATED)
-- self.zfssa.create_snapshot(self.pool,
-- self.project,
-- self.vol,
-- self.snap)
-- expected_arg = {'name': self.snap}
-- self.zfssa.rclient.post.assert_called_with(
-- self.pool_url + self.pool + '/projects/' + self.project +
-- '/luns/' + self.vol + '/snapshots', expected_arg)
--
-- self.zfssa.rclient.delete.return_value = self._create_response(
-- client.Status.NO_CONTENT)
-- self.zfssa.delete_snapshot(self.pool,
-- self.project,
-- self.vol,
-- self.snap)
-- self.zfssa.rclient.delete.assert_called_with(
-- self.pool_url + self.pool + '/projects/' + self.project +
-- '/luns/' + self.vol + '/snapshots/' + self.snap)
--
-- def test_clone_snapshot(self):
-- self.zfssa.rclient.put.return_value = self._create_response(
-- client.Status.CREATED)
-- self.zfssa.clone_snapshot(self.pool,
-- self.project,
-- self.vol,
-- self.snap,
-- self.project,
-- self.clone)
-- expected_svc = '/api/storage/v1/pools/' + self.pool + '/projects/' + \
-- self.project + '/luns/' + self.vol + '/snapshots/' + self.snap + \
-- '/clone'
-- expected_arg = {'project': self.project,
-- 'share': self.clone,
-- 'nodestroy': True}
-- self.zfssa.rclient.put.assert_called_with(expected_svc, expected_arg)
--
-- def test_get_project_stats(self):
-- ret_val = json.dumps({"project": {"name": self.project,
-- "space_available": 15754895360,
-- "space_total": 25754895360,
-- "dedup": False,
-- "logbias": "latency",
-- "encryption": "off"}})
-- self.zfssa.rclient.get.return_value = self._create_response(
-- client.Status.OK, ret_val)
-- self.zfssa.get_project_stats(self.pool, self.project)
-- expected_svc = '/api/storage/v1/pools/' + self.pool + '/projects/' + \
-- self.project
-- self.zfssa.rclient.get.assert_called_with(expected_svc)
--
-- self.zfssa.rclient.get.return_value = self._create_response(
-- client.Status.NOT_FOUND)
-- self.assertRaises(exception.VolumeBackendAPIException,
-- self.zfssa.get_project_stats,
-- self.pool,
-- self.project)
--
--
--class TestZFSSANfsApi(test.TestCase):
--
-- @mock.patch.object(rest, 'factory_restclient')
-- def setUp(self, _restclient):
-- super(TestZFSSANfsApi, self).setUp()
-- self.host = 'fakehost'
-- self.user = 'fakeuser'
-- self.url = None
-- self.pool = 'fakepool'
-- self.project = 'fakeproject'
-- self.share = 'fakeshare'
-- self.snap = 'fakesnapshot'
-- self.targetalias = 'fakealias'
-- _restclient.return_value = mock.MagicMock(spec=client.RestClientURL)
-- self.webdavclient = mock.MagicMock(spec=webdavclient.ZFSSAWebDAVClient)
-- self.zfssa = rest.ZFSSANfsApi()
-- self.zfssa.set_host('fakehost')
-- self.pool_url = '/api/storage/v1/pools/'
--
-- def _create_response(self, status, data='data'):
-- response = FakeResponse(status, data)
-- return response
--
-- def test_verify_share(self):
-- self.zfssa.rclient.get.return_value = self._create_response(
-- client.Status.OK)
-- self.zfssa.verify_share(self.pool, self.project, self.share)
-- self.zfssa.rclient.get.assert_called_with(self.pool_url + self.pool +
-- '/projects/' + self.project +
-- '/filesystems/' + self.share)
--
-- def test_create_delete_snapshot(self):
-- self.zfssa.rclient.post.return_value = self._create_response(
-- client.Status.CREATED)
-- self.zfssa.create_snapshot(self.pool,
-- self.project,
-- self.share,
-- self.snap)
-- expected_arg = {'name': self.snap}
-- self.zfssa.rclient.post.assert_called_with(
-- self.pool_url + self.pool + '/projects/' + self.project +
-- '/filesystems/' + self.share + '/snapshots', expected_arg)
--
-- self.zfssa.rclient.delete.return_value = self._create_response(
-- client.Status.NO_CONTENT)
-- self.zfssa.delete_snapshot(self.pool,
-- self.project,
-- self.share,
-- self.snap)
-- self.zfssa.rclient.delete.assert_called_with(
-- self.pool_url + self.pool + '/projects/' + self.project +
-- '/filesystems/' + self.share + '/snapshots/' + self.snap)
--
-- def create_delete_snapshot_of_volume_file(self):
-- src_file = "fake_src_file"
-- dst_file = "fake_dst_file"
-- self.zfssa.create_snapshot_of_volume_file(src_file=src_file,
-- dst_file=dst_file)
-- self.zfssa.webdavclient.request.assert_called_once_with(
-- src_file=src_file,
-- dst_file=dst_file,
-- method='COPY')
-- self.zfssa.delete_snapshot_of_volume_file(src_file=src_file)
-- self.zfssa.webdavclient.request.assert_called_once_with(
-- src_file=src_file, method='DELETE')
--
-- def test_get_share(self):
-- ret_val = json.dumps({'filesystem': 'test_fs'})
-- self.zfssa.rclient.get.return_value = self._create_response(
-- client.Status.OK, ret_val)
-- ret = self.zfssa.get_share(self.pool, self.project, self.share)
-- self.zfssa.rclient.get.assert_called_with(self.pool_url + self.pool +
-- '/projects/' + self.project +
-- '/filesystems/' + self.share)
-- self.assertEqual('test_fs', ret)
--
-- def test_create_share(self):
-- self.zfssa.rclient.get.return_value = self._create_response(
-- client.Status.NOT_FOUND)
-- self.zfssa.rclient.post.return_value = self._create_response(
-- client.Status.BAD_REQUEST)
-- self.assertRaises(exception.VolumeBackendAPIException,
-- self.zfssa.create_share,
-- self.pool,
-- self.project,
-- self.share,
-- {})
--
-- @mock.patch.object(rest.ZFSSANfsApi, '_change_service_state')
-- @mock.patch.object(rest.ZFSSANfsApi, 'verify_service')
-- def test_enable_disable_modify_service(self,
-- verify_service,
-- _change_service_state):
-- self.zfssa.enable_service('http')
-- self.zfssa._change_service_state.assert_called_with(
-- 'http', state='enable')
-- self.zfssa.verify_service.assert_called_with('http')
--
-- self.zfssa.disable_service('http')
-- self.zfssa._change_service_state.assert_called_with(
-- 'http', state='disable')
-- self.zfssa.verify_service.assert_called_with('http', status='offline')
--
-- ret_val = json.dumps({'service': {
-- "href": "/api/service/v1/services/http",
-- "<status>": "online",
-- "require_login": False,
-- "protocols": "http/https",
-- "listen_port": 81,
-- "https_port": 443}})
-- self.zfssa.rclient.put.return_value = self._create_response(
-- client.Status.ACCEPTED, ret_val)
-- args = {'listen_port': 81}
-- self.zfssa.modify_service('http', args)
-- self.zfssa.rclient.put.called_with('/api/service/v1/services/http',
-- args)
--
--
--class TestRestClientURL(test.TestCase):
-- def setUp(self):
-- super(TestRestClientURL, self).setUp()
-- self.timeout = 60
-- self.url = '1.1.1.1'
-- self.client = client.RestClientURL(self.url, timeout=self.timeout)
--
-- @mock.patch.object(client.RestClientURL, 'request')
-- def test_post(self, _request):
-- path = '/api/storage/v1/pools'
-- body = {'name': 'fakepool'}
-- self.client.post(path, body=body)
-- self.client.request.assert_called_with(path, 'POST', body)
--
-- @mock.patch.object(client.RestClientURL, 'request')
-- def test_get(self, _request):
-- path = '/api/storage/v1/pools'
-- self.client.get(path)
-- self.client.request.assert_called_with(path, 'GET')
--
-- @mock.patch.object(client.RestClientURL, 'request')
-- def test_put(self, _request):
-- path = '/api/storage/v1/pools'
-- body = {'name': 'fakepool'}
-- self.client.put(path, body=body)
-- self.client.request.assert_called_with(path, 'PUT', body)
--
-- @mock.patch.object(client.RestClientURL, 'request')
-- def test_delete(self, _request):
-- path = '/api/storage/v1/pools'
-- self.client.delete(path)
-- self.client.request.assert_called_with(path, 'DELETE')
--
-- @mock.patch.object(client.RestClientURL, 'request')
-- def test_head(self, _request):
-- path = '/api/storage/v1/pools'
-- self.client.head(path)
-- self.client.request.assert_called_with(path, 'HEAD')
--
-- @mock.patch.object(client, 'RestResult')
-- @mock.patch.object(client.urllib.request, 'Request')
-- @mock.patch.object(client.urllib.request, 'urlopen')
-- def test_request(self, _urlopen, _Request, _RestResult):
-- path = '/api/storage/v1/pools'
-- _urlopen.return_value = mock.Mock()
-- self.client.request(path, mock.ANY)
-- _Request.assert_called_with(self.url + path, None, self.client.headers)
-- self.assertEqual(1, _urlopen.call_count)
-- _RestResult.assert_called_with(response=mock.ANY)
--
-- @mock.patch.object(client, 'RestResult')
-- @mock.patch.object(client.urllib.request, 'Request')
-- @mock.patch.object(client.urllib.request, 'urlopen')
-- @mock.patch.object(client, 'ssl', new_callable=FakeSSL)
-- def test_ssl_with_context(self, _ssl, _urlopen, _Request, _RestResult):
-- """Test PEP476 certificate opt_out fix. """
-- path = '/api/storage/v1/pools'
-- _urlopen.return_value = mock.Mock()
-- self.client.request(path, mock.ANY)
-- _urlopen.assert_called_once_with(mock.ANY,
-- timeout=self.timeout,
-- context='fakecontext')
--
-- @mock.patch.object(client, 'RestResult')
-- @mock.patch.object(client.urllib.request, 'Request')
-- @mock.patch.object(client.urllib.request, 'urlopen')
-- @mock.patch.object(client, 'ssl', new_callable=object)
-- def test_ssl_no_context(self, _ssl, _urlopen, _Request, _RestResult):
-- """Verify the PEP476 fix backward compatibility. """
-- path = '/api/storage/v1/pools'
-- _urlopen.return_value = mock.Mock()
-- self.client.request(path, mock.ANY)
-- _urlopen.assert_called_once_with(mock.ANY, timeout=self.timeout)
Code Review / openstack-build / cinder-build.git / commitdiff