From dc4ce932ed304a2c1dbe68059bdea664792db67f Mon Sep 17 00:00:00 2001 From: Yulia Portnova Date: Mon, 2 Sep 2013 09:59:07 +0300 Subject: [PATCH] Renamed cinder to manila. Fixed setup.py, fixed bin scripts. --- .idea/.name | 1 + .idea/encodings.xml | 5 + .idea/manila.iml | 9 + .idea/misc.xml | 30 + .idea/modules.xml | 9 + .idea/other.xml | 7 + .idea/scopes/scope_settings.xml | 5 + .idea/testrunner.xml | 8 + .idea/vcs.xml | 7 + .idea/workspace.xml | 1287 +++++++++++++++++ bin/{cinder-all => manila-all} | 26 +- bin/{cinder-api => manila-api} | 18 +- bin/{cinder-backup => manila-backup} | 22 +- ...bbit-queues => manila-clear-rabbit-queues} | 24 +- bin/{cinder-manage => manila-manage} | 86 +- bin/{cinder-rootwrap => manila-rootwrap} | 16 +- ...c-zmq-receiver => manila-rpc-zmq-receiver} | 14 +- bin/{cinder-scheduler => manila-scheduler} | 22 +- bin/{cinder-share => manila-share} | 22 +- bin/{cinder-volume => manila-volume} | 22 +- ...-usage-audit => manila-volume-usage-audit} | 28 +- doc/ext/cinder_autodoc.py | 4 +- doc/source/conf.py | 10 +- manila.egg-info/PKG-INFO | 41 + manila.egg-info/SOURCES.txt | 917 ++++++++++++ manila.egg-info/dependency_links.txt | 1 + manila.egg-info/entry_points.txt | 10 + manila.egg-info/requires.txt | 25 + manila.egg-info/top_level.txt | 1 + {cinder => manila}/__init__.py | 4 +- {cinder => manila}/api/__init__.py | 2 +- {cinder => manila}/api/auth.py | 12 +- {cinder => manila}/api/common.py | 24 +- {cinder => manila}/api/contrib/__init__.py | 8 +- .../api/contrib/admin_actions.py | 18 +- {cinder => manila}/api/contrib/backups.py | 28 +- .../contrib/extended_snapshot_attributes.py | 18 +- {cinder => manila}/api/contrib/hosts.py | 30 +- .../api/contrib/image_create.py | 2 +- .../api/contrib/quota_classes.py | 16 +- {cinder => manila}/api/contrib/quotas.py | 20 +- {cinder => manila}/api/contrib/services.py | 20 +- .../api/contrib/share_actions.py | 14 +- .../api/contrib/share_snapshots.py | 26 +- {cinder => manila}/api/contrib/shares.py | 24 +- .../api/contrib/types_extra_specs.py | 24 +- .../api/contrib/types_manage.py | 18 +- .../api/contrib/volume_actions.py | 36 +- .../api/contrib/volume_host_attribute.py | 14 +- .../api/contrib/volume_image_metadata.py | 12 +- .../api/contrib/volume_tenant_attribute.py | 12 +- {cinder => manila}/api/extensions.py | 34 +- {cinder => manila}/api/middleware/__init__.py | 0 {cinder => manila}/api/middleware/auth.py | 18 +- {cinder => manila}/api/middleware/fault.py | 8 +- .../api/middleware/sizelimit.py | 8 +- {cinder => manila}/api/openstack/__init__.py | 16 +- {cinder => manila}/api/openstack/urlmap.py | 8 +- .../api/openstack/volume/__init__.py | 8 +- .../api/openstack/volume/versions.py | 8 +- {cinder => manila}/api/openstack/wsgi.py | 20 +- {cinder => manila}/api/schemas/atom-link.rng | 0 .../api/schemas/v1.1/extension.rng | 0 .../api/schemas/v1.1/extensions.rng | 0 .../api/schemas/v1.1/limits.rng | 0 .../api/schemas/v1.1/metadata.rng | 0 {cinder => manila}/api/sizelimit.py | 8 +- {cinder => manila}/api/urlmap.py | 6 +- {cinder => manila}/api/v1/__init__.py | 0 {cinder => manila}/api/v1/limits.py | 22 +- {cinder => manila}/api/v1/router.py | 22 +- .../api/v1/snapshot_metadata.py | 20 +- {cinder => manila}/api/v1/snapshots.py | 30 +- {cinder/api/v2 => manila/api/v1}/types.py | 14 +- {cinder => manila}/api/v1/volume_metadata.py | 20 +- {cinder => manila}/api/v1/volumes.py | 30 +- {cinder => manila}/api/v2/__init__.py | 0 {cinder => manila}/api/v2/limits.py | 22 +- {cinder => manila}/api/v2/router.py | 18 +- .../api/v2/snapshot_metadata.py | 20 +- {cinder => manila}/api/v2/snapshots.py | 30 +- {cinder/api/v1 => manila/api/v2}/types.py | 14 +- {cinder => manila}/api/v2/views/__init__.py | 0 {cinder => manila}/api/v2/views/volumes.py | 4 +- {cinder => manila}/api/v2/volumes.py | 32 +- {cinder => manila}/api/versions.py | 8 +- {cinder => manila}/api/views/__init__.py | 0 {cinder => manila}/api/views/backups.py | 4 +- {cinder => manila}/api/views/limits.py | 2 +- .../api/views/share_snapshots.py | 4 +- {cinder => manila}/api/views/shares.py | 4 +- {cinder => manila}/api/views/types.py | 2 +- {cinder => manila}/api/views/versions.py | 0 {cinder => manila}/api/xmlutil.py | 6 +- {cinder => manila}/backup/__init__.py | 10 +- {cinder => manila}/backup/api.py | 14 +- {cinder => manila}/backup/manager.py | 20 +- {cinder => manila}/backup/rpcapi.py | 10 +- .../backup/services/__init__.py | 0 {cinder => manila}/backup/services/swift.py | 10 +- {cinder => manila}/brick/__init__.py | 0 {cinder => manila}/brick/iscsi/__init__.py | 0 {cinder => manila}/brick/iscsi/iscsi.py | 14 +- .../brick/local_dev/__init__.py | 0 {cinder => manila}/brick/local_dev/lvm.py | 6 +- {cinder => manila}/common/__init__.py | 0 {cinder => manila}/common/sqlalchemyutils.py | 4 +- {cinder => manila}/compute/__init__.py | 0 .../compute/aggregate_states.py | 0 {cinder => manila}/context.py | 10 +- {cinder => manila}/db/__init__.py | 2 +- {cinder => manila}/db/api.py | 14 +- {cinder => manila}/db/base.py | 6 +- {cinder => manila}/db/migration.py | 4 +- {cinder => manila}/db/sqlalchemy/__init__.py | 0 {cinder => manila}/db/sqlalchemy/api.py | 18 +- .../db/sqlalchemy/migrate_repo/README | 0 .../db/sqlalchemy/migrate_repo/__init__.py | 0 .../db/sqlalchemy/migrate_repo/manage.py | 0 .../db/sqlalchemy/migrate_repo/migrate.cfg | 0 .../migrate_repo/versions/001_cinder_init.py | 4 +- .../migrate_repo/versions/002_quota_class.py | 2 +- .../versions/003_glance_metadata.py | 2 +- .../versions/004_volume_type_to_uuid.py | 2 +- .../versions/005_add_source_volume_column.py | 2 +- .../versions/005_sqlite_downgrade.sql | 0 .../006_snapshots_add_provider_location.py | 0 .../versions/007_add_volume_snapshot_fk.py | 0 .../versions/007_sqlite_downgrade.sql | 0 .../migrate_repo/versions/008_add_backup.py | 2 +- .../009_add_snapshot_metadata_table.py | 2 +- .../versions/010_add_share_tables.py | 2 +- .../versions/011_add_share_snapshot_table.py | 2 +- .../migrate_repo/versions/__init__.py | 0 {cinder => manila}/db/sqlalchemy/migration.py | 12 +- {cinder => manila}/db/sqlalchemy/models.py | 16 +- {cinder => manila}/db/sqlalchemy/session.py | 10 +- {cinder => manila}/exception.py | 4 +- {cinder => manila}/flags.py | 42 +- {cinder => manila}/image/__init__.py | 0 {cinder => manila}/image/glance.py | 10 +- {cinder => manila}/image/image_utils.py | 8 +- .../locale/bg_BG/LC_MESSAGES/cinder.po | 38 +- .../locale/bs/LC_MESSAGES/cinder.po | 40 +- {cinder => manila}/locale/cinder.pot | 0 .../locale/cs/LC_MESSAGES/cinder.po | 40 +- .../locale/da/LC_MESSAGES/cinder.po | 40 +- .../locale/de/LC_MESSAGES/cinder.po | 40 +- .../locale/en_AU/LC_MESSAGES/cinder.po | 40 +- .../locale/en_GB/LC_MESSAGES/cinder.po | 40 +- .../locale/en_US/LC_MESSAGES/cinder.po | 46 +- .../locale/es/LC_MESSAGES/cinder.po | 40 +- .../locale/fi_FI/LC_MESSAGES/cinder.po | 38 +- .../locale/fr/LC_MESSAGES/cinder.po | 40 +- .../locale/it/LC_MESSAGES/cinder.po | 40 +- .../locale/ja/LC_MESSAGES/cinder.po | 40 +- .../locale/ko/LC_MESSAGES/cinder.po | 40 +- .../locale/ko_KR/LC_MESSAGES/cinder.po | 38 +- .../locale/pt_BR/LC_MESSAGES/cinder.po | 40 +- .../locale/ru/LC_MESSAGES/cinder.po | 40 +- .../locale/tl/LC_MESSAGES/cinder.po | 40 +- .../locale/tr/LC_MESSAGES/cinder.po | 40 +- .../locale/uk/LC_MESSAGES/cinder.po | 40 +- .../locale/vi_VN/LC_MESSAGES/cinder.po | 38 +- .../locale/zh_CN/LC_MESSAGES/cinder.po | 40 +- .../locale/zh_TW/LC_MESSAGES/cinder.po | 40 +- {cinder => manila}/manager.py | 12 +- {cinder => manila}/openstack/__init__.py | 0 {cinder => manila}/openstack/common/README | 0 .../openstack/common/__init__.py | 0 .../openstack/common/context.py | 0 .../openstack/common/eventlet_backdoor.py | 0 .../openstack/common/exception.py | 2 +- .../openstack/common/excutils.py | 2 +- .../openstack/common/fileutils.py | 0 .../openstack/common/gettextutils.py | 6 +- .../openstack/common/importutils.py | 0 .../openstack/common/jsonutils.py | 2 +- {cinder => manila}/openstack/common/local.py | 0 .../openstack/common/lockutils.py | 8 +- {cinder => manila}/openstack/common/log.py | 10 +- .../openstack/common/loopingcall.py | 6 +- .../openstack/common/network_utils.py | 0 .../openstack/common/notifier/__init__.py | 0 .../openstack/common/notifier/api.py | 12 +- .../openstack/common/notifier/log_notifier.py | 6 +- .../common/notifier/no_op_notifier.py | 0 .../common/notifier/rabbit_notifier.py | 6 +- .../openstack/common/notifier/rpc_notifier.py | 8 +- .../common/notifier/rpc_notifier2.py | 8 +- .../common/notifier/test_notifier.py | 0 {cinder => manila}/openstack/common/policy.py | 4 +- .../openstack/common/processutils.py | 4 +- .../openstack/common/rootwrap/__init__.py | 0 .../openstack/common/rootwrap/cmd.py | 16 +- .../openstack/common/rootwrap/filters.py | 0 .../openstack/common/rootwrap/wrapper.py | 2 +- .../openstack/common/rpc/__init__.py | 10 +- .../openstack/common/rpc/amqp.py | 10 +- .../openstack/common/rpc/common.py | 10 +- .../openstack/common/rpc/dispatcher.py | 2 +- .../openstack/common/rpc/impl_fake.py | 2 +- .../openstack/common/rpc/impl_kombu.py | 8 +- .../openstack/common/rpc/impl_qpid.py | 12 +- .../openstack/common/rpc/impl_zmq.py | 14 +- .../openstack/common/rpc/matchmaker.py | 4 +- .../openstack/common/rpc/matchmaker_redis.py | 6 +- .../openstack/common/rpc/proxy.py | 2 +- .../openstack/common/rpc/service.py | 10 +- .../openstack/common/rpc/zmq_receiver.py | 6 +- .../openstack/common/scheduler/__init__.py | 0 .../openstack/common/scheduler/filter.py | 0 .../common/scheduler/filters/__init__.py | 4 +- .../filters/availability_zone_filter.py | 2 +- .../scheduler/filters/capabilities_filter.py | 6 +- .../scheduler/filters/extra_specs_ops.py | 2 +- .../common/scheduler/filters/json_filter.py | 4 +- .../openstack/common/scheduler/weight.py | 0 .../common/scheduler/weights/__init__.py | 2 +- .../openstack/common/service.py | 12 +- .../openstack/common/strutils.py | 2 +- .../openstack/common/threadgroup.py | 4 +- .../openstack/common/timeutils.py | 0 .../openstack/common/uuidutils.py | 0 {cinder => manila}/policy.py | 12 +- {cinder => manila}/quota.py | 14 +- {cinder => manila}/scheduler/__init__.py | 4 +- {cinder => manila}/scheduler/chance.py | 6 +- {cinder => manila}/scheduler/driver.py | 16 +- .../scheduler/filter_scheduler.py | 12 +- .../scheduler/filters/__init__.py | 0 .../scheduler/filters/capacity_filter.py | 4 +- .../scheduler/filters/retry_filter.py | 4 +- {cinder => manila}/scheduler/host_manager.py | 20 +- {cinder => manila}/scheduler/manager.py | 24 +- {cinder => manila}/scheduler/rpcapi.py | 8 +- .../scheduler/scheduler_options.py | 6 +- {cinder => manila}/scheduler/simple.py | 12 +- .../scheduler/weights/__init__.py | 0 .../scheduler/weights/capacity.py | 4 +- {cinder => manila}/service.py | 24 +- {cinder => manila}/share/__init__.py | 10 +- {cinder => manila}/share/api.py | 24 +- {cinder => manila}/share/configuration.py | 4 +- {cinder => manila}/share/driver.py | 14 +- {cinder => manila}/share/drivers/__init__.py | 4 +- {cinder => manila}/share/drivers/lvm.py | 18 +- {cinder => manila}/share/drivers/netapp.py | 8 +- {cinder => manila}/share/manager.py | 22 +- {cinder => manila}/share/rpcapi.py | 10 +- {cinder => manila}/test.py | 14 +- {cinder => manila}/testing/README.rst | 0 {cinder => manila}/tests/__init__.py | 12 +- .../contrib => manila/tests/api}/__init__.py | 2 +- {cinder => manila}/tests/api/common.py | 0 .../tests/api/contrib}/__init__.py | 2 +- {cinder => manila}/tests/api/contrib/stubs.py | 2 +- .../tests/api/contrib/test_admin_actions.py | 44 +- .../tests/api/contrib/test_backups.py | 24 +- .../test_extended_snapshot_attributes.py | 14 +- .../tests/api/contrib/test_hosts.py | 62 +- .../tests/api/contrib/test_services.py | 86 +- .../tests/api/contrib/test_share_actions.py | 20 +- .../tests/api/contrib/test_share_snapshots.py | 12 +- .../tests/api/contrib/test_shares.py | 14 +- .../api/contrib/test_types_extra_specs.py | 32 +- .../tests/api/contrib/test_types_manage.py | 14 +- .../tests/api/contrib/test_volume_actions.py | 20 +- .../api/contrib/test_volume_host_attribute.py | 24 +- .../api/contrib/test_volume_image_metadata.py | 12 +- .../contrib/test_volume_tenant_attribute.py | 24 +- .../tests/api/extensions/__init__.py | 0 .../tests/api/extensions/foxinsocks.py | 4 +- {cinder => manila}/tests/api/fakes.py | 28 +- .../tests/api/middleware/__init__.py | 0 .../tests/api/middleware/test_auth.py | 8 +- .../tests/api/middleware/test_faults.py | 12 +- .../tests/api/middleware/test_sizelimit.py | 6 +- .../tests/api/openstack/__init__.py | 2 +- .../tests/api/openstack/test_wsgi.py | 8 +- {cinder => manila}/tests/api/test_common.py | 8 +- .../tests/api/test_extensions.py | 12 +- {cinder => manila}/tests/api/test_router.py | 18 +- {cinder => manila}/tests/api/test_wsgi.py | 4 +- {cinder => manila}/tests/api/test_xmlutil.py | 4 +- {cinder => manila}/tests/api/v1/__init__.py | 0 {cinder => manila}/tests/api/v1/stubs.py | 4 +- .../tests/api/v1/test_limits.py | 22 +- .../tests/api/v1/test_snapshot_metadata.py | 84 +- .../tests/api/v1/test_snapshots.py | 18 +- {cinder => manila}/tests/api/v1/test_types.py | 14 +- .../tests/api/v1/test_volume_metadata.py | 82 +- .../tests/api/v1/test_volumes.py | 26 +- {cinder => manila}/tests/api/v2/__init__.py | 0 {cinder => manila}/tests/api/v2/stubs.py | 4 +- .../tests/api/v2/test_limits.py | 22 +- .../tests/api/v2/test_snapshot_metadata.py | 84 +- .../tests/api/v2/test_snapshots.py | 18 +- {cinder => manila}/tests/api/v2/test_types.py | 14 +- .../tests/api/v2/test_volumes.py | 26 +- {cinder => manila}/tests/backup/__init__.py | 0 .../tests/backup/fake_service.py | 4 +- .../tests/backup/fake_swift_client.py | 2 +- {cinder => manila}/tests/brick/__init__.py | 0 .../tests/brick/test_brick_lvm.py | 10 +- {cinder => manila}/tests/db/__init__.py | 0 {cinder => manila}/tests/db/fakes.py | 2 +- {cinder => manila}/tests/declare_flags.py | 2 +- {cinder => manila}/tests/fake_driver.py | 6 +- {cinder => manila}/tests/fake_flags.py | 22 +- {cinder => manila}/tests/fake_utils.py | 8 +- {cinder => manila}/tests/glance/__init__.py | 0 {cinder => manila}/tests/glance/stubs.py | 0 {cinder => manila}/tests/image/__init__.py | 2 +- {cinder => manila}/tests/image/fake.py | 12 +- {cinder => manila}/tests/image/test_glance.py | 12 +- .../tests/integrated/__init__.py | 2 +- .../tests/integrated/api/__init__.py | 0 .../tests/integrated/api/client.py | 4 +- .../tests/integrated/integrated_helpers.py | 8 +- .../tests/integrated/test_extensions.py | 8 +- .../tests/integrated/test_login.py | 4 +- .../tests/integrated/test_volumes.py | 14 +- .../tests/integrated/test_xml.py | 8 +- .../tests/monkey_patch_example/__init__.py | 0 .../tests/monkey_patch_example/example_a.py | 0 .../tests/monkey_patch_example/example_b.py | 0 {cinder => manila}/tests/policy.json | 0 {cinder => manila}/tests/runtime_flags.py | 2 +- .../tests/scheduler/__init__.py | 2 +- {cinder => manila}/tests/scheduler/fakes.py | 8 +- .../tests/scheduler/test_capacity_weigher.py | 12 +- .../tests/scheduler/test_filter_scheduler.py | 18 +- .../tests/scheduler/test_host_filters.py | 20 +- .../tests/scheduler/test_host_manager.py | 16 +- .../tests/scheduler/test_rpcapi.py | 12 +- .../tests/scheduler/test_scheduler.py | 26 +- .../tests/scheduler/test_scheduler_options.py | 6 +- .../tests/test_HpSanISCSIDriver.py | 10 +- {cinder => manila}/tests/test_api.py | 0 {cinder => manila}/tests/test_backup.py | 20 +- {cinder => manila}/tests/test_backup_swift.py | 16 +- {cinder => manila}/tests/test_context.py | 4 +- {cinder => manila}/tests/test_coraid.py | 16 +- .../tests/test_drivers_compatibility.py | 70 +- {cinder => manila}/tests/test_emc.py | 16 +- {cinder => manila}/tests/test_exception.py | 8 +- {cinder => manila}/tests/test_flags.py | 10 +- {cinder => manila}/tests/test_glusterfs.py | 14 +- {cinder => manila}/tests/test_hp3par.py | 12 +- {cinder => manila}/tests/test_huawei.py | 10 +- {cinder => manila}/tests/test_iscsi.py | 6 +- {cinder => manila}/tests/test_migrations.conf | 0 {cinder => manila}/tests/test_migrations.py | 14 +- {cinder => manila}/tests/test_misc.py | 6 +- {cinder => manila}/tests/test_netapp.py | 14 +- {cinder => manila}/tests/test_netapp_nfs.py | 14 +- {cinder => manila}/tests/test_nexenta.py | 64 +- {cinder => manila}/tests/test_nfs.py | 14 +- {cinder => manila}/tests/test_policy.py | 20 +- {cinder => manila}/tests/test_quota.py | 30 +- {cinder => manila}/tests/test_rbd.py | 26 +- {cinder => manila}/tests/test_scality.py | 8 +- {cinder => manila}/tests/test_service.py | 32 +- {cinder => manila}/tests/test_share.py | 28 +- {cinder => manila}/tests/test_share_api.py | 20 +- {cinder => manila}/tests/test_share_driver.py | 10 +- {cinder => manila}/tests/test_share_lvm.py | 26 +- {cinder => manila}/tests/test_share_netapp.py | 10 +- {cinder => manila}/tests/test_share_rpcapi.py | 16 +- {cinder => manila}/tests/test_sheepdog.py | 6 +- .../tests/test_skip_examples.py | 2 +- {cinder => manila}/tests/test_solidfire.py | 12 +- {cinder => manila}/tests/test_storwize_svc.py | 18 +- {cinder => manila}/tests/test_test.py | 4 +- {cinder => manila}/tests/test_test_utils.py | 4 +- {cinder => manila}/tests/test_utils.py | 34 +- {cinder => manila}/tests/test_volume.py | 96 +- .../tests/test_volume_configuration.py | 10 +- .../tests/test_volume_glance_metadata.py | 8 +- .../tests/test_volume_rpcapi.py | 16 +- {cinder => manila}/tests/test_volume_types.py | 18 +- .../tests/test_volume_types_extra_specs.py | 6 +- {cinder => manila}/tests/test_volume_utils.py | 20 +- {cinder => manila}/tests/test_windows.py | 12 +- {cinder => manila}/tests/test_wsgi.py | 32 +- {cinder => manila}/tests/test_xenapi_sm.py | 16 +- {cinder => manila}/tests/test_xiv.py | 10 +- {cinder => manila}/tests/test_zadara.py | 10 +- {cinder => manila}/tests/utils.py | 8 +- {cinder => manila}/tests/var/ca.crt | 0 {cinder => manila}/tests/var/certificate.crt | 0 {cinder => manila}/tests/var/privatekey.key | 0 {cinder => manila}/tests/windows/__init__.py | 0 .../tests/windows/basetestcase.py | 8 +- {cinder => manila}/tests/windows/db_fakes.py | 0 {cinder => manila}/tests/windows/mockproxy.py | 0 .../tests/windows/stubs/README.rst | 0 ...river.test_check_for_setup_errors_wmi.p.gz | Bin ...stWindowsDriver.test_create_export_os.p.gz | Bin ...tWindowsDriver.test_create_export_wmi.p.gz | Bin ...WindowsDriver.test_create_snapshot_os.p.gz | Bin ...indowsDriver.test_create_snapshot_wmi.p.gz | Bin ...r.test_create_volume_from_snapshot_os.p.gz | Bin ....test_create_volume_from_snapshot_wmi.p.gz | Bin ...stWindowsDriver.test_create_volume_os.p.gz | Bin ...tWindowsDriver.test_create_volume_wmi.p.gz | Bin ...WindowsDriver.test_delete_snapshot_os.p.gz | Bin ...indowsDriver.test_delete_snapshot_wmi.p.gz | Bin ...stWindowsDriver.test_delete_volume_os.p.gz | Bin ...tWindowsDriver.test_delete_volume_wmi.p.gz | Bin ...stWindowsDriver.test_ensure_export_os.p.gz | Bin ...tWindowsDriver.test_ensure_export_wmi.p.gz | Bin ...sDriver.test_initialize_connection_os.p.gz | Bin ...Driver.test_initialize_connection_wmi.p.gz | Bin ...stWindowsDriver.test_remove_export_os.p.gz | Bin ...tWindowsDriver.test_remove_export_wmi.p.gz | Bin .../tests/windows/windowsutils.py | 2 +- {cinder => manila}/tests/xenapi/__init__.py | 0 {cinder => manila}/utils.py | 40 +- {cinder => manila}/version.py | 2 +- {cinder => manila}/volume/__init__.py | 10 +- {cinder => manila}/volume/api.py | 28 +- {cinder => manila}/volume/configuration.py | 4 +- {cinder => manila}/volume/driver.py | 14 +- {cinder => manila}/volume/drivers/__init__.py | 4 +- {cinder => manila}/volume/drivers/coraid.py | 16 +- .../volume/drivers/emc/__init__.py | 0 .../drivers/emc/cinder_emc_config.xml.sample | 0 .../volume/drivers/emc/emc_smis_common.py | 10 +- .../volume/drivers/emc/emc_smis_iscsi.py | 12 +- .../volume/drivers/glusterfs.py | 12 +- .../volume/drivers/huawei/__init__.py | 0 .../huawei/cinder_huawei_conf.xml.sample | 0 .../volume/drivers/huawei/huawei_iscsi.py | 16 +- {cinder => manila}/volume/drivers/lvm.py | 22 +- .../volume/drivers/netapp/__init__.py | 0 .../volume/drivers/netapp/api.py | 2 +- .../volume/drivers/netapp/iscsi.py | 18 +- .../volume/drivers/netapp/nfs.py | 14 +- .../volume/drivers/nexenta/__init__.py | 0 .../volume/drivers/nexenta/jsonrpc.py | 6 +- .../volume/drivers/nexenta/volume.py | 18 +- {cinder => manila}/volume/drivers/nfs.py | 12 +- {cinder => manila}/volume/drivers/rbd.py | 10 +- .../volume/drivers/san/__init__.py | 4 +- .../volume/drivers/san/hp/__init__.py | 0 .../volume/drivers/san/hp/hp_3par_common.py | 12 +- .../volume/drivers/san/hp/hp_3par_fc.py | 18 +- .../volume/drivers/san/hp/hp_3par_iscsi.py | 18 +- .../volume/drivers/san/hp_lefthand.py | 8 +- {cinder => manila}/volume/drivers/san/san.py | 10 +- .../volume/drivers/san/solaris.py | 8 +- {cinder => manila}/volume/drivers/scality.py | 14 +- {cinder => manila}/volume/drivers/sheepdog.py | 8 +- .../volume/drivers/solidfire.py | 14 +- .../volume/drivers/storwize_svc.py | 16 +- {cinder => manila}/volume/drivers/windows.py | 8 +- .../volume/drivers/xenapi/__init__.py | 0 .../volume/drivers/xenapi/lib.py | 2 +- .../volume/drivers/xenapi/sm.py | 14 +- .../volume/drivers/xenapi/tools.py | 0 {cinder => manila}/volume/drivers/xiv.py | 12 +- {cinder => manila}/volume/drivers/zadara.py | 12 +- {cinder => manila}/volume/manager.py | 100 +- {cinder => manila}/volume/rpcapi.py | 10 +- {cinder => manila}/volume/utils.py | 12 +- {cinder => manila}/volume/volume_types.py | 10 +- {cinder => manila}/wsgi.py | 20 +- setup.cfg | 60 +- tools/conf/extract_opts.py | 6 +- tools/lintstack.py | 10 +- tools/patch_tox_venv.py | 2 +- 473 files changed, 5209 insertions(+), 2846 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/encodings.xml create mode 100644 .idea/manila.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/other.xml create mode 100644 .idea/scopes/scope_settings.xml create mode 100644 .idea/testrunner.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml rename bin/{cinder-all => manila-all} (77%) rename bin/{cinder-api => manila-api} (80%) rename bin/{cinder-backup => manila-backup} (72%) rename bin/{cinder-clear-rabbit-queues => manila-clear-rabbit-queues} (77%) rename bin/{cinder-manage => manila-manage} (92%) rename bin/{cinder-rootwrap => manila-rootwrap} (90%) rename bin/{cinder-rpc-zmq-receiver => manila-rpc-zmq-receiver} (80%) rename bin/{cinder-scheduler => manila-scheduler} (73%) rename bin/{cinder-share => manila-share} (77%) rename bin/{cinder-volume => manila-volume} (78%) rename bin/{cinder-volume-usage-audit => manila-volume-usage-audit} (85%) create mode 100644 manila.egg-info/PKG-INFO create mode 100644 manila.egg-info/SOURCES.txt create mode 100644 manila.egg-info/dependency_links.txt create mode 100644 manila.egg-info/entry_points.txt create mode 100644 manila.egg-info/requires.txt create mode 100644 manila.egg-info/top_level.txt rename {cinder => manila}/__init__.py (95%) rename {cinder => manila}/api/__init__.py (97%) rename {cinder => manila}/api/auth.py (75%) rename {cinder => manila}/api/common.py (95%) rename {cinder => manila}/api/contrib/__init__.py (86%) rename {cinder => manila}/api/contrib/admin_actions.py (94%) rename {cinder => manila}/api/contrib/backups.py (94%) rename {cinder => manila}/api/contrib/extended_snapshot_attributes.py (93%) rename {cinder => manila}/api/contrib/hosts.py (94%) rename {cinder => manila}/api/contrib/image_create.py (96%) rename {cinder => manila}/api/contrib/quota_classes.py (92%) rename {cinder => manila}/api/contrib/quotas.py (90%) rename {cinder => manila}/api/contrib/services.py (91%) rename {cinder => manila}/api/contrib/share_actions.py (90%) rename {cinder => manila}/api/contrib/share_snapshots.py (91%) rename {cinder => manila}/api/contrib/shares.py (93%) rename {cinder => manila}/api/contrib/types_extra_specs.py (92%) rename {cinder => manila}/api/contrib/types_manage.py (91%) rename {cinder => manila}/api/contrib/volume_actions.py (90%) rename {cinder => manila}/api/contrib/volume_host_attribute.py (92%) rename {cinder => manila}/api/contrib/volume_image_metadata.py (94%) rename {cinder => manila}/api/contrib/volume_tenant_attribute.py (93%) rename {cinder => manila}/api/extensions.py (93%) rename {cinder => manila}/api/middleware/__init__.py (100%) rename {cinder => manila}/api/middleware/auth.py (92%) rename {cinder => manila}/api/middleware/fault.py (94%) rename {cinder => manila}/api/middleware/sizelimit.py (94%) rename {cinder => manila}/api/openstack/__init__.py (91%) rename {cinder => manila}/api/openstack/urlmap.py (79%) rename {cinder => manila}/api/openstack/volume/__init__.py (77%) rename {cinder => manila}/api/openstack/volume/versions.py (79%) rename {cinder => manila}/api/openstack/wsgi.py (98%) rename {cinder => manila}/api/schemas/atom-link.rng (100%) rename {cinder => manila}/api/schemas/v1.1/extension.rng (100%) rename {cinder => manila}/api/schemas/v1.1/extensions.rng (100%) rename {cinder => manila}/api/schemas/v1.1/limits.rng (100%) rename {cinder => manila}/api/schemas/v1.1/metadata.rng (100%) rename {cinder => manila}/api/sizelimit.py (80%) rename {cinder => manila}/api/urlmap.py (98%) rename {cinder => manila}/api/v1/__init__.py (100%) rename {cinder => manila}/api/v1/limits.py (96%) rename {cinder => manila}/api/v1/router.py (88%) rename {cinder => manila}/api/v1/snapshot_metadata.py (93%) rename {cinder => manila}/api/v1/snapshots.py (92%) rename {cinder/api/v2 => manila/api/v1}/types.py (89%) rename {cinder => manila}/api/v1/volume_metadata.py (93%) rename {cinder => manila}/api/v1/volumes.py (95%) rename {cinder => manila}/api/v2/__init__.py (100%) rename {cinder => manila}/api/v2/limits.py (96%) rename {cinder => manila}/api/v2/router.py (87%) rename {cinder => manila}/api/v2/snapshot_metadata.py (93%) rename {cinder => manila}/api/v2/snapshots.py (93%) rename {cinder/api/v1 => manila/api/v2}/types.py (89%) rename {cinder => manila}/api/v2/views/__init__.py (100%) rename {cinder => manila}/api/v2/views/volumes.py (98%) rename {cinder => manila}/api/v2/volumes.py (94%) rename {cinder => manila}/api/versions.py (98%) rename {cinder => manila}/api/views/__init__.py (100%) rename {cinder => manila}/api/views/backups.py (97%) rename {cinder => manila}/api/views/limits.py (98%) rename {cinder => manila}/api/views/share_snapshots.py (97%) rename {cinder => manila}/api/views/shares.py (97%) rename {cinder => manila}/api/views/types.py (97%) rename {cinder => manila}/api/views/versions.py (100%) rename {cinder => manila}/api/xmlutil.py (99%) rename {cinder => manila}/backup/__init__.py (76%) rename {cinder => manila}/backup/api.py (96%) rename {cinder => manila}/backup/manager.py (96%) rename {cinder => manila}/backup/rpcapi.py (91%) rename {cinder => manila}/backup/services/__init__.py (100%) rename {cinder => manila}/backup/services/swift.py (98%) rename {cinder => manila}/brick/__init__.py (100%) rename {cinder => manila}/brick/iscsi/__init__.py (100%) rename {cinder => manila}/brick/iscsi/iscsi.py (98%) rename {cinder => manila}/brick/local_dev/__init__.py (100%) rename {cinder => manila}/brick/local_dev/lvm.py (98%) rename {cinder => manila}/common/__init__.py (100%) rename {cinder => manila}/common/sqlalchemyutils.py (98%) rename {cinder => manila}/compute/__init__.py (100%) rename {cinder => manila}/compute/aggregate_states.py (100%) rename {cinder => manila}/context.py (96%) rename {cinder => manila}/db/__init__.py (96%) rename {cinder => manila}/db/api.py (98%) rename {cinder => manila}/db/base.py (91%) rename {cinder => manila}/db/migration.py (92%) rename {cinder => manila}/db/sqlalchemy/__init__.py (100%) rename {cinder => manila}/db/sqlalchemy/api.py (99%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/README (100%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/__init__.py (100%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/manage.py (100%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/migrate.cfg (100%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py (99%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/versions/002_quota_class.py (99%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py (98%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py (99%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py (96%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/versions/005_sqlite_downgrade.sql (100%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py (100%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/versions/007_add_volume_snapshot_fk.py (100%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/versions/007_sqlite_downgrade.sql (100%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/versions/008_add_backup.py (98%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py (97%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/versions/010_add_share_tables.py (98%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/versions/011_add_share_snapshot_table.py (97%) rename {cinder => manila}/db/sqlalchemy/migrate_repo/versions/__init__.py (100%) rename {cinder => manila}/db/sqlalchemy/migration.py (93%) rename {cinder => manila}/db/sqlalchemy/models.py (97%) rename {cinder => manila}/db/sqlalchemy/session.py (95%) rename {cinder => manila}/exception.py (99%) rename {cinder => manila}/flags.py (89%) rename {cinder => manila}/image/__init__.py (100%) rename {cinder => manila}/image/glance.py (98%) rename {cinder => manila}/image/image_utils.py (98%) rename {cinder => manila}/locale/bg_BG/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/bs/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/cinder.pot (100%) rename {cinder => manila}/locale/cs/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/da/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/de/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/en_AU/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/en_GB/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/en_US/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/es/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/fi_FI/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/fr/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/it/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/ja/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/ko/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/ko_KR/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/pt_BR/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/ru/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/tl/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/tr/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/uk/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/vi_VN/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/zh_CN/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/locale/zh_TW/LC_MESSAGES/cinder.po (99%) rename {cinder => manila}/manager.py (96%) rename {cinder => manila}/openstack/__init__.py (100%) rename {cinder => manila}/openstack/common/README (100%) rename {cinder => manila}/openstack/common/__init__.py (100%) rename {cinder => manila}/openstack/common/context.py (100%) rename {cinder => manila}/openstack/common/eventlet_backdoor.py (100%) rename {cinder => manila}/openstack/common/exception.py (98%) rename {cinder => manila}/openstack/common/excutils.py (97%) rename {cinder => manila}/openstack/common/fileutils.py (100%) rename {cinder => manila}/openstack/common/gettextutils.py (88%) rename {cinder => manila}/openstack/common/importutils.py (100%) rename {cinder => manila}/openstack/common/jsonutils.py (99%) rename {cinder => manila}/openstack/common/local.py (100%) rename {cinder => manila}/openstack/common/lockutils.py (98%) rename {cinder => manila}/openstack/common/log.py (98%) rename {cinder => manila}/openstack/common/loopingcall.py (96%) rename {cinder => manila}/openstack/common/network_utils.py (100%) rename {cinder => manila}/openstack/common/notifier/__init__.py (100%) rename {cinder => manila}/openstack/common/notifier/api.py (95%) rename {cinder => manila}/openstack/common/notifier/log_notifier.py (88%) rename {cinder => manila}/openstack/common/notifier/no_op_notifier.py (100%) rename {cinder => manila}/openstack/common/notifier/rabbit_notifier.py (85%) rename {cinder => manila}/openstack/common/notifier/rpc_notifier.py (88%) rename {cinder => manila}/openstack/common/notifier/rpc_notifier2.py (89%) rename {cinder => manila}/openstack/common/notifier/test_notifier.py (100%) rename {cinder => manila}/openstack/common/policy.py (98%) rename {cinder => manila}/openstack/common/processutils.py (98%) rename {cinder => manila}/openstack/common/rootwrap/__init__.py (100%) rename {cinder => manila}/openstack/common/rootwrap/cmd.py (90%) rename {cinder => manila}/openstack/common/rootwrap/filters.py (100%) rename {cinder => manila}/openstack/common/rootwrap/wrapper.py (99%) rename {cinder => manila}/openstack/common/rpc/__init__.py (97%) rename {cinder => manila}/openstack/common/rpc/amqp.py (99%) rename {cinder => manila}/openstack/common/rpc/common.py (98%) rename {cinder => manila}/openstack/common/rpc/dispatcher.py (98%) rename {cinder => manila}/openstack/common/rpc/impl_fake.py (98%) rename {cinder => manila}/openstack/common/rpc/impl_kombu.py (99%) rename {cinder => manila}/openstack/common/rpc/impl_qpid.py (98%) rename {cinder => manila}/openstack/common/rpc/impl_zmq.py (98%) rename {cinder => manila}/openstack/common/rpc/matchmaker.py (99%) rename {cinder => manila}/openstack/common/rpc/matchmaker_redis.py (96%) rename {cinder => manila}/openstack/common/rpc/proxy.py (99%) rename {cinder => manila}/openstack/common/rpc/service.py (90%) rename {cinder => manila}/openstack/common/rpc/zmq_receiver.py (88%) rename {cinder => manila}/openstack/common/scheduler/__init__.py (100%) rename {cinder => manila}/openstack/common/scheduler/filter.py (100%) rename {cinder => manila}/openstack/common/scheduler/filters/__init__.py (92%) rename {cinder => manila}/openstack/common/scheduler/filters/availability_zone_filter.py (95%) rename {cinder => manila}/openstack/common/scheduler/filters/capabilities_filter.py (93%) rename {cinder => manila}/openstack/common/scheduler/filters/extra_specs_ops.py (98%) rename {cinder => manila}/openstack/common/scheduler/filters/json_filter.py (97%) rename {cinder => manila}/openstack/common/scheduler/weight.py (100%) rename {cinder => manila}/openstack/common/scheduler/weights/__init__.py (95%) rename {cinder => manila}/openstack/common/service.py (96%) rename {cinder => manila}/openstack/common/strutils.py (98%) rename {cinder => manila}/openstack/common/threadgroup.py (97%) rename {cinder => manila}/openstack/common/timeutils.py (100%) rename {cinder => manila}/openstack/common/uuidutils.py (100%) rename {cinder => manila}/policy.py (93%) rename {cinder => manila}/quota.py (99%) rename {cinder => manila}/scheduler/__init__.py (92%) rename {cinder => manila}/scheduler/chance.py (97%) rename {cinder => manila}/scheduler/driver.py (92%) rename {cinder => manila}/scheduler/filter_scheduler.py (98%) rename {cinder => manila}/scheduler/filters/__init__.py (100%) rename {cinder => manila}/scheduler/filters/capacity_filter.py (95%) rename {cinder => manila}/scheduler/filters/retry_filter.py (93%) rename {cinder => manila}/scheduler/host_manager.py (96%) rename {cinder => manila}/scheduler/manager.py (93%) rename {cinder => manila}/scheduler/rpcapi.py (93%) rename {cinder => manila}/scheduler/scheduler_options.py (96%) rename {cinder => manila}/scheduler/simple.py (97%) rename {cinder => manila}/scheduler/weights/__init__.py (100%) rename {cinder => manila}/scheduler/weights/capacity.py (96%) rename {cinder => manila}/service.py (97%) rename {cinder => manila}/share/__init__.py (79%) rename {cinder => manila}/share/api.py (96%) rename {cinder => manila}/share/configuration.py (97%) rename {cinder => manila}/share/driver.py (95%) rename {cinder => manila}/share/drivers/__init__.py (89%) rename {cinder => manila}/share/drivers/lvm.py (98%) rename {cinder => manila}/share/drivers/netapp.py (99%) rename {cinder => manila}/share/manager.py (94%) rename {cinder => manila}/share/rpcapi.py (94%) rename {cinder => manila}/test.py (97%) rename {cinder => manila}/testing/README.rst (100%) rename {cinder => manila}/tests/__init__.py (91%) rename {cinder/tests/api/contrib => manila/tests/api}/__init__.py (96%) rename {cinder => manila}/tests/api/common.py (100%) rename {cinder/tests/api => manila/tests/api/contrib}/__init__.py (96%) rename {cinder => manila}/tests/api/contrib/stubs.py (98%) rename {cinder => manila}/tests/api/contrib/test_admin_actions.py (93%) rename {cinder => manila}/tests/api/contrib/test_backups.py (98%) rename {cinder => manila}/tests/api/contrib/test_extended_snapshot_attributes.py (94%) rename {cinder => manila}/tests/api/contrib/test_hosts.py (79%) rename {cinder => manila}/tests/api/contrib/test_services.py (74%) rename {cinder => manila}/tests/api/contrib/test_share_actions.py (91%) rename {cinder => manila}/tests/api/contrib/test_share_snapshots.py (96%) rename {cinder => manila}/tests/api/contrib/test_shares.py (97%) rename {cinder => manila}/tests/api/contrib/test_types_extra_specs.py (90%) rename {cinder => manila}/tests/api/contrib/test_types_manage.py (93%) rename {cinder => manila}/tests/api/contrib/test_volume_actions.py (95%) rename {cinder => manila}/tests/api/contrib/test_volume_host_attribute.py (90%) rename {cinder => manila}/tests/api/contrib/test_volume_image_metadata.py (94%) rename {cinder => manila}/tests/api/contrib/test_volume_tenant_attribute.py (90%) rename {cinder => manila}/tests/api/extensions/__init__.py (100%) rename {cinder => manila}/tests/api/extensions/foxinsocks.py (97%) rename {cinder => manila}/tests/api/fakes.py (89%) rename {cinder => manila}/tests/api/middleware/__init__.py (100%) rename {cinder => manila}/tests/api/middleware/test_auth.py (92%) rename {cinder => manila}/tests/api/middleware/test_faults.py (96%) rename {cinder => manila}/tests/api/middleware/test_sizelimit.py (97%) rename {cinder => manila}/tests/api/openstack/__init__.py (96%) rename {cinder => manila}/tests/api/openstack/test_wsgi.py (99%) rename {cinder => manila}/tests/api/test_common.py (98%) rename {cinder => manila}/tests/api/test_extensions.py (96%) rename {cinder => manila}/tests/api/test_router.py (94%) rename {cinder => manila}/tests/api/test_wsgi.py (97%) rename {cinder => manila}/tests/api/test_xmlutil.py (99%) rename {cinder => manila}/tests/api/v1/__init__.py (100%) rename {cinder => manila}/tests/api/v1/stubs.py (98%) rename {cinder => manila}/tests/api/v1/test_limits.py (98%) rename {cinder => manila}/tests/api/v1/test_snapshot_metadata.py (87%) rename {cinder => manila}/tests/api/v1/test_snapshots.py (98%) rename {cinder => manila}/tests/api/v1/test_types.py (96%) rename {cinder => manila}/tests/api/v1/test_volume_metadata.py (87%) rename {cinder => manila}/tests/api/v1/test_volumes.py (98%) rename {cinder => manila}/tests/api/v2/__init__.py (100%) rename {cinder => manila}/tests/api/v2/stubs.py (98%) rename {cinder => manila}/tests/api/v2/test_limits.py (98%) rename {cinder => manila}/tests/api/v2/test_snapshot_metadata.py (87%) rename {cinder => manila}/tests/api/v2/test_snapshots.py (98%) rename {cinder => manila}/tests/api/v2/test_types.py (96%) rename {cinder => manila}/tests/api/v2/test_volumes.py (98%) rename {cinder => manila}/tests/backup/__init__.py (100%) rename {cinder => manila}/tests/backup/fake_service.py (94%) rename {cinder => manila}/tests/backup/fake_swift_client.py (98%) rename {cinder => manila}/tests/brick/__init__.py (100%) rename {cinder => manila}/tests/brick/test_brick_lvm.py (96%) rename {cinder => manila}/tests/db/__init__.py (100%) rename {cinder => manila}/tests/db/fakes.py (98%) rename {cinder => manila}/tests/declare_flags.py (97%) rename {cinder => manila}/tests/fake_driver.py (96%) rename {cinder => manila}/tests/fake_flags.py (67%) rename {cinder => manila}/tests/fake_utils.py (95%) rename {cinder => manila}/tests/glance/__init__.py (100%) rename {cinder => manila}/tests/glance/stubs.py (100%) rename {cinder => manila}/tests/image/__init__.py (96%) rename {cinder => manila}/tests/image/fake.py (97%) rename {cinder => manila}/tests/image/test_glance.py (99%) rename {cinder => manila}/tests/integrated/__init__.py (96%) rename {cinder => manila}/tests/integrated/api/__init__.py (100%) rename {cinder => manila}/tests/integrated/api/client.py (98%) rename {cinder => manila}/tests/integrated/integrated_helpers.py (95%) rename {cinder => manila}/tests/integrated/test_extensions.py (87%) rename {cinder => manila}/tests/integrated/test_login.py (90%) rename {cinder => manila}/tests/integrated/test_volumes.py (95%) rename {cinder => manila}/tests/integrated/test_xml.py (90%) rename {cinder => manila}/tests/monkey_patch_example/__init__.py (100%) rename {cinder => manila}/tests/monkey_patch_example/example_a.py (100%) rename {cinder => manila}/tests/monkey_patch_example/example_b.py (100%) rename {cinder => manila}/tests/policy.json (100%) rename {cinder => manila}/tests/runtime_flags.py (97%) rename {cinder => manila}/tests/scheduler/__init__.py (96%) rename {cinder => manila}/tests/scheduler/fakes.py (96%) rename {cinder => manila}/tests/scheduler/test_capacity_weigher.py (93%) rename {cinder => manila}/tests/scheduler/test_filter_scheduler.py (97%) rename {cinder => manila}/tests/scheduler/test_host_filters.py (94%) rename {cinder => manila}/tests/scheduler/test_host_manager.py (97%) rename {cinder => manila}/tests/scheduler/test_rpcapi.py (93%) rename {cinder => manila}/tests/scheduler/test_scheduler.py (96%) rename {cinder => manila}/tests/scheduler/test_scheduler_options.py (97%) rename {cinder => manila}/tests/test_HpSanISCSIDriver.py (97%) rename {cinder => manila}/tests/test_api.py (100%) rename {cinder => manila}/tests/test_backup.py (97%) rename {cinder => manila}/tests/test_backup_swift.py (96%) rename {cinder => manila}/tests/test_context.py (98%) rename {cinder => manila}/tests/test_coraid.py (96%) rename {cinder => manila}/tests/test_drivers_compatibility.py (72%) rename {cinder => manila}/tests/test_emc.py (98%) rename {cinder => manila}/tests/test_exception.py (95%) rename {cinder => manila}/tests/test_flags.py (93%) rename {cinder => manila}/tests/test_glusterfs.py (98%) rename {cinder => manila}/tests/test_hp3par.py (99%) rename {cinder => manila}/tests/test_huawei.py (99%) rename {cinder => manila}/tests/test_iscsi.py (98%) rename {cinder => manila}/tests/test_migrations.conf (100%) rename {cinder => manila}/tests/test_migrations.py (98%) rename {cinder => manila}/tests/test_misc.py (94%) rename {cinder => manila}/tests/test_netapp.py (99%) rename {cinder => manila}/tests/test_netapp_nfs.py (98%) rename {cinder => manila}/tests/test_nexenta.py (84%) rename {cinder => manila}/tests/test_nfs.py (98%) rename {cinder => manila}/tests/test_policy.py (95%) rename {cinder => manila}/tests/test_quota.py (99%) rename {cinder => manila}/tests/test_rbd.py (93%) rename {cinder => manila}/tests/test_scality.py (98%) rename {cinder => manila}/tests/test_service.py (92%) rename {cinder => manila}/tests/test_share.py (95%) rename {cinder => manila}/tests/test_share_api.py (98%) rename {cinder => manila}/tests/test_share_driver.py (89%) rename {cinder => manila}/tests/test_share_lvm.py (98%) rename {cinder => manila}/tests/test_share_netapp.py (99%) rename {cinder => manila}/tests/test_share_rpcapi.py (95%) rename {cinder => manila}/tests/test_sheepdog.py (95%) rename {cinder => manila}/tests/test_skip_examples.py (98%) rename {cinder => manila}/tests/test_solidfire.py (97%) rename {cinder => manila}/tests/test_storwize_svc.py (99%) rename {cinder => manila}/tests/test_test.py (95%) rename {cinder => manila}/tests/test_test_utils.py (93%) rename {cinder => manila}/tests/test_utils.py (97%) rename {cinder => manila}/tests/test_volume.py (95%) rename {cinder => manila}/tests/test_volume_configuration.py (92%) rename {cinder => manila}/tests/test_volume_glance_metadata.py (98%) rename {cinder => manila}/tests/test_volume_rpcapi.py (95%) rename {cinder => manila}/tests/test_volume_types.py (96%) rename {cinder => manila}/tests/test_volume_types_extra_specs.py (98%) rename {cinder => manila}/tests/test_volume_utils.py (91%) rename {cinder => manila}/tests/test_windows.py (97%) rename {cinder => manila}/tests/test_wsgi.py (91%) rename {cinder => manila}/tests/test_xenapi_sm.py (97%) rename {cinder => manila}/tests/test_xiv.py (98%) rename {cinder => manila}/tests/test_zadara.py (99%) rename {cinder => manila}/tests/utils.py (83%) rename {cinder => manila}/tests/var/ca.crt (100%) rename {cinder => manila}/tests/var/certificate.crt (100%) rename {cinder => manila}/tests/var/privatekey.key (100%) rename {cinder => manila}/tests/windows/__init__.py (100%) rename {cinder => manila}/tests/windows/basetestcase.py (95%) rename {cinder => manila}/tests/windows/db_fakes.py (100%) rename {cinder => manila}/tests/windows/mockproxy.py (100%) rename {cinder => manila}/tests/windows/stubs/README.rst (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_check_for_setup_errors_wmi.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_os.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_wmi.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_os.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_wmi.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_os.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_wmi.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_os.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_wmi.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_os.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_wmi.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_os.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_wmi.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_os.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_wmi.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_os.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_wmi.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_os.p.gz (100%) rename {cinder => manila}/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_wmi.p.gz (100%) rename {cinder => manila}/tests/windows/windowsutils.py (99%) rename {cinder => manila}/tests/xenapi/__init__.py (100%) rename {cinder => manila}/utils.py (97%) rename {cinder => manila}/version.py (94%) rename {cinder => manila}/volume/__init__.py (78%) rename {cinder => manila}/volume/api.py (98%) rename {cinder => manila}/volume/configuration.py (97%) rename {cinder => manila}/volume/driver.py (98%) rename {cinder => manila}/volume/drivers/__init__.py (90%) rename {cinder => manila}/volume/drivers/coraid.py (98%) rename {cinder => manila}/volume/drivers/emc/__init__.py (100%) rename {cinder => manila}/volume/drivers/emc/cinder_emc_config.xml.sample (100%) rename {cinder => manila}/volume/drivers/emc/emc_smis_common.py (99%) rename {cinder => manila}/volume/drivers/emc/emc_smis_iscsi.py (97%) rename {cinder => manila}/volume/drivers/glusterfs.py (97%) rename {cinder => manila}/volume/drivers/huawei/__init__.py (100%) rename {cinder => manila}/volume/drivers/huawei/cinder_huawei_conf.xml.sample (100%) rename {cinder => manila}/volume/drivers/huawei/huawei_iscsi.py (99%) rename {cinder => manila}/volume/drivers/lvm.py (98%) rename {cinder => manila}/volume/drivers/netapp/__init__.py (100%) rename {cinder => manila}/volume/drivers/netapp/api.py (99%) rename {cinder => manila}/volume/drivers/netapp/iscsi.py (99%) rename {cinder => manila}/volume/drivers/netapp/nfs.py (98%) rename {cinder => manila}/volume/drivers/nexenta/__init__.py (100%) rename {cinder => manila}/volume/drivers/nexenta/jsonrpc.py (95%) rename {cinder => manila}/volume/drivers/nexenta/volume.py (97%) rename {cinder => manila}/volume/drivers/nfs.py (97%) rename {cinder => manila}/volume/drivers/rbd.py (98%) rename {cinder => manila}/volume/drivers/san/__init__.py (92%) rename {cinder => manila}/volume/drivers/san/hp/__init__.py (100%) rename {cinder => manila}/volume/drivers/san/hp/hp_3par_common.py (99%) rename {cinder => manila}/volume/drivers/san/hp/hp_3par_fc.py (95%) rename {cinder => manila}/volume/drivers/san/hp/hp_3par_iscsi.py (96%) rename {cinder => manila}/volume/drivers/san/hp_lefthand.py (98%) rename {cinder => manila}/volume/drivers/san/san.py (97%) rename {cinder => manila}/volume/drivers/san/solaris.py (98%) rename {cinder => manila}/volume/drivers/scality.py (97%) rename {cinder => manila}/volume/drivers/sheepdog.py (97%) rename {cinder => manila}/volume/drivers/solidfire.py (98%) rename {cinder => manila}/volume/drivers/storwize_svc.py (99%) rename {cinder => manila}/volume/drivers/windows.py (98%) rename {cinder => manila}/volume/drivers/xenapi/__init__.py (100%) rename {cinder => manila}/volume/drivers/xenapi/lib.py (99%) rename {cinder => manila}/volume/drivers/xenapi/sm.py (97%) rename {cinder => manila}/volume/drivers/xenapi/tools.py (100%) rename {cinder => manila}/volume/drivers/xiv.py (93%) rename {cinder => manila}/volume/drivers/zadara.py (98%) rename {cinder => manila}/volume/manager.py (92%) rename {cinder => manila}/volume/rpcapi.py (96%) rename {cinder => manila}/volume/utils.py (93%) rename {cinder => manila}/volume/volume_types.py (97%) rename {cinder => manila}/wsgi.py (97%) diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000000..8a25575764 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +manila \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000000..e206d70d85 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/manila.iml b/.idea/manila.iml new file mode 100644 index 0000000000..a34a85703f --- /dev/null +++ b/.idea/manila.iml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000..ed0902ab5a --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000000..e4e361ee25 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/other.xml b/.idea/other.xml new file mode 100644 index 0000000000..a7f0eb1751 --- /dev/null +++ b/.idea/other.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000000..922003b843 --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/testrunner.xml b/.idea/testrunner.xml new file mode 100644 index 0000000000..41ab8a60ff --- /dev/null +++ b/.idea/testrunner.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000..c80f2198b5 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000000..2b85114393 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,1287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1377869547472 + 1377869547472 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/cinder-all b/bin/manila-all similarity index 77% rename from bin/cinder-all rename to bin/manila-all index 9591d1574f..a1eb84ef2a 100755 --- a/bin/cinder-all +++ b/bin/manila-all @@ -18,9 +18,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Starter script for All cinder services. +"""Starter script for All manila services. -This script attempts to start all the cinder services in one process. Each +This script attempts to start all the manila services in one process. Each service is started in its own greenthread. Please note that exceptions and sys.exit() on the starting of a service are logged and the script will continue attempting to launch the rest of the services. @@ -36,32 +36,32 @@ import sys possible_topdir = os.path.normpath(os.path.join(os.path.abspath( sys.argv[0]), os.pardir, os.pardir)) -if os.path.exists(os.path.join(possible_topdir, "cinder", "__init__.py")): +if os.path.exists(os.path.join(possible_topdir, "manila", "__init__.py")): sys.path.insert(0, possible_topdir) -from cinder.openstack.common import gettextutils -gettextutils.install('cinder') +from manila.openstack.common import gettextutils +gettextutils.install('manila') -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import service -from cinder import utils +from manila import flags +from manila.openstack.common import log as logging +from manila import service +from manila import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup("cinder") - LOG = logging.getLogger('cinder.all') + logging.setup("manila") + LOG = logging.getLogger('manila.all') utils.monkey_patch() servers = [] - # cinder-api + # manila-api try: servers.append(service.WSGIService('osapi_volume')) except (Exception, SystemExit): LOG.exception(_('Failed to load osapi_volume')) - for binary in ['cinder-volume', 'cinder-scheduler']: + for binary in ['manila-volume', 'manila-scheduler']: try: servers.append(service.Service.create(binary=binary)) except (Exception, SystemExit): diff --git a/bin/cinder-api b/bin/manila-api similarity index 80% rename from bin/cinder-api rename to bin/manila-api index 0f05b519c8..e9c5dca5e4 100755 --- a/bin/cinder-api +++ b/bin/manila-api @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Starter script for Cinder OS API.""" +"""Starter script for manila OS API.""" # NOTE(jdg): If we port over multi worker code from Nova # we'll need to set monkey_patch(os=False), unless @@ -32,20 +32,20 @@ import sys possible_topdir = os.path.normpath(os.path.join(os.path.abspath( sys.argv[0]), os.pardir, os.pardir)) -if os.path.exists(os.path.join(possible_topdir, "cinder", "__init__.py")): +if os.path.exists(os.path.join(possible_topdir, "manila", "__init__.py")): sys.path.insert(0, possible_topdir) -from cinder.openstack.common import gettextutils -gettextutils.install('cinder') +from manila.openstack.common import gettextutils +gettextutils.install('manila') -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import service -from cinder import utils +from manila import flags +from manila.openstack.common import log as logging +from manila import service +from manila import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup("cinder") + logging.setup("manila") utils.monkey_patch() server = service.WSGIService('osapi_volume') service.serve(server) diff --git a/bin/cinder-backup b/bin/manila-backup similarity index 72% rename from bin/cinder-backup rename to bin/manila-backup index 71f83006a2..e28c32b12a 100755 --- a/bin/cinder-backup +++ b/bin/manila-backup @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. -"""Starter script for Cinder Volume Backup.""" +"""Starter script for manila Volume Backup.""" import os import sys @@ -24,27 +24,27 @@ import eventlet eventlet.monkey_patch() -# If ../cinder/__init__.py exists, add ../ to Python search path, so that +# If ../manila/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)) -if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')): +if os.path.exists(os.path.join(possible_topdir, 'manila', '__init__.py')): sys.path.insert(0, possible_topdir) -from cinder.openstack.common import gettextutils -gettextutils.install('cinder') +from manila.openstack.common import gettextutils +gettextutils.install('manila') -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import service -from cinder import utils +from manila import flags +from manila.openstack.common import log as logging +from manila import service +from manila import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup("cinder") + logging.setup("manila") utils.monkey_patch() launcher = service.ProcessLauncher() - server = service.Service.create(binary='cinder-backup') + server = service.Service.create(binary='manila-backup') launcher.launch_server(server) launcher.wait() diff --git a/bin/cinder-clear-rabbit-queues b/bin/manila-clear-rabbit-queues similarity index 77% rename from bin/cinder-clear-rabbit-queues rename to bin/manila-clear-rabbit-queues index 684a56578a..31fd383205 100755 --- a/bin/cinder-clear-rabbit-queues +++ b/bin/manila-clear-rabbit-queues @@ -16,7 +16,7 @@ # License for the specific language governing permissions and limitations # under the License. -"""Admin/debug script to wipe rabbitMQ (AMQP) queues cinder uses. +"""Admin/debug script to wipe rabbitMQ (AMQP) queues manila uses. This can be used if you need to change durable options on queues, or to wipe all messages in the queue system if things are in a serious bad way. @@ -28,29 +28,29 @@ import os import sys import time -# If ../cinder/__init__.py exists, add ../ to Python search path, so that +# If ../manila/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)) -if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')): +if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'manila', '__init__.py')): sys.path.insert(0, POSSIBLE_TOPDIR) -from cinder.openstack.common import gettextutils -gettextutils.install('cinder') +from manila.openstack.common import gettextutils +gettextutils.install('manila') from oslo.config import cfg -from cinder import context -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common import rpc +from manila import context +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common import rpc delete_exchange_opt = \ cfg.BoolOpt('delete_exchange', default=False, - help='delete cinder exchange too.') + help='delete manila exchange too.') FLAGS = flags.FLAGS FLAGS.register_cli_opt(delete_exchange_opt) @@ -70,7 +70,7 @@ def delete_queues(queues): if __name__ == '__main__': args = flags.parse_args(sys.argv) - logging.setup("cinder") + logging.setup("manila") delete_queues(args[1:]) if FLAGS.delete_exchange: delete_exchange(FLAGS.control_exchange) diff --git a/bin/cinder-manage b/bin/manila-manage similarity index 92% rename from bin/cinder-manage rename to bin/manila-manage index 63f638fc43..3255bbba8a 100755 --- a/bin/cinder-manage +++ b/bin/manila-manage @@ -51,7 +51,7 @@ """ - CLI interface for cinder management. + CLI interface for manila management. """ import os @@ -63,29 +63,29 @@ from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import sessionmaker -# If ../cinder/__init__.py exists, add ../ to Python search path, so that +# If ../manila/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)) -if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')): +if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'manila', '__init__.py')): sys.path.insert(0, POSSIBLE_TOPDIR) -from cinder.openstack.common import gettextutils -gettextutils.install('cinder') +from manila.openstack.common import gettextutils +gettextutils.install('manila') from oslo.config import cfg -from cinder import context -from cinder import db -from cinder.db import migration -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common import rpc -from cinder.openstack.common import uuidutils -from cinder import utils -from cinder import version +from manila import context +from manila import db +from manila.db import migration +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common import rpc +from manila.openstack.common import uuidutils +from manila import utils +from manila import version FLAGS = flags.FLAGS @@ -179,7 +179,7 @@ def _db_error(caught_exception): print caught_exception print _("The above error may show that the database has not " "been created.\nPlease create a database using " - "'cinder-manage db sync' before running this command.") + "'manila-manage db sync' before running this command.") exit(1) @@ -237,15 +237,15 @@ class VersionCommands(object): class ImportCommands(object): - """Methods for importing Nova volumes to Cinder. + """Methods for importing Nova volumes to manila. EXPECTATIONS: These methods will do two things: - 1. Import relevant Nova DB info in to Cinder - 2. Import persistent tgt files from Nova to Cinder (see copy_tgt_files) + 1. Import relevant Nova DB info in to manila + 2. Import persistent tgt files from Nova to manila (see copy_tgt_files) If you're using VG's (local storage) for your backend YOU MUST install - Cinder on the same node that you're migrating from. + manila on the same node that you're migrating from. """ def __init__(self): pass @@ -264,12 +264,12 @@ class ImportCommands(object): session = sessionmaker(bind=engine) return (session(), engine) - def _backup_cinder_db(self): + def _backup_manila_db(self): #First, dump the dest_db as a backup incase this goes wrong - cinder_dump = utils.execute('mysqldump', 'cinder') - if 'Dump completed on' in cinder_dump[0]: - with open('./cinder_db_bkup.sql', 'w+') as fo: - for line in cinder_dump: + manila_dump = utils.execute('mysqldump', 'manila') + if 'Dump completed on' in manila_dump[0]: + with open('./manila_db_bkup.sql', 'w+') as fo: + for line in manila_dump: fo.write(line) else: raise exception.InvalidResults() @@ -296,7 +296,7 @@ class ImportCommands(object): print (_('Sorry, only mysql backups are supported!')) raise exception.InvalidRequest() else: - self._backup_cinder_db() + self._backup_manila_db() (src, src_engine) = self._open_session(src_db) src_meta = MetaData(bind=src_engine) @@ -307,7 +307,7 @@ class ImportCommands(object): if src.query(table).first().version < 132: print (_('ERROR: Specified Nova DB is not at a compatible ' 'migration version!\nNova must be at Folsom or newer ' - 'to import into Cinder database.')) + 'to import into manila database.')) sys.exit(2) for table_name in table_list: @@ -336,34 +336,34 @@ class ImportCommands(object): @args('src', metavar='', help='db-engine://db_user[:passwd]@db_host[:port]\t\t' 'example: mysql://root:secrete@192.168.137.1') - @args('dest', metavar='', + @args('dest', metavar='', help='db-engine://db_user[:passwd]@db_host[:port]\t\t' 'example: mysql://root:secrete@192.168.137.1') @args('--backup', metavar='<0|1>', choices=[0, 1], default=1, - help='Perform mysqldump of cinder db before writing to it' + help='Perform mysqldump of manila db before writing to it' ' (default: %(default)d)') def import_db(self, src_db, dest_db, backup_db=1): - """Import relevant volume DB entries from Nova into Cinder. + """Import relevant volume DB entries from Nova into manila. NOTE: - Your Cinder DB should be clean WRT volume entries. + Your manila DB should be clean WRT volume entries. NOTE: - We take an sqldump of the cinder DB before mods + We take an sqldump of the manila DB before mods If you're not using mysql, set backup_db=0 and create your own backup. """ src_db = '%s/nova' % src_db - dest_db = '%s/cinder' % dest_db + dest_db = '%s/manila' % dest_db self._import_db(src_db, dest_db, backup_db) @args('src', help='e.g. (login@src_host:]/opt/stack/nova/volumes/)') @args('dest', nargs='?', default=None, - help='e.g. (login@src_host:/opt/stack/cinder/volumes/) ' + help='e.g. (login@src_host:/opt/stack/manila/volumes/) ' 'optional, if emitted, \'volume_dir\' in config will be used') def copy_ptgt_files(self, src_tgts, dest_tgts=None): - """Copy persistent scsi tgt files from nova to cinder. + """Copy persistent scsi tgt files from nova to manila. Default destination is FLAGS.volume_dir or state_path/volumes/ @@ -620,7 +620,7 @@ class GetLogCommands(object): @args('num_entries', nargs='?', type=int, default=10, help='Number of entries to list (default: %(default)d)') def syslog(self, num_entries=10): - """Get of the cinder syslog events.""" + """Get of the manila syslog events.""" entries = int(num_entries) count = 0 log_file = '' @@ -633,16 +633,16 @@ class GetLogCommands(object): sys.exit(1) lines = [line.strip() for line in open(log_file, "r")] lines.reverse() - print "Last %s cinder syslog entries:-" % (entries) + print "Last %s manila syslog entries:-" % (entries) for line in lines: - if line.find("cinder") > 0: + if line.find("manila") > 0: count += 1 print "%s" % (line) if count == entries: break if count == 0: - print "No cinder entries in syslog!" + print "No manila entries in syslog!" class BackupCommands(object): @@ -684,7 +684,7 @@ class BackupCommands(object): class ServiceCommands(object): """Methods for managing services.""" def list(self): - """Show a list of all cinder services.""" + """Show a list of all manila services.""" ctxt = context.get_admin_context() services = db.service_get_all(ctxt) print_format = "%-16s %-36s %-16s %-10s %-5s %-10s" @@ -787,7 +787,7 @@ def main(): FLAGS.register_cli_opt(category_opt) script_name = sys.argv[0] if len(sys.argv) < 2: - print(_("\nOpenStack Cinder version: %(version)s\n") % + print(_("\nOpenStack manila version: %(version)s\n") % {'version': version.version_string()}) print script_name + " category action []" print _("Available categories:") @@ -797,7 +797,7 @@ def main(): try: flags.parse_args(sys.argv) - logging.setup("cinder") + logging.setup("manila") except cfg.ConfigFilesNotFoundError: cfgfile = FLAGS.config_file[-1] if FLAGS.config_file else None if cfgfile and not os.access(cfgfile, os.R_OK): @@ -808,7 +808,7 @@ def main(): except Exception: print _('sudo failed, continuing as if nothing happened') - print _('Please re-run cinder-manage as root.') + print _('Please re-run manila-manage as root.') sys.exit(2) fn = FLAGS.category.action_fn diff --git a/bin/cinder-rootwrap b/bin/manila-rootwrap similarity index 90% rename from bin/cinder-rootwrap rename to bin/manila-rootwrap index cb2a92f5ea..595ddffd87 100755 --- a/bin/cinder-rootwrap +++ b/bin/manila-rootwrap @@ -20,14 +20,14 @@ Filters which commands a service is allowed to run as another user. - To use this with cinder, you should set the following in - cinder.conf: - rootwrap_config=/etc/cinder/rootwrap.conf + To use this with manila, you should set the following in + manila.conf: + rootwrap_config=/etc/manila/rootwrap.conf - You also need to let the cinder user run cinder-rootwrap + You also need to let the manila user run manila-rootwrap as root in sudoers: - cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap - /etc/cinder/rootwrap.conf * + manila ALL = (root) NOPASSWD: /usr/bin/manila-rootwrap + /etc/manila/rootwrap.conf * Service packaging should deploy .filters files only on nodes where they are needed, to avoid allowing more than is necessary. @@ -73,10 +73,10 @@ if __name__ == '__main__': # Add ../ to sys.path to allow running from branch possible_topdir = os.path.normpath(os.path.join(os.path.abspath(execname), os.pardir, os.pardir)) - if os.path.exists(os.path.join(possible_topdir, "cinder", "__init__.py")): + if os.path.exists(os.path.join(possible_topdir, "manila", "__init__.py")): sys.path.insert(0, possible_topdir) - from cinder.openstack.common.rootwrap import wrapper + from manila.openstack.common.rootwrap import wrapper # Load configuration try: diff --git a/bin/cinder-rpc-zmq-receiver b/bin/manila-rpc-zmq-receiver similarity index 80% rename from bin/cinder-rpc-zmq-receiver rename to bin/manila-rpc-zmq-receiver index e8dbf0effe..474ffcaace 100755 --- a/bin/cinder-rpc-zmq-receiver +++ b/bin/manila-rpc-zmq-receiver @@ -22,19 +22,19 @@ import contextlib import os import sys -# If ../cinder/__init__.py exists, add ../ to Python search path, so that +# If ../manila/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)) -if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')): +if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'manila', '__init__.py')): sys.path.insert(0, POSSIBLE_TOPDIR) from oslo.config import cfg -from cinder.openstack.common import log as logging -from cinder.openstack.common import rpc -from cinder.openstack.common.rpc import impl_zmq +from manila.openstack.common import log as logging +from manila.openstack.common import rpc +from manila.openstack.common.rpc import impl_zmq CONF = cfg.CONF CONF.register_opts(rpc.rpc_opts) @@ -42,8 +42,8 @@ CONF.register_opts(impl_zmq.zmq_opts) def main(): - CONF(sys.argv[1:], project='cinder') - logging.setup("cinder") + CONF(sys.argv[1:], project='manila') + logging.setup("manila") with contextlib.closing(impl_zmq.ZmqProxy(CONF)) as reactor: reactor.consume_in_thread() diff --git a/bin/cinder-scheduler b/bin/manila-scheduler similarity index 73% rename from bin/cinder-scheduler rename to bin/manila-scheduler index 28edd8bbf9..1a15ff7633 100755 --- a/bin/cinder-scheduler +++ b/bin/manila-scheduler @@ -17,7 +17,7 @@ # License for the specific language governing permissions and limitations # under the License. -"""Starter script for Cinder Scheduler.""" +"""Starter script for manila Scheduler.""" import eventlet eventlet.monkey_patch() @@ -25,26 +25,26 @@ eventlet.monkey_patch() import os import sys -# If ../cinder/__init__.py exists, add ../ to Python search path, so that +# If ../manila/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)) -if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')): +if os.path.exists(os.path.join(possible_topdir, 'manila', '__init__.py')): sys.path.insert(0, possible_topdir) -from cinder.openstack.common import gettextutils -gettextutils.install('cinder') +from manila.openstack.common import gettextutils +gettextutils.install('manila') -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import service -from cinder import utils +from manila import flags +from manila.openstack.common import log as logging +from manila import service +from manila import utils if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup("cinder") + logging.setup("manila") utils.monkey_patch() - server = service.Service.create(binary='cinder-scheduler') + server = service.Service.create(binary='manila-scheduler') service.serve(server) service.wait() diff --git a/bin/cinder-share b/bin/manila-share similarity index 77% rename from bin/cinder-share rename to bin/manila-share index b3ba88d398..2f73b0b340 100755 --- a/bin/cinder-share +++ b/bin/manila-share @@ -16,7 +16,7 @@ # License for the specific language governing permissions and limitations # under the License. -"""Starter script for Cinder Share.""" +"""Starter script for manila Share.""" import eventlet eventlet.monkey_patch() @@ -24,27 +24,27 @@ eventlet.monkey_patch() import os import sys -# If ../cinder/__init__.py exists, add ../ to Python search path, so that +# If ../manila/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)) -if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')): +if os.path.exists(os.path.join(possible_topdir, 'manila', '__init__.py')): sys.path.insert(0, possible_topdir) -from cinder.openstack.common import gettextutils -gettextutils.install('cinder') +from manila.openstack.common import gettextutils +gettextutils.install('manila') -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import service -from cinder import utils +from manila import flags +from manila.openstack.common import log as logging +from manila import service +from manila import utils FLAGS = flags.FLAGS if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup("cinder") + logging.setup("manila") utils.monkey_patch() launcher = service.ProcessLauncher() if FLAGS.enabled_share_backends: @@ -55,6 +55,6 @@ if __name__ == '__main__': service_name=backend) launcher.launch_server(server) else: - server = service.Service.create(binary='cinder-share') + server = service.Service.create(binary='manila-share') launcher.launch_server(server) launcher.wait() diff --git a/bin/cinder-volume b/bin/manila-volume similarity index 78% rename from bin/cinder-volume rename to bin/manila-volume index 9c36238d66..66b7ada64b 100755 --- a/bin/cinder-volume +++ b/bin/manila-volume @@ -17,7 +17,7 @@ # License for the specific language governing permissions and limitations # under the License. -"""Starter script for Cinder Volume.""" +"""Starter script for manila Volume.""" import eventlet eventlet.monkey_patch() @@ -25,27 +25,27 @@ eventlet.monkey_patch() import os import sys -# If ../cinder/__init__.py exists, add ../ to Python search path, so that +# If ../manila/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)) -if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')): +if os.path.exists(os.path.join(possible_topdir, 'manila', '__init__.py')): sys.path.insert(0, possible_topdir) -from cinder.openstack.common import gettextutils -gettextutils.install('cinder') +from manila.openstack.common import gettextutils +gettextutils.install('manila') -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import service -from cinder import utils +from manila import flags +from manila.openstack.common import log as logging +from manila import service +from manila import utils FLAGS = flags.FLAGS if __name__ == '__main__': flags.parse_args(sys.argv) - logging.setup("cinder") + logging.setup("manila") utils.monkey_patch() launcher = service.ProcessLauncher() if FLAGS.enabled_backends: @@ -56,6 +56,6 @@ if __name__ == '__main__': service_name=backend) launcher.launch_server(server) else: - server = service.Service.create(binary='cinder-volume') + server = service.Service.create(binary='manila-volume') launcher.launch_server(server) launcher.wait() diff --git a/bin/cinder-volume-usage-audit b/bin/manila-volume-usage-audit similarity index 85% rename from bin/cinder-volume-usage-audit rename to bin/manila-volume-usage-audit index 13ea447a9f..5585d76f85 100755 --- a/bin/cinder-volume-usage-audit +++ b/bin/manila-volume-usage-audit @@ -38,24 +38,24 @@ import os import sys import traceback -# If ../cinder/__init__.py exists, add ../ to Python search path, so that +# If ../manila/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)) -if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')): +if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'manila', '__init__.py')): sys.path.insert(0, POSSIBLE_TOPDIR) -from cinder.openstack.common import gettextutils -gettextutils.install('cinder') +from manila.openstack.common import gettextutils +gettextutils.install('manila') -from cinder import context -from cinder import db -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common import rpc -from cinder import utils -import cinder.volume.utils +from manila import context +from manila import db +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common import rpc +from manila import utils +import manila.volume.utils FLAGS = flags.FLAGS @@ -63,7 +63,7 @@ FLAGS = flags.FLAGS if __name__ == '__main__': admin_context = context.get_admin_context() flags.parse_args(sys.argv) - logging.setup("cinder") + logging.setup("manila") begin, end = utils.last_completed_audit_period() print _("Starting volume usage audit") msg = _("Creating usages for %(begin_period)s until %(end_period)s") @@ -80,7 +80,7 @@ if __name__ == '__main__': print _("Found %d volumes") % len(volumes) for volume_ref in volumes: try: - cinder.volume.utils.notify_usage_exists( + manila.volume.utils.notify_usage_exists( admin_context, volume_ref) except Exception, e: print traceback.format_exc(e) @@ -91,7 +91,7 @@ if __name__ == '__main__': print _("Found %d snapshots") % len(snapshots) for snapshot_ref in snapshots: try: - cinder.volume.utils.notify_about_snapshot_usage(admin_context, + manila.volume.utils.notify_about_snapshot_usage(admin_context, snapshot_ref, 'exists', extra_info) diff --git a/doc/ext/cinder_autodoc.py b/doc/ext/cinder_autodoc.py index a778f4a522..1c18012485 100644 --- a/doc/ext/cinder_autodoc.py +++ b/doc/ext/cinder_autodoc.py @@ -1,9 +1,9 @@ import gettext import os -gettext.install('cinder') +gettext.install('manila') -from cinder import utils +from manila import utils def setup(app): diff --git a/doc/source/conf.py b/doc/source/conf.py index 40e564bd34..570ce1498e 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# cinder documentation build configuration file, created by +# manila documentation build configuration file, created by # sphinx-quickstart on Sat May 1 15:17:47 2010. # # This file is execfile()d with the current directory set @@ -64,14 +64,14 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'cinder' +project = u'manila' copyright = u'2010-present, OpenStack, LLC' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # -from cinder.version import version_info +from manila.version import version_info # The full version, including alpha/beta/rc tags. release = version_info.release_string() # The short X.Y version. @@ -116,7 +116,7 @@ show_authors = False pygments_style = 'sphinx' # A list of ignored prefixes for module index sorting. -modindex_common_prefix = ['cinder.'] +modindex_common_prefix = ['manila.'] # -- Options for man page output ---------------------------------------------- @@ -124,7 +124,7 @@ modindex_common_prefix = ['cinder.'] # List of tuples 'sourcefile', 'target', u'title', u'Authors name', 'manual' man_pages = [ - ('man/cinder-manage', 'cinder-manage', u'Cloud controller fabric', + ('man/manila-manage', 'manila-manage', u'Cloud controller fabric', [u'OpenStack'], 1) ] diff --git a/manila.egg-info/PKG-INFO b/manila.egg-info/PKG-INFO new file mode 100644 index 0000000000..cd1dafd2fd --- /dev/null +++ b/manila.egg-info/PKG-INFO @@ -0,0 +1,41 @@ +Metadata-Version: 1.1 +Name: manila +Version: 2013.2.a2.gf99ef92 +Summary: OpenStack Share Storage +Home-page: http://www.openstack.org/ +Author: OpenStack +Author-email: openstack-dev@lists.openstack.org +License: UNKNOWN +Description: The Choose Your Own Adventure README for Cinder + =============================================== + + You have come across a storage service for an open cloud computing service. + It has identified itself as "Cinder." It was abstracted from the Nova project. + + To monitor it from a distance: follow `@openstack `_ on twitter. + + To tame it for use in your own cloud: read http://docs.openstack.org + + To study its anatomy: read http://cinder.openstack.org + + To dissect it in detail: visit http://github.com/openstack/cinder + + To taunt it with its weaknesses: use http://bugs.launchpad.net/cinder + + To watch it: http://jenkins.openstack.org + + To hack at it: read HACKING + + To cry over its pylint problems: http://jenkins.openstack.org/job/cinder-pylint/violations + + +Platform: UNKNOWN +Classifier: Environment :: OpenStack +Classifier: Intended Audience :: Information Technology +Classifier: Intended Audience :: System Administrators +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Operating System :: POSIX :: Linux +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: 2 +Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 2.6 diff --git a/manila.egg-info/SOURCES.txt b/manila.egg-info/SOURCES.txt new file mode 100644 index 0000000000..0f0fee22ec --- /dev/null +++ b/manila.egg-info/SOURCES.txt @@ -0,0 +1,917 @@ +CONTRIBUTING.md +HACKING.rst +LICENSE +MANIFEST.in +README.md +README.rst +babel.cfg +openstack-common.conf +pylintrc +run_tests.sh +setup.cfg +setup.py +tox.ini +bin/cinder-all +bin/cinder-api +bin/cinder-backup +bin/cinder-clear-rabbit-queues +bin/cinder-manage +bin/cinder-rootwrap +bin/cinder-rpc-zmq-receiver +bin/cinder-scheduler +bin/cinder-share +bin/cinder-volume +bin/cinder-volume-usage-audit +cinder/__init__.py +cinder/context.py +cinder/exception.py +cinder/flags.py +cinder/manager.py +cinder/policy.py +cinder/quota.py +cinder/service.py +cinder/test.py +cinder/utils.py +cinder/version.py +cinder/wsgi.py +cinder/api/__init__.py +cinder/api/auth.py +cinder/api/common.py +cinder/api/extensions.py +cinder/api/sizelimit.py +cinder/api/urlmap.py +cinder/api/versions.py +cinder/api/xmlutil.py +cinder/api/contrib/__init__.py +cinder/api/contrib/admin_actions.py +cinder/api/contrib/backups.py +cinder/api/contrib/extended_snapshot_attributes.py +cinder/api/contrib/hosts.py +cinder/api/contrib/image_create.py +cinder/api/contrib/quota_classes.py +cinder/api/contrib/quotas.py +cinder/api/contrib/services.py +cinder/api/contrib/share_actions.py +cinder/api/contrib/share_snapshots.py +cinder/api/contrib/shares.py +cinder/api/contrib/types_extra_specs.py +cinder/api/contrib/types_manage.py +cinder/api/contrib/volume_actions.py +cinder/api/contrib/volume_host_attribute.py +cinder/api/contrib/volume_image_metadata.py +cinder/api/contrib/volume_tenant_attribute.py +cinder/api/middleware/__init__.py +cinder/api/middleware/auth.py +cinder/api/middleware/fault.py +cinder/api/middleware/sizelimit.py +cinder/api/openstack/__init__.py +cinder/api/openstack/urlmap.py +cinder/api/openstack/wsgi.py +cinder/api/openstack/volume/__init__.py +cinder/api/openstack/volume/versions.py +cinder/api/schemas/atom-link.rng +cinder/api/schemas/v1.1/extension.rng +cinder/api/schemas/v1.1/extensions.rng +cinder/api/schemas/v1.1/limits.rng +cinder/api/schemas/v1.1/metadata.rng +cinder/api/v1/__init__.py +cinder/api/v1/limits.py +cinder/api/v1/router.py +cinder/api/v1/snapshot_metadata.py +cinder/api/v1/snapshots.py +cinder/api/v1/types.py +cinder/api/v1/volume_metadata.py +cinder/api/v1/volumes.py +cinder/api/v2/__init__.py +cinder/api/v2/limits.py +cinder/api/v2/router.py +cinder/api/v2/snapshot_metadata.py +cinder/api/v2/snapshots.py +cinder/api/v2/types.py +cinder/api/v2/volumes.py +cinder/api/v2/views/__init__.py +cinder/api/v2/views/volumes.py +cinder/api/views/__init__.py +cinder/api/views/backups.py +cinder/api/views/limits.py +cinder/api/views/share_snapshots.py +cinder/api/views/shares.py +cinder/api/views/types.py +cinder/api/views/versions.py +cinder/backup/__init__.py +cinder/backup/api.py +cinder/backup/manager.py +cinder/backup/rpcapi.py +cinder/backup/services/__init__.py +cinder/backup/services/swift.py +cinder/brick/__init__.py +cinder/brick/iscsi/__init__.py +cinder/brick/iscsi/iscsi.py +cinder/brick/local_dev/__init__.py +cinder/brick/local_dev/lvm.py +cinder/common/__init__.py +cinder/common/sqlalchemyutils.py +cinder/compute/__init__.py +cinder/compute/aggregate_states.py +cinder/db/__init__.py +cinder/db/api.py +cinder/db/base.py +cinder/db/migration.py +cinder/db/sqlalchemy/__init__.py +cinder/db/sqlalchemy/api.py +cinder/db/sqlalchemy/migration.py +cinder/db/sqlalchemy/models.py +cinder/db/sqlalchemy/session.py +cinder/db/sqlalchemy/migrate_repo/README +cinder/db/sqlalchemy/migrate_repo/__init__.py +cinder/db/sqlalchemy/migrate_repo/manage.py +cinder/db/sqlalchemy/migrate_repo/migrate.cfg +cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py +cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py +cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py +cinder/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py +cinder/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py +cinder/db/sqlalchemy/migrate_repo/versions/005_sqlite_downgrade.sql +cinder/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py +cinder/db/sqlalchemy/migrate_repo/versions/007_add_volume_snapshot_fk.py +cinder/db/sqlalchemy/migrate_repo/versions/007_sqlite_downgrade.sql +cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py +cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py +cinder/db/sqlalchemy/migrate_repo/versions/010_add_share_tables.py +cinder/db/sqlalchemy/migrate_repo/versions/011_add_share_snapshot_table.py +cinder/db/sqlalchemy/migrate_repo/versions/__init__.py +cinder/image/__init__.py +cinder/image/glance.py +cinder/image/image_utils.py +cinder/locale/cinder.pot +cinder/locale/bg_BG/LC_MESSAGES/cinder.po +cinder/locale/bs/LC_MESSAGES/cinder.po +cinder/locale/cs/LC_MESSAGES/cinder.po +cinder/locale/da/LC_MESSAGES/cinder.po +cinder/locale/de/LC_MESSAGES/cinder.po +cinder/locale/en_AU/LC_MESSAGES/cinder.po +cinder/locale/en_GB/LC_MESSAGES/cinder.po +cinder/locale/en_US/LC_MESSAGES/cinder.po +cinder/locale/es/LC_MESSAGES/cinder.po +cinder/locale/fi_FI/LC_MESSAGES/cinder.po +cinder/locale/fr/LC_MESSAGES/cinder.po +cinder/locale/it/LC_MESSAGES/cinder.po +cinder/locale/ja/LC_MESSAGES/cinder.po +cinder/locale/ko/LC_MESSAGES/cinder.po +cinder/locale/ko_KR/LC_MESSAGES/cinder.po +cinder/locale/pt_BR/LC_MESSAGES/cinder.po +cinder/locale/ru/LC_MESSAGES/cinder.po +cinder/locale/tl/LC_MESSAGES/cinder.po +cinder/locale/tr/LC_MESSAGES/cinder.po +cinder/locale/uk/LC_MESSAGES/cinder.po +cinder/locale/vi_VN/LC_MESSAGES/cinder.po +cinder/locale/zh_CN/LC_MESSAGES/cinder.po +cinder/locale/zh_TW/LC_MESSAGES/cinder.po +cinder/openstack/__init__.py +cinder/openstack/common/README +cinder/openstack/common/__init__.py +cinder/openstack/common/context.py +cinder/openstack/common/eventlet_backdoor.py +cinder/openstack/common/exception.py +cinder/openstack/common/excutils.py +cinder/openstack/common/fileutils.py +cinder/openstack/common/gettextutils.py +cinder/openstack/common/importutils.py +cinder/openstack/common/jsonutils.py +cinder/openstack/common/local.py +cinder/openstack/common/lockutils.py +cinder/openstack/common/log.py +cinder/openstack/common/loopingcall.py +cinder/openstack/common/network_utils.py +cinder/openstack/common/policy.py +cinder/openstack/common/processutils.py +cinder/openstack/common/service.py +cinder/openstack/common/strutils.py +cinder/openstack/common/threadgroup.py +cinder/openstack/common/timeutils.py +cinder/openstack/common/uuidutils.py +cinder/openstack/common/notifier/__init__.py +cinder/openstack/common/notifier/api.py +cinder/openstack/common/notifier/log_notifier.py +cinder/openstack/common/notifier/no_op_notifier.py +cinder/openstack/common/notifier/rabbit_notifier.py +cinder/openstack/common/notifier/rpc_notifier.py +cinder/openstack/common/notifier/rpc_notifier2.py +cinder/openstack/common/notifier/test_notifier.py +cinder/openstack/common/rootwrap/__init__.py +cinder/openstack/common/rootwrap/cmd.py +cinder/openstack/common/rootwrap/filters.py +cinder/openstack/common/rootwrap/wrapper.py +cinder/openstack/common/rpc/__init__.py +cinder/openstack/common/rpc/amqp.py +cinder/openstack/common/rpc/common.py +cinder/openstack/common/rpc/dispatcher.py +cinder/openstack/common/rpc/impl_fake.py +cinder/openstack/common/rpc/impl_kombu.py +cinder/openstack/common/rpc/impl_qpid.py +cinder/openstack/common/rpc/impl_zmq.py +cinder/openstack/common/rpc/matchmaker.py +cinder/openstack/common/rpc/matchmaker_redis.py +cinder/openstack/common/rpc/proxy.py +cinder/openstack/common/rpc/service.py +cinder/openstack/common/rpc/zmq_receiver.py +cinder/openstack/common/scheduler/__init__.py +cinder/openstack/common/scheduler/filter.py +cinder/openstack/common/scheduler/weight.py +cinder/openstack/common/scheduler/filters/__init__.py +cinder/openstack/common/scheduler/filters/availability_zone_filter.py +cinder/openstack/common/scheduler/filters/capabilities_filter.py +cinder/openstack/common/scheduler/filters/extra_specs_ops.py +cinder/openstack/common/scheduler/filters/json_filter.py +cinder/openstack/common/scheduler/weights/__init__.py +cinder/scheduler/__init__.py +cinder/scheduler/chance.py +cinder/scheduler/driver.py +cinder/scheduler/filter_scheduler.py +cinder/scheduler/host_manager.py +cinder/scheduler/manager.py +cinder/scheduler/rpcapi.py +cinder/scheduler/scheduler_options.py +cinder/scheduler/simple.py +cinder/scheduler/filters/__init__.py +cinder/scheduler/filters/capacity_filter.py +cinder/scheduler/filters/retry_filter.py +cinder/scheduler/weights/__init__.py +cinder/scheduler/weights/capacity.py +cinder/share/__init__.py +cinder/share/api.py +cinder/share/configuration.py +cinder/share/driver.py +cinder/share/manager.py +cinder/share/rpcapi.py +cinder/share/drivers/__init__.py +cinder/share/drivers/lvm.py +cinder/share/drivers/netapp.py +cinder/testing/README.rst +cinder/tests/__init__.py +cinder/tests/declare_flags.py +cinder/tests/fake_driver.py +cinder/tests/fake_flags.py +cinder/tests/fake_utils.py +cinder/tests/policy.json +cinder/tests/runtime_flags.py +cinder/tests/test_HpSanISCSIDriver.py +cinder/tests/test_api.py +cinder/tests/test_backup.py +cinder/tests/test_backup_swift.py +cinder/tests/test_context.py +cinder/tests/test_coraid.py +cinder/tests/test_drivers_compatibility.py +cinder/tests/test_emc.py +cinder/tests/test_exception.py +cinder/tests/test_flags.py +cinder/tests/test_glusterfs.py +cinder/tests/test_hp3par.py +cinder/tests/test_huawei.py +cinder/tests/test_iscsi.py +cinder/tests/test_migrations.conf +cinder/tests/test_migrations.py +cinder/tests/test_misc.py +cinder/tests/test_netapp.py +cinder/tests/test_netapp_nfs.py +cinder/tests/test_nexenta.py +cinder/tests/test_nfs.py +cinder/tests/test_policy.py +cinder/tests/test_quota.py +cinder/tests/test_rbd.py +cinder/tests/test_scality.py +cinder/tests/test_service.py +cinder/tests/test_share.py +cinder/tests/test_share_api.py +cinder/tests/test_share_driver.py +cinder/tests/test_share_lvm.py +cinder/tests/test_share_netapp.py +cinder/tests/test_share_rpcapi.py +cinder/tests/test_sheepdog.py +cinder/tests/test_skip_examples.py +cinder/tests/test_solidfire.py +cinder/tests/test_storwize_svc.py +cinder/tests/test_test.py +cinder/tests/test_test_utils.py +cinder/tests/test_utils.py +cinder/tests/test_volume.py +cinder/tests/test_volume_configuration.py +cinder/tests/test_volume_glance_metadata.py +cinder/tests/test_volume_rpcapi.py +cinder/tests/test_volume_types.py +cinder/tests/test_volume_types_extra_specs.py +cinder/tests/test_volume_utils.py +cinder/tests/test_windows.py +cinder/tests/test_wsgi.py +cinder/tests/test_xenapi_sm.py +cinder/tests/test_xiv.py +cinder/tests/test_zadara.py +cinder/tests/utils.py +cinder/tests/api/__init__.py +cinder/tests/api/common.py +cinder/tests/api/fakes.py +cinder/tests/api/test_common.py +cinder/tests/api/test_extensions.py +cinder/tests/api/test_router.py +cinder/tests/api/test_wsgi.py +cinder/tests/api/test_xmlutil.py +cinder/tests/api/contrib/__init__.py +cinder/tests/api/contrib/stubs.py +cinder/tests/api/contrib/test_admin_actions.py +cinder/tests/api/contrib/test_backups.py +cinder/tests/api/contrib/test_extended_snapshot_attributes.py +cinder/tests/api/contrib/test_hosts.py +cinder/tests/api/contrib/test_services.py +cinder/tests/api/contrib/test_share_actions.py +cinder/tests/api/contrib/test_share_snapshots.py +cinder/tests/api/contrib/test_shares.py +cinder/tests/api/contrib/test_types_extra_specs.py +cinder/tests/api/contrib/test_types_manage.py +cinder/tests/api/contrib/test_volume_actions.py +cinder/tests/api/contrib/test_volume_host_attribute.py +cinder/tests/api/contrib/test_volume_image_metadata.py +cinder/tests/api/contrib/test_volume_tenant_attribute.py +cinder/tests/api/extensions/__init__.py +cinder/tests/api/extensions/foxinsocks.py +cinder/tests/api/middleware/__init__.py +cinder/tests/api/middleware/test_auth.py +cinder/tests/api/middleware/test_faults.py +cinder/tests/api/middleware/test_sizelimit.py +cinder/tests/api/openstack/__init__.py +cinder/tests/api/openstack/test_wsgi.py +cinder/tests/api/v1/__init__.py +cinder/tests/api/v1/stubs.py +cinder/tests/api/v1/test_limits.py +cinder/tests/api/v1/test_snapshot_metadata.py +cinder/tests/api/v1/test_snapshots.py +cinder/tests/api/v1/test_types.py +cinder/tests/api/v1/test_volume_metadata.py +cinder/tests/api/v1/test_volumes.py +cinder/tests/api/v2/__init__.py +cinder/tests/api/v2/stubs.py +cinder/tests/api/v2/test_limits.py +cinder/tests/api/v2/test_snapshot_metadata.py +cinder/tests/api/v2/test_snapshots.py +cinder/tests/api/v2/test_types.py +cinder/tests/api/v2/test_volumes.py +cinder/tests/backup/__init__.py +cinder/tests/backup/fake_service.py +cinder/tests/backup/fake_swift_client.py +cinder/tests/brick/__init__.py +cinder/tests/brick/test_brick_lvm.py +cinder/tests/db/__init__.py +cinder/tests/db/fakes.py +cinder/tests/glance/__init__.py +cinder/tests/glance/stubs.py +cinder/tests/image/__init__.py +cinder/tests/image/fake.py +cinder/tests/image/test_glance.py +cinder/tests/integrated/__init__.py +cinder/tests/integrated/integrated_helpers.py +cinder/tests/integrated/test_extensions.py +cinder/tests/integrated/test_login.py +cinder/tests/integrated/test_volumes.py +cinder/tests/integrated/test_xml.py +cinder/tests/integrated/api/__init__.py +cinder/tests/integrated/api/client.py +cinder/tests/monkey_patch_example/__init__.py +cinder/tests/monkey_patch_example/example_a.py +cinder/tests/monkey_patch_example/example_b.py +cinder/tests/scheduler/__init__.py +cinder/tests/scheduler/fakes.py +cinder/tests/scheduler/test_capacity_weigher.py +cinder/tests/scheduler/test_filter_scheduler.py +cinder/tests/scheduler/test_host_filters.py +cinder/tests/scheduler/test_host_manager.py +cinder/tests/scheduler/test_rpcapi.py +cinder/tests/scheduler/test_scheduler.py +cinder/tests/scheduler/test_scheduler_options.py +cinder/tests/var/ca.crt +cinder/tests/var/certificate.crt +cinder/tests/var/privatekey.key +cinder/tests/windows/__init__.py +cinder/tests/windows/basetestcase.py +cinder/tests/windows/db_fakes.py +cinder/tests/windows/mockproxy.py +cinder/tests/windows/windowsutils.py +cinder/tests/windows/stubs/README.rst +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_check_for_setup_errors_wmi.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_os.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_wmi.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_os.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_wmi.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_os.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_wmi.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_os.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_wmi.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_os.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_wmi.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_os.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_wmi.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_os.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_wmi.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_os.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_wmi.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_os.p.gz +cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_wmi.p.gz +cinder/tests/xenapi/__init__.py +cinder/volume/__init__.py +cinder/volume/api.py +cinder/volume/configuration.py +cinder/volume/driver.py +cinder/volume/manager.py +cinder/volume/rpcapi.py +cinder/volume/utils.py +cinder/volume/volume_types.py +cinder/volume/drivers/__init__.py +cinder/volume/drivers/coraid.py +cinder/volume/drivers/glusterfs.py +cinder/volume/drivers/lvm.py +cinder/volume/drivers/nfs.py +cinder/volume/drivers/rbd.py +cinder/volume/drivers/scality.py +cinder/volume/drivers/sheepdog.py +cinder/volume/drivers/solidfire.py +cinder/volume/drivers/storwize_svc.py +cinder/volume/drivers/windows.py +cinder/volume/drivers/xiv.py +cinder/volume/drivers/zadara.py +cinder/volume/drivers/emc/__init__.py +cinder/volume/drivers/emc/cinder_emc_config.xml.sample +cinder/volume/drivers/emc/emc_smis_common.py +cinder/volume/drivers/emc/emc_smis_iscsi.py +cinder/volume/drivers/huawei/__init__.py +cinder/volume/drivers/huawei/cinder_huawei_conf.xml.sample +cinder/volume/drivers/huawei/huawei_iscsi.py +cinder/volume/drivers/netapp/__init__.py +cinder/volume/drivers/netapp/api.py +cinder/volume/drivers/netapp/iscsi.py +cinder/volume/drivers/netapp/nfs.py +cinder/volume/drivers/nexenta/__init__.py +cinder/volume/drivers/nexenta/jsonrpc.py +cinder/volume/drivers/nexenta/volume.py +cinder/volume/drivers/san/__init__.py +cinder/volume/drivers/san/hp_lefthand.py +cinder/volume/drivers/san/san.py +cinder/volume/drivers/san/solaris.py +cinder/volume/drivers/san/hp/__init__.py +cinder/volume/drivers/san/hp/hp_3par_common.py +cinder/volume/drivers/san/hp/hp_3par_fc.py +cinder/volume/drivers/san/hp/hp_3par_iscsi.py +cinder/volume/drivers/xenapi/__init__.py +cinder/volume/drivers/xenapi/lib.py +cinder/volume/drivers/xenapi/sm.py +cinder/volume/drivers/xenapi/tools.py +contrib/redhat-eventlet.patch +doc/.gitignore +doc/Makefile +doc/README.rst +doc/find_autodoc_modules.sh +doc/generate_autodoc_index.sh +doc/ext/__init__.py +doc/ext/cinder_autodoc.py +doc/ext/cinder_todo.py +doc/source/conf.py +doc/source/index.rst +doc/source/_ga/layout.html +doc/source/_static/.gitignore +doc/source/_static/.placeholder +doc/source/_static/basic.css +doc/source/_static/default.css +doc/source/_static/jquery.tweet.js +doc/source/_static/tweaks.css +doc/source/_templates/.gitignore +doc/source/_templates/.placeholder +doc/source/_theme/layout.html +doc/source/_theme/theme.conf +doc/source/devref/addmethod.openstackapi.rst +doc/source/devref/api.rst +doc/source/devref/architecture.rst +doc/source/devref/auth.rst +doc/source/devref/cinder.rst +doc/source/devref/database.rst +doc/source/devref/development.environment.rst +doc/source/devref/fakes.rst +doc/source/devref/gerrit.rst +doc/source/devref/il8n.rst +doc/source/devref/index.rst +doc/source/devref/jenkins.rst +doc/source/devref/launchpad.rst +doc/source/devref/rpc.rst +doc/source/devref/scheduler.rst +doc/source/devref/services.rst +doc/source/devref/threading.rst +doc/source/devref/unit_tests.rst +doc/source/devref/volume.rst +doc/source/images/rpc/arch.png +doc/source/images/rpc/arch.svg +doc/source/images/rpc/flow1.png +doc/source/images/rpc/flow1.svg +doc/source/images/rpc/flow2.png +doc/source/images/rpc/flow2.svg +doc/source/images/rpc/rabt.png +doc/source/images/rpc/rabt.svg +doc/source/images/rpc/state.png +doc/source/man/cinder-manage.rst +etc/cinder/api-paste.ini +etc/cinder/cinder.conf.sample +etc/cinder/logging_sample.conf +etc/cinder/policy.json +etc/cinder/rootwrap.conf +etc/cinder/rootwrap.d/share.filters +etc/cinder/rootwrap.d/volume.filters +manila/__init__.py +manila/context.py +manila/exception.py +manila/flags.py +manila/manager.py +manila/policy.py +manila/quota.py +manila/service.py +manila/test.py +manila/utils.py +manila/version.py +manila/wsgi.py +manila.egg-info/PKG-INFO +manila.egg-info/SOURCES.txt +manila.egg-info/dependency_links.txt +manila.egg-info/entry_points.txt +manila.egg-info/requires.txt +manila.egg-info/top_level.txt +manila/api/__init__.py +manila/api/auth.py +manila/api/common.py +manila/api/extensions.py +manila/api/sizelimit.py +manila/api/urlmap.py +manila/api/versions.py +manila/api/xmlutil.py +manila/api/contrib/__init__.py +manila/api/contrib/admin_actions.py +manila/api/contrib/backups.py +manila/api/contrib/extended_snapshot_attributes.py +manila/api/contrib/hosts.py +manila/api/contrib/image_create.py +manila/api/contrib/quota_classes.py +manila/api/contrib/quotas.py +manila/api/contrib/services.py +manila/api/contrib/share_actions.py +manila/api/contrib/share_snapshots.py +manila/api/contrib/shares.py +manila/api/contrib/types_extra_specs.py +manila/api/contrib/types_manage.py +manila/api/contrib/volume_actions.py +manila/api/contrib/volume_host_attribute.py +manila/api/contrib/volume_image_metadata.py +manila/api/contrib/volume_tenant_attribute.py +manila/api/middleware/__init__.py +manila/api/middleware/auth.py +manila/api/middleware/fault.py +manila/api/middleware/sizelimit.py +manila/api/openstack/__init__.py +manila/api/openstack/urlmap.py +manila/api/openstack/wsgi.py +manila/api/openstack/volume/__init__.py +manila/api/openstack/volume/versions.py +manila/api/v1/__init__.py +manila/api/v1/limits.py +manila/api/v1/router.py +manila/api/v1/snapshot_metadata.py +manila/api/v1/snapshots.py +manila/api/v1/types.py +manila/api/v1/volume_metadata.py +manila/api/v1/volumes.py +manila/api/v2/__init__.py +manila/api/v2/limits.py +manila/api/v2/router.py +manila/api/v2/snapshot_metadata.py +manila/api/v2/snapshots.py +manila/api/v2/types.py +manila/api/v2/volumes.py +manila/api/v2/views/__init__.py +manila/api/v2/views/volumes.py +manila/api/views/__init__.py +manila/api/views/backups.py +manila/api/views/limits.py +manila/api/views/share_snapshots.py +manila/api/views/shares.py +manila/api/views/types.py +manila/api/views/versions.py +manila/backup/__init__.py +manila/backup/api.py +manila/backup/manager.py +manila/backup/rpcapi.py +manila/backup/services/__init__.py +manila/backup/services/swift.py +manila/brick/__init__.py +manila/brick/iscsi/__init__.py +manila/brick/iscsi/iscsi.py +manila/brick/local_dev/__init__.py +manila/brick/local_dev/lvm.py +manila/common/__init__.py +manila/common/sqlalchemyutils.py +manila/compute/__init__.py +manila/compute/aggregate_states.py +manila/db/__init__.py +manila/db/api.py +manila/db/base.py +manila/db/migration.py +manila/db/sqlalchemy/__init__.py +manila/db/sqlalchemy/api.py +manila/db/sqlalchemy/migration.py +manila/db/sqlalchemy/models.py +manila/db/sqlalchemy/session.py +manila/db/sqlalchemy/migrate_repo/__init__.py +manila/db/sqlalchemy/migrate_repo/manage.py +manila/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py +manila/db/sqlalchemy/migrate_repo/versions/002_quota_class.py +manila/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py +manila/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py +manila/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py +manila/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py +manila/db/sqlalchemy/migrate_repo/versions/007_add_volume_snapshot_fk.py +manila/db/sqlalchemy/migrate_repo/versions/008_add_backup.py +manila/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py +manila/db/sqlalchemy/migrate_repo/versions/010_add_share_tables.py +manila/db/sqlalchemy/migrate_repo/versions/011_add_share_snapshot_table.py +manila/db/sqlalchemy/migrate_repo/versions/__init__.py +manila/image/__init__.py +manila/image/glance.py +manila/image/image_utils.py +manila/openstack/__init__.py +manila/openstack/common/__init__.py +manila/openstack/common/context.py +manila/openstack/common/eventlet_backdoor.py +manila/openstack/common/exception.py +manila/openstack/common/excutils.py +manila/openstack/common/fileutils.py +manila/openstack/common/gettextutils.py +manila/openstack/common/importutils.py +manila/openstack/common/jsonutils.py +manila/openstack/common/local.py +manila/openstack/common/lockutils.py +manila/openstack/common/log.py +manila/openstack/common/loopingcall.py +manila/openstack/common/network_utils.py +manila/openstack/common/policy.py +manila/openstack/common/processutils.py +manila/openstack/common/service.py +manila/openstack/common/strutils.py +manila/openstack/common/threadgroup.py +manila/openstack/common/timeutils.py +manila/openstack/common/uuidutils.py +manila/openstack/common/notifier/__init__.py +manila/openstack/common/notifier/api.py +manila/openstack/common/notifier/log_notifier.py +manila/openstack/common/notifier/no_op_notifier.py +manila/openstack/common/notifier/rabbit_notifier.py +manila/openstack/common/notifier/rpc_notifier.py +manila/openstack/common/notifier/rpc_notifier2.py +manila/openstack/common/notifier/test_notifier.py +manila/openstack/common/rootwrap/__init__.py +manila/openstack/common/rootwrap/cmd.py +manila/openstack/common/rootwrap/filters.py +manila/openstack/common/rootwrap/wrapper.py +manila/openstack/common/rpc/__init__.py +manila/openstack/common/rpc/amqp.py +manila/openstack/common/rpc/common.py +manila/openstack/common/rpc/dispatcher.py +manila/openstack/common/rpc/impl_fake.py +manila/openstack/common/rpc/impl_kombu.py +manila/openstack/common/rpc/impl_qpid.py +manila/openstack/common/rpc/impl_zmq.py +manila/openstack/common/rpc/matchmaker.py +manila/openstack/common/rpc/matchmaker_redis.py +manila/openstack/common/rpc/proxy.py +manila/openstack/common/rpc/service.py +manila/openstack/common/rpc/zmq_receiver.py +manila/openstack/common/scheduler/__init__.py +manila/openstack/common/scheduler/filter.py +manila/openstack/common/scheduler/weight.py +manila/openstack/common/scheduler/filters/__init__.py +manila/openstack/common/scheduler/filters/availability_zone_filter.py +manila/openstack/common/scheduler/filters/capabilities_filter.py +manila/openstack/common/scheduler/filters/extra_specs_ops.py +manila/openstack/common/scheduler/filters/json_filter.py +manila/openstack/common/scheduler/weights/__init__.py +manila/scheduler/__init__.py +manila/scheduler/chance.py +manila/scheduler/driver.py +manila/scheduler/filter_scheduler.py +manila/scheduler/host_manager.py +manila/scheduler/manager.py +manila/scheduler/rpcapi.py +manila/scheduler/scheduler_options.py +manila/scheduler/simple.py +manila/scheduler/filters/__init__.py +manila/scheduler/filters/capacity_filter.py +manila/scheduler/filters/retry_filter.py +manila/scheduler/weights/__init__.py +manila/scheduler/weights/capacity.py +manila/share/__init__.py +manila/share/api.py +manila/share/configuration.py +manila/share/driver.py +manila/share/manager.py +manila/share/rpcapi.py +manila/share/drivers/__init__.py +manila/share/drivers/lvm.py +manila/share/drivers/netapp.py +manila/tests/__init__.py +manila/tests/declare_flags.py +manila/tests/fake_driver.py +manila/tests/fake_flags.py +manila/tests/fake_utils.py +manila/tests/runtime_flags.py +manila/tests/test_HpSanISCSIDriver.py +manila/tests/test_api.py +manila/tests/test_backup.py +manila/tests/test_backup_swift.py +manila/tests/test_context.py +manila/tests/test_coraid.py +manila/tests/test_drivers_compatibility.py +manila/tests/test_emc.py +manila/tests/test_exception.py +manila/tests/test_flags.py +manila/tests/test_glusterfs.py +manila/tests/test_hp3par.py +manila/tests/test_huawei.py +manila/tests/test_iscsi.py +manila/tests/test_migrations.py +manila/tests/test_misc.py +manila/tests/test_netapp.py +manila/tests/test_netapp_nfs.py +manila/tests/test_nexenta.py +manila/tests/test_nfs.py +manila/tests/test_policy.py +manila/tests/test_quota.py +manila/tests/test_rbd.py +manila/tests/test_scality.py +manila/tests/test_service.py +manila/tests/test_share.py +manila/tests/test_share_api.py +manila/tests/test_share_driver.py +manila/tests/test_share_lvm.py +manila/tests/test_share_netapp.py +manila/tests/test_share_rpcapi.py +manila/tests/test_sheepdog.py +manila/tests/test_skip_examples.py +manila/tests/test_solidfire.py +manila/tests/test_storwize_svc.py +manila/tests/test_test.py +manila/tests/test_test_utils.py +manila/tests/test_utils.py +manila/tests/test_volume.py +manila/tests/test_volume_configuration.py +manila/tests/test_volume_glance_metadata.py +manila/tests/test_volume_rpcapi.py +manila/tests/test_volume_types.py +manila/tests/test_volume_types_extra_specs.py +manila/tests/test_volume_utils.py +manila/tests/test_windows.py +manila/tests/test_wsgi.py +manila/tests/test_xenapi_sm.py +manila/tests/test_xiv.py +manila/tests/test_zadara.py +manila/tests/utils.py +manila/tests/api/__init__.py +manila/tests/api/common.py +manila/tests/api/fakes.py +manila/tests/api/test_common.py +manila/tests/api/test_extensions.py +manila/tests/api/test_router.py +manila/tests/api/test_wsgi.py +manila/tests/api/test_xmlutil.py +manila/tests/api/contrib/__init__.py +manila/tests/api/contrib/stubs.py +manila/tests/api/contrib/test_admin_actions.py +manila/tests/api/contrib/test_backups.py +manila/tests/api/contrib/test_extended_snapshot_attributes.py +manila/tests/api/contrib/test_hosts.py +manila/tests/api/contrib/test_services.py +manila/tests/api/contrib/test_share_actions.py +manila/tests/api/contrib/test_share_snapshots.py +manila/tests/api/contrib/test_shares.py +manila/tests/api/contrib/test_types_extra_specs.py +manila/tests/api/contrib/test_types_manage.py +manila/tests/api/contrib/test_volume_actions.py +manila/tests/api/contrib/test_volume_host_attribute.py +manila/tests/api/contrib/test_volume_image_metadata.py +manila/tests/api/contrib/test_volume_tenant_attribute.py +manila/tests/api/extensions/__init__.py +manila/tests/api/extensions/foxinsocks.py +manila/tests/api/middleware/__init__.py +manila/tests/api/middleware/test_auth.py +manila/tests/api/middleware/test_faults.py +manila/tests/api/middleware/test_sizelimit.py +manila/tests/api/openstack/__init__.py +manila/tests/api/openstack/test_wsgi.py +manila/tests/api/v1/__init__.py +manila/tests/api/v1/stubs.py +manila/tests/api/v1/test_limits.py +manila/tests/api/v1/test_snapshot_metadata.py +manila/tests/api/v1/test_snapshots.py +manila/tests/api/v1/test_types.py +manila/tests/api/v1/test_volume_metadata.py +manila/tests/api/v1/test_volumes.py +manila/tests/api/v2/__init__.py +manila/tests/api/v2/stubs.py +manila/tests/api/v2/test_limits.py +manila/tests/api/v2/test_snapshot_metadata.py +manila/tests/api/v2/test_snapshots.py +manila/tests/api/v2/test_types.py +manila/tests/api/v2/test_volumes.py +manila/tests/backup/__init__.py +manila/tests/backup/fake_service.py +manila/tests/backup/fake_swift_client.py +manila/tests/brick/__init__.py +manila/tests/brick/test_brick_lvm.py +manila/tests/db/__init__.py +manila/tests/db/fakes.py +manila/tests/glance/__init__.py +manila/tests/glance/stubs.py +manila/tests/image/__init__.py +manila/tests/image/fake.py +manila/tests/image/test_glance.py +manila/tests/integrated/__init__.py +manila/tests/integrated/integrated_helpers.py +manila/tests/integrated/test_extensions.py +manila/tests/integrated/test_login.py +manila/tests/integrated/test_volumes.py +manila/tests/integrated/test_xml.py +manila/tests/integrated/api/__init__.py +manila/tests/integrated/api/client.py +manila/tests/monkey_patch_example/__init__.py +manila/tests/monkey_patch_example/example_a.py +manila/tests/monkey_patch_example/example_b.py +manila/tests/scheduler/__init__.py +manila/tests/scheduler/fakes.py +manila/tests/scheduler/test_capacity_weigher.py +manila/tests/scheduler/test_filter_scheduler.py +manila/tests/scheduler/test_host_filters.py +manila/tests/scheduler/test_host_manager.py +manila/tests/scheduler/test_rpcapi.py +manila/tests/scheduler/test_scheduler.py +manila/tests/scheduler/test_scheduler_options.py +manila/tests/windows/__init__.py +manila/tests/windows/basetestcase.py +manila/tests/windows/db_fakes.py +manila/tests/windows/mockproxy.py +manila/tests/windows/windowsutils.py +manila/tests/xenapi/__init__.py +manila/volume/__init__.py +manila/volume/api.py +manila/volume/configuration.py +manila/volume/driver.py +manila/volume/manager.py +manila/volume/rpcapi.py +manila/volume/utils.py +manila/volume/volume_types.py +manila/volume/drivers/__init__.py +manila/volume/drivers/coraid.py +manila/volume/drivers/glusterfs.py +manila/volume/drivers/lvm.py +manila/volume/drivers/nfs.py +manila/volume/drivers/rbd.py +manila/volume/drivers/scality.py +manila/volume/drivers/sheepdog.py +manila/volume/drivers/solidfire.py +manila/volume/drivers/storwize_svc.py +manila/volume/drivers/windows.py +manila/volume/drivers/xiv.py +manila/volume/drivers/zadara.py +manila/volume/drivers/emc/__init__.py +manila/volume/drivers/emc/emc_smis_common.py +manila/volume/drivers/emc/emc_smis_iscsi.py +manila/volume/drivers/huawei/__init__.py +manila/volume/drivers/huawei/huawei_iscsi.py +manila/volume/drivers/netapp/__init__.py +manila/volume/drivers/netapp/api.py +manila/volume/drivers/netapp/iscsi.py +manila/volume/drivers/netapp/nfs.py +manila/volume/drivers/nexenta/__init__.py +manila/volume/drivers/nexenta/jsonrpc.py +manila/volume/drivers/nexenta/volume.py +manila/volume/drivers/san/__init__.py +manila/volume/drivers/san/hp_lefthand.py +manila/volume/drivers/san/san.py +manila/volume/drivers/san/solaris.py +manila/volume/drivers/san/hp/__init__.py +manila/volume/drivers/san/hp/hp_3par_common.py +manila/volume/drivers/san/hp/hp_3par_fc.py +manila/volume/drivers/san/hp/hp_3par_iscsi.py +manila/volume/drivers/xenapi/__init__.py +manila/volume/drivers/xenapi/lib.py +manila/volume/drivers/xenapi/sm.py +manila/volume/drivers/xenapi/tools.py +tools/enable-pre-commit-hook.sh +tools/install_venv.py +tools/install_venv_common.py +tools/lintstack.py +tools/lintstack.sh +tools/patch_tox_venv.py +tools/pip-requires +tools/test-requires +tools/with_venv.sh +tools/conf/extract_opts.py +tools/conf/generate_sample.sh \ No newline at end of file diff --git a/manila.egg-info/dependency_links.txt b/manila.egg-info/dependency_links.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/manila.egg-info/dependency_links.txt @@ -0,0 +1 @@ + diff --git a/manila.egg-info/entry_points.txt b/manila.egg-info/entry_points.txt new file mode 100644 index 0000000000..604b2f946b --- /dev/null +++ b/manila.egg-info/entry_points.txt @@ -0,0 +1,10 @@ +[cinder.scheduler.filters] +CapabilitiesFilter = cinder.openstack.common.scheduler.filters.capabilities_filter:CapabilitiesFilter +RetryFilter = cinder.scheduler.filters.retry_filter:RetryFilter +CapacityFilter = cinder.scheduler.filters.capacity_filter:CapacityFilter +JsonFilter = cinder.openstack.common.scheduler.filters.json_filter:JsonFilter +AvailabilityZoneFilter = cinder.openstack.common.scheduler.filters.availability_zone_filter:AvailabilityZoneFilter + +[cinder.scheduler.weights] +CapacityWeigher = cinder.scheduler.weights.capacity:CapacityWeigher + diff --git a/manila.egg-info/requires.txt b/manila.egg-info/requires.txt new file mode 100644 index 0000000000..2469a7f959 --- /dev/null +++ b/manila.egg-info/requires.txt @@ -0,0 +1,25 @@ +d2to1>=0.2.10,<0.3 +pbr>=0.5,<0.6 +amqplib>=0.6.1 +anyjson>=0.2.4 +babel>=0.9.6 +eventlet>=0.9.12 +greenlet>=0.3.1 +iso8601>=0.1.4 +kombu>=1.0.4 +lockfile>=0.8 +lxml>=2.3 +oslo.config>=1.1.0 +paramiko>=1.8.0 +paste +pastedeploy>=1.5.0 +python-glanceclient>=0.5.0,<2 +python-keystoneclient>=0.2,<0.3 +python-swiftclient>=1.2,<2 +routes>=1.12.3 +sqlalchemy>=0.7,<=0.7.99 +sqlalchemy-migrate>=0.7 +stevedore>=0.7 +suds>=0.4 +webob>=1.0.8 +wsgiref>=0.1.2 \ No newline at end of file diff --git a/manila.egg-info/top_level.txt b/manila.egg-info/top_level.txt new file mode 100644 index 0000000000..159f5152ed --- /dev/null +++ b/manila.egg-info/top_level.txt @@ -0,0 +1 @@ +manila diff --git a/cinder/__init__.py b/manila/__init__.py similarity index 95% rename from cinder/__init__.py rename to manila/__init__.py index d765b088e9..23375b7fa1 100644 --- a/cinder/__init__.py +++ b/manila/__init__.py @@ -17,10 +17,10 @@ # under the License. """ -:mod:`cinder` -- Cloud IaaS Platform +:mod:`manila` -- Cloud IaaS Platform =================================== -.. automodule:: cinder +.. automodule:: manila :platform: Unix :synopsis: Infrastructure-as-a-Service Cloud platform. .. moduleauthor:: Jesse Andrews diff --git a/cinder/api/__init__.py b/manila/api/__init__.py similarity index 97% rename from cinder/api/__init__.py rename to manila/api/__init__.py index fc348ac565..3374ac5e8d 100644 --- a/cinder/api/__init__.py +++ b/manila/api/__init__.py @@ -18,7 +18,7 @@ import paste.urlmap -from cinder import flags +from manila import flags FLAGS = flags.FLAGS diff --git a/cinder/api/auth.py b/manila/api/auth.py similarity index 75% rename from cinder/api/auth.py rename to manila/api/auth.py index ac673cf71f..8e9e57c631 100644 --- a/cinder/api/auth.py +++ b/manila/api/auth.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.api.middleware import auth -from cinder.openstack.common import log as logging +from manila.api.middleware import auth +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) @@ -23,14 +23,14 @@ LOG = logging.getLogger(__name__) class CinderKeystoneContext(auth.CinderKeystoneContext): def __init__(self, application): - LOG.warn(_('cinder.api.auth:CinderKeystoneContext is deprecated. ' + LOG.warn(_('manila.api.auth:CinderKeystoneContext is deprecated. ' 'Please use ' - 'cinder.api.middleware.auth:CinderKeystoneContext ' + 'manila.api.middleware.auth:CinderKeystoneContext ' 'instead.')) super(CinderKeystoneContext, self).__init__(application) def pipeline_factory(loader, global_conf, **local_conf): - LOG.warn(_('cinder.api.auth:pipeline_factory is deprecated. Please use ' - 'cinder.api.middleware.auth:pipeline_factory instead.')) + LOG.warn(_('manila.api.auth:pipeline_factory is deprecated. Please use ' + 'manila.api.middleware.auth:pipeline_factory instead.')) auth.pipeline_factory(loader, global_conf, **local_conf) diff --git a/cinder/api/common.py b/manila/api/common.py similarity index 95% rename from cinder/api/common.py rename to manila/api/common.py index 94bf594c00..704e5ed811 100644 --- a/cinder/api/common.py +++ b/manila/api/common.py @@ -21,11 +21,11 @@ import urlparse import webob -from cinder.api.openstack import wsgi -from cinder.api import xmlutil -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import utils +from manila.api.openstack import wsgi +from manila.api import xmlutil +from manila import flags +from manila.openstack.common import log as logging +from manila import utils LOG = logging.getLogger(__name__) @@ -139,11 +139,11 @@ def limited_by_marker(items, request, max_limit=FLAGS.osapi_max_limit): def remove_version_from_href(href): """Removes the first api version from the href. - Given: 'http://www.cinder.com/v1.1/123' - Returns: 'http://www.cinder.com/123' + Given: 'http://www.manila.com/v1.1/123' + Returns: 'http://www.manila.com/123' - Given: 'http://www.cinder.com/v1.1' - Returns: 'http://www.cinder.com' + Given: 'http://www.manila.com/v1.1' + Returns: 'http://www.manila.com' """ parsed_url = urlparse.urlsplit(href) @@ -194,7 +194,7 @@ class ViewBuilder(object): prefix = self._update_link_prefix(request.application_url, FLAGS.osapi_volume_base_URL) url = os.path.join(prefix, - request.environ["cinder.context"].project_id, + request.environ["manila.context"].project_id, self._collection_name) return "%s?%s" % (url, dict_to_query_str(params)) @@ -203,7 +203,7 @@ class ViewBuilder(object): prefix = self._update_link_prefix(request.application_url, FLAGS.osapi_volume_base_URL) return os.path.join(prefix, - request.environ["cinder.context"].project_id, + request.environ["manila.context"].project_id, self._collection_name, str(identifier)) @@ -213,7 +213,7 @@ class ViewBuilder(object): base_url = self._update_link_prefix(base_url, FLAGS.osapi_volume_base_URL) return os.path.join(base_url, - request.environ["cinder.context"].project_id, + request.environ["manila.context"].project_id, self._collection_name, str(identifier)) diff --git a/cinder/api/contrib/__init__.py b/manila/api/contrib/__init__.py similarity index 86% rename from cinder/api/contrib/__init__.py rename to manila/api/contrib/__init__.py index 503bc90b8f..4b20970532 100644 --- a/cinder/api/contrib/__init__.py +++ b/manila/api/contrib/__init__.py @@ -15,15 +15,15 @@ # License for the specific language governing permissions and limitations # under the License. -"""Contrib contains extensions that are shipped with cinder. +"""Contrib contains extensions that are shipped with manila. It can't be called 'extensions' because that causes namespacing problems. """ -from cinder.api import extensions -from cinder import flags -from cinder.openstack.common import log as logging +from manila.api import extensions +from manila import flags +from manila.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/cinder/api/contrib/admin_actions.py b/manila/api/contrib/admin_actions.py similarity index 94% rename from cinder/api/contrib/admin_actions.py rename to manila/api/contrib/admin_actions.py index a45b370776..455de06b12 100644 --- a/cinder/api/contrib/admin_actions.py +++ b/manila/api/contrib/admin_actions.py @@ -15,12 +15,12 @@ import webob from webob import exc -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder import db -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import volume +from manila.api import extensions +from manila.api.openstack import wsgi +from manila import db +from manila import exception +from manila.openstack.common import log as logging +from manila import volume LOG = logging.getLogger(__name__) @@ -74,7 +74,7 @@ class AdminController(wsgi.Controller): @wsgi.action('os-reset_status') def _reset_status(self, req, id, body): """Reset status on the resource.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] self.authorize(context, 'reset_status') update = self.validate_update(body['os-reset_status']) msg = _("Updating %(resource)s '%(id)s' with '%(update)r'") @@ -89,7 +89,7 @@ class AdminController(wsgi.Controller): @wsgi.action('os-force_delete') def _force_delete(self, req, id, body): """Delete a resource, bypassing the check that it must be available.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] self.authorize(context, 'force_delete') try: resource = self._get(context, id) @@ -129,7 +129,7 @@ class VolumeAdminController(AdminController): Roll back a bad detach after the volume been disconnected from the hypervisor. """ - context = req.environ['cinder.context'] + context = req.environ['manila.context'] self.authorize(context, 'force_detach') try: volume = self._get(context, id) diff --git a/cinder/api/contrib/backups.py b/manila/api/contrib/backups.py similarity index 94% rename from cinder/api/contrib/backups.py rename to manila/api/contrib/backups.py index 02444ac550..c7333f68fb 100644 --- a/cinder/api/contrib/backups.py +++ b/manila/api/contrib/backups.py @@ -19,15 +19,15 @@ import webob from webob import exc from xml.dom import minidom -from cinder.api import common -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder.api.views import backups as backup_views -from cinder.api import xmlutil -from cinder import backup as backupAPI -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging +from manila.api import common +from manila.api import extensions +from manila.api.openstack import wsgi +from manila.api.views import backups as backup_views +from manila.api import xmlutil +from manila import backup as backupAPI +from manila import exception +from manila import flags +from manila.openstack.common import log as logging FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) @@ -126,7 +126,7 @@ class BackupsController(wsgi.Controller): def show(self, req, id): """Return data about the given backup.""" LOG.debug(_('show called for member %s'), id) - context = req.environ['cinder.context'] + context = req.environ['manila.context'] try: backup = self.backup_api.get(context, backup_id=id) @@ -138,7 +138,7 @@ class BackupsController(wsgi.Controller): def delete(self, req, id): """Delete a backup.""" LOG.debug(_('delete called for member %s'), id) - context = req.environ['cinder.context'] + context = req.environ['manila.context'] LOG.audit(_('Delete backup with id: %s'), id, context=context) @@ -163,7 +163,7 @@ class BackupsController(wsgi.Controller): def _get_backups(self, req, is_detail): """Returns a list of backups, transformed through view builder.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] backups = self.backup_api.get_all(context) limited_list = common.limited(backups, req) @@ -186,7 +186,7 @@ class BackupsController(wsgi.Controller): if not self.is_valid_body(body, 'backup'): raise exc.HTTPBadRequest() - context = req.environ['cinder.context'] + context = req.environ['manila.context'] try: backup = body['backup'] @@ -222,7 +222,7 @@ class BackupsController(wsgi.Controller): if not self.is_valid_body(body, 'restore'): raise exc.HTTPBadRequest() - context = req.environ['cinder.context'] + context = req.environ['manila.context'] try: restore = body['restore'] diff --git a/cinder/api/contrib/extended_snapshot_attributes.py b/manila/api/contrib/extended_snapshot_attributes.py similarity index 93% rename from cinder/api/contrib/extended_snapshot_attributes.py rename to manila/api/contrib/extended_snapshot_attributes.py index f55fa53ac2..d9d7b15af4 100644 --- a/cinder/api/contrib/extended_snapshot_attributes.py +++ b/manila/api/contrib/extended_snapshot_attributes.py @@ -16,13 +16,13 @@ from webob import exc -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder.api import xmlutil -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import volume +from manila.api import extensions +from manila.api.openstack import wsgi +from manila.api import xmlutil +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila import volume FLAGS = flags.FLAGS @@ -50,7 +50,7 @@ class ExtendedSnapshotAttributesController(wsgi.Controller): @wsgi.extends def show(self, req, resp_obj, id): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if authorize(context): # Attach our slave template to the response object resp_obj.attach(xml=ExtendedSnapshotAttributeTemplate()) @@ -65,7 +65,7 @@ class ExtendedSnapshotAttributesController(wsgi.Controller): @wsgi.extends def detail(self, req, resp_obj): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if authorize(context): # Attach our slave template to the response object resp_obj.attach(xml=ExtendedSnapshotAttributesTemplate()) diff --git a/cinder/api/contrib/hosts.py b/manila/api/contrib/hosts.py similarity index 94% rename from cinder/api/contrib/hosts.py rename to manila/api/contrib/hosts.py index 0fc85481d6..4c93f25254 100644 --- a/cinder/api/contrib/hosts.py +++ b/manila/api/contrib/hosts.py @@ -18,16 +18,16 @@ import webob.exc from xml.parsers import expat -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder.api import xmlutil -from cinder import db -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder import utils -from cinder.volume import api as volume_api +from manila.api import extensions +from manila.api.openstack import wsgi +from manila.api import xmlutil +from manila import db +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils +from manila import utils +from manila.volume import api as volume_api FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) @@ -93,7 +93,7 @@ class HostDeserializer(wsgi.XMLDeserializer): def _list_hosts(req, service=None): """Returns a summary list of hosts.""" curr_time = timeutils.utcnow() - context = req.environ['cinder.context'] + context = req.environ['manila.context'] services = db.service_get_all(context, False) zone = '' if 'zone' in req.GET: @@ -143,14 +143,14 @@ class HostController(object): @wsgi.serializers(xml=HostIndexTemplate) def index(self, req): - authorize(req.environ['cinder.context']) + authorize(req.environ['manila.context']) return {'hosts': _list_hosts(req)} @wsgi.serializers(xml=HostUpdateTemplate) @wsgi.deserializers(xml=HostDeserializer) @check_host def update(self, req, id, body): - authorize(req.environ['cinder.context']) + authorize(req.environ['manila.context']) update_values = {} for raw_key, raw_val in body.iteritems(): key = raw_key.lower().strip() @@ -172,7 +172,7 @@ class HostController(object): def _set_enabled_status(self, req, host, enabled): """Sets the specified host's ability to accept new volumes.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] state = "enabled" if enabled else "disabled" LOG.audit(_("Setting host %(host)s to %(state)s.") % locals()) result = self.api.set_host_enabled(context, @@ -197,7 +197,7 @@ class HostController(object): 'volume_count': 1, 'total_volume_gb': 2048} """ host = id - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if not context.is_admin: msg = _("Describe-resource is admin only functionality") raise webob.exc.HTTPForbidden(explanation=msg) diff --git a/cinder/api/contrib/image_create.py b/manila/api/contrib/image_create.py similarity index 96% rename from cinder/api/contrib/image_create.py rename to manila/api/contrib/image_create.py index a3ee923e72..b93ee2fe24 100644 --- a/cinder/api/contrib/image_create.py +++ b/manila/api/contrib/image_create.py @@ -19,7 +19,7 @@ """The Create Volume from Image extension.""" -from cinder.api import extensions +from manila.api import extensions class Image_create(extensions.ExtensionDescriptor): diff --git a/cinder/api/contrib/quota_classes.py b/manila/api/contrib/quota_classes.py similarity index 92% rename from cinder/api/contrib/quota_classes.py rename to manila/api/contrib/quota_classes.py index 597ccd004c..fdca56216d 100644 --- a/cinder/api/contrib/quota_classes.py +++ b/manila/api/contrib/quota_classes.py @@ -15,12 +15,12 @@ import webob -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder.api import xmlutil -from cinder import db -from cinder import exception -from cinder import quota +from manila.api import extensions +from manila.api.openstack import wsgi +from manila.api import xmlutil +from manila import db +from manila import exception +from manila import quota QUOTAS = quota.QUOTAS @@ -56,7 +56,7 @@ class QuotaClassSetsController(object): @wsgi.serializers(xml=QuotaClassTemplate) def show(self, req, id): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] authorize(context) try: db.sqlalchemy.api.authorize_quota_class_context(context, id) @@ -68,7 +68,7 @@ class QuotaClassSetsController(object): @wsgi.serializers(xml=QuotaClassTemplate) def update(self, req, id, body): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] authorize(context) quota_class = id for key in body['quota_class_set'].keys(): diff --git a/cinder/api/contrib/quotas.py b/manila/api/contrib/quotas.py similarity index 90% rename from cinder/api/contrib/quotas.py rename to manila/api/contrib/quotas.py index 374eed1803..9d3eb81187 100644 --- a/cinder/api/contrib/quotas.py +++ b/manila/api/contrib/quotas.py @@ -17,13 +17,13 @@ import webob -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder.api import xmlutil -from cinder import db -from cinder.db.sqlalchemy import api as sqlalchemy_api -from cinder import exception -from cinder import quota +from manila.api import extensions +from manila.api.openstack import wsgi +from manila.api import xmlutil +from manila import db +from manila.db.sqlalchemy import api as sqlalchemy_api +from manila import exception +from manila import quota QUOTAS = quota.QUOTAS @@ -73,7 +73,7 @@ class QuotaSetsController(object): @wsgi.serializers(xml=QuotaTemplate) def show(self, req, id): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] authorize_show(context) try: sqlalchemy_api.authorize_project_context(context, id) @@ -84,7 +84,7 @@ class QuotaSetsController(object): @wsgi.serializers(xml=QuotaTemplate) def update(self, req, id, body): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] authorize_update(context) project_id = id for key in body['quota_set'].keys(): @@ -101,7 +101,7 @@ class QuotaSetsController(object): @wsgi.serializers(xml=QuotaTemplate) def defaults(self, req, id): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] authorize_show(context) return self._format_quota_set(id, QUOTAS.get_defaults(context)) diff --git a/cinder/api/contrib/services.py b/manila/api/contrib/services.py similarity index 91% rename from cinder/api/contrib/services.py rename to manila/api/contrib/services.py index 3efac96f63..271f12b071 100644 --- a/cinder/api/contrib/services.py +++ b/manila/api/contrib/services.py @@ -18,14 +18,14 @@ import webob.exc -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder.api import xmlutil -from cinder import db -from cinder import exception -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder import utils +from manila.api import extensions +from manila.api.openstack import wsgi +from manila.api import xmlutil +from manila import db +from manila import exception +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils +from manila import utils LOG = logging.getLogger(__name__) @@ -62,7 +62,7 @@ class ServiceController(object): """ Return a list of all running services. Filter by host & service name. """ - context = req.environ['cinder.context'] + context = req.environ['manila.context'] authorize(context) now = timeutils.utcnow() services = db.service_get_all(context) @@ -95,7 +95,7 @@ class ServiceController(object): @wsgi.serializers(xml=ServicesUpdateTemplate) def update(self, req, id, body): """Enable/Disable scheduling for a service""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] authorize(context) if id == "enable": diff --git a/cinder/api/contrib/share_actions.py b/manila/api/contrib/share_actions.py similarity index 90% rename from cinder/api/contrib/share_actions.py rename to manila/api/contrib/share_actions.py index 33040e722a..221d7f0798 100644 --- a/cinder/api/contrib/share_actions.py +++ b/manila/api/contrib/share_actions.py @@ -14,10 +14,10 @@ import webob -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder import exception -from cinder import share +from manila.api import extensions +from manila.api.openstack import wsgi +from manila import exception +from manila import share class ShareActionsController(wsgi.Controller): @@ -28,7 +28,7 @@ class ShareActionsController(wsgi.Controller): @wsgi.action('os-allow_access') def _allow_access(self, req, id, body): """Add share access rule.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] share = self.share_api.get(context, id) @@ -41,7 +41,7 @@ class ShareActionsController(wsgi.Controller): @wsgi.action('os-deny_access') def _deny_access(self, req, id, body): """Remove access rule.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] access_id = body['os-deny_access']['access_id'] @@ -58,7 +58,7 @@ class ShareActionsController(wsgi.Controller): @wsgi.action('os-access_list') def _access_list(self, req, id, body): """list access rules.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] share = self.share_api.get(context, id) access_list = self.share_api.access_get_all(context, share) diff --git a/cinder/api/contrib/share_snapshots.py b/manila/api/contrib/share_snapshots.py similarity index 91% rename from cinder/api/contrib/share_snapshots.py rename to manila/api/contrib/share_snapshots.py index 56c4affff2..cc1bed968b 100644 --- a/cinder/api/contrib/share_snapshots.py +++ b/manila/api/contrib/share_snapshots.py @@ -18,15 +18,15 @@ import webob from webob import exc -from cinder.api import common -from cinder.api.contrib import shares -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder.api.views import share_snapshots as snapshot_views -from cinder.api import xmlutil -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import share +from manila.api import common +from manila.api.contrib import shares +from manila.api import extensions +from manila.api.openstack import wsgi +from manila.api.views import share_snapshots as snapshot_views +from manila.api import xmlutil +from manila import exception +from manila.openstack.common import log as logging +from manila import share LOG = logging.getLogger(__name__) @@ -71,7 +71,7 @@ class ShareSnapshotsController(wsgi.Controller): @wsgi.serializers(xml=SnapshotTemplate) def show(self, req, id): """Return data about the given snapshot.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] try: snapshot = self.share_api.get_snapshot(context, id) @@ -82,7 +82,7 @@ class ShareSnapshotsController(wsgi.Controller): def delete(self, req, id): """Delete a snapshot.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] LOG.audit(_("Delete snapshot with id: %s"), id, context=context) @@ -105,7 +105,7 @@ class ShareSnapshotsController(wsgi.Controller): def _get_snapshots(self, req, is_detail): """Returns a list of snapshots.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] search_opts = {} search_opts.update(req.GET) @@ -135,7 +135,7 @@ class ShareSnapshotsController(wsgi.Controller): @wsgi.serializers(xml=SnapshotTemplate) def create(self, req, body): """Creates a new snapshot.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if not self.is_valid_body(body, 'share-snapshot'): raise exc.HTTPUnprocessableEntity() diff --git a/cinder/api/contrib/shares.py b/manila/api/contrib/shares.py similarity index 93% rename from cinder/api/contrib/shares.py rename to manila/api/contrib/shares.py index 104087ce1a..f8ba9b6550 100644 --- a/cinder/api/contrib/shares.py +++ b/manila/api/contrib/shares.py @@ -18,14 +18,14 @@ import webob from webob import exc -from cinder.api import common -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder.api.views import shares as share_views -from cinder.api import xmlutil -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import share +from manila.api import common +from manila.api import extensions +from manila.api.openstack import wsgi +from manila.api.views import shares as share_views +from manila.api import xmlutil +from manila import exception +from manila.openstack.common import log as logging +from manila import share LOG = logging.getLogger(__name__) @@ -84,7 +84,7 @@ class ShareController(wsgi.Controller): @wsgi.serializers(xml=ShareTemplate) def show(self, req, id): """Return data about the given share.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] try: share = self.share_api.get(context, id) @@ -95,7 +95,7 @@ class ShareController(wsgi.Controller): def delete(self, req, id): """Delete a share.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] LOG.audit(_("Delete share with id: %s"), id, context=context) @@ -120,7 +120,7 @@ class ShareController(wsgi.Controller): """Returns a list of shares, transformed through view builder. """ - context = req.environ['cinder.context'] + context = req.environ['manila.context'] search_opts = {} search_opts.update(req.GET) @@ -150,7 +150,7 @@ class ShareController(wsgi.Controller): @wsgi.serializers(xml=ShareTemplate) def create(self, req, body): """Creates a new share.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if not self.is_valid_body(body, 'share'): raise exc.HTTPUnprocessableEntity() diff --git a/cinder/api/contrib/types_extra_specs.py b/manila/api/contrib/types_extra_specs.py similarity index 92% rename from cinder/api/contrib/types_extra_specs.py rename to manila/api/contrib/types_extra_specs.py index 7377f5245d..85cbbe794c 100644 --- a/cinder/api/contrib/types_extra_specs.py +++ b/manila/api/contrib/types_extra_specs.py @@ -19,13 +19,13 @@ import webob -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder.api import xmlutil -from cinder import db -from cinder import exception -from cinder.openstack.common.notifier import api as notifier_api -from cinder.volume import volume_types +from manila.api import extensions +from manila.api.openstack import wsgi +from manila.api import xmlutil +from manila import db +from manila import exception +from manila.openstack.common.notifier import api as notifier_api +from manila.volume import volume_types authorize = extensions.extension_authorizer('volume', 'types_extra_specs') @@ -69,14 +69,14 @@ class VolumeTypeExtraSpecsController(wsgi.Controller): @wsgi.serializers(xml=VolumeTypeExtraSpecsTemplate) def index(self, req, type_id): """ Returns the list of extra specs for a given volume type """ - context = req.environ['cinder.context'] + context = req.environ['manila.context'] authorize(context) self._check_type(context, type_id) return self._get_extra_specs(context, type_id) @wsgi.serializers(xml=VolumeTypeExtraSpecsTemplate) def create(self, req, type_id, body=None): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] authorize(context) if not self.is_valid_body(body, 'extra_specs'): @@ -96,7 +96,7 @@ class VolumeTypeExtraSpecsController(wsgi.Controller): @wsgi.serializers(xml=VolumeTypeExtraSpecTemplate) def update(self, req, type_id, id, body=None): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] authorize(context) if not body: expl = _('Request body empty') @@ -120,7 +120,7 @@ class VolumeTypeExtraSpecsController(wsgi.Controller): @wsgi.serializers(xml=VolumeTypeExtraSpecTemplate) def show(self, req, type_id, id): """Return a single extra spec item.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] authorize(context) self._check_type(context, type_id) specs = self._get_extra_specs(context, type_id) @@ -131,7 +131,7 @@ class VolumeTypeExtraSpecsController(wsgi.Controller): def delete(self, req, type_id, id): """ Deletes an existing extra spec """ - context = req.environ['cinder.context'] + context = req.environ['manila.context'] self._check_type(context, type_id) authorize(context) db.volume_type_extra_specs_delete(context, type_id, id) diff --git a/cinder/api/contrib/types_manage.py b/manila/api/contrib/types_manage.py similarity index 91% rename from cinder/api/contrib/types_manage.py rename to manila/api/contrib/types_manage.py index eb17e730be..0c4dacf1af 100644 --- a/cinder/api/contrib/types_manage.py +++ b/manila/api/contrib/types_manage.py @@ -19,13 +19,13 @@ import webob -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder.api.v1 import types -from cinder.api.views import types as views_types -from cinder import exception -from cinder.openstack.common.notifier import api as notifier_api -from cinder.volume import volume_types +from manila.api import extensions +from manila.api.openstack import wsgi +from manila.api.v1 import types +from manila.api.views import types as views_types +from manila import exception +from manila.openstack.common.notifier import api as notifier_api +from manila.volume import volume_types authorize = extensions.extension_authorizer('volume', 'types_manage') @@ -47,7 +47,7 @@ class VolumeTypesManageController(wsgi.Controller): @wsgi.serializers(xml=types.VolumeTypeTemplate) def _create(self, req, body): """Creates a new volume type.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] authorize(context) if not self.is_valid_body(body, 'volume_type'): @@ -87,7 +87,7 @@ class VolumeTypesManageController(wsgi.Controller): @wsgi.action("delete") def _delete(self, req, id): """Deletes an existing volume type.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] authorize(context) try: diff --git a/cinder/api/contrib/volume_actions.py b/manila/api/contrib/volume_actions.py similarity index 90% rename from cinder/api/contrib/volume_actions.py rename to manila/api/contrib/volume_actions.py index 50587c3692..87cdfea7d3 100644 --- a/cinder/api/contrib/volume_actions.py +++ b/manila/api/contrib/volume_actions.py @@ -14,15 +14,15 @@ import webob -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder.api import xmlutil -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common.rpc import common as rpc_common -from cinder import utils -from cinder import volume +from manila.api import extensions +from manila.api.openstack import wsgi +from manila.api import xmlutil +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common.rpc import common as rpc_common +from manila import utils +from manila import volume FLAGS = flags.FLAGS @@ -76,7 +76,7 @@ class VolumeActionsController(wsgi.Controller): @wsgi.action('os-attach') def _attach(self, req, id, body): """Add attachment metadata.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] volume = self.volume_api.get(context, id) instance_uuid = body['os-attach']['instance_uuid'] @@ -89,7 +89,7 @@ class VolumeActionsController(wsgi.Controller): @wsgi.action('os-detach') def _detach(self, req, id, body): """Clear attachment metadata.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] volume = self.volume_api.get(context, id) self.volume_api.detach(context, volume) return webob.Response(status_int=202) @@ -97,7 +97,7 @@ class VolumeActionsController(wsgi.Controller): @wsgi.action('os-reserve') def _reserve(self, req, id, body): """Mark volume as reserved.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] volume = self.volume_api.get(context, id) self.volume_api.reserve_volume(context, volume) return webob.Response(status_int=202) @@ -105,7 +105,7 @@ class VolumeActionsController(wsgi.Controller): @wsgi.action('os-unreserve') def _unreserve(self, req, id, body): """Unmark volume as reserved.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] volume = self.volume_api.get(context, id) self.volume_api.unreserve_volume(context, volume) return webob.Response(status_int=202) @@ -113,7 +113,7 @@ class VolumeActionsController(wsgi.Controller): @wsgi.action('os-begin_detaching') def _begin_detaching(self, req, id, body): """Update volume status to 'detaching'.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] volume = self.volume_api.get(context, id) self.volume_api.begin_detaching(context, volume) return webob.Response(status_int=202) @@ -121,7 +121,7 @@ class VolumeActionsController(wsgi.Controller): @wsgi.action('os-roll_detaching') def _roll_detaching(self, req, id, body): """Roll back volume status to 'in-use'.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] volume = self.volume_api.get(context, id) self.volume_api.roll_detaching(context, volume) return webob.Response(status_int=202) @@ -129,7 +129,7 @@ class VolumeActionsController(wsgi.Controller): @wsgi.action('os-initialize_connection') def _initialize_connection(self, req, id, body): """Initialize volume attachment.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] volume = self.volume_api.get(context, id) connector = body['os-initialize_connection']['connector'] info = self.volume_api.initialize_connection(context, @@ -140,7 +140,7 @@ class VolumeActionsController(wsgi.Controller): @wsgi.action('os-terminate_connection') def _terminate_connection(self, req, id, body): """Terminate volume attachment.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] volume = self.volume_api.get(context, id) connector = body['os-terminate_connection']['connector'] self.volume_api.terminate_connection(context, volume, connector) @@ -152,7 +152,7 @@ class VolumeActionsController(wsgi.Controller): @wsgi.deserializers(xml=VolumeToImageDeserializer) def _volume_upload_image(self, req, id, body): """Uploads the specified volume to image service.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] try: params = body['os-volume_upload_image'] except (TypeError, KeyError): diff --git a/cinder/api/contrib/volume_host_attribute.py b/manila/api/contrib/volume_host_attribute.py similarity index 92% rename from cinder/api/contrib/volume_host_attribute.py rename to manila/api/contrib/volume_host_attribute.py index 183e72587d..573d83a23d 100644 --- a/cinder/api/contrib/volume_host_attribute.py +++ b/manila/api/contrib/volume_host_attribute.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder.api import xmlutil -from cinder.openstack.common import log as logging -from cinder import volume +from manila.api import extensions +from manila.api.openstack import wsgi +from manila.api import xmlutil +from manila.openstack.common import log as logging +from manila import volume LOG = logging.getLogger(__name__) @@ -40,14 +40,14 @@ class VolumeHostAttributeController(wsgi.Controller): @wsgi.extends def show(self, req, resp_obj, id): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if authorize(context): resp_obj.attach(xml=VolumeHostAttributeTemplate()) self._add_volume_host_attribute(context, resp_obj.obj['volume']) @wsgi.extends def detail(self, req, resp_obj): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if authorize(context): resp_obj.attach(xml=VolumeListHostAttributeTemplate()) for volume in list(resp_obj.obj['volumes']): diff --git a/cinder/api/contrib/volume_image_metadata.py b/manila/api/contrib/volume_image_metadata.py similarity index 94% rename from cinder/api/contrib/volume_image_metadata.py rename to manila/api/contrib/volume_image_metadata.py index 58e5cd2951..66054d4be8 100644 --- a/cinder/api/contrib/volume_image_metadata.py +++ b/manila/api/contrib/volume_image_metadata.py @@ -14,10 +14,10 @@ """The Volume Image Metadata API extension.""" -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder.api import xmlutil -from cinder import volume +from manila.api import extensions +from manila.api.openstack import wsgi +from manila.api import xmlutil +from manila import volume authorize = extensions.soft_extension_authorizer('volume', @@ -42,14 +42,14 @@ class VolumeImageMetadataController(wsgi.Controller): @wsgi.extends def show(self, req, resp_obj, id): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if authorize(context): resp_obj.attach(xml=VolumeImageMetadataTemplate()) self._add_image_metadata(context, resp_obj.obj['volume']) @wsgi.extends def detail(self, req, resp_obj): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if authorize(context): resp_obj.attach(xml=VolumesImageMetadataTemplate()) for volume in list(resp_obj.obj.get('volumes', [])): diff --git a/cinder/api/contrib/volume_tenant_attribute.py b/manila/api/contrib/volume_tenant_attribute.py similarity index 93% rename from cinder/api/contrib/volume_tenant_attribute.py rename to manila/api/contrib/volume_tenant_attribute.py index 620ae10065..35f24048a1 100644 --- a/cinder/api/contrib/volume_tenant_attribute.py +++ b/manila/api/contrib/volume_tenant_attribute.py @@ -12,10 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.api import extensions -from cinder.api.openstack import wsgi -from cinder.api import xmlutil -from cinder import volume +from manila.api import extensions +from manila.api.openstack import wsgi +from manila.api import xmlutil +from manila import volume authorize = extensions.soft_extension_authorizer('volume', @@ -38,14 +38,14 @@ class VolumeTenantAttributeController(wsgi.Controller): @wsgi.extends def show(self, req, resp_obj, id): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if authorize(context): resp_obj.attach(xml=VolumeTenantAttributeTemplate()) self._add_volume_tenant_attribute(context, resp_obj.obj['volume']) @wsgi.extends def detail(self, req, resp_obj): - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if authorize(context): resp_obj.attach(xml=VolumeListTenantAttributeTemplate()) for volume in list(resp_obj.obj['volumes']): diff --git a/cinder/api/extensions.py b/manila/api/extensions.py similarity index 93% rename from cinder/api/extensions.py rename to manila/api/extensions.py index 67e682a0cc..cd3cbca545 100644 --- a/cinder/api/extensions.py +++ b/manila/api/extensions.py @@ -21,15 +21,15 @@ import os import webob.dec import webob.exc -import cinder.api.openstack -from cinder.api.openstack import wsgi -from cinder.api import xmlutil -from cinder import exception -from cinder import flags -from cinder.openstack.common import exception as common_exception -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging -import cinder.policy +import manila.api.openstack +from manila.api.openstack import wsgi +from manila.api import xmlutil +from manila import exception +from manila import flags +from manila.openstack.common import exception as common_exception +from manila.openstack.common import importutils +from manila.openstack.common import log as logging +import manila.policy LOG = logging.getLogger(__name__) @@ -175,7 +175,7 @@ class ExtensionsResource(wsgi.Resource): class ExtensionManager(object): """Load extensions from the configured extension path. - See cinder/tests/api/extensions/foxinsocks/extension.py for an + See manila/tests/api/extensions/foxinsocks/extension.py for an example extension implementation. """ @@ -271,13 +271,13 @@ class ExtensionManager(object): # NOTE(thingee): Backwards compat for the old extension loader path. # We can drop this post-grizzly in the H release. - old_contrib_path = ('cinder.api.openstack.volume.contrib.' + old_contrib_path = ('manila.api.openstack.volume.contrib.' 'standard_extensions') - new_contrib_path = 'cinder.api.contrib.standard_extensions' + new_contrib_path = 'manila.api.contrib.standard_extensions' if old_contrib_path in extensions: LOG.warn(_('osapi_volume_extension is set to deprecated path: %s'), old_contrib_path) - LOG.warn(_('Please set your flag or cinder.conf settings for ' + LOG.warn(_('Please set your flag or manila.conf settings for ' 'osapi_volume_extension to: %s'), new_contrib_path) extensions = [e.replace(old_contrib_path, new_contrib_path) for e in extensions] @@ -291,9 +291,9 @@ class ExtensionManager(object): class ControllerExtension(object): - """Extend core controllers of cinder OpenStack API. + """Extend core controllers of manila OpenStack API. - Provide a way to extend existing cinder OpenStack API core + Provide a way to extend existing manila OpenStack API core controllers. """ @@ -304,7 +304,7 @@ class ControllerExtension(object): class ResourceExtension(object): - """Add top level resources to the OpenStack API in cinder.""" + """Add top level resources to the OpenStack API in manila.""" def __init__(self, collection, controller, parent=None, collection_actions=None, member_actions=None, @@ -391,7 +391,7 @@ def extension_authorizer(api_name, extension_name): target = {'project_id': context.project_id, 'user_id': context.user_id} action = '%s_extension:%s' % (api_name, extension_name) - cinder.policy.enforce(context, action, target) + manila.policy.enforce(context, action, target) return authorize diff --git a/cinder/api/middleware/__init__.py b/manila/api/middleware/__init__.py similarity index 100% rename from cinder/api/middleware/__init__.py rename to manila/api/middleware/__init__.py diff --git a/cinder/api/middleware/auth.py b/manila/api/middleware/auth.py similarity index 92% rename from cinder/api/middleware/auth.py rename to manila/api/middleware/auth.py index 6c6e23862c..7f7c60d146 100644 --- a/cinder/api/middleware/auth.py +++ b/manila/api/middleware/auth.py @@ -24,11 +24,11 @@ from oslo.config import cfg import webob.dec import webob.exc -from cinder.api.openstack import wsgi -from cinder import context -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import wsgi as base_wsgi +from manila.api.openstack import wsgi +from manila import context +from manila import flags +from manila.openstack.common import log as logging +from manila import wsgi as base_wsgi use_forwarded_for_opt = cfg.BoolOpt( 'use_forwarded_for', @@ -57,7 +57,7 @@ def pipeline_factory(loader, global_conf, **local_conf): class InjectContext(base_wsgi.Middleware): - """Add a 'cinder.context' to WSGI environ.""" + """Add a 'manila.context' to WSGI environ.""" def __init__(self, context, *args, **kwargs): self.context = context @@ -65,7 +65,7 @@ class InjectContext(base_wsgi.Middleware): @webob.dec.wsgify(RequestClass=base_wsgi.Request) def __call__(self, req): - req.environ['cinder.context'] = self.context + req.environ['manila.context'] = self.context return self.application @@ -102,7 +102,7 @@ class CinderKeystoneContext(base_wsgi.Middleware): auth_token=auth_token, remote_address=remote_address) - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx return self.application @@ -136,5 +136,5 @@ class NoAuthMiddleware(base_wsgi.Middleware): is_admin=True, remote_address=remote_address) - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx return self.application diff --git a/cinder/api/middleware/fault.py b/manila/api/middleware/fault.py similarity index 94% rename from cinder/api/middleware/fault.py rename to manila/api/middleware/fault.py index dddd166ac5..767efa2a04 100644 --- a/cinder/api/middleware/fault.py +++ b/manila/api/middleware/fault.py @@ -19,10 +19,10 @@ import webob.dec import webob.exc -from cinder.api.openstack import wsgi -from cinder.openstack.common import log as logging -from cinder import utils -from cinder import wsgi as base_wsgi +from manila.api.openstack import wsgi +from manila.openstack.common import log as logging +from manila import utils +from manila import wsgi as base_wsgi LOG = logging.getLogger(__name__) diff --git a/cinder/api/middleware/sizelimit.py b/manila/api/middleware/sizelimit.py similarity index 94% rename from cinder/api/middleware/sizelimit.py rename to manila/api/middleware/sizelimit.py index 868db0f39e..ca7a3b63a8 100644 --- a/cinder/api/middleware/sizelimit.py +++ b/manila/api/middleware/sizelimit.py @@ -22,9 +22,9 @@ from oslo.config import cfg import webob.dec import webob.exc -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import wsgi +from manila import flags +from manila.openstack.common import log as logging +from manila import wsgi #default request size is 112k max_request_body_size_opt = cfg.IntOpt('osapi_max_request_body_size', @@ -66,7 +66,7 @@ class LimitingReader(object): class RequestBodySizeLimiter(wsgi.Middleware): - """Add a 'cinder.context' to WSGI environ.""" + """Add a 'manila.context' to WSGI environ.""" def __init__(self, *args, **kwargs): super(RequestBodySizeLimiter, self).__init__(*args, **kwargs) diff --git a/cinder/api/openstack/__init__.py b/manila/api/openstack/__init__.py similarity index 91% rename from cinder/api/openstack/__init__.py rename to manila/api/openstack/__init__.py index a3b2e6da2e..bbc575ab92 100644 --- a/cinder/api/openstack/__init__.py +++ b/manila/api/openstack/__init__.py @@ -20,11 +20,11 @@ WSGI middleware for OpenStack API controllers. import routes -from cinder.api.middleware import fault -from cinder.api.openstack import wsgi -from cinder.openstack.common import log as logging -from cinder import utils -from cinder import wsgi as base_wsgi +from manila.api.middleware import fault +from manila.api.openstack import wsgi +from manila.openstack.common import log as logging +from manila import utils +from manila import wsgi as base_wsgi LOG = logging.getLogger(__name__) @@ -63,7 +63,7 @@ class APIRouter(base_wsgi.Router): @classmethod def factory(cls, global_config, **local_config): - """Simple paste factory, :class:`cinder.wsgi.Router` doesn't have""" + """Simple paste factory, :class:`manila.wsgi.Router` doesn't have""" return cls() def __init__(self, ext_mgr=None): @@ -125,6 +125,6 @@ class APIRouter(base_wsgi.Router): class FaultWrapper(fault.FaultWrapper): def __init__(self, application): - LOG.warn(_('cinder.api.openstack:FaultWrapper is deprecated. Please ' - 'use cinder.api.middleware.fault:FaultWrapper instead.')) + LOG.warn(_('manila.api.openstack:FaultWrapper is deprecated. Please ' + 'use manila.api.middleware.fault:FaultWrapper instead.')) super(FaultWrapper, self).__init__(application) diff --git a/cinder/api/openstack/urlmap.py b/manila/api/openstack/urlmap.py similarity index 79% rename from cinder/api/openstack/urlmap.py rename to manila/api/openstack/urlmap.py index ab240709dd..4b7ab94fe0 100644 --- a/cinder/api/openstack/urlmap.py +++ b/manila/api/openstack/urlmap.py @@ -14,14 +14,14 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.api import urlmap -from cinder.openstack.common import log as logging +from manila.api import urlmap +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) def urlmap_factory(loader, global_conf, **local_conf): - LOG.warn(_('cinder.api.openstack.urlmap:urlmap_factory is deprecated. ' - 'Please use cinder.api.urlmap:urlmap_factory instead.')) + LOG.warn(_('manila.api.openstack.urlmap:urlmap_factory is deprecated. ' + 'Please use manila.api.urlmap:urlmap_factory instead.')) urlmap.urlmap_factory(loader, global_conf, **local_conf) diff --git a/cinder/api/openstack/volume/__init__.py b/manila/api/openstack/volume/__init__.py similarity index 77% rename from cinder/api/openstack/volume/__init__.py rename to manila/api/openstack/volume/__init__.py index 875db43472..b8608f0e97 100644 --- a/cinder/api/openstack/volume/__init__.py +++ b/manila/api/openstack/volume/__init__.py @@ -14,14 +14,14 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.api.v1.router import APIRouter as v1_router -from cinder.openstack.common import log as logging +from manila.api.v1.router import APIRouter as v1_router +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) class APIRouter(v1_router): def __init__(self, ext_mgr=None): - LOG.warn(_('cinder.api.openstack.volume:APIRouter is deprecated. ' - 'Please use cinder.api.v1.router:APIRouter instead.')) + LOG.warn(_('manila.api.openstack.volume:APIRouter is deprecated. ' + 'Please use manila.api.v1.router:APIRouter instead.')) super(APIRouter, self).__init__(ext_mgr) diff --git a/cinder/api/openstack/volume/versions.py b/manila/api/openstack/volume/versions.py similarity index 79% rename from cinder/api/openstack/volume/versions.py rename to manila/api/openstack/volume/versions.py index 857b7698c7..5f81b43c95 100644 --- a/cinder/api/openstack/volume/versions.py +++ b/manila/api/openstack/volume/versions.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.api import versions -from cinder.openstack.common import log as logging +from manila.api import versions +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) @@ -23,7 +23,7 @@ LOG = logging.getLogger(__name__) class Versions(versions.Versions): def __init__(self): - LOG.warn(_('cinder.api.openstack.volume.versions.Versions is ' - 'deprecated. Please use cinder.api.versions.Versions ' + LOG.warn(_('manila.api.openstack.volume.versions.Versions is ' + 'deprecated. Please use manila.api.versions.Versions ' 'instead.')) super(Versions, self).__init__() diff --git a/cinder/api/openstack/wsgi.py b/manila/api/openstack/wsgi.py similarity index 98% rename from cinder/api/openstack/wsgi.py rename to manila/api/openstack/wsgi.py index cc882c826a..b92e4bbd05 100644 --- a/cinder/api/openstack/wsgi.py +++ b/manila/api/openstack/wsgi.py @@ -20,11 +20,11 @@ import math import time import webob -from cinder import exception -from cinder.openstack.common import jsonutils -from cinder.openstack.common import log as logging -from cinder import utils -from cinder import wsgi +from manila import exception +from manila.openstack.common import jsonutils +from manila.openstack.common import log as logging +from manila import utils +from manila import wsgi from lxml import etree from xml.dom import minidom @@ -65,7 +65,7 @@ class Request(webob.Request): def best_match_content_type(self): """Determine the requested response content-type.""" - if 'cinder.best_content_type' not in self.environ: + if 'manila.best_content_type' not in self.environ: # Calculate the best MIME type content_type = None @@ -79,10 +79,10 @@ class Request(webob.Request): if not content_type: content_type = self.accept.best_match(SUPPORTED_CONTENT_TYPES) - self.environ['cinder.best_content_type'] = (content_type or + self.environ['manila.best_content_type'] = (content_type or 'application/json') - return self.environ['cinder.best_content_type'] + return self.environ['manila.best_content_type'] def get_content_type(self): """Determine content type of the request body. @@ -836,7 +836,7 @@ class Resource(wsgi.Application): action_args.update(contents) project_id = action_args.pop("project_id", None) - context = request.environ.get('cinder.context') + context = request.environ.get('manila.context') if (context and project_id and (project_id != context.project_id)): msg = _("Malformed request url") return Fault(webob.exc.HTTPBadRequest(explanation=msg)) @@ -1092,7 +1092,7 @@ class Fault(webob.exc.HTTPException): def _set_request_id_header(req, headers): - context = req.environ.get('cinder.context') + context = req.environ.get('manila.context') if context: headers['x-compute-request-id'] = context.request_id diff --git a/cinder/api/schemas/atom-link.rng b/manila/api/schemas/atom-link.rng similarity index 100% rename from cinder/api/schemas/atom-link.rng rename to manila/api/schemas/atom-link.rng diff --git a/cinder/api/schemas/v1.1/extension.rng b/manila/api/schemas/v1.1/extension.rng similarity index 100% rename from cinder/api/schemas/v1.1/extension.rng rename to manila/api/schemas/v1.1/extension.rng diff --git a/cinder/api/schemas/v1.1/extensions.rng b/manila/api/schemas/v1.1/extensions.rng similarity index 100% rename from cinder/api/schemas/v1.1/extensions.rng rename to manila/api/schemas/v1.1/extensions.rng diff --git a/cinder/api/schemas/v1.1/limits.rng b/manila/api/schemas/v1.1/limits.rng similarity index 100% rename from cinder/api/schemas/v1.1/limits.rng rename to manila/api/schemas/v1.1/limits.rng diff --git a/cinder/api/schemas/v1.1/metadata.rng b/manila/api/schemas/v1.1/metadata.rng similarity index 100% rename from cinder/api/schemas/v1.1/metadata.rng rename to manila/api/schemas/v1.1/metadata.rng diff --git a/cinder/api/sizelimit.py b/manila/api/sizelimit.py similarity index 80% rename from cinder/api/sizelimit.py rename to manila/api/sizelimit.py index 70cd45473e..29ae401e75 100644 --- a/cinder/api/sizelimit.py +++ b/manila/api/sizelimit.py @@ -14,15 +14,15 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.api.middleware import sizelimit -from cinder.openstack.common import log as logging +from manila.api.middleware import sizelimit +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) class RequestBodySizeLimiter(sizelimit.RequestBodySizeLimiter): def __init__(self, *args, **kwargs): - LOG.warn(_('cinder.api.sizelimit:RequestBodySizeLimiter is ' - 'deprecated. Please use cinder.api.middleware.sizelimit:' + LOG.warn(_('manila.api.sizelimit:RequestBodySizeLimiter is ' + 'deprecated. Please use manila.api.middleware.sizelimit:' 'RequestBodySizeLimiter instead')) super(RequestBodySizeLimiter, self).__init__(*args, **kwargs) diff --git a/cinder/api/urlmap.py b/manila/api/urlmap.py similarity index 98% rename from cinder/api/urlmap.py rename to manila/api/urlmap.py index 18ec2020d0..c291962b78 100644 --- a/cinder/api/urlmap.py +++ b/manila/api/urlmap.py @@ -19,8 +19,8 @@ import paste.urlmap import re import urllib2 -from cinder.api.openstack import wsgi -from cinder.openstack.common import log as logging +from manila.api.openstack import wsgi +from manila.openstack.common import log as logging _quoted_string_re = r'"[^"\\]*(?:\\.[^"\\]*)*"' @@ -290,7 +290,7 @@ class URLMap(paste.urlmap.URLMap): app = self._munge_path(app, path_info, app_url) if app: - environ['cinder.best_content_type'] = mime_type + environ['manila.best_content_type'] = mime_type return app(environ, start_response) environ['paste.urlmap_object'] = self diff --git a/cinder/api/v1/__init__.py b/manila/api/v1/__init__.py similarity index 100% rename from cinder/api/v1/__init__.py rename to manila/api/v1/__init__.py diff --git a/cinder/api/v1/limits.py b/manila/api/v1/limits.py similarity index 96% rename from cinder/api/v1/limits.py rename to manila/api/v1/limits.py index b8a0ad848d..a4691fcab3 100644 --- a/cinder/api/v1/limits.py +++ b/manila/api/v1/limits.py @@ -27,13 +27,13 @@ import time import webob.dec import webob.exc -from cinder.api.openstack import wsgi -from cinder.api.views import limits as limits_views -from cinder.api import xmlutil -from cinder.openstack.common import importutils -from cinder.openstack.common import jsonutils -from cinder import quota -from cinder import wsgi as base_wsgi +from manila.api.openstack import wsgi +from manila.api.views import limits as limits_views +from manila.api import xmlutil +from manila.openstack.common import importutils +from manila.openstack.common import jsonutils +from manila import quota +from manila import wsgi as base_wsgi QUOTAS = quota.QUOTAS @@ -83,11 +83,11 @@ class LimitsController(object): """ Return all global and rate limit information. """ - context = req.environ['cinder.context'] + context = req.environ['manila.context'] quotas = QUOTAS.get_project_quotas(context, context.project_id, usages=False) abs_limits = dict((k, v['limit']) for k, v in quotas.items()) - rate_limits = req.environ.get("cinder.limits", []) + rate_limits = req.environ.get("manila.limits", []) builder = self._get_view_builder(req) return builder.build(rate_limits, abs_limits) @@ -257,7 +257,7 @@ class RateLimitingMiddleware(base_wsgi.Middleware): """ verb = req.method url = req.url - context = req.environ.get("cinder.context") + context = req.environ.get("manila.context") if context: username = context.user_id @@ -271,7 +271,7 @@ class RateLimitingMiddleware(base_wsgi.Middleware): retry = time.time() + delay return wsgi.OverLimitFault(msg, error, retry) - req.environ["cinder.limits"] = self._limiter.get_limits(username) + req.environ["manila.limits"] = self._limiter.get_limits(username) return self.application diff --git a/cinder/api/v1/router.py b/manila/api/v1/router.py similarity index 88% rename from cinder/api/v1/router.py rename to manila/api/v1/router.py index bb361412cd..9b61b67734 100644 --- a/cinder/api/v1/router.py +++ b/manila/api/v1/router.py @@ -21,22 +21,22 @@ WSGI middleware for OpenStack Volume API. """ -from cinder.api import extensions -import cinder.api.openstack -from cinder.api.v1 import limits -from cinder.api.v1 import snapshot_metadata -from cinder.api.v1 import snapshots -from cinder.api.v1 import types -from cinder.api.v1 import volume_metadata -from cinder.api.v1 import volumes -from cinder.api import versions -from cinder.openstack.common import log as logging +from manila.api import extensions +import manila.api.openstack +from manila.api.v1 import limits +from manila.api.v1 import snapshot_metadata +from manila.api.v1 import snapshots +from manila.api.v1 import types +from manila.api.v1 import volume_metadata +from manila.api.v1 import volumes +from manila.api import versions +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) -class APIRouter(cinder.api.openstack.APIRouter): +class APIRouter(manila.api.openstack.APIRouter): """ Routes requests on the OpenStack API to the appropriate controller and method. diff --git a/cinder/api/v1/snapshot_metadata.py b/manila/api/v1/snapshot_metadata.py similarity index 93% rename from cinder/api/v1/snapshot_metadata.py rename to manila/api/v1/snapshot_metadata.py index 6322204ff7..cf573fdcff 100644 --- a/cinder/api/v1/snapshot_metadata.py +++ b/manila/api/v1/snapshot_metadata.py @@ -17,10 +17,10 @@ import webob -from cinder.api import common -from cinder.api.openstack import wsgi -from cinder import exception -from cinder import volume +from manila.api import common +from manila.api.openstack import wsgi +from manila import exception +from manila import volume from webob import exc @@ -43,7 +43,7 @@ class Controller(object): @wsgi.serializers(xml=common.MetadataTemplate) def index(self, req, snapshot_id): """ Returns the list of metadata for a given snapshot""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] return {'metadata': self._get_metadata(context, snapshot_id)} @wsgi.serializers(xml=common.MetadataTemplate) @@ -55,7 +55,7 @@ class Controller(object): msg = _("Malformed request body") raise exc.HTTPBadRequest(explanation=msg) - context = req.environ['cinder.context'] + context = req.environ['manila.context'] new_metadata = self._update_snapshot_metadata(context, snapshot_id, @@ -81,7 +81,7 @@ class Controller(object): expl = _('Request body contains too many items') raise exc.HTTPBadRequest(explanation=expl) - context = req.environ['cinder.context'] + context = req.environ['manila.context'] self._update_snapshot_metadata(context, snapshot_id, meta_item, @@ -98,7 +98,7 @@ class Controller(object): expl = _('Malformed request body') raise exc.HTTPBadRequest(explanation=expl) - context = req.environ['cinder.context'] + context = req.environ['manila.context'] new_metadata = self._update_snapshot_metadata(context, snapshot_id, metadata, @@ -132,7 +132,7 @@ class Controller(object): @wsgi.serializers(xml=common.MetaItemTemplate) def show(self, req, snapshot_id, id): """ Return a single metadata item """ - context = req.environ['cinder.context'] + context = req.environ['manila.context'] data = self._get_metadata(context, snapshot_id) try: @@ -143,7 +143,7 @@ class Controller(object): def delete(self, req, snapshot_id, id): """ Deletes an existing metadata """ - context = req.environ['cinder.context'] + context = req.environ['manila.context'] metadata = self._get_metadata(context, snapshot_id) diff --git a/cinder/api/v1/snapshots.py b/manila/api/v1/snapshots.py similarity index 92% rename from cinder/api/v1/snapshots.py rename to manila/api/v1/snapshots.py index 6dd24e1a70..33816855ea 100644 --- a/cinder/api/v1/snapshots.py +++ b/manila/api/v1/snapshots.py @@ -18,16 +18,16 @@ import webob from webob import exc -from cinder.api import common -from cinder.api.openstack import wsgi -from cinder.api.v1 import volumes -from cinder.api import xmlutil -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common import strutils -from cinder import utils -from cinder import volume +from manila.api import common +from manila.api.openstack import wsgi +from manila.api.v1 import volumes +from manila.api import xmlutil +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common import strutils +from manila import utils +from manila import volume LOG = logging.getLogger(__name__) @@ -107,7 +107,7 @@ class SnapshotsController(wsgi.Controller): @wsgi.serializers(xml=SnapshotTemplate) def show(self, req, id): """Return data about the given snapshot.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] try: vol = self.volume_api.get_snapshot(context, id) @@ -118,7 +118,7 @@ class SnapshotsController(wsgi.Controller): def delete(self, req, id): """Delete a snapshot.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] LOG.audit(_("Delete snapshot with id: %s"), id, context=context) @@ -141,7 +141,7 @@ class SnapshotsController(wsgi.Controller): def _items(self, req, entity_maker): """Returns a list of snapshots, transformed through entity_maker.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] search_opts = {} search_opts.update(req.GET) @@ -159,7 +159,7 @@ class SnapshotsController(wsgi.Controller): def create(self, req, body): """Creates a new snapshot.""" kwargs = {} - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if not self.is_valid_body(body, 'snapshot'): raise exc.HTTPUnprocessableEntity() @@ -199,7 +199,7 @@ class SnapshotsController(wsgi.Controller): @wsgi.serializers(xml=SnapshotTemplate) def update(self, req, id, body): """Update a snapshot.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if not body: raise exc.HTTPUnprocessableEntity() diff --git a/cinder/api/v2/types.py b/manila/api/v1/types.py similarity index 89% rename from cinder/api/v2/types.py rename to manila/api/v1/types.py index 1513b8dcfa..6af805f289 100644 --- a/cinder/api/v2/types.py +++ b/manila/api/v1/types.py @@ -19,11 +19,11 @@ from webob import exc -from cinder.api.openstack import wsgi -from cinder.api.views import types as views_types -from cinder.api import xmlutil -from cinder import exception -from cinder.volume import volume_types +from manila.api.openstack import wsgi +from manila.api.views import types as views_types +from manila.api import xmlutil +from manila import exception +from manila.volume import volume_types def make_voltype(elem): @@ -57,14 +57,14 @@ class VolumeTypesController(wsgi.Controller): @wsgi.serializers(xml=VolumeTypesTemplate) def index(self, req): """Returns the list of volume types.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] vol_types = volume_types.get_all_types(context).values() return self._view_builder.index(req, vol_types) @wsgi.serializers(xml=VolumeTypeTemplate) def show(self, req, id): """Return a single volume type item.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] try: vol_type = volume_types.get_volume_type(context, id) diff --git a/cinder/api/v1/volume_metadata.py b/manila/api/v1/volume_metadata.py similarity index 93% rename from cinder/api/v1/volume_metadata.py rename to manila/api/v1/volume_metadata.py index 4f6df75b6e..e7da0d7277 100644 --- a/cinder/api/v1/volume_metadata.py +++ b/manila/api/v1/volume_metadata.py @@ -17,10 +17,10 @@ import webob -from cinder.api import common -from cinder.api.openstack import wsgi -from cinder import exception -from cinder import volume +from manila.api import common +from manila.api.openstack import wsgi +from manila import exception +from manila import volume from webob import exc @@ -43,7 +43,7 @@ class Controller(object): @wsgi.serializers(xml=common.MetadataTemplate) def index(self, req, volume_id): """ Returns the list of metadata for a given volume""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] return {'metadata': self._get_metadata(context, volume_id)} @wsgi.serializers(xml=common.MetadataTemplate) @@ -55,7 +55,7 @@ class Controller(object): msg = _("Malformed request body") raise exc.HTTPBadRequest(explanation=msg) - context = req.environ['cinder.context'] + context = req.environ['manila.context'] new_metadata = self._update_volume_metadata(context, volume_id, @@ -81,7 +81,7 @@ class Controller(object): expl = _('Request body contains too many items') raise exc.HTTPBadRequest(explanation=expl) - context = req.environ['cinder.context'] + context = req.environ['manila.context'] self._update_volume_metadata(context, volume_id, meta_item, @@ -98,7 +98,7 @@ class Controller(object): expl = _('Malformed request body') raise exc.HTTPBadRequest(explanation=expl) - context = req.environ['cinder.context'] + context = req.environ['manila.context'] new_metadata = self._update_volume_metadata(context, volume_id, metadata, @@ -132,7 +132,7 @@ class Controller(object): @wsgi.serializers(xml=common.MetaItemTemplate) def show(self, req, volume_id, id): """ Return a single metadata item """ - context = req.environ['cinder.context'] + context = req.environ['manila.context'] data = self._get_metadata(context, volume_id) try: @@ -143,7 +143,7 @@ class Controller(object): def delete(self, req, volume_id, id): """ Deletes an existing metadata """ - context = req.environ['cinder.context'] + context = req.environ['manila.context'] metadata = self._get_metadata(context, volume_id) diff --git a/cinder/api/v1/volumes.py b/manila/api/v1/volumes.py similarity index 95% rename from cinder/api/v1/volumes.py rename to manila/api/v1/volumes.py index b7a687ee1f..97b3cf70a2 100644 --- a/cinder/api/v1/volumes.py +++ b/manila/api/v1/volumes.py @@ -18,16 +18,16 @@ import webob from webob import exc -from cinder.api import common -from cinder.api.openstack import wsgi -from cinder.api import xmlutil -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common import uuidutils -from cinder import utils -from cinder import volume -from cinder.volume import volume_types +from manila.api import common +from manila.api.openstack import wsgi +from manila.api import xmlutil +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common import uuidutils +from manila import utils +from manila import volume +from manila.volume import volume_types LOG = logging.getLogger(__name__) @@ -220,7 +220,7 @@ class VolumeController(wsgi.Controller): @wsgi.serializers(xml=VolumeTemplate) def show(self, req, id): """Return data about the given volume.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] try: vol = self.volume_api.get(context, id) @@ -231,7 +231,7 @@ class VolumeController(wsgi.Controller): def delete(self, req, id): """Delete a volume.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] LOG.audit(_("Delete volume with id: %s"), id, context=context) @@ -258,7 +258,7 @@ class VolumeController(wsgi.Controller): search_opts = {} search_opts.update(req.GET) - context = req.environ['cinder.context'] + context = req.environ['manila.context'] remove_invalid_options(context, search_opts, self._get_volume_search_options()) @@ -291,7 +291,7 @@ class VolumeController(wsgi.Controller): if not self.is_valid_body(body, 'volume'): raise exc.HTTPUnprocessableEntity() - context = req.environ['cinder.context'] + context = req.environ['manila.context'] volume = body['volume'] kwargs = {} @@ -370,7 +370,7 @@ class VolumeController(wsgi.Controller): @wsgi.serializers(xml=VolumeTemplate) def update(self, req, id, body): """Update a volume.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if not body: raise exc.HTTPUnprocessableEntity() diff --git a/cinder/api/v2/__init__.py b/manila/api/v2/__init__.py similarity index 100% rename from cinder/api/v2/__init__.py rename to manila/api/v2/__init__.py diff --git a/cinder/api/v2/limits.py b/manila/api/v2/limits.py similarity index 96% rename from cinder/api/v2/limits.py rename to manila/api/v2/limits.py index b8a0ad848d..a4691fcab3 100644 --- a/cinder/api/v2/limits.py +++ b/manila/api/v2/limits.py @@ -27,13 +27,13 @@ import time import webob.dec import webob.exc -from cinder.api.openstack import wsgi -from cinder.api.views import limits as limits_views -from cinder.api import xmlutil -from cinder.openstack.common import importutils -from cinder.openstack.common import jsonutils -from cinder import quota -from cinder import wsgi as base_wsgi +from manila.api.openstack import wsgi +from manila.api.views import limits as limits_views +from manila.api import xmlutil +from manila.openstack.common import importutils +from manila.openstack.common import jsonutils +from manila import quota +from manila import wsgi as base_wsgi QUOTAS = quota.QUOTAS @@ -83,11 +83,11 @@ class LimitsController(object): """ Return all global and rate limit information. """ - context = req.environ['cinder.context'] + context = req.environ['manila.context'] quotas = QUOTAS.get_project_quotas(context, context.project_id, usages=False) abs_limits = dict((k, v['limit']) for k, v in quotas.items()) - rate_limits = req.environ.get("cinder.limits", []) + rate_limits = req.environ.get("manila.limits", []) builder = self._get_view_builder(req) return builder.build(rate_limits, abs_limits) @@ -257,7 +257,7 @@ class RateLimitingMiddleware(base_wsgi.Middleware): """ verb = req.method url = req.url - context = req.environ.get("cinder.context") + context = req.environ.get("manila.context") if context: username = context.user_id @@ -271,7 +271,7 @@ class RateLimitingMiddleware(base_wsgi.Middleware): retry = time.time() + delay return wsgi.OverLimitFault(msg, error, retry) - req.environ["cinder.limits"] = self._limiter.get_limits(username) + req.environ["manila.limits"] = self._limiter.get_limits(username) return self.application diff --git a/cinder/api/v2/router.py b/manila/api/v2/router.py similarity index 87% rename from cinder/api/v2/router.py rename to manila/api/v2/router.py index e3e51399f1..d86ff4ff3f 100644 --- a/cinder/api/v2/router.py +++ b/manila/api/v2/router.py @@ -21,20 +21,20 @@ WSGI middleware for OpenStack Volume API. """ -from cinder.api import extensions -import cinder.api.openstack -from cinder.api.v2 import limits -from cinder.api.v2 import snapshots -from cinder.api.v2 import types -from cinder.api.v2 import volumes -from cinder.api import versions -from cinder.openstack.common import log as logging +from manila.api import extensions +import manila.api.openstack +from manila.api.v2 import limits +from manila.api.v2 import snapshots +from manila.api.v2 import types +from manila.api.v2 import volumes +from manila.api import versions +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) -class APIRouter(cinder.api.openstack.APIRouter): +class APIRouter(manila.api.openstack.APIRouter): """ Routes requests on the OpenStack API to the appropriate controller and method. diff --git a/cinder/api/v2/snapshot_metadata.py b/manila/api/v2/snapshot_metadata.py similarity index 93% rename from cinder/api/v2/snapshot_metadata.py rename to manila/api/v2/snapshot_metadata.py index 6322204ff7..cf573fdcff 100644 --- a/cinder/api/v2/snapshot_metadata.py +++ b/manila/api/v2/snapshot_metadata.py @@ -17,10 +17,10 @@ import webob -from cinder.api import common -from cinder.api.openstack import wsgi -from cinder import exception -from cinder import volume +from manila.api import common +from manila.api.openstack import wsgi +from manila import exception +from manila import volume from webob import exc @@ -43,7 +43,7 @@ class Controller(object): @wsgi.serializers(xml=common.MetadataTemplate) def index(self, req, snapshot_id): """ Returns the list of metadata for a given snapshot""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] return {'metadata': self._get_metadata(context, snapshot_id)} @wsgi.serializers(xml=common.MetadataTemplate) @@ -55,7 +55,7 @@ class Controller(object): msg = _("Malformed request body") raise exc.HTTPBadRequest(explanation=msg) - context = req.environ['cinder.context'] + context = req.environ['manila.context'] new_metadata = self._update_snapshot_metadata(context, snapshot_id, @@ -81,7 +81,7 @@ class Controller(object): expl = _('Request body contains too many items') raise exc.HTTPBadRequest(explanation=expl) - context = req.environ['cinder.context'] + context = req.environ['manila.context'] self._update_snapshot_metadata(context, snapshot_id, meta_item, @@ -98,7 +98,7 @@ class Controller(object): expl = _('Malformed request body') raise exc.HTTPBadRequest(explanation=expl) - context = req.environ['cinder.context'] + context = req.environ['manila.context'] new_metadata = self._update_snapshot_metadata(context, snapshot_id, metadata, @@ -132,7 +132,7 @@ class Controller(object): @wsgi.serializers(xml=common.MetaItemTemplate) def show(self, req, snapshot_id, id): """ Return a single metadata item """ - context = req.environ['cinder.context'] + context = req.environ['manila.context'] data = self._get_metadata(context, snapshot_id) try: @@ -143,7 +143,7 @@ class Controller(object): def delete(self, req, snapshot_id, id): """ Deletes an existing metadata """ - context = req.environ['cinder.context'] + context = req.environ['manila.context'] metadata = self._get_metadata(context, snapshot_id) diff --git a/cinder/api/v2/snapshots.py b/manila/api/v2/snapshots.py similarity index 93% rename from cinder/api/v2/snapshots.py rename to manila/api/v2/snapshots.py index 5c7dc1f9b9..6ec08c50f4 100644 --- a/cinder/api/v2/snapshots.py +++ b/manila/api/v2/snapshots.py @@ -18,16 +18,16 @@ import webob from webob import exc -from cinder.api import common -from cinder.api.openstack import wsgi -from cinder.api.v2 import volumes -from cinder.api import xmlutil -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common import strutils -from cinder import utils -from cinder import volume +from manila.api import common +from manila.api.openstack import wsgi +from manila.api.v2 import volumes +from manila.api import xmlutil +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common import strutils +from manila import utils +from manila import volume LOG = logging.getLogger(__name__) @@ -107,7 +107,7 @@ class SnapshotsController(wsgi.Controller): @wsgi.serializers(xml=SnapshotTemplate) def show(self, req, id): """Return data about the given snapshot.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] try: vol = self.volume_api.get_snapshot(context, id) @@ -118,7 +118,7 @@ class SnapshotsController(wsgi.Controller): def delete(self, req, id): """Delete a snapshot.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] LOG.audit(_("Delete snapshot with id: %s"), id, context=context) @@ -141,7 +141,7 @@ class SnapshotsController(wsgi.Controller): def _items(self, req, entity_maker): """Returns a list of snapshots, transformed through entity_maker.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] search_opts = {} search_opts.update(req.GET) @@ -165,7 +165,7 @@ class SnapshotsController(wsgi.Controller): def create(self, req, body): """Creates a new snapshot.""" kwargs = {} - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if not self.is_valid_body(body, 'snapshot'): raise exc.HTTPBadRequest() @@ -210,7 +210,7 @@ class SnapshotsController(wsgi.Controller): @wsgi.serializers(xml=SnapshotTemplate) def update(self, req, id, body): """Update a snapshot.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if not body: raise exc.HTTPBadRequest() diff --git a/cinder/api/v1/types.py b/manila/api/v2/types.py similarity index 89% rename from cinder/api/v1/types.py rename to manila/api/v2/types.py index 1513b8dcfa..6af805f289 100644 --- a/cinder/api/v1/types.py +++ b/manila/api/v2/types.py @@ -19,11 +19,11 @@ from webob import exc -from cinder.api.openstack import wsgi -from cinder.api.views import types as views_types -from cinder.api import xmlutil -from cinder import exception -from cinder.volume import volume_types +from manila.api.openstack import wsgi +from manila.api.views import types as views_types +from manila.api import xmlutil +from manila import exception +from manila.volume import volume_types def make_voltype(elem): @@ -57,14 +57,14 @@ class VolumeTypesController(wsgi.Controller): @wsgi.serializers(xml=VolumeTypesTemplate) def index(self, req): """Returns the list of volume types.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] vol_types = volume_types.get_all_types(context).values() return self._view_builder.index(req, vol_types) @wsgi.serializers(xml=VolumeTypeTemplate) def show(self, req, id): """Return a single volume type item.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] try: vol_type = volume_types.get_volume_type(context, id) diff --git a/cinder/api/v2/views/__init__.py b/manila/api/v2/views/__init__.py similarity index 100% rename from cinder/api/v2/views/__init__.py rename to manila/api/v2/views/__init__.py diff --git a/cinder/api/v2/views/volumes.py b/manila/api/v2/views/volumes.py similarity index 98% rename from cinder/api/v2/views/volumes.py rename to manila/api/v2/views/volumes.py index c1deec4663..a85aacebc7 100644 --- a/cinder/api/v2/views/volumes.py +++ b/manila/api/v2/views/volumes.py @@ -15,8 +15,8 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.api import common -from cinder.openstack.common import log as logging +from manila.api import common +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/api/v2/volumes.py b/manila/api/v2/volumes.py similarity index 94% rename from cinder/api/v2/volumes.py rename to manila/api/v2/volumes.py index bf46449d44..5fd3c1fee8 100644 --- a/cinder/api/v2/volumes.py +++ b/manila/api/v2/volumes.py @@ -18,17 +18,17 @@ import webob from webob import exc -from cinder.api import common -from cinder.api.openstack import wsgi -from cinder.api.v2.views import volumes as volume_views -from cinder.api import xmlutil -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common import uuidutils -from cinder import utils -from cinder import volume -from cinder.volume import volume_types +from manila.api import common +from manila.api.openstack import wsgi +from manila.api.v2.views import volumes as volume_views +from manila.api import xmlutil +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common import uuidutils +from manila import utils +from manila import volume +from manila.volume import volume_types LOG = logging.getLogger(__name__) @@ -137,7 +137,7 @@ class VolumeController(wsgi.Controller): @wsgi.serializers(xml=VolumeTemplate) def show(self, req, id): """Return data about the given volume.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] try: vol = self.volume_api.get(context, id) @@ -148,7 +148,7 @@ class VolumeController(wsgi.Controller): def delete(self, req, id): """Delete a volume.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] LOG.audit(_("Delete volume with id: %s"), id, context=context) @@ -172,7 +172,7 @@ class VolumeController(wsgi.Controller): def _get_volumes(self, req, is_detail): """Returns a list of volumes, transformed through view builder.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] params = req.params.copy() marker = params.pop('marker', None) @@ -223,7 +223,7 @@ class VolumeController(wsgi.Controller): if not self.is_valid_body(body, 'volume'): raise exc.HTTPBadRequest() - context = req.environ['cinder.context'] + context = req.environ['manila.context'] volume = body['volume'] kwargs = {} @@ -301,7 +301,7 @@ class VolumeController(wsgi.Controller): @wsgi.serializers(xml=VolumeTemplate) def update(self, req, id, body): """Update a volume.""" - context = req.environ['cinder.context'] + context = req.environ['manila.context'] if not body: raise exc.HTTPBadRequest() diff --git a/cinder/api/versions.py b/manila/api/versions.py similarity index 98% rename from cinder/api/versions.py rename to manila/api/versions.py index 30627bd29a..debc1dfb89 100644 --- a/cinder/api/versions.py +++ b/manila/api/versions.py @@ -18,10 +18,10 @@ import datetime from lxml import etree -from cinder.api.openstack import wsgi -from cinder.api.views import versions as views_versions -from cinder.api import xmlutil -from cinder import flags +from manila.api.openstack import wsgi +from manila.api.views import versions as views_versions +from manila.api import xmlutil +from manila import flags FLAGS = flags.FLAGS diff --git a/cinder/api/views/__init__.py b/manila/api/views/__init__.py similarity index 100% rename from cinder/api/views/__init__.py rename to manila/api/views/__init__.py diff --git a/cinder/api/views/backups.py b/manila/api/views/backups.py similarity index 97% rename from cinder/api/views/backups.py rename to manila/api/views/backups.py index 446bf30c61..4f57a941bb 100644 --- a/cinder/api/views/backups.py +++ b/manila/api/views/backups.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.api import common -from cinder.openstack.common import log as logging +from manila.api import common +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/api/views/limits.py b/manila/api/views/limits.py similarity index 98% rename from cinder/api/views/limits.py rename to manila/api/views/limits.py index 81b1e794ec..94002114b1 100644 --- a/cinder/api/views/limits.py +++ b/manila/api/views/limits.py @@ -17,7 +17,7 @@ import datetime -from cinder.openstack.common import timeutils +from manila.openstack.common import timeutils class ViewBuilder(object): diff --git a/cinder/api/views/share_snapshots.py b/manila/api/views/share_snapshots.py similarity index 97% rename from cinder/api/views/share_snapshots.py rename to manila/api/views/share_snapshots.py index dc1c8a05c0..ec69737287 100644 --- a/cinder/api/views/share_snapshots.py +++ b/manila/api/views/share_snapshots.py @@ -15,8 +15,8 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.api import common -from cinder.openstack.common import log as logging +from manila.api import common +from manila.openstack.common import log as logging class ViewBuilder(common.ViewBuilder): diff --git a/cinder/api/views/shares.py b/manila/api/views/shares.py similarity index 97% rename from cinder/api/views/shares.py rename to manila/api/views/shares.py index 32fb58a5ac..b97c6f5ea2 100644 --- a/cinder/api/views/shares.py +++ b/manila/api/views/shares.py @@ -15,8 +15,8 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.api import common -from cinder.openstack.common import log as logging +from manila.api import common +from manila.openstack.common import log as logging class ViewBuilder(common.ViewBuilder): diff --git a/cinder/api/views/types.py b/manila/api/views/types.py similarity index 97% rename from cinder/api/views/types.py rename to manila/api/views/types.py index 675ec01fe5..c95981ed78 100644 --- a/cinder/api/views/types.py +++ b/manila/api/views/types.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.api import common +from manila.api import common class ViewBuilder(common.ViewBuilder): diff --git a/cinder/api/views/versions.py b/manila/api/views/versions.py similarity index 100% rename from cinder/api/views/versions.py rename to manila/api/views/versions.py diff --git a/cinder/api/xmlutil.py b/manila/api/xmlutil.py similarity index 99% rename from cinder/api/xmlutil.py rename to manila/api/xmlutil.py index 93b722e1f5..753c1d372a 100644 --- a/cinder/api/xmlutil.py +++ b/manila/api/xmlutil.py @@ -19,7 +19,7 @@ import os.path from lxml import etree -from cinder import utils +from manila import utils XMLNS_V10 = 'http://docs.rackspacecloud.com/servers/api/v1.0' @@ -35,9 +35,9 @@ XMLNS_SHARE_V1 = '' def validate_schema(xml, schema_name): if isinstance(xml, str): xml = etree.fromstring(xml) - base_path = 'cinder/api/schemas/v1.1/' + base_path = 'manila/api/schemas/v1.1/' if schema_name in ('atom', 'atom-link'): - base_path = 'cinder/api/schemas/' + base_path = 'manila/api/schemas/' schema_path = os.path.join(utils.cinderdir(), '%s%s.rng' % (base_path, schema_name)) schema_doc = etree.parse(schema_path) diff --git a/cinder/backup/__init__.py b/manila/backup/__init__.py similarity index 76% rename from cinder/backup/__init__.py rename to manila/backup/__init__.py index 368e2ffff0..8c557dc216 100644 --- a/cinder/backup/__init__.py +++ b/manila/backup/__init__.py @@ -14,10 +14,10 @@ # under the License. # Importing full names to not pollute the namespace and cause possible -# collisions with use of 'from cinder.backup import ' elsewhere. +# collisions with use of 'from manila.backup import ' elsewhere. -import cinder.flags -import cinder.openstack.common.importutils +import manila.flags +import manila.openstack.common.importutils -API = cinder.openstack.common.importutils.import_class( - cinder.flags.FLAGS.backup_api_class) +API = manila.openstack.common.importutils.import_class( + manila.flags.FLAGS.backup_api_class) diff --git a/cinder/backup/api.py b/manila/backup/api.py similarity index 96% rename from cinder/backup/api.py rename to manila/backup/api.py index 1b5d1d49bd..333a98a39d 100644 --- a/cinder/backup/api.py +++ b/manila/backup/api.py @@ -19,12 +19,12 @@ Handles all requests relating to the volume backups service. from eventlet import greenthread -from cinder.backup import rpcapi as backup_rpcapi -from cinder.db import base -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -import cinder.volume +from manila.backup import rpcapi as backup_rpcapi +from manila.db import base +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +import manila.volume FLAGS = flags.FLAGS @@ -37,7 +37,7 @@ class API(base.Base): def __init__(self, db_driver=None): self.backup_rpcapi = backup_rpcapi.BackupAPI() - self.volume_api = cinder.volume.API() + self.volume_api = manila.volume.API() super(API, self).__init__(db_driver) def get(self, context, backup_id): diff --git a/cinder/backup/manager.py b/manila/backup/manager.py similarity index 96% rename from cinder/backup/manager.py rename to manila/backup/manager.py index b4a972327b..5be06a3f5a 100755 --- a/cinder/backup/manager.py +++ b/manila/backup/manager.py @@ -25,28 +25,28 @@ Volume backups can be created, restored, deleted and listed. **Related Flags** :backup_topic: What :mod:`rpc` topic to listen to (default: - `cinder-backup`). + `manila-backup`). :backup_manager: The module name of a class derived from :class:`manager.Manager` (default: - :class:`cinder.backup.manager.Manager`). + :class:`manila.backup.manager.Manager`). """ from oslo.config import cfg -from cinder import context -from cinder import exception -from cinder import flags -from cinder import manager -from cinder.openstack.common import excutils -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging +from manila import context +from manila import exception +from manila import flags +from manila import manager +from manila.openstack.common import excutils +from manila.openstack.common import importutils +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) backup_manager_opts = [ cfg.StrOpt('backup_service', - default='cinder.backup.services.swift', + default='manila.backup.services.swift', help='Service to use for backups.'), ] diff --git a/cinder/backup/rpcapi.py b/manila/backup/rpcapi.py similarity index 91% rename from cinder/backup/rpcapi.py rename to manila/backup/rpcapi.py index a0b8771bca..f503f9d8e6 100644 --- a/cinder/backup/rpcapi.py +++ b/manila/backup/rpcapi.py @@ -19,10 +19,10 @@ Client side of the volume backup RPC API. """ -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common import rpc -import cinder.openstack.common.rpc.proxy +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common import rpc +import manila.openstack.common.rpc.proxy LOG = logging.getLogger(__name__) @@ -30,7 +30,7 @@ LOG = logging.getLogger(__name__) FLAGS = flags.FLAGS -class BackupAPI(cinder.openstack.common.rpc.proxy.RpcProxy): +class BackupAPI(manila.openstack.common.rpc.proxy.RpcProxy): '''Client side of the volume rpc API. API version history: diff --git a/cinder/backup/services/__init__.py b/manila/backup/services/__init__.py similarity index 100% rename from cinder/backup/services/__init__.py rename to manila/backup/services/__init__.py diff --git a/cinder/backup/services/swift.py b/manila/backup/services/swift.py similarity index 98% rename from cinder/backup/services/swift.py rename to manila/backup/services/swift.py index 43cbd1ff2d..5b625e0b2b 100644 --- a/cinder/backup/services/swift.py +++ b/manila/backup/services/swift.py @@ -40,11 +40,11 @@ import StringIO import eventlet from oslo.config import cfg -from cinder.db import base -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils +from manila.db import base +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils from swiftclient import client as swift LOG = logging.getLogger(__name__) diff --git a/cinder/brick/__init__.py b/manila/brick/__init__.py similarity index 100% rename from cinder/brick/__init__.py rename to manila/brick/__init__.py diff --git a/cinder/brick/iscsi/__init__.py b/manila/brick/iscsi/__init__.py similarity index 100% rename from cinder/brick/iscsi/__init__.py rename to manila/brick/iscsi/__init__.py diff --git a/cinder/brick/iscsi/iscsi.py b/manila/brick/iscsi/iscsi.py similarity index 98% rename from cinder/brick/iscsi/iscsi.py rename to manila/brick/iscsi/iscsi.py index 5748697075..01e489c07d 100644 --- a/cinder/brick/iscsi/iscsi.py +++ b/manila/brick/iscsi/iscsi.py @@ -24,11 +24,11 @@ import re from oslo.config import cfg -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import utils -from cinder.volume import utils as volume_utils +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila import utils +from manila.volume import utils as volume_utils LOG = logging.getLogger(__name__) @@ -60,7 +60,7 @@ iscsi_helper_opt = [cfg.StrOpt('iscsi_helper', FLAGS = flags.FLAGS FLAGS.register_opts(iscsi_helper_opt) -FLAGS.import_opt('volume_name_template', 'cinder.db') +FLAGS.import_opt('volume_name_template', 'manila.db') class TargetAdmin(object): @@ -199,7 +199,7 @@ class TgtAdm(TargetAdmin): raise exception.ISCSITargetRemoveFailed(volume_id=vol_id) try: # NOTE(vish): --force is a workaround for bug: - # https://bugs.launchpad.net/cinder/+bug/1159948 + # https://bugs.launchpad.net/manila/+bug/1159948 self._execute('tgt-admin', '--force', '--delete', diff --git a/cinder/brick/local_dev/__init__.py b/manila/brick/local_dev/__init__.py similarity index 100% rename from cinder/brick/local_dev/__init__.py rename to manila/brick/local_dev/__init__.py diff --git a/cinder/brick/local_dev/lvm.py b/manila/brick/local_dev/lvm.py similarity index 98% rename from cinder/brick/local_dev/lvm.py rename to manila/brick/local_dev/lvm.py index e01104427f..e798056c43 100644 --- a/cinder/brick/local_dev/lvm.py +++ b/manila/brick/local_dev/lvm.py @@ -23,9 +23,9 @@ import math from itertools import izip -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import log as logging -from cinder.openstack.common import processutils as putils +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import log as logging +from manila.openstack.common import processutils as putils LOG = logging.getLogger(__name__) diff --git a/cinder/common/__init__.py b/manila/common/__init__.py similarity index 100% rename from cinder/common/__init__.py rename to manila/common/__init__.py diff --git a/cinder/common/sqlalchemyutils.py b/manila/common/sqlalchemyutils.py similarity index 98% rename from cinder/common/sqlalchemyutils.py rename to manila/common/sqlalchemyutils.py index 19b7ca9ea7..d289ac4b5d 100755 --- a/cinder/common/sqlalchemyutils.py +++ b/manila/common/sqlalchemyutils.py @@ -22,8 +22,8 @@ import sqlalchemy -from cinder import exception -from cinder.openstack.common import log as logging +from manila import exception +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/compute/__init__.py b/manila/compute/__init__.py similarity index 100% rename from cinder/compute/__init__.py rename to manila/compute/__init__.py diff --git a/cinder/compute/aggregate_states.py b/manila/compute/aggregate_states.py similarity index 100% rename from cinder/compute/aggregate_states.py rename to manila/compute/aggregate_states.py diff --git a/cinder/context.py b/manila/context.py similarity index 96% rename from cinder/context.py rename to manila/context.py index 951496043e..1d002fc2a7 100644 --- a/cinder/context.py +++ b/manila/context.py @@ -17,15 +17,15 @@ # License for the specific language governing permissions and limitations # under the License. -"""RequestContext: context for requests that persist through all of cinder.""" +"""RequestContext: context for requests that persist through all of manila.""" import copy import uuid -from cinder.openstack.common import local -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder import policy +from manila.openstack.common import local +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils +from manila import policy LOG = logging.getLogger(__name__) diff --git a/cinder/db/__init__.py b/manila/db/__init__.py similarity index 96% rename from cinder/db/__init__.py rename to manila/db/__init__.py index f4eb417ec9..083a0a1fb2 100644 --- a/cinder/db/__init__.py +++ b/manila/db/__init__.py @@ -20,4 +20,4 @@ DB abstraction for Cinder """ -from cinder.db.api import * +from manila.db.api import * diff --git a/cinder/db/api.py b/manila/db/api.py similarity index 98% rename from cinder/db/api.py rename to manila/db/api.py index dd546e64b9..da1b360043 100644 --- a/cinder/db/api.py +++ b/manila/db/api.py @@ -21,8 +21,8 @@ The underlying driver is loaded as a :class:`LazyPluggable`. -Functions in this module are imported into the cinder.db namespace. Call these -functions from cinder.db namespace, not the cinder.db.api namespace. +Functions in this module are imported into the manila.db namespace. Call these +functions from manila.db namespace, not the manila.db.api namespace. All functions in this module return objects that implement a dictionary-like interface. Currently, many of these objects are sqlalchemy objects that @@ -36,7 +36,7 @@ these objects be simple dictionaries. `sqlalchemy` is the only supported backend right now. :sql_connection: string specifying the sqlalchemy connection to use, like: - `sqlite:///var/lib/cinder/cinder.sqlite`. + `sqlite:///var/lib/manila/manila.sqlite`. :enable_new_services: when adding a new service to the database, is it in the pool of available hardware (Default: True) @@ -45,9 +45,9 @@ these objects be simple dictionaries. from oslo.config import cfg -from cinder import exception -from cinder import flags -from cinder import utils +from manila import exception +from manila import flags +from manila import utils db_opts = [ cfg.StrOpt('db_backend', @@ -77,7 +77,7 @@ FLAGS = flags.FLAGS FLAGS.register_opts(db_opts) IMPL = utils.LazyPluggable('db_backend', - sqlalchemy='cinder.db.sqlalchemy.api') + sqlalchemy='manila.db.sqlalchemy.api') class NoMoreTargets(exception.CinderException): diff --git a/cinder/db/base.py b/manila/db/base.py similarity index 91% rename from cinder/db/base.py rename to manila/db/base.py index edfbeb626c..dfa8d3e6d9 100644 --- a/cinder/db/base.py +++ b/manila/db/base.py @@ -20,11 +20,11 @@ from oslo.config import cfg -from cinder import flags -from cinder.openstack.common import importutils +from manila import flags +from manila.openstack.common import importutils db_driver_opt = cfg.StrOpt('db_driver', - default='cinder.db', + default='manila.db', help='driver to use for database access') FLAGS = flags.FLAGS diff --git a/cinder/db/migration.py b/manila/db/migration.py similarity index 92% rename from cinder/db/migration.py rename to manila/db/migration.py index 6079055e50..fa422c72f8 100644 --- a/cinder/db/migration.py +++ b/manila/db/migration.py @@ -18,11 +18,11 @@ """Database setup and migration commands.""" -from cinder import utils +from manila import utils IMPL = utils.LazyPluggable('db_backend', - sqlalchemy='cinder.db.sqlalchemy.migration') + sqlalchemy='manila.db.sqlalchemy.migration') INIT_VERSION = 000 diff --git a/cinder/db/sqlalchemy/__init__.py b/manila/db/sqlalchemy/__init__.py similarity index 100% rename from cinder/db/sqlalchemy/__init__.py rename to manila/db/sqlalchemy/__init__.py diff --git a/cinder/db/sqlalchemy/api.py b/manila/db/sqlalchemy/api.py similarity index 99% rename from cinder/db/sqlalchemy/api.py rename to manila/db/sqlalchemy/api.py index bc0c6c2bc1..cd7835bc54 100644 --- a/cinder/db/sqlalchemy/api.py +++ b/manila/db/sqlalchemy/api.py @@ -29,15 +29,15 @@ from sqlalchemy.orm import joinedload from sqlalchemy.sql.expression import literal_column from sqlalchemy.sql import func -from cinder.common import sqlalchemyutils -from cinder import db -from cinder.db.sqlalchemy import models -from cinder.db.sqlalchemy.session import get_session -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder.openstack.common import uuidutils +from manila.common import sqlalchemyutils +from manila import db +from manila.db.sqlalchemy import models +from manila.db.sqlalchemy.session import get_session +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils +from manila.openstack.common import uuidutils FLAGS = flags.FLAGS diff --git a/cinder/db/sqlalchemy/migrate_repo/README b/manila/db/sqlalchemy/migrate_repo/README similarity index 100% rename from cinder/db/sqlalchemy/migrate_repo/README rename to manila/db/sqlalchemy/migrate_repo/README diff --git a/cinder/db/sqlalchemy/migrate_repo/__init__.py b/manila/db/sqlalchemy/migrate_repo/__init__.py similarity index 100% rename from cinder/db/sqlalchemy/migrate_repo/__init__.py rename to manila/db/sqlalchemy/migrate_repo/__init__.py diff --git a/cinder/db/sqlalchemy/migrate_repo/manage.py b/manila/db/sqlalchemy/migrate_repo/manage.py similarity index 100% rename from cinder/db/sqlalchemy/migrate_repo/manage.py rename to manila/db/sqlalchemy/migrate_repo/manage.py diff --git a/cinder/db/sqlalchemy/migrate_repo/migrate.cfg b/manila/db/sqlalchemy/migrate_repo/migrate.cfg similarity index 100% rename from cinder/db/sqlalchemy/migrate_repo/migrate.cfg rename to manila/db/sqlalchemy/migrate_repo/migrate.cfg diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py b/manila/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py similarity index 99% rename from cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py rename to manila/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py index e46faf4b13..e40c0e95f4 100644 --- a/cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py +++ b/manila/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py @@ -17,8 +17,8 @@ from sqlalchemy import Boolean, Column, DateTime, ForeignKey from sqlalchemy import Integer, MetaData, String, Table -from cinder import flags -from cinder.openstack.common import log as logging +from manila import flags +from manila.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py b/manila/db/sqlalchemy/migrate_repo/versions/002_quota_class.py similarity index 99% rename from cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py rename to manila/db/sqlalchemy/migrate_repo/versions/002_quota_class.py index fe911c0d40..094978a827 100644 --- a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py +++ b/manila/db/sqlalchemy/migrate_repo/versions/002_quota_class.py @@ -17,7 +17,7 @@ from sqlalchemy import Boolean, Column, DateTime from sqlalchemy import MetaData, Integer, String, Table, ForeignKey -from cinder.openstack.common import log as logging +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py b/manila/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py similarity index 98% rename from cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py rename to manila/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py index 7d6a3b1d46..83fac2c410 100644 --- a/cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py +++ b/manila/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py @@ -17,7 +17,7 @@ from sqlalchemy import Column, DateTime, Text, Boolean from sqlalchemy import MetaData, Integer, String, Table, ForeignKey -from cinder.openstack.common import log as logging +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py b/manila/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py similarity index 99% rename from cinder/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py rename to manila/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py index 202079b0be..ca145ac58b 100644 --- a/cinder/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py +++ b/manila/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py @@ -14,7 +14,7 @@ import uuid -from cinder.openstack.common import log as logging +from manila.openstack.common import log as logging from migrate import ForeignKeyConstraint from sqlalchemy import Integer, MetaData, String, Table diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py b/manila/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py similarity index 96% rename from cinder/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py rename to manila/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py index d20cda953c..8894ec4842 100644 --- a/cinder/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py +++ b/manila/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py @@ -13,7 +13,7 @@ # under the License. -from cinder.openstack.common import log as logging +from manila.openstack.common import log as logging from sqlalchemy import Column from sqlalchemy import MetaData, String, Table diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/005_sqlite_downgrade.sql b/manila/db/sqlalchemy/migrate_repo/versions/005_sqlite_downgrade.sql similarity index 100% rename from cinder/db/sqlalchemy/migrate_repo/versions/005_sqlite_downgrade.sql rename to manila/db/sqlalchemy/migrate_repo/versions/005_sqlite_downgrade.sql diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py b/manila/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py similarity index 100% rename from cinder/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py rename to manila/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/007_add_volume_snapshot_fk.py b/manila/db/sqlalchemy/migrate_repo/versions/007_add_volume_snapshot_fk.py similarity index 100% rename from cinder/db/sqlalchemy/migrate_repo/versions/007_add_volume_snapshot_fk.py rename to manila/db/sqlalchemy/migrate_repo/versions/007_add_volume_snapshot_fk.py diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/007_sqlite_downgrade.sql b/manila/db/sqlalchemy/migrate_repo/versions/007_sqlite_downgrade.sql similarity index 100% rename from cinder/db/sqlalchemy/migrate_repo/versions/007_sqlite_downgrade.sql rename to manila/db/sqlalchemy/migrate_repo/versions/007_sqlite_downgrade.sql diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py b/manila/db/sqlalchemy/migrate_repo/versions/008_add_backup.py similarity index 98% rename from cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py rename to manila/db/sqlalchemy/migrate_repo/versions/008_add_backup.py index 5dfbed0f63..085c11bd16 100644 --- a/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py +++ b/manila/db/sqlalchemy/migrate_repo/versions/008_add_backup.py @@ -18,7 +18,7 @@ from sqlalchemy import Boolean, Column, DateTime from sqlalchemy import MetaData, Integer, String, Table -from cinder.openstack.common import log as logging +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py b/manila/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py similarity index 97% rename from cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py rename to manila/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py index 3ccd79a232..0f7fc51a56 100644 --- a/cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py +++ b/manila/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py @@ -15,7 +15,7 @@ from sqlalchemy import Boolean, Column, DateTime from sqlalchemy import Integer, MetaData, String, Table, ForeignKey -from cinder.openstack.common import log as logging +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/010_add_share_tables.py b/manila/db/sqlalchemy/migrate_repo/versions/010_add_share_tables.py similarity index 98% rename from cinder/db/sqlalchemy/migrate_repo/versions/010_add_share_tables.py rename to manila/db/sqlalchemy/migrate_repo/versions/010_add_share_tables.py index 11914c58f4..d8181eee17 100644 --- a/cinder/db/sqlalchemy/migrate_repo/versions/010_add_share_tables.py +++ b/manila/db/sqlalchemy/migrate_repo/versions/010_add_share_tables.py @@ -17,7 +17,7 @@ from sqlalchemy import MetaData, Table, String, DateTime, Boolean from sqlalchemy import Integer, Column, ForeignKey -from cinder.openstack.common import log as logging +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/011_add_share_snapshot_table.py b/manila/db/sqlalchemy/migrate_repo/versions/011_add_share_snapshot_table.py similarity index 97% rename from cinder/db/sqlalchemy/migrate_repo/versions/011_add_share_snapshot_table.py rename to manila/db/sqlalchemy/migrate_repo/versions/011_add_share_snapshot_table.py index 7eaff3c5c9..a10d5d08af 100644 --- a/cinder/db/sqlalchemy/migrate_repo/versions/011_add_share_snapshot_table.py +++ b/manila/db/sqlalchemy/migrate_repo/versions/011_add_share_snapshot_table.py @@ -18,7 +18,7 @@ from sqlalchemy.schema import Column, ForeignKey, MetaData, Table from sqlalchemy.types import Boolean, DateTime, Integer, String -from cinder.openstack.common import log as logging +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/__init__.py b/manila/db/sqlalchemy/migrate_repo/versions/__init__.py similarity index 100% rename from cinder/db/sqlalchemy/migrate_repo/versions/__init__.py rename to manila/db/sqlalchemy/migrate_repo/versions/__init__.py diff --git a/cinder/db/sqlalchemy/migration.py b/manila/db/sqlalchemy/migration.py similarity index 93% rename from cinder/db/sqlalchemy/migration.py rename to manila/db/sqlalchemy/migration.py index 5365d9cdcd..45da0760e9 100644 --- a/cinder/db/sqlalchemy/migration.py +++ b/manila/db/sqlalchemy/migration.py @@ -19,11 +19,11 @@ import distutils.version as dist_version import os -from cinder.db import migration -from cinder.db.sqlalchemy.session import get_engine -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging +from manila.db import migration +from manila.db.sqlalchemy.session import get_engine +from manila import exception +from manila import flags +from manila.openstack.common import log as logging import migrate @@ -48,7 +48,7 @@ def patched_with_engine(f, *a, **kw): engine.dispose() -# TODO(jkoelker) When migrate 0.7.3 is released and cinder depends +# TODO(jkoelker) When migrate 0.7.3 is released and manila depends # on that version or higher, this can be removed MIN_PKG_VERSION = dist_version.StrictVersion('0.7.3') if (not hasattr(migrate, '__version__') or diff --git a/cinder/db/sqlalchemy/models.py b/manila/db/sqlalchemy/models.py similarity index 97% rename from cinder/db/sqlalchemy/models.py rename to manila/db/sqlalchemy/models.py index 9798347902..715f900994 100644 --- a/cinder/db/sqlalchemy/models.py +++ b/manila/db/sqlalchemy/models.py @@ -18,7 +18,7 @@ # License for the specific language governing permissions and limitations # under the License. """ -SQLAlchemy models for cinder data. +SQLAlchemy models for manila data. """ from sqlalchemy import Column, Integer, String, Text, schema @@ -27,11 +27,11 @@ from sqlalchemy.ext.declarative import declarative_base from sqlalchemy import ForeignKey, DateTime, Boolean, Enum from sqlalchemy.orm import relationship, backref, object_mapper -from cinder.db.sqlalchemy.session import get_session +from manila.db.sqlalchemy.session import get_session -from cinder import exception -from cinder import flags -from cinder.openstack.common import timeutils +from manila import exception +from manila import flags +from manila.openstack.common import timeutils FLAGS = flags.FLAGS @@ -110,11 +110,11 @@ class Service(BASE, CinderBase): topic = Column(String(255)) report_count = Column(Integer, nullable=False, default=0) disabled = Column(Boolean, default=False) - availability_zone = Column(String(255), default='cinder') + availability_zone = Column(String(255), default='manila') class CinderNode(BASE, CinderBase): - """Represents a running cinder service on a host.""" + """Represents a running manila service on a host.""" __tablename__ = 'cinder_nodes' id = Column(Integer, primary_key=True) @@ -503,7 +503,7 @@ class ShareSnapshot(BASE, CinderBase): def register_models(): """Register Models and create metadata. - Called from cinder.db.sqlalchemy.__init__ as part of loading the driver, + Called from manila.db.sqlalchemy.__init__ as part of loading the driver, it will never need to be called explicitly elsewhere unless the connection is lost and needs to be reestablished. """ diff --git a/cinder/db/sqlalchemy/session.py b/manila/db/sqlalchemy/session.py similarity index 95% rename from cinder/db/sqlalchemy/session.py rename to manila/db/sqlalchemy/session.py index cd9045efae..7e493d31f8 100644 --- a/cinder/db/sqlalchemy/session.py +++ b/manila/db/sqlalchemy/session.py @@ -25,9 +25,9 @@ import sqlalchemy.interfaces import sqlalchemy.orm from sqlalchemy.pool import NullPool, StaticPool -import cinder.exception -import cinder.flags as flags -from cinder.openstack.common import log as logging +import manila.exception +import manila.flags as flags +from manila.openstack.common import log as logging FLAGS = flags.FLAGS @@ -46,8 +46,8 @@ def get_session(autocommit=True, expire_on_commit=False): _MAKER = get_maker(engine, autocommit, expire_on_commit) session = _MAKER() - session.query = cinder.exception.wrap_db_error(session.query) - session.flush = cinder.exception.wrap_db_error(session.flush) + session.query = manila.exception.wrap_db_error(session.query) + session.flush = manila.exception.wrap_db_error(session.flush) return session diff --git a/cinder/exception.py b/manila/exception.py similarity index 99% rename from cinder/exception.py rename to manila/exception.py index a56282f056..3091cc23a2 100644 --- a/cinder/exception.py +++ b/manila/exception.py @@ -27,8 +27,8 @@ SHOULD include dedicated exception logging. from oslo.config import cfg import webob.exc -from cinder import flags -from cinder.openstack.common import log as logging +from manila import flags +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/flags.py b/manila/flags.py similarity index 89% rename from cinder/flags.py rename to manila/flags.py index 47daaa3ba9..6bb1b89787 100644 --- a/cinder/flags.py +++ b/manila/flags.py @@ -32,13 +32,13 @@ import sys from oslo.config import cfg -from cinder import version +from manila import version FLAGS = cfg.CONF def parse_args(argv, default_config_files=None): - FLAGS(argv[1:], project='cinder', + FLAGS(argv[1:], project='manila', version=version.version_string(), default_config_files=default_config_files) @@ -89,17 +89,17 @@ core_opts = [ '100=Everything'), cfg.StrOpt('api_paste_config', default="api-paste.ini", - help='File name for the paste.deploy config for cinder-api'), + help='File name for the paste.deploy config for manila-api'), cfg.StrOpt('pybasedir', default=os.path.abspath(os.path.join(os.path.dirname(__file__), '../')), - help='Directory where the cinder python module is installed'), + help='Directory where the manila python module is installed'), cfg.StrOpt('bindir', default='$pybasedir/bin', - help='Directory where cinder binaries are installed'), + help='Directory where manila binaries are installed'), cfg.StrOpt('state_path', default='$pybasedir', - help="Top-level directory for maintaining cinder's state"), ] + help="Top-level directory for maintaining manila's state"), ] debug_opts = [ ] @@ -119,7 +119,7 @@ global_opts = [ help='default glance port'), cfg.ListOpt('glance_api_servers', default=['$glance_host:$glance_port'], - help='A list of the glance api servers available to cinder ' + help='A list of the glance api servers available to manila ' '([hostname|ip]:port)'), cfg.IntOpt('glance_api_version', default=1, @@ -132,16 +132,16 @@ global_opts = [ help='Allow to perform insecure SSL (https) requests to ' 'glance'), cfg.StrOpt('scheduler_topic', - default='cinder-scheduler', + default='manila-scheduler', help='the topic scheduler nodes listen on'), cfg.StrOpt('volume_topic', - default='cinder-volume', + default='manila-volume', help='the topic volume nodes listen on'), cfg.StrOpt('backup_topic', - default='cinder-backup', + default='manila-backup', help='the topic volume backup nodes listen on'), cfg.StrOpt('share_topic', - default='cinder-share', + default='manila-share', help='the topic share nodes listen on'), cfg.BoolOpt('enable_v1_api', default=True, @@ -155,10 +155,10 @@ global_opts = [ cfg.ListOpt('osapi_volume_ext_list', default=[], help='Specify list of extensions to load when using osapi_' - 'volume_extension option with cinder.api.contrib.' + 'volume_extension option with manila.api.contrib.' 'select_extensions'), cfg.MultiStrOpt('osapi_volume_extension', - default=['cinder.api.contrib.standard_extensions'], + default=['manila.api.contrib.standard_extensions'], help='osapi volume extension to load'), cfg.StrOpt('osapi_volume_base_URL', default=None, @@ -170,7 +170,7 @@ global_opts = [ help='the maximum number of items returned in a single ' 'response from a collection resource'), cfg.StrOpt('sqlite_db', - default='cinder.sqlite', + default='manila.sqlite', help='the filename to use with sqlite'), cfg.BoolOpt('sqlite_synchronous', default=True, @@ -186,16 +186,16 @@ global_opts = [ default=10, help='interval between retries of opening a sql connection'), cfg.StrOpt('volume_manager', - default='cinder.volume.manager.VolumeManager', + default='manila.volume.manager.VolumeManager', help='full class name for the Manager for volume'), cfg.StrOpt('backup_manager', - default='cinder.backup.manager.BackupManager', + default='manila.backup.manager.BackupManager', help='full class name for the Manager for volume backup'), cfg.StrOpt('scheduler_manager', - default='cinder.scheduler.manager.SchedulerManager', + default='manila.scheduler.manager.SchedulerManager', help='full class name for the Manager for scheduler'), cfg.StrOpt('share_manager', - default='cinder.share.manager.ShareManager', + default='manila.share.manager.ShareManager', help='full class name for the Manager for share'), cfg.StrOpt('host', default=socket.gethostname(), @@ -232,13 +232,13 @@ global_opts = [ default=60, help='maximum time since last check-in for up service'), cfg.StrOpt('volume_api_class', - default='cinder.volume.api.API', + default='manila.volume.api.API', help='The full class name of the volume API class to use'), cfg.StrOpt('backup_api_class', - default='cinder.backup.api.API', + default='manila.backup.api.API', help='The full class name of the volume backup API class'), cfg.StrOpt('share_api_class', - default='cinder.share.api.API', + default='manila.share.api.API', help='The full class name of the share API class to use'), cfg.StrOpt('auth_strategy', default='noauth', diff --git a/cinder/image/__init__.py b/manila/image/__init__.py similarity index 100% rename from cinder/image/__init__.py rename to manila/image/__init__.py diff --git a/cinder/image/glance.py b/manila/image/glance.py similarity index 98% rename from cinder/image/glance.py rename to manila/image/glance.py index bfec5288e7..c8d20b7c66 100644 --- a/cinder/image/glance.py +++ b/manila/image/glance.py @@ -29,11 +29,11 @@ import urlparse import glanceclient import glanceclient.exc -from cinder import exception -from cinder import flags -from cinder.openstack.common import jsonutils -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils +from manila import exception +from manila import flags +from manila.openstack.common import jsonutils +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/cinder/image/image_utils.py b/manila/image/image_utils.py similarity index 98% rename from cinder/image/image_utils.py rename to manila/image/image_utils.py index 417f2b90c9..7efda7b0a9 100644 --- a/cinder/image/image_utils.py +++ b/manila/image/image_utils.py @@ -31,10 +31,10 @@ import tempfile from oslo.config import cfg -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import utils +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila import utils LOG = logging.getLogger(__name__) diff --git a/cinder/locale/bg_BG/LC_MESSAGES/cinder.po b/manila/locale/bg_BG/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/bg_BG/LC_MESSAGES/cinder.po rename to manila/locale/bg_BG/LC_MESSAGES/cinder.po index 99d199eec5..8984c54fb3 100644 --- a/cinder/locale/bg_BG/LC_MESSAGES/cinder.po +++ b/manila/locale/bg_BG/LC_MESSAGES/cinder.po @@ -1,6 +1,6 @@ # Bulgarian (Bulgaria) translations for cinder. # Copyright (C) 2013 ORGANIZATION -# This file is distributed under the same license as the cinder project. +# This file is distributed under the same license as the manila project. # # Translators: msgid "" @@ -699,7 +699,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -836,14 +836,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -929,7 +929,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -950,8 +950,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1117,14 +1117,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1192,14 +1192,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3349,7 +3349,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4894,7 +4894,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/bs/LC_MESSAGES/cinder.po b/manila/locale/bs/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/bs/LC_MESSAGES/cinder.po rename to manila/locale/bs/LC_MESSAGES/cinder.po index f6c4550d49..989311175e 100644 --- a/cinder/locale/bs/LC_MESSAGES/cinder.po +++ b/manila/locale/bs/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # Bosnian translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2012-01-19 20:22+0000\n" @@ -698,7 +698,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -835,14 +835,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -928,7 +928,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -949,8 +949,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1116,14 +1116,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1191,14 +1191,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3356,7 +3356,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4901,7 +4901,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/cinder.pot b/manila/locale/cinder.pot similarity index 100% rename from cinder/locale/cinder.pot rename to manila/locale/cinder.pot diff --git a/cinder/locale/cs/LC_MESSAGES/cinder.po b/manila/locale/cs/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/cs/LC_MESSAGES/cinder.po rename to manila/locale/cs/LC_MESSAGES/cinder.po index f733b85c1f..796f5b4775 100644 --- a/cinder/locale/cs/LC_MESSAGES/cinder.po +++ b/manila/locale/cs/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # Czech translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2012-04-04 20:28+0000\n" @@ -716,7 +716,7 @@ msgstr "Získány neznámé argumenty klíčového slova pro utils.execute: %r" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -853,14 +853,14 @@ msgstr "Musíte zavést __call__" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -946,7 +946,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -967,8 +967,8 @@ msgstr "Nelze načíst rozšíření %(ext_name)s: %(exc)s" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1138,14 +1138,14 @@ msgstr "Rozšíření %(ext_name)s: rozšiřování zdroje %(collection)s" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1213,14 +1213,14 @@ msgstr "%(url)s vrátilo chybu: %(e)s" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3392,7 +3392,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4949,7 +4949,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/da/LC_MESSAGES/cinder.po b/manila/locale/da/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/da/LC_MESSAGES/cinder.po rename to manila/locale/da/LC_MESSAGES/cinder.po index cb3418a31a..f8912c8f1e 100644 --- a/cinder/locale/da/LC_MESSAGES/cinder.po +++ b/manila/locale/da/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # Danish translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2011-01-15 21:46+0000\n" @@ -698,7 +698,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -835,14 +835,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -928,7 +928,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -949,8 +949,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1116,14 +1116,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1191,14 +1191,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3348,7 +3348,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4893,7 +4893,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/de/LC_MESSAGES/cinder.po b/manila/locale/de/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/de/LC_MESSAGES/cinder.po rename to manila/locale/de/LC_MESSAGES/cinder.po index d0ded78bb7..8ddd88c810 100644 --- a/cinder/locale/de/LC_MESSAGES/cinder.po +++ b/manila/locale/de/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # German translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2011-08-23 11:23+0000\n" @@ -703,7 +703,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -840,14 +840,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -933,7 +933,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -954,8 +954,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1121,14 +1121,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1196,14 +1196,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3354,7 +3354,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4904,7 +4904,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/en_AU/LC_MESSAGES/cinder.po b/manila/locale/en_AU/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/en_AU/LC_MESSAGES/cinder.po rename to manila/locale/en_AU/LC_MESSAGES/cinder.po index edf412a44e..225293a3da 100644 --- a/cinder/locale/en_AU/LC_MESSAGES/cinder.po +++ b/manila/locale/en_AU/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # English (Australia) translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2011-10-21 11:27+0000\n" @@ -705,7 +705,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -842,14 +842,14 @@ msgstr "You must implement __call__" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -935,7 +935,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -956,8 +956,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1123,14 +1123,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1198,14 +1198,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3372,7 +3372,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4924,7 +4924,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/en_GB/LC_MESSAGES/cinder.po b/manila/locale/en_GB/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/en_GB/LC_MESSAGES/cinder.po rename to manila/locale/en_GB/LC_MESSAGES/cinder.po index 0e31102dab..227446e6e5 100644 --- a/cinder/locale/en_GB/LC_MESSAGES/cinder.po +++ b/manila/locale/en_GB/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # English (United Kingdom) translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2012-03-30 11:10+0000\n" @@ -708,7 +708,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -845,14 +845,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -938,7 +938,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -959,8 +959,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1126,14 +1126,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1201,14 +1201,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3374,7 +3374,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4925,7 +4925,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/en_US/LC_MESSAGES/cinder.po b/manila/locale/en_US/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/en_US/LC_MESSAGES/cinder.po rename to manila/locale/en_US/LC_MESSAGES/cinder.po index 52a35261c4..da0d1d06f4 100644 --- a/cinder/locale/en_US/LC_MESSAGES/cinder.po +++ b/manila/locale/en_US/LC_MESSAGES/cinder.po @@ -1,6 +1,6 @@ # English (United States) translations for cinder. # Copyright (C) 2013 ORGANIZATION -# This file is distributed under the same license as the cinder project. +# This file is distributed under the same license as the manila project. # # Translators: msgid "" @@ -709,11 +709,11 @@ msgstr "Got unknown keyword args to utils.execute: %r" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." #: cinder/utils.py:169 cinder/openstack/common/processutils.py:137 @@ -851,14 +851,14 @@ msgstr "You must implement __call__" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -944,10 +944,10 @@ msgstr "osapi_volume_extension is set to deprecated path: %s" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" #: cinder/api/extensions.py:289 @@ -967,8 +967,8 @@ msgstr "Failed to load extension %(ext_name)s: %(exc)s" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1136,14 +1136,14 @@ msgstr "Extension %(ext_name)s extending resource: %(collection)s" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1211,14 +1211,14 @@ msgstr "%(url)s returned a fault: %(e)s" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3467,8 +3467,8 @@ msgstr "More than one valid preset was detected, using %s" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." -msgstr "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." +msgstr "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." #: cinder/volume/drivers/solidfire.py:406 #, python-format @@ -5229,10 +5229,10 @@ msgstr "_execute_cli:%s" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" #: cinder/volume/drivers/huawei/huawei_iscsi.py:872 diff --git a/cinder/locale/es/LC_MESSAGES/cinder.po b/manila/locale/es/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/es/LC_MESSAGES/cinder.po rename to manila/locale/es/LC_MESSAGES/cinder.po index 69c0cb128b..18e7477e1e 100644 --- a/cinder/locale/es/LC_MESSAGES/cinder.po +++ b/manila/locale/es/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # Spanish translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2012-03-10 06:08+0000\n" @@ -710,7 +710,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -847,14 +847,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -940,7 +940,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -961,8 +961,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1128,14 +1128,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1203,14 +1203,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3381,7 +3381,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4933,7 +4933,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/fi_FI/LC_MESSAGES/cinder.po b/manila/locale/fi_FI/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/fi_FI/LC_MESSAGES/cinder.po rename to manila/locale/fi_FI/LC_MESSAGES/cinder.po index 87cea00182..4f6c3e54c7 100644 --- a/cinder/locale/fi_FI/LC_MESSAGES/cinder.po +++ b/manila/locale/fi_FI/LC_MESSAGES/cinder.po @@ -1,6 +1,6 @@ # Finnish (Finland) translations for cinder. # Copyright (C) 2013 ORGANIZATION -# This file is distributed under the same license as the cinder project. +# This file is distributed under the same license as the manila project. # # Translators: msgid "" @@ -699,7 +699,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -836,14 +836,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -929,7 +929,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -950,8 +950,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1117,14 +1117,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1192,14 +1192,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3349,7 +3349,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4894,7 +4894,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/fr/LC_MESSAGES/cinder.po b/manila/locale/fr/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/fr/LC_MESSAGES/cinder.po rename to manila/locale/fr/LC_MESSAGES/cinder.po index 2a22497847..5fe4f7473f 100644 --- a/cinder/locale/fr/LC_MESSAGES/cinder.po +++ b/manila/locale/fr/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # French translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2012-04-06 14:54+0000\n" @@ -710,7 +710,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -847,14 +847,14 @@ msgstr "Vous devez implémenter __call__" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -940,7 +940,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -961,8 +961,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1128,14 +1128,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1203,14 +1203,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3383,7 +3383,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4939,7 +4939,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/it/LC_MESSAGES/cinder.po b/manila/locale/it/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/it/LC_MESSAGES/cinder.po rename to manila/locale/it/LC_MESSAGES/cinder.po index f65735c064..c53ea82324 100644 --- a/cinder/locale/it/LC_MESSAGES/cinder.po +++ b/manila/locale/it/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # Italian translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2012-04-01 18:59+0000\n" @@ -707,7 +707,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -844,14 +844,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -937,7 +937,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -958,8 +958,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1125,14 +1125,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1200,14 +1200,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3372,7 +3372,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4924,7 +4924,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/ja/LC_MESSAGES/cinder.po b/manila/locale/ja/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/ja/LC_MESSAGES/cinder.po rename to manila/locale/ja/LC_MESSAGES/cinder.po index e5c816d40e..1a4bacea20 100644 --- a/cinder/locale/ja/LC_MESSAGES/cinder.po +++ b/manila/locale/ja/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # Japanese translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2011-08-23 11:22+0000\n" @@ -705,7 +705,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -842,14 +842,14 @@ msgstr "__call__ を実装しなければなりません" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -935,7 +935,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -956,8 +956,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1123,14 +1123,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1198,14 +1198,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3373,7 +3373,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4925,7 +4925,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/ko/LC_MESSAGES/cinder.po b/manila/locale/ko/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/ko/LC_MESSAGES/cinder.po rename to manila/locale/ko/LC_MESSAGES/cinder.po index 6731edc57f..cd3d4577d3 100644 --- a/cinder/locale/ko/LC_MESSAGES/cinder.po +++ b/manila/locale/ko/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # Korean translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2011-12-16 04:42+0000\n" @@ -703,7 +703,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -840,14 +840,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -933,7 +933,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -954,8 +954,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1121,14 +1121,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1196,14 +1196,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3363,7 +3363,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4913,7 +4913,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/ko_KR/LC_MESSAGES/cinder.po b/manila/locale/ko_KR/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/ko_KR/LC_MESSAGES/cinder.po rename to manila/locale/ko_KR/LC_MESSAGES/cinder.po index c1f7387564..fa9e8484f9 100644 --- a/cinder/locale/ko_KR/LC_MESSAGES/cinder.po +++ b/manila/locale/ko_KR/LC_MESSAGES/cinder.po @@ -1,6 +1,6 @@ # Korean (South Korea) translations for cinder. # Copyright (C) 2013 ORGANIZATION -# This file is distributed under the same license as the cinder project. +# This file is distributed under the same license as the manila project. # # Translators: msgid "" @@ -699,7 +699,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -836,14 +836,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -929,7 +929,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -950,8 +950,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1117,14 +1117,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1192,14 +1192,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3349,7 +3349,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4894,7 +4894,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po b/manila/locale/pt_BR/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/pt_BR/LC_MESSAGES/cinder.po rename to manila/locale/pt_BR/LC_MESSAGES/cinder.po index 22b4551c9b..a1f8c620c0 100644 --- a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po +++ b/manila/locale/pt_BR/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # Brazilian Portuguese translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2012-02-06 21:07+0000\n" @@ -706,7 +706,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -843,14 +843,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -936,7 +936,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -957,8 +957,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1124,14 +1124,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1199,14 +1199,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3371,7 +3371,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4923,7 +4923,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/ru/LC_MESSAGES/cinder.po b/manila/locale/ru/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/ru/LC_MESSAGES/cinder.po rename to manila/locale/ru/LC_MESSAGES/cinder.po index bb1482b9fa..8ac542f750 100644 --- a/cinder/locale/ru/LC_MESSAGES/cinder.po +++ b/manila/locale/ru/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # Russian translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2012-03-25 09:34+0000\n" @@ -716,7 +716,7 @@ msgstr "Приняты неизвестные аргументы ключево #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -854,14 +854,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -947,7 +947,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -968,8 +968,8 @@ msgstr "Ошибка загрузки расширения %(ext_name)s: %(exc)s #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1139,14 +1139,14 @@ msgstr "Расширение %(ext_name)s расширение ресурса: % #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1214,14 +1214,14 @@ msgstr "%(url)s возвратил ошибку: %(e)s" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3413,7 +3413,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4971,7 +4971,7 @@ msgstr "_удалить: %s" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/tl/LC_MESSAGES/cinder.po b/manila/locale/tl/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/tl/LC_MESSAGES/cinder.po rename to manila/locale/tl/LC_MESSAGES/cinder.po index 7e7da70c70..2d511e773d 100644 --- a/cinder/locale/tl/LC_MESSAGES/cinder.po +++ b/manila/locale/tl/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # Tagalog translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2011-08-23 11:21+0000\n" @@ -698,7 +698,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -835,14 +835,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -928,7 +928,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -949,8 +949,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1116,14 +1116,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1191,14 +1191,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3348,7 +3348,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4894,7 +4894,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/tr/LC_MESSAGES/cinder.po b/manila/locale/tr/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/tr/LC_MESSAGES/cinder.po rename to manila/locale/tr/LC_MESSAGES/cinder.po index 89a33aa59d..8c4d31e446 100644 --- a/cinder/locale/tr/LC_MESSAGES/cinder.po +++ b/manila/locale/tr/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # Turkish translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2011-12-14 18:10+0000\n" @@ -698,7 +698,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -835,14 +835,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -928,7 +928,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -949,8 +949,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1116,14 +1116,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1191,14 +1191,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3348,7 +3348,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4893,7 +4893,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/uk/LC_MESSAGES/cinder.po b/manila/locale/uk/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/uk/LC_MESSAGES/cinder.po rename to manila/locale/uk/LC_MESSAGES/cinder.po index 751ff76fce..f4d97ee946 100644 --- a/cinder/locale/uk/LC_MESSAGES/cinder.po +++ b/manila/locale/uk/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # Ukrainian translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2011-08-23 11:21+0000\n" @@ -699,7 +699,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -836,14 +836,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -929,7 +929,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -950,8 +950,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1117,14 +1117,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1192,14 +1192,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3349,7 +3349,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4895,7 +4895,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/vi_VN/LC_MESSAGES/cinder.po b/manila/locale/vi_VN/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/vi_VN/LC_MESSAGES/cinder.po rename to manila/locale/vi_VN/LC_MESSAGES/cinder.po index 32cab9dc7c..e9c8aced4a 100644 --- a/cinder/locale/vi_VN/LC_MESSAGES/cinder.po +++ b/manila/locale/vi_VN/LC_MESSAGES/cinder.po @@ -1,6 +1,6 @@ # Vietnamese (Vietnam) translations for cinder. # Copyright (C) 2013 ORGANIZATION -# This file is distributed under the same license as the cinder project. +# This file is distributed under the same license as the manila project. # # Translators: msgid "" @@ -699,7 +699,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -836,14 +836,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -929,7 +929,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -950,8 +950,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1117,14 +1117,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1192,14 +1192,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3349,7 +3349,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4894,7 +4894,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po b/manila/locale/zh_CN/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/zh_CN/LC_MESSAGES/cinder.po rename to manila/locale/zh_CN/LC_MESSAGES/cinder.po index 5af90c372b..131a1e8336 100644 --- a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po +++ b/manila/locale/zh_CN/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # Chinese (Simplified) translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2012-04-03 23:36+0000\n" @@ -709,7 +709,7 @@ msgstr "发现未知的 utils.execute 关键字参数：%r" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -847,14 +847,14 @@ msgstr "你必须执行 __call__" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -940,7 +940,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -961,8 +961,8 @@ msgstr "加载扩展 %(ext_name)s 失败：%(exc)s" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1130,14 +1130,14 @@ msgstr "扩展资源的扩展 %(ext_name)s：%(collection)s" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1205,14 +1205,14 @@ msgstr "%(url)s返回错误：%(e)s" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3410,7 +3410,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4971,7 +4971,7 @@ msgstr "_delete: %s" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po b/manila/locale/zh_TW/LC_MESSAGES/cinder.po similarity index 99% rename from cinder/locale/zh_TW/LC_MESSAGES/cinder.po rename to manila/locale/zh_TW/LC_MESSAGES/cinder.po index 7bbe63bbbf..000b6d9f86 100644 --- a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po +++ b/manila/locale/zh_TW/LC_MESSAGES/cinder.po @@ -1,11 +1,11 @@ # Chinese (Traditional) translation for cinder # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the cinder package. +# This file is distributed under the same license as the manila package. # FIRST AUTHOR , 2011. # msgid "" msgstr "" -"Project-Id-Version: cinder\n" +"Project-Id-Version: manila\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-05-21 18:10+0000\n" "PO-Revision-Date: 2012-03-07 02:00+0000\n" @@ -706,7 +706,7 @@ msgstr "" #: cinder/utils.py:153 msgid "" "The root_helper option (which lets you specify a root wrapper different " -"from cinder-rootwrap, and defaults to using sudo) is now deprecated. You " +"from manila-rootwrap, and defaults to using sudo) is now deprecated. You " "should use the rootwrap_config option instead." msgstr "" @@ -843,14 +843,14 @@ msgstr "" #: cinder/api/auth.py:26 msgid "" -"cinder.api.auth:CinderKeystoneContext is deprecated. Please use " -"cinder.api.middleware.auth:CinderKeystoneContext instead." +"manila.api.auth:CinderKeystoneContext is deprecated. Please use " +"manila.api.middleware.auth:CinderKeystoneContext instead." msgstr "" #: cinder/api/auth.py:34 msgid "" -"cinder.api.auth:pipeline_factory is deprecated. Please use " -"cinder.api.middleware.auth:pipeline_factory instead." +"manila.api.auth:pipeline_factory is deprecated. Please use " +"manila.api.middleware.auth:pipeline_factory instead." msgstr "" #: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:359 @@ -936,7 +936,7 @@ msgstr "" #: cinder/api/extensions.py:280 #, python-format msgid "" -"Please set your flag or cinder.conf settings for osapi_volume_extension " +"Please set your flag or manila.conf settings for osapi_volume_extension " "to: %s" msgstr "" @@ -957,8 +957,8 @@ msgstr "" #: cinder/api/sizelimit.py:25 msgid "" -"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " -"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" +"manila.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " +"manila.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" #: cinder/api/xmlutil.py:268 @@ -1124,14 +1124,14 @@ msgstr "" #: cinder/api/openstack/__init__.py:128 msgid "" -"cinder.api.openstack:FaultWrapper is deprecated. Please use " -"cinder.api.middleware.fault:FaultWrapper instead." +"manila.api.openstack:FaultWrapper is deprecated. Please use " +"manila.api.middleware.fault:FaultWrapper instead." msgstr "" #: cinder/api/openstack/urlmap.py:25 msgid "" -"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " -"cinder.api.urlmap:urlmap_factory instead." +"manila.api.openstack.urlmap:urlmap_factory is deprecated. Please use " +"manila.api.urlmap:urlmap_factory instead." msgstr "" #: cinder/api/openstack/wsgi.py:134 cinder/api/openstack/wsgi.py:537 @@ -1199,14 +1199,14 @@ msgstr "" #: cinder/api/openstack/volume/__init__.py:25 msgid "" -"cinder.api.openstack.volume:APIRouter is deprecated. Please use " -"cinder.api.v1.router:APIRouter instead." +"manila.api.openstack.volume:APIRouter is deprecated. Please use " +"manila.api.v1.router:APIRouter instead." msgstr "" #: cinder/api/openstack/volume/versions.py:26 msgid "" -"cinder.api.openstack.volume.versions.Versions is deprecated. Please use " -"cinder.api.versions.Versions instead." +"manila.api.openstack.volume.versions.Versions is deprecated. Please use " +"manila.api.versions.Versions instead." msgstr "" #: cinder/api/v1/limits.py:144 cinder/api/v2/limits.py:144 @@ -3367,7 +3367,7 @@ msgstr "" #: cinder/volume/drivers/solidfire.py:397 #, python-format -msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." +msgid "Mapped SolidFire volumeID %(sfid)s to manila ID %(uuid)s." msgstr "" #: cinder/volume/drivers/solidfire.py:406 @@ -4918,7 +4918,7 @@ msgstr "" #: cinder/volume/drivers/huawei/huawei_iscsi.py:838 #, python-format msgid "" -"_name_translate:Name in cinder: %(old)s, new name in storage system: " +"_name_translate:Name in manila: %(old)s, new name in storage system: " "%(new)s" msgstr "" diff --git a/cinder/manager.py b/manila/manager.py similarity index 96% rename from cinder/manager.py rename to manila/manager.py index 5f52e56865..1c37eab8e7 100644 --- a/cinder/manager.py +++ b/manila/manager.py @@ -53,12 +53,12 @@ This module provides Manager, a base class for managers. """ -from cinder.db import base -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common.rpc import dispatcher as rpc_dispatcher -from cinder.scheduler import rpcapi as scheduler_rpcapi -from cinder import version +from manila.db import base +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common.rpc import dispatcher as rpc_dispatcher +from manila.scheduler import rpcapi as scheduler_rpcapi +from manila import version FLAGS = flags.FLAGS diff --git a/cinder/openstack/__init__.py b/manila/openstack/__init__.py similarity index 100% rename from cinder/openstack/__init__.py rename to manila/openstack/__init__.py diff --git a/cinder/openstack/common/README b/manila/openstack/common/README similarity index 100% rename from cinder/openstack/common/README rename to manila/openstack/common/README diff --git a/cinder/openstack/common/__init__.py b/manila/openstack/common/__init__.py similarity index 100% rename from cinder/openstack/common/__init__.py rename to manila/openstack/common/__init__.py diff --git a/cinder/openstack/common/context.py b/manila/openstack/common/context.py similarity index 100% rename from cinder/openstack/common/context.py rename to manila/openstack/common/context.py diff --git a/cinder/openstack/common/eventlet_backdoor.py b/manila/openstack/common/eventlet_backdoor.py similarity index 100% rename from cinder/openstack/common/eventlet_backdoor.py rename to manila/openstack/common/eventlet_backdoor.py diff --git a/cinder/openstack/common/exception.py b/manila/openstack/common/exception.py similarity index 98% rename from cinder/openstack/common/exception.py rename to manila/openstack/common/exception.py index c8690157f5..8ea271096a 100644 --- a/cinder/openstack/common/exception.py +++ b/manila/openstack/common/exception.py @@ -21,7 +21,7 @@ Exceptions common to OpenStack projects import logging -from cinder.openstack.common.gettextutils import _ +from manila.openstack.common.gettextutils import _ _FATAL_EXCEPTION_FORMAT_ERRORS = False diff --git a/cinder/openstack/common/excutils.py b/manila/openstack/common/excutils.py similarity index 97% rename from cinder/openstack/common/excutils.py rename to manila/openstack/common/excutils.py index ccb2d072e9..9c4e8b9060 100644 --- a/cinder/openstack/common/excutils.py +++ b/manila/openstack/common/excutils.py @@ -24,7 +24,7 @@ import logging import sys import traceback -from cinder.openstack.common.gettextutils import _ +from manila.openstack.common.gettextutils import _ @contextlib.contextmanager diff --git a/cinder/openstack/common/fileutils.py b/manila/openstack/common/fileutils.py similarity index 100% rename from cinder/openstack/common/fileutils.py rename to manila/openstack/common/fileutils.py diff --git a/cinder/openstack/common/gettextutils.py b/manila/openstack/common/gettextutils.py similarity index 88% rename from cinder/openstack/common/gettextutils.py rename to manila/openstack/common/gettextutils.py index 5c0540b43d..eddf7b8902 100644 --- a/cinder/openstack/common/gettextutils.py +++ b/manila/openstack/common/gettextutils.py @@ -20,14 +20,14 @@ gettext for openstack-common modules. Usual usage in an openstack.common module: - from cinder.openstack.common.gettextutils import _ + from manila.openstack.common.gettextutils import _ """ import gettext import os -_localedir = os.environ.get('cinder'.upper() + '_LOCALEDIR') -_t = gettext.translation('cinder', localedir=_localedir, fallback=True) +_localedir = os.environ.get('manila'.upper() + '_LOCALEDIR') +_t = gettext.translation('manila', localedir=_localedir, fallback=True) def _(msg): diff --git a/cinder/openstack/common/importutils.py b/manila/openstack/common/importutils.py similarity index 100% rename from cinder/openstack/common/importutils.py rename to manila/openstack/common/importutils.py diff --git a/cinder/openstack/common/jsonutils.py b/manila/openstack/common/jsonutils.py similarity index 99% rename from cinder/openstack/common/jsonutils.py rename to manila/openstack/common/jsonutils.py index 70134d4192..ad45f715c9 100644 --- a/cinder/openstack/common/jsonutils.py +++ b/manila/openstack/common/jsonutils.py @@ -41,7 +41,7 @@ import json import types import xmlrpclib -from cinder.openstack.common import timeutils +from manila.openstack.common import timeutils _nasty_type_tests = [inspect.ismodule, inspect.isclass, inspect.ismethod, diff --git a/cinder/openstack/common/local.py b/manila/openstack/common/local.py similarity index 100% rename from cinder/openstack/common/local.py rename to manila/openstack/common/local.py diff --git a/cinder/openstack/common/lockutils.py b/manila/openstack/common/lockutils.py similarity index 98% rename from cinder/openstack/common/lockutils.py rename to manila/openstack/common/lockutils.py index f21f0d9186..2d58a7d0b5 100644 --- a/cinder/openstack/common/lockutils.py +++ b/manila/openstack/common/lockutils.py @@ -27,10 +27,10 @@ import weakref from eventlet import semaphore from oslo.config import cfg -from cinder.openstack.common import fileutils -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import local -from cinder.openstack.common import log as logging +from manila.openstack.common import fileutils +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import local +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/log.py b/manila/openstack/common/log.py similarity index 98% rename from cinder/openstack/common/log.py rename to manila/openstack/common/log.py index c170971f95..41fb9bb17a 100644 --- a/cinder/openstack/common/log.py +++ b/manila/openstack/common/log.py @@ -43,10 +43,10 @@ import traceback from oslo.config import cfg -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import jsonutils -from cinder.openstack.common import local -from cinder.openstack.common import notifier +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import jsonutils +from manila.openstack.common import local +from manila.openstack.common import notifier _DEFAULT_LOG_FORMAT = "%(asctime)s %(levelname)8s [%(name)s] %(message)s" @@ -306,7 +306,7 @@ class JSONFormatter(logging.Formatter): class PublishErrorsHandler(logging.Handler): def emit(self, record): - if ('cinder.openstack.common.notifier.log_notifier' in + if ('manila.openstack.common.notifier.log_notifier' in CONF.notification_driver): return notifier.api.notify(None, 'error.publisher', diff --git a/cinder/openstack/common/loopingcall.py b/manila/openstack/common/loopingcall.py similarity index 96% rename from cinder/openstack/common/loopingcall.py rename to manila/openstack/common/loopingcall.py index 8be3a00eb4..459ab7c1b3 100644 --- a/cinder/openstack/common/loopingcall.py +++ b/manila/openstack/common/loopingcall.py @@ -22,9 +22,9 @@ import sys from eventlet import event from eventlet import greenthread -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/network_utils.py b/manila/openstack/common/network_utils.py similarity index 100% rename from cinder/openstack/common/network_utils.py rename to manila/openstack/common/network_utils.py diff --git a/cinder/openstack/common/notifier/__init__.py b/manila/openstack/common/notifier/__init__.py similarity index 100% rename from cinder/openstack/common/notifier/__init__.py rename to manila/openstack/common/notifier/__init__.py diff --git a/cinder/openstack/common/notifier/api.py b/manila/openstack/common/notifier/api.py similarity index 95% rename from cinder/openstack/common/notifier/api.py rename to manila/openstack/common/notifier/api.py index 6b82e4451e..043a2477ad 100644 --- a/cinder/openstack/common/notifier/api.py +++ b/manila/openstack/common/notifier/api.py @@ -17,12 +17,12 @@ import uuid from oslo.config import cfg -from cinder.openstack.common import context -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import importutils -from cinder.openstack.common import jsonutils -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils +from manila.openstack.common import context +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import importutils +from manila.openstack.common import jsonutils +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/notifier/log_notifier.py b/manila/openstack/common/notifier/log_notifier.py similarity index 88% rename from cinder/openstack/common/notifier/log_notifier.py rename to manila/openstack/common/notifier/log_notifier.py index 010d29cea3..9e8b52f951 100644 --- a/cinder/openstack/common/notifier/log_notifier.py +++ b/manila/openstack/common/notifier/log_notifier.py @@ -15,8 +15,8 @@ from oslo.config import cfg -from cinder.openstack.common import jsonutils -from cinder.openstack.common import log as logging +from manila.openstack.common import jsonutils +from manila.openstack.common import log as logging CONF = cfg.CONF @@ -30,6 +30,6 @@ def notify(_context, message): CONF.default_notification_level) priority = priority.lower() logger = logging.getLogger( - 'cinder.openstack.common.notification.%s' % + 'manila.openstack.common.notification.%s' % message['event_type']) getattr(logger, priority)(jsonutils.dumps(message)) diff --git a/cinder/openstack/common/notifier/no_op_notifier.py b/manila/openstack/common/notifier/no_op_notifier.py similarity index 100% rename from cinder/openstack/common/notifier/no_op_notifier.py rename to manila/openstack/common/notifier/no_op_notifier.py diff --git a/cinder/openstack/common/notifier/rabbit_notifier.py b/manila/openstack/common/notifier/rabbit_notifier.py similarity index 85% rename from cinder/openstack/common/notifier/rabbit_notifier.py rename to manila/openstack/common/notifier/rabbit_notifier.py index 2ffe9524e9..a982675889 100644 --- a/cinder/openstack/common/notifier/rabbit_notifier.py +++ b/manila/openstack/common/notifier/rabbit_notifier.py @@ -14,9 +14,9 @@ # under the License. -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import log as logging -from cinder.openstack.common.notifier import rpc_notifier +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import log as logging +from manila.openstack.common.notifier import rpc_notifier LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/notifier/rpc_notifier.py b/manila/openstack/common/notifier/rpc_notifier.py similarity index 88% rename from cinder/openstack/common/notifier/rpc_notifier.py rename to manila/openstack/common/notifier/rpc_notifier.py index 46a95a17c9..8b9da4fbe7 100644 --- a/cinder/openstack/common/notifier/rpc_notifier.py +++ b/manila/openstack/common/notifier/rpc_notifier.py @@ -15,10 +15,10 @@ from oslo.config import cfg -from cinder.openstack.common import context as req_context -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import log as logging -from cinder.openstack.common import rpc +from manila.openstack.common import context as req_context +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import log as logging +from manila.openstack.common import rpc LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/notifier/rpc_notifier2.py b/manila/openstack/common/notifier/rpc_notifier2.py similarity index 89% rename from cinder/openstack/common/notifier/rpc_notifier2.py rename to manila/openstack/common/notifier/rpc_notifier2.py index 62a8eda53d..36b3266aab 100644 --- a/cinder/openstack/common/notifier/rpc_notifier2.py +++ b/manila/openstack/common/notifier/rpc_notifier2.py @@ -17,10 +17,10 @@ from oslo.config import cfg -from cinder.openstack.common import context as req_context -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import log as logging -from cinder.openstack.common import rpc +from manila.openstack.common import context as req_context +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import log as logging +from manila.openstack.common import rpc LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/notifier/test_notifier.py b/manila/openstack/common/notifier/test_notifier.py similarity index 100% rename from cinder/openstack/common/notifier/test_notifier.py rename to manila/openstack/common/notifier/test_notifier.py diff --git a/cinder/openstack/common/policy.py b/manila/openstack/common/policy.py similarity index 98% rename from cinder/openstack/common/policy.py rename to manila/openstack/common/policy.py index 0ca48ce9e8..ed0571b87b 100644 --- a/cinder/openstack/common/policy.py +++ b/manila/openstack/common/policy.py @@ -21,8 +21,8 @@ import logging import urllib import urllib2 -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import jsonutils +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import jsonutils LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/processutils.py b/manila/openstack/common/processutils.py similarity index 98% rename from cinder/openstack/common/processutils.py rename to manila/openstack/common/processutils.py index 47e7d08b1e..ec7a0c2f53 100644 --- a/cinder/openstack/common/processutils.py +++ b/manila/openstack/common/processutils.py @@ -27,8 +27,8 @@ import signal from eventlet.green import subprocess from eventlet import greenthread -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import log as logging +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/rootwrap/__init__.py b/manila/openstack/common/rootwrap/__init__.py similarity index 100% rename from cinder/openstack/common/rootwrap/__init__.py rename to manila/openstack/common/rootwrap/__init__.py diff --git a/cinder/openstack/common/rootwrap/cmd.py b/manila/openstack/common/rootwrap/cmd.py similarity index 90% rename from cinder/openstack/common/rootwrap/cmd.py rename to manila/openstack/common/rootwrap/cmd.py index 78265e30ca..4359810f00 100755 --- a/cinder/openstack/common/rootwrap/cmd.py +++ b/manila/openstack/common/rootwrap/cmd.py @@ -20,14 +20,14 @@ Filters which commands a service is allowed to run as another user. - To use this with cinder, you should set the following in - cinder.conf: - rootwrap_config=/etc/cinder/rootwrap.conf + To use this with manila, you should set the following in + manila.conf: + rootwrap_config=/etc/manila/rootwrap.conf - You also need to let the cinder user run cinder-rootwrap + You also need to let the manila user run manila-rootwrap as root in sudoers: - cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap - /etc/cinder/rootwrap.conf * + manila ALL = (root) NOPASSWD: /usr/bin/manila-rootwrap + /etc/manila/rootwrap.conf * Service packaging should deploy .filters files only on nodes where they are needed, to avoid allowing more than is necessary. @@ -73,10 +73,10 @@ def main(): # Add ../ to sys.path to allow running from branch possible_topdir = os.path.normpath(os.path.join(os.path.abspath(execname), os.pardir, os.pardir)) - if os.path.exists(os.path.join(possible_topdir, "cinder", "__init__.py")): + if os.path.exists(os.path.join(possible_topdir, "manila", "__init__.py")): sys.path.insert(0, possible_topdir) - from cinder.openstack.common.rootwrap import wrapper + from manila.openstack.common.rootwrap import wrapper # Load configuration try: diff --git a/cinder/openstack/common/rootwrap/filters.py b/manila/openstack/common/rootwrap/filters.py similarity index 100% rename from cinder/openstack/common/rootwrap/filters.py rename to manila/openstack/common/rootwrap/filters.py diff --git a/cinder/openstack/common/rootwrap/wrapper.py b/manila/openstack/common/rootwrap/wrapper.py similarity index 99% rename from cinder/openstack/common/rootwrap/wrapper.py rename to manila/openstack/common/rootwrap/wrapper.py index a8ab123905..7f8984c1e8 100644 --- a/cinder/openstack/common/rootwrap/wrapper.py +++ b/manila/openstack/common/rootwrap/wrapper.py @@ -22,7 +22,7 @@ import logging.handlers import os import string -from cinder.openstack.common.rootwrap import filters +from manila.openstack.common.rootwrap import filters class NoFilterMatched(Exception): diff --git a/cinder/openstack/common/rpc/__init__.py b/manila/openstack/common/rpc/__init__.py similarity index 97% rename from cinder/openstack/common/rpc/__init__.py rename to manila/openstack/common/rpc/__init__.py index 3ffce83325..606b257e9d 100644 --- a/cinder/openstack/common/rpc/__init__.py +++ b/manila/openstack/common/rpc/__init__.py @@ -30,9 +30,9 @@ import logging from oslo.config import cfg -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import importutils -from cinder.openstack.common import local +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import importutils +from manila.openstack.common import local LOG = logging.getLogger(__name__) @@ -56,9 +56,9 @@ rpc_opts = [ help='Seconds to wait before a cast expires (TTL). ' 'Only supported by impl_zmq.'), cfg.ListOpt('allowed_rpc_exception_modules', - default=['cinder.openstack.common.exception', + default=['manila.openstack.common.exception', 'nova.exception', - 'cinder.exception', + 'manila.exception', 'exceptions', ], help='Modules of exceptions that are permitted to be recreated' diff --git a/cinder/openstack/common/rpc/amqp.py b/manila/openstack/common/rpc/amqp.py similarity index 99% rename from cinder/openstack/common/rpc/amqp.py rename to manila/openstack/common/rpc/amqp.py index 9addfa1c76..f6b208bc15 100644 --- a/cinder/openstack/common/rpc/amqp.py +++ b/manila/openstack/common/rpc/amqp.py @@ -39,11 +39,11 @@ from eventlet import semaphore # option is removed. from oslo.config import cfg -from cinder.openstack.common import excutils -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import local -from cinder.openstack.common import log as logging -from cinder.openstack.common.rpc import common as rpc_common +from manila.openstack.common import excutils +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import local +from manila.openstack.common import log as logging +from manila.openstack.common.rpc import common as rpc_common # TODO(pekowski): Remove this option in Havana. diff --git a/cinder/openstack/common/rpc/common.py b/manila/openstack/common/rpc/common.py similarity index 98% rename from cinder/openstack/common/rpc/common.py rename to manila/openstack/common/rpc/common.py index 9f0552e5e9..980e602907 100644 --- a/cinder/openstack/common/rpc/common.py +++ b/manila/openstack/common/rpc/common.py @@ -23,11 +23,11 @@ import traceback from oslo.config import cfg -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import importutils -from cinder.openstack.common import jsonutils -from cinder.openstack.common import local -from cinder.openstack.common import log as logging +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import importutils +from manila.openstack.common import jsonutils +from manila.openstack.common import local +from manila.openstack.common import log as logging CONF = cfg.CONF diff --git a/cinder/openstack/common/rpc/dispatcher.py b/manila/openstack/common/rpc/dispatcher.py similarity index 98% rename from cinder/openstack/common/rpc/dispatcher.py rename to manila/openstack/common/rpc/dispatcher.py index 85195d4a74..47eb8b0caa 100644 --- a/cinder/openstack/common/rpc/dispatcher.py +++ b/manila/openstack/common/rpc/dispatcher.py @@ -83,7 +83,7 @@ On the client side, the same changes should be made as in example 1. The minimum version that supports the new parameter should be specified. """ -from cinder.openstack.common.rpc import common as rpc_common +from manila.openstack.common.rpc import common as rpc_common class RpcDispatcher(object): diff --git a/cinder/openstack/common/rpc/impl_fake.py b/manila/openstack/common/rpc/impl_fake.py similarity index 98% rename from cinder/openstack/common/rpc/impl_fake.py rename to manila/openstack/common/rpc/impl_fake.py index ec7200a7b6..de4b541c3a 100644 --- a/cinder/openstack/common/rpc/impl_fake.py +++ b/manila/openstack/common/rpc/impl_fake.py @@ -27,7 +27,7 @@ import time import eventlet -from cinder.openstack.common.rpc import common as rpc_common +from manila.openstack.common.rpc import common as rpc_common CONSUMERS = {} diff --git a/cinder/openstack/common/rpc/impl_kombu.py b/manila/openstack/common/rpc/impl_kombu.py similarity index 99% rename from cinder/openstack/common/rpc/impl_kombu.py rename to manila/openstack/common/rpc/impl_kombu.py index 681f531843..360403d3d1 100644 --- a/cinder/openstack/common/rpc/impl_kombu.py +++ b/manila/openstack/common/rpc/impl_kombu.py @@ -30,10 +30,10 @@ import kombu.entity import kombu.messaging from oslo.config import cfg -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import network_utils -from cinder.openstack.common.rpc import amqp as rpc_amqp -from cinder.openstack.common.rpc import common as rpc_common +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import network_utils +from manila.openstack.common.rpc import amqp as rpc_amqp +from manila.openstack.common.rpc import common as rpc_common kombu_opts = [ cfg.StrOpt('kombu_ssl_version', diff --git a/cinder/openstack/common/rpc/impl_qpid.py b/manila/openstack/common/rpc/impl_qpid.py similarity index 98% rename from cinder/openstack/common/rpc/impl_qpid.py rename to manila/openstack/common/rpc/impl_qpid.py index 24235b1f11..900adc0b7c 100644 --- a/cinder/openstack/common/rpc/impl_qpid.py +++ b/manila/openstack/common/rpc/impl_qpid.py @@ -24,12 +24,12 @@ import eventlet import greenlet from oslo.config import cfg -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import importutils -from cinder.openstack.common import jsonutils -from cinder.openstack.common import log as logging -from cinder.openstack.common.rpc import amqp as rpc_amqp -from cinder.openstack.common.rpc import common as rpc_common +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import importutils +from manila.openstack.common import jsonutils +from manila.openstack.common import log as logging +from manila.openstack.common.rpc import amqp as rpc_amqp +from manila.openstack.common.rpc import common as rpc_common qpid_messaging = importutils.try_import("qpid.messaging") qpid_exceptions = importutils.try_import("qpid.messaging.exceptions") diff --git a/cinder/openstack/common/rpc/impl_zmq.py b/manila/openstack/common/rpc/impl_zmq.py similarity index 98% rename from cinder/openstack/common/rpc/impl_zmq.py rename to manila/openstack/common/rpc/impl_zmq.py index d3d3599e8f..d387764cc5 100644 --- a/cinder/openstack/common/rpc/impl_zmq.py +++ b/manila/openstack/common/rpc/impl_zmq.py @@ -26,12 +26,12 @@ import eventlet import greenlet from oslo.config import cfg -from cinder.openstack.common import excutils -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import importutils -from cinder.openstack.common import jsonutils -from cinder.openstack.common import processutils as utils -from cinder.openstack.common.rpc import common as rpc_common +from manila.openstack.common import excutils +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import importutils +from manila.openstack.common import jsonutils +from manila.openstack.common import processutils as utils +from manila.openstack.common.rpc import common as rpc_common zmq = importutils.try_import('eventlet.green.zmq') @@ -52,7 +52,7 @@ zmq_opts = [ # The module.Class to use for matchmaking. cfg.StrOpt( 'rpc_zmq_matchmaker', - default=('cinder.openstack.common.rpc.' + default=('manila.openstack.common.rpc.' 'matchmaker.MatchMakerLocalhost'), help='MatchMaker driver', ), diff --git a/cinder/openstack/common/rpc/matchmaker.py b/manila/openstack/common/rpc/matchmaker.py similarity index 99% rename from cinder/openstack/common/rpc/matchmaker.py rename to manila/openstack/common/rpc/matchmaker.py index f12c14dfd1..67f2635be8 100644 --- a/cinder/openstack/common/rpc/matchmaker.py +++ b/manila/openstack/common/rpc/matchmaker.py @@ -25,8 +25,8 @@ import json import eventlet from oslo.config import cfg -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import log as logging +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import log as logging matchmaker_opts = [ diff --git a/cinder/openstack/common/rpc/matchmaker_redis.py b/manila/openstack/common/rpc/matchmaker_redis.py similarity index 96% rename from cinder/openstack/common/rpc/matchmaker_redis.py rename to manila/openstack/common/rpc/matchmaker_redis.py index 87f9fb2956..eb2c9934eb 100644 --- a/cinder/openstack/common/rpc/matchmaker_redis.py +++ b/manila/openstack/common/rpc/matchmaker_redis.py @@ -20,9 +20,9 @@ return keys for direct exchanges, per (approximate) AMQP parlance. from oslo.config import cfg -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging -from cinder.openstack.common.rpc import matchmaker as mm_common +from manila.openstack.common import importutils +from manila.openstack.common import log as logging +from manila.openstack.common.rpc import matchmaker as mm_common redis = importutils.try_import('redis') diff --git a/cinder/openstack/common/rpc/proxy.py b/manila/openstack/common/rpc/proxy.py similarity index 99% rename from cinder/openstack/common/rpc/proxy.py rename to manila/openstack/common/rpc/proxy.py index 4ddc5c936a..62e45bf5bc 100644 --- a/cinder/openstack/common/rpc/proxy.py +++ b/manila/openstack/common/rpc/proxy.py @@ -22,7 +22,7 @@ For more information about rpc API version numbers, see: """ -from cinder.openstack.common import rpc +from manila.openstack.common import rpc class RpcProxy(object): diff --git a/cinder/openstack/common/rpc/service.py b/manila/openstack/common/rpc/service.py similarity index 90% rename from cinder/openstack/common/rpc/service.py rename to manila/openstack/common/rpc/service.py index b1f997d38f..57429a02e1 100644 --- a/cinder/openstack/common/rpc/service.py +++ b/manila/openstack/common/rpc/service.py @@ -17,11 +17,11 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import log as logging -from cinder.openstack.common import rpc -from cinder.openstack.common.rpc import dispatcher as rpc_dispatcher -from cinder.openstack.common import service +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import log as logging +from manila.openstack.common import rpc +from manila.openstack.common.rpc import dispatcher as rpc_dispatcher +from manila.openstack.common import service LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/rpc/zmq_receiver.py b/manila/openstack/common/rpc/zmq_receiver.py similarity index 88% rename from cinder/openstack/common/rpc/zmq_receiver.py rename to manila/openstack/common/rpc/zmq_receiver.py index e4c6ee30ed..44d6760781 100755 --- a/cinder/openstack/common/rpc/zmq_receiver.py +++ b/manila/openstack/common/rpc/zmq_receiver.py @@ -23,9 +23,9 @@ import sys from oslo.config import cfg -from cinder.openstack.common import log as logging -from cinder.openstack.common import rpc -from cinder.openstack.common.rpc import impl_zmq +from manila.openstack.common import log as logging +from manila.openstack.common import rpc +from manila.openstack.common.rpc import impl_zmq CONF = cfg.CONF CONF.register_opts(rpc.rpc_opts) diff --git a/cinder/openstack/common/scheduler/__init__.py b/manila/openstack/common/scheduler/__init__.py similarity index 100% rename from cinder/openstack/common/scheduler/__init__.py rename to manila/openstack/common/scheduler/__init__.py diff --git a/cinder/openstack/common/scheduler/filter.py b/manila/openstack/common/scheduler/filter.py similarity index 100% rename from cinder/openstack/common/scheduler/filter.py rename to manila/openstack/common/scheduler/filter.py diff --git a/cinder/openstack/common/scheduler/filters/__init__.py b/manila/openstack/common/scheduler/filters/__init__.py similarity index 92% rename from cinder/openstack/common/scheduler/filters/__init__.py rename to manila/openstack/common/scheduler/filters/__init__.py index 40bf096a41..c41ed437d9 100644 --- a/cinder/openstack/common/scheduler/filters/__init__.py +++ b/manila/openstack/common/scheduler/filters/__init__.py @@ -17,8 +17,8 @@ Scheduler host filters """ -from cinder.openstack.common import log as logging -from cinder.openstack.common.scheduler import filter +from manila.openstack.common import log as logging +from manila.openstack.common.scheduler import filter LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/scheduler/filters/availability_zone_filter.py b/manila/openstack/common/scheduler/filters/availability_zone_filter.py similarity index 95% rename from cinder/openstack/common/scheduler/filters/availability_zone_filter.py rename to manila/openstack/common/scheduler/filters/availability_zone_filter.py index 0c3ca1ef74..8d88090976 100644 --- a/cinder/openstack/common/scheduler/filters/availability_zone_filter.py +++ b/manila/openstack/common/scheduler/filters/availability_zone_filter.py @@ -14,7 +14,7 @@ # under the License. -from cinder.openstack.common.scheduler import filters +from manila.openstack.common.scheduler import filters class AvailabilityZoneFilter(filters.BaseHostFilter): diff --git a/cinder/openstack/common/scheduler/filters/capabilities_filter.py b/manila/openstack/common/scheduler/filters/capabilities_filter.py similarity index 93% rename from cinder/openstack/common/scheduler/filters/capabilities_filter.py rename to manila/openstack/common/scheduler/filters/capabilities_filter.py index ae859e927a..9ad72fd676 100644 --- a/cinder/openstack/common/scheduler/filters/capabilities_filter.py +++ b/manila/openstack/common/scheduler/filters/capabilities_filter.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.openstack.common import log as logging -from cinder.openstack.common.scheduler import filters -from cinder.openstack.common.scheduler.filters import extra_specs_ops +from manila.openstack.common import log as logging +from manila.openstack.common.scheduler import filters +from manila.openstack.common.scheduler.filters import extra_specs_ops LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/scheduler/filters/extra_specs_ops.py b/manila/openstack/common/scheduler/filters/extra_specs_ops.py similarity index 98% rename from cinder/openstack/common/scheduler/filters/extra_specs_ops.py rename to manila/openstack/common/scheduler/filters/extra_specs_ops.py index b3730f5af4..b254007e6a 100644 --- a/cinder/openstack/common/scheduler/filters/extra_specs_ops.py +++ b/manila/openstack/common/scheduler/filters/extra_specs_ops.py @@ -15,7 +15,7 @@ import operator -from cinder.openstack.common import strutils +from manila.openstack.common import strutils # 1. The following operations are supported: # =, s==, s!=, s>=, s>, s<=, s<, , , , ==, !=, >=, <= diff --git a/cinder/openstack/common/scheduler/filters/json_filter.py b/manila/openstack/common/scheduler/filters/json_filter.py similarity index 97% rename from cinder/openstack/common/scheduler/filters/json_filter.py rename to manila/openstack/common/scheduler/filters/json_filter.py index 370f23b2ae..9d5d1b2882 100644 --- a/cinder/openstack/common/scheduler/filters/json_filter.py +++ b/manila/openstack/common/scheduler/filters/json_filter.py @@ -16,8 +16,8 @@ import operator -from cinder.openstack.common import jsonutils -from cinder.openstack.common.scheduler import filters +from manila.openstack.common import jsonutils +from manila.openstack.common.scheduler import filters class JsonFilter(filters.BaseHostFilter): diff --git a/cinder/openstack/common/scheduler/weight.py b/manila/openstack/common/scheduler/weight.py similarity index 100% rename from cinder/openstack/common/scheduler/weight.py rename to manila/openstack/common/scheduler/weight.py diff --git a/cinder/openstack/common/scheduler/weights/__init__.py b/manila/openstack/common/scheduler/weights/__init__.py similarity index 95% rename from cinder/openstack/common/scheduler/weights/__init__.py rename to manila/openstack/common/scheduler/weights/__init__.py index a2743577d7..ee6aaea3aa 100644 --- a/cinder/openstack/common/scheduler/weights/__init__.py +++ b/manila/openstack/common/scheduler/weights/__init__.py @@ -18,7 +18,7 @@ Scheduler host weights """ -from cinder.openstack.common.scheduler import weight +from manila.openstack.common.scheduler import weight class WeighedHost(weight.WeighedObject): diff --git a/cinder/openstack/common/service.py b/manila/openstack/common/service.py similarity index 96% rename from cinder/openstack/common/service.py rename to manila/openstack/common/service.py index 8600a0b087..4a891f9adb 100644 --- a/cinder/openstack/common/service.py +++ b/manila/openstack/common/service.py @@ -30,14 +30,14 @@ import eventlet import logging as std_logging from oslo.config import cfg -from cinder.openstack.common import eventlet_backdoor -from cinder.openstack.common.gettextutils import _ -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging -from cinder.openstack.common import threadgroup +from manila.openstack.common import eventlet_backdoor +from manila.openstack.common.gettextutils import _ +from manila.openstack.common import importutils +from manila.openstack.common import log as logging +from manila.openstack.common import threadgroup -rpc = importutils.try_import('cinder.openstack.common.rpc') +rpc = importutils.try_import('manila.openstack.common.rpc') CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/strutils.py b/manila/openstack/common/strutils.py similarity index 98% rename from cinder/openstack/common/strutils.py rename to manila/openstack/common/strutils.py index a4e3899725..cb5270e48e 100644 --- a/cinder/openstack/common/strutils.py +++ b/manila/openstack/common/strutils.py @@ -21,7 +21,7 @@ System-level utilities and helper functions. import sys -from cinder.openstack.common.gettextutils import _ +from manila.openstack.common.gettextutils import _ TRUE_STRINGS = ('1', 't', 'true', 'on', 'y', 'yes') diff --git a/cinder/openstack/common/threadgroup.py b/manila/openstack/common/threadgroup.py similarity index 97% rename from cinder/openstack/common/threadgroup.py rename to manila/openstack/common/threadgroup.py index 5d6ec006b9..6528444c0b 100644 --- a/cinder/openstack/common/threadgroup.py +++ b/manila/openstack/common/threadgroup.py @@ -18,8 +18,8 @@ from eventlet import greenlet from eventlet import greenpool from eventlet import greenthread -from cinder.openstack.common import log as logging -from cinder.openstack.common import loopingcall +from manila.openstack.common import log as logging +from manila.openstack.common import loopingcall LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/timeutils.py b/manila/openstack/common/timeutils.py similarity index 100% rename from cinder/openstack/common/timeutils.py rename to manila/openstack/common/timeutils.py diff --git a/cinder/openstack/common/uuidutils.py b/manila/openstack/common/uuidutils.py similarity index 100% rename from cinder/openstack/common/uuidutils.py rename to manila/openstack/common/uuidutils.py diff --git a/cinder/policy.py b/manila/policy.py similarity index 93% rename from cinder/policy.py rename to manila/policy.py index 9b2b4defd1..7f7175b3ee 100644 --- a/cinder/policy.py +++ b/manila/policy.py @@ -19,10 +19,10 @@ from oslo.config import cfg -from cinder import exception -from cinder import flags -from cinder.openstack.common import policy -from cinder import utils +from manila import exception +from manila import flags +from manila.openstack.common import policy +from manila import utils policy_opts = [ cfg.StrOpt('policy_file', @@ -64,7 +64,7 @@ def _set_brain(data): def enforce(context, action, target): """Verifies that the action is valid on the target in this context. - :param context: cinder context + :param context: manila context :param action: string representing the action to be checked this should be colon separated for clarity. i.e. ``compute:create_instance``, @@ -75,7 +75,7 @@ def enforce(context, action, target): for object creation this should be a dictionary representing the location of the object e.g. ``{'project_id': context.project_id}`` - :raises cinder.exception.PolicyNotAuthorized: if verification fails. + :raises manila.exception.PolicyNotAuthorized: if verification fails. """ init() diff --git a/cinder/quota.py b/manila/quota.py similarity index 99% rename from cinder/quota.py rename to manila/quota.py index 59868d33d2..7c89606595 100644 --- a/cinder/quota.py +++ b/manila/quota.py @@ -22,12 +22,12 @@ import datetime from oslo.config import cfg -from cinder import db -from cinder import exception -from cinder import flags -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils +from manila import db +from manila import exception +from manila import flags +from manila.openstack.common import importutils +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils LOG = logging.getLogger(__name__) @@ -52,7 +52,7 @@ quota_opts = [ default=0, help='number of seconds between subsequent usage refreshes'), cfg.StrOpt('quota_driver', - default='cinder.quota.DbQuotaDriver', + default='manila.quota.DbQuotaDriver', help='default driver to use for quota checks'), ] FLAGS = flags.FLAGS diff --git a/cinder/scheduler/__init__.py b/manila/scheduler/__init__.py similarity index 92% rename from cinder/scheduler/__init__.py rename to manila/scheduler/__init__.py index 727de580eb..c790d469e6 100644 --- a/cinder/scheduler/__init__.py +++ b/manila/scheduler/__init__.py @@ -15,10 +15,10 @@ # under the License. """ -:mod:`cinder.scheduler` -- Scheduler Nodes +:mod:`manila.scheduler` -- Scheduler Nodes ===================================================== -.. automodule:: cinder.scheduler +.. automodule:: manila.scheduler :platform: Unix :synopsis: Module that picks a volume node to create a volume. .. moduleauthor:: Sandy Walsh diff --git a/cinder/scheduler/chance.py b/manila/scheduler/chance.py similarity index 97% rename from cinder/scheduler/chance.py rename to manila/scheduler/chance.py index 0393afca53..13682bfc02 100644 --- a/cinder/scheduler/chance.py +++ b/manila/scheduler/chance.py @@ -23,9 +23,9 @@ Chance (Random) Scheduler implementation import random -from cinder import exception -from cinder import flags -from cinder.scheduler import driver +from manila import exception +from manila import flags +from manila.scheduler import driver FLAGS = flags.FLAGS diff --git a/cinder/scheduler/driver.py b/manila/scheduler/driver.py similarity index 92% rename from cinder/scheduler/driver.py rename to manila/scheduler/driver.py index b3aa7bf177..fb5cdc049c 100644 --- a/cinder/scheduler/driver.py +++ b/manila/scheduler/driver.py @@ -23,17 +23,17 @@ Scheduler base class that all Schedulers should inherit from from oslo.config import cfg -from cinder import db -from cinder import flags -from cinder.openstack.common import importutils -from cinder.openstack.common import timeutils -from cinder.share import rpcapi as share_rpcapi -from cinder import utils -from cinder.volume import rpcapi as volume_rpcapi +from manila import db +from manila import flags +from manila.openstack.common import importutils +from manila.openstack.common import timeutils +from manila.share import rpcapi as share_rpcapi +from manila import utils +from manila.volume import rpcapi as volume_rpcapi scheduler_driver_opts = [ cfg.StrOpt('scheduler_host_manager', - default='cinder.scheduler.host_manager.HostManager', + default='manila.scheduler.host_manager.HostManager', help='The scheduler host manager class to use'), cfg.IntOpt('scheduler_max_attempts', default=3, diff --git a/cinder/scheduler/filter_scheduler.py b/manila/scheduler/filter_scheduler.py similarity index 98% rename from cinder/scheduler/filter_scheduler.py rename to manila/scheduler/filter_scheduler.py index ef87f40e8e..a813bbfbd7 100644 --- a/cinder/scheduler/filter_scheduler.py +++ b/manila/scheduler/filter_scheduler.py @@ -22,12 +22,12 @@ Weighing Functions. import operator -from cinder import exception -from cinder import flags -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging -from cinder.scheduler import driver -from cinder.scheduler import scheduler_options +from manila import exception +from manila import flags +from manila.openstack.common import importutils +from manila.openstack.common import log as logging +from manila.scheduler import driver +from manila.scheduler import scheduler_options FLAGS = flags.FLAGS diff --git a/cinder/scheduler/filters/__init__.py b/manila/scheduler/filters/__init__.py similarity index 100% rename from cinder/scheduler/filters/__init__.py rename to manila/scheduler/filters/__init__.py diff --git a/cinder/scheduler/filters/capacity_filter.py b/manila/scheduler/filters/capacity_filter.py similarity index 95% rename from cinder/scheduler/filters/capacity_filter.py rename to manila/scheduler/filters/capacity_filter.py index 1f5ec624e2..7d7c9f0b25 100644 --- a/cinder/scheduler/filters/capacity_filter.py +++ b/manila/scheduler/filters/capacity_filter.py @@ -18,8 +18,8 @@ import math -from cinder.openstack.common import log as logging -from cinder.openstack.common.scheduler import filters +from manila.openstack.common import log as logging +from manila.openstack.common.scheduler import filters LOG = logging.getLogger(__name__) diff --git a/cinder/scheduler/filters/retry_filter.py b/manila/scheduler/filters/retry_filter.py similarity index 93% rename from cinder/scheduler/filters/retry_filter.py rename to manila/scheduler/filters/retry_filter.py index ae84a4e277..f0db6cdd5f 100644 --- a/cinder/scheduler/filters/retry_filter.py +++ b/manila/scheduler/filters/retry_filter.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.openstack.common import log as logging -from cinder.openstack.common.scheduler import filters +from manila.openstack.common import log as logging +from manila.openstack.common.scheduler import filters LOG = logging.getLogger(__name__) diff --git a/cinder/scheduler/host_manager.py b/manila/scheduler/host_manager.py similarity index 96% rename from cinder/scheduler/host_manager.py rename to manila/scheduler/host_manager.py index 45039902bf..14a3919c6b 100644 --- a/cinder/scheduler/host_manager.py +++ b/manila/scheduler/host_manager.py @@ -21,14 +21,14 @@ import UserDict from oslo.config import cfg -from cinder import db -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common.scheduler import filters -from cinder.openstack.common.scheduler import weights -from cinder.openstack.common import timeutils -from cinder import utils +from manila import db +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common.scheduler import filters +from manila.openstack.common.scheduler import weights +from manila.openstack.common import timeutils +from manila import utils host_manager_opts = [ cfg.ListOpt('scheduler_default_filters', @@ -177,10 +177,10 @@ class HostManager(object): def __init__(self): self.service_states = {} # { : {: {cap k : v}}} self.host_state_map = {} - self.filter_handler = filters.HostFilterHandler('cinder.scheduler.' + self.filter_handler = filters.HostFilterHandler('manila.scheduler.' 'filters') self.filter_classes = self.filter_handler.get_all_classes() - self.weight_handler = weights.HostWeightHandler('cinder.scheduler.' + self.weight_handler = weights.HostWeightHandler('manila.scheduler.' 'weights') self.weight_classes = self.weight_handler.get_all_classes() diff --git a/cinder/scheduler/manager.py b/manila/scheduler/manager.py similarity index 93% rename from cinder/scheduler/manager.py rename to manila/scheduler/manager.py index f41fb0b3b7..c90de94308 100644 --- a/cinder/scheduler/manager.py +++ b/manila/scheduler/manager.py @@ -23,22 +23,22 @@ Scheduler Service from oslo.config import cfg -from cinder import context -from cinder import db -from cinder import exception -from cinder import flags -from cinder import manager -from cinder.openstack.common import excutils -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging -from cinder.openstack.common.notifier import api as notifier -from cinder.share import rpcapi as share_rpcapi -from cinder.volume import rpcapi as volume_rpcapi +from manila import context +from manila import db +from manila import exception +from manila import flags +from manila import manager +from manila.openstack.common import excutils +from manila.openstack.common import importutils +from manila.openstack.common import log as logging +from manila.openstack.common.notifier import api as notifier +from manila.share import rpcapi as share_rpcapi +from manila.volume import rpcapi as volume_rpcapi LOG = logging.getLogger(__name__) scheduler_driver_opt = cfg.StrOpt('scheduler_driver', - default='cinder.scheduler.filter_scheduler.' + default='manila.scheduler.filter_scheduler.' 'FilterScheduler', help='Default scheduler driver to use') diff --git a/cinder/scheduler/rpcapi.py b/manila/scheduler/rpcapi.py similarity index 93% rename from cinder/scheduler/rpcapi.py rename to manila/scheduler/rpcapi.py index 4a9bc0a2db..81d65fe0b4 100644 --- a/cinder/scheduler/rpcapi.py +++ b/manila/scheduler/rpcapi.py @@ -18,15 +18,15 @@ Client side of the scheduler manager RPC API. """ -from cinder import flags -from cinder.openstack.common import jsonutils -import cinder.openstack.common.rpc.proxy +from manila import flags +from manila.openstack.common import jsonutils +import manila.openstack.common.rpc.proxy FLAGS = flags.FLAGS -class SchedulerAPI(cinder.openstack.common.rpc.proxy.RpcProxy): +class SchedulerAPI(manila.openstack.common.rpc.proxy.RpcProxy): '''Client side of the scheduler rpc API. API version history: diff --git a/cinder/scheduler/scheduler_options.py b/manila/scheduler/scheduler_options.py similarity index 96% rename from cinder/scheduler/scheduler_options.py rename to manila/scheduler/scheduler_options.py index 9b05bb7178..2f4c42e747 100644 --- a/cinder/scheduler/scheduler_options.py +++ b/manila/scheduler/scheduler_options.py @@ -28,9 +28,9 @@ import os from oslo.config import cfg -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils scheduler_json_config_location_opt = cfg.StrOpt( 'scheduler_json_config_location', diff --git a/cinder/scheduler/simple.py b/manila/scheduler/simple.py similarity index 97% rename from cinder/scheduler/simple.py rename to manila/scheduler/simple.py index c088a72f6f..4a7fe99962 100644 --- a/cinder/scheduler/simple.py +++ b/manila/scheduler/simple.py @@ -23,12 +23,12 @@ Simple Scheduler from oslo.config import cfg -from cinder import db -from cinder import exception -from cinder import flags -from cinder.scheduler import chance -from cinder.scheduler import driver -from cinder import utils +from manila import db +from manila import exception +from manila import flags +from manila.scheduler import chance +from manila.scheduler import driver +from manila import utils simple_scheduler_opts = [ cfg.IntOpt("max_gigabytes", diff --git a/cinder/scheduler/weights/__init__.py b/manila/scheduler/weights/__init__.py similarity index 100% rename from cinder/scheduler/weights/__init__.py rename to manila/scheduler/weights/__init__.py diff --git a/cinder/scheduler/weights/capacity.py b/manila/scheduler/weights/capacity.py similarity index 96% rename from cinder/scheduler/weights/capacity.py rename to manila/scheduler/weights/capacity.py index e2042e9cd7..63dc171c76 100644 --- a/cinder/scheduler/weights/capacity.py +++ b/manila/scheduler/weights/capacity.py @@ -24,8 +24,8 @@ import math from oslo.config import cfg -from cinder import flags -from cinder.openstack.common.scheduler import weights +from manila import flags +from manila.openstack.common.scheduler import weights capacity_weight_opts = [ cfg.FloatOpt('capacity_weight_multiplier', diff --git a/cinder/service.py b/manila/service.py similarity index 97% rename from cinder/service.py rename to manila/service.py index 4e7c549770..fe97961685 100644 --- a/cinder/service.py +++ b/manila/service.py @@ -31,16 +31,16 @@ import eventlet import greenlet from oslo.config import cfg -from cinder import context -from cinder import db -from cinder import exception -from cinder import flags -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging -from cinder.openstack.common import rpc -from cinder import utils -from cinder import version -from cinder import wsgi +from manila import context +from manila import db +from manila import exception +from manila import flags +from manila.openstack.common import importutils +from manila.openstack.common import log as logging +from manila.openstack.common import rpc +from manila import utils +from manila import version +from manila import wsgi LOG = logging.getLogger(__name__) @@ -419,7 +419,7 @@ class Service(object): :param host: defaults to FLAGS.host :param binary: defaults to basename of executable - :param topic: defaults to bin_name - 'cinder-' part + :param topic: defaults to bin_name - 'manila-' part :param manager: defaults to FLAGS._manager :param report_interval: defaults to FLAGS.report_interval :param periodic_interval: defaults to FLAGS.periodic_interval @@ -433,7 +433,7 @@ class Service(object): if not topic: topic = binary if not manager: - subtopic = topic.rpartition('cinder-')[2] + subtopic = topic.rpartition('manila-')[2] manager = FLAGS.get('%s_manager' % subtopic, None) if report_interval is None: report_interval = FLAGS.report_interval diff --git a/cinder/share/__init__.py b/manila/share/__init__.py similarity index 79% rename from cinder/share/__init__.py rename to manila/share/__init__.py index da1ef5addc..3fe5149aaa 100644 --- a/cinder/share/__init__.py +++ b/manila/share/__init__.py @@ -17,9 +17,9 @@ # under the License. # Importing full names to not pollute the namespace and cause possible -# collisions with use of 'from cinder.share import ' elsewhere. -import cinder.flags -import cinder.openstack.common.importutils +# collisions with use of 'from manila.share import ' elsewhere. +import manila.flags +import manila.openstack.common.importutils -API = cinder.openstack.common.importutils.import_class( - cinder.flags.FLAGS.share_api_class) +API = manila.openstack.common.importutils.import_class( + manila.flags.FLAGS.share_api_class) diff --git a/cinder/share/api.py b/manila/share/api.py similarity index 96% rename from cinder/share/api.py rename to manila/share/api.py index 633ea4fcec..7d4745eec9 100644 --- a/cinder/share/api.py +++ b/manila/share/api.py @@ -22,17 +22,17 @@ Handles all requests relating to shares. import functools -from cinder.db import base -from cinder import exception -from cinder import flags -from cinder.image import glance -from cinder.openstack.common import log as logging -from cinder.openstack.common import rpc -from cinder.openstack.common import timeutils -import cinder.policy -from cinder import quota -from cinder.scheduler import rpcapi as scheduler_rpcapi -from cinder.share import rpcapi as share_rpcapi +from manila.db import base +from manila import exception +from manila import flags +from manila.image import glance +from manila.openstack.common import log as logging +from manila.openstack.common import rpc +from manila.openstack.common import timeutils +import manila.policy +from manila import quota +from manila.scheduler import rpcapi as scheduler_rpcapi +from manila.share import rpcapi as share_rpcapi from oslo.config import cfg @@ -64,7 +64,7 @@ def check_policy(context, action, target_obj=None): } target.update(target_obj or {}) _action = 'share:%s' % action - cinder.policy.enforce(context, _action, target) + manila.policy.enforce(context, _action, target) class API(base.Base): diff --git a/cinder/share/configuration.py b/manila/share/configuration.py similarity index 97% rename from cinder/share/configuration.py rename to manila/share/configuration.py index 4b9ae08b17..bde5681121 100644 --- a/cinder/share/configuration.py +++ b/manila/share/configuration.py @@ -45,8 +45,8 @@ and registered in the group in which they are used. from oslo.config import cfg -from cinder import flags -from cinder.openstack.common import log as logging +from manila import flags +from manila.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/cinder/share/driver.py b/manila/share/driver.py similarity index 95% rename from cinder/share/driver.py rename to manila/share/driver.py index 6a6fb1ba46..9f49720c75 100644 --- a/cinder/share/driver.py +++ b/manila/share/driver.py @@ -24,11 +24,11 @@ import os import re import time -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.share.configuration import Configuration -from cinder import utils +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.share.configuration import Configuration +from manila import utils from oslo.config import cfg @@ -53,8 +53,8 @@ FLAGS.register_opts(share_opts) #TODO(rushiagr): keep the configuration option in only one class and not two -#NOTE(rushiagr): The right place for this class is cinder.driver or -# cinder.utils. +#NOTE(rushiagr): The right place for this class is manila.driver or +# manila.utils. class ExecuteMixin(object): """Provides an executable functionality to a driver class.""" diff --git a/cinder/share/drivers/__init__.py b/manila/share/drivers/__init__.py similarity index 89% rename from cinder/share/drivers/__init__.py rename to manila/share/drivers/__init__.py index 96f778e81e..14f17f59a0 100644 --- a/cinder/share/drivers/__init__.py +++ b/manila/share/drivers/__init__.py @@ -13,10 +13,10 @@ # under the License. """ -:mod:`cinder.share.driver` -- Cinder Share Drivers +:mod:`manila.share.driver` -- Cinder Share Drivers ===================================================== -.. automodule:: cinder.share.driver +.. automodule:: manila.share.driver :platform: Unix :synopsis: Module containing all the Cinder Share drivers. """ diff --git a/cinder/share/drivers/lvm.py b/manila/share/drivers/lvm.py similarity index 98% rename from cinder/share/drivers/lvm.py rename to manila/share/drivers/lvm.py index f81b144571..794a55624a 100644 --- a/cinder/share/drivers/lvm.py +++ b/manila/share/drivers/lvm.py @@ -24,12 +24,12 @@ import math import os import re -from cinder import exception -from cinder import flags -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging -from cinder.share import driver -from cinder import utils +from manila import exception +from manila import flags +from manila.openstack.common import importutils +from manila.openstack.common import log as logging +from manila.share import driver +from manila import utils from oslo.config import cfg @@ -50,12 +50,12 @@ share_opts = [ help='If set, create lvms with multiple mirrors. Note that ' 'this requires lvm_mirrors + 2 pvs with available space'), cfg.StrOpt('share_volume_group', - default='cinder-shares', + default='manila-shares', help='Name for the VG that will contain exported shares'), cfg.ListOpt('share_lvm_helpers', default=[ - 'CIFS=cinder.share.drivers.lvm.CIFSNetConfHelper', - 'NFS=cinder.share.drivers.lvm.NFSHelper', + 'CIFS=manila.share.drivers.lvm.CIFSNetConfHelper', + 'NFS=manila.share.drivers.lvm.NFSHelper', ], help='Specify list of share export helpers.'), ] diff --git a/cinder/share/drivers/netapp.py b/manila/share/drivers/netapp.py similarity index 99% rename from cinder/share/drivers/netapp.py rename to manila/share/drivers/netapp.py index 6baa83904a..fe130bd5e4 100644 --- a/cinder/share/drivers/netapp.py +++ b/manila/share/drivers/netapp.py @@ -22,10 +22,10 @@ ONTAP 7-mode storage systems with installed CIFS and NFS licenses. import suds from suds.sax import text -from cinder import exception -from cinder import flags -from cinder.openstack.common import log -from cinder.share import driver +from manila import exception +from manila import flags +from manila.openstack.common import log +from manila.share import driver from oslo.config import cfg diff --git a/cinder/share/manager.py b/manila/share/manager.py similarity index 94% rename from cinder/share/manager.py rename to manila/share/manager.py index 18232f0446..de699e36c3 100644 --- a/cinder/share/manager.py +++ b/manila/share/manager.py @@ -19,18 +19,18 @@ **Related Flags** :share_driver: Used by :class:`ShareManager`. Defaults to - :class:`cinder.share.drivers.lvm.LVMShareDriver`. + :class:`manila.share.drivers.lvm.LVMShareDriver`. """ -from cinder import context -from cinder import exception -from cinder import flags -from cinder import manager -from cinder.openstack.common import excutils -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder.share.configuration import Configuration +from manila import context +from manila import exception +from manila import flags +from manila import manager +from manila.openstack.common import excutils +from manila.openstack.common import importutils +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils +from manila.share.configuration import Configuration from oslo.config import cfg @@ -38,7 +38,7 @@ LOG = logging.getLogger(__name__) share_manager_opts = [ cfg.StrOpt('share_driver', - default='cinder.share.drivers.lvm.LVMShareDriver', + default='manila.share.drivers.lvm.LVMShareDriver', help='Driver to use for share creation'), ] diff --git a/cinder/share/rpcapi.py b/manila/share/rpcapi.py similarity index 94% rename from cinder/share/rpcapi.py rename to manila/share/rpcapi.py index 4347ebc7b3..484417b7dc 100644 --- a/cinder/share/rpcapi.py +++ b/manila/share/rpcapi.py @@ -18,16 +18,16 @@ Client side of the share RPC API. """ -from cinder import exception -from cinder import flags -from cinder.openstack.common import rpc -import cinder.openstack.common.rpc.proxy +from manila import exception +from manila import flags +from manila.openstack.common import rpc +import manila.openstack.common.rpc.proxy FLAGS = flags.FLAGS -class ShareAPI(cinder.openstack.common.rpc.proxy.RpcProxy): +class ShareAPI(manila.openstack.common.rpc.proxy.RpcProxy): '''Client side of the share rpc API. API version history: diff --git a/cinder/test.py b/manila/test.py similarity index 97% rename from cinder/test.py rename to manila/test.py index 967eadca37..36188a279a 100644 --- a/cinder/test.py +++ b/manila/test.py @@ -32,12 +32,12 @@ import nose.plugins.skip from oslo.config import cfg import stubout -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder import service -from cinder import tests -from cinder.tests import fake_flags +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils +from manila import service +from manila import tests +from manila.tests import fake_flags test_opts = [ cfg.StrOpt('sqlite_clean_db', @@ -178,7 +178,7 @@ class TestCase(unittest.TestCase): def start_service(self, name, host=None, **kwargs): host = host and host or uuid.uuid4().hex kwargs.setdefault('host', host) - kwargs.setdefault('binary', 'cinder-%s' % name) + kwargs.setdefault('binary', 'manila-%s' % name) svc = service.Service.create(**kwargs) svc.start() self._services.append(svc) diff --git a/cinder/testing/README.rst b/manila/testing/README.rst similarity index 100% rename from cinder/testing/README.rst rename to manila/testing/README.rst diff --git a/cinder/tests/__init__.py b/manila/tests/__init__.py similarity index 91% rename from cinder/tests/__init__.py rename to manila/tests/__init__.py index 5027886ad6..390d5632ed 100644 --- a/cinder/tests/__init__.py +++ b/manila/tests/__init__.py @@ -17,10 +17,10 @@ # under the License. """ -:mod:`cinder.tests` -- Cinder Unittests +:mod:`manila.tests` -- Cinder Unittests ===================================================== -.. automodule:: cinder.tests +.. automodule:: manila.tests :platform: Unix .. moduleauthor:: Jesse Andrews .. moduleauthor:: Devin Carlen @@ -40,8 +40,8 @@ setattr(__builtin__, '_', lambda x: x) import os import shutil -from cinder.db.sqlalchemy.session import get_engine -from cinder import flags +from manila.db.sqlalchemy.session import get_engine +from manila import flags FLAGS = flags.FLAGS @@ -62,8 +62,8 @@ def reset_db(): def setup(): import mox # Fail fast if you don't have mox. Workaround for bug 810424 - from cinder.db import migration - from cinder.tests import fake_flags + from manila.db import migration + from manila.tests import fake_flags fake_flags.set_defaults(FLAGS) if FLAGS.sql_connection == "sqlite://": diff --git a/cinder/tests/api/contrib/__init__.py b/manila/tests/api/__init__.py similarity index 96% rename from cinder/tests/api/contrib/__init__.py rename to manila/tests/api/__init__.py index 3be5ce944c..9488909d3c 100644 --- a/cinder/tests/api/contrib/__init__.py +++ b/manila/tests/api/__init__.py @@ -16,4 +16,4 @@ # under the License. # NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from cinder.tests import * +from manila.tests import * diff --git a/cinder/tests/api/common.py b/manila/tests/api/common.py similarity index 100% rename from cinder/tests/api/common.py rename to manila/tests/api/common.py diff --git a/cinder/tests/api/__init__.py b/manila/tests/api/contrib/__init__.py similarity index 96% rename from cinder/tests/api/__init__.py rename to manila/tests/api/contrib/__init__.py index 3be5ce944c..9488909d3c 100644 --- a/cinder/tests/api/__init__.py +++ b/manila/tests/api/contrib/__init__.py @@ -16,4 +16,4 @@ # under the License. # NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from cinder.tests import * +from manila.tests import * diff --git a/cinder/tests/api/contrib/stubs.py b/manila/tests/api/contrib/stubs.py similarity index 98% rename from cinder/tests/api/contrib/stubs.py rename to manila/tests/api/contrib/stubs.py index ff900785e6..6a8b931d45 100644 --- a/cinder/tests/api/contrib/stubs.py +++ b/manila/tests/api/contrib/stubs.py @@ -17,7 +17,7 @@ import datetime -from cinder import exception as exc +from manila import exception as exc FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' FAKE_UUIDS = {} diff --git a/cinder/tests/api/contrib/test_admin_actions.py b/manila/tests/api/contrib/test_admin_actions.py similarity index 93% rename from cinder/tests/api/contrib/test_admin_actions.py rename to manila/tests/api/contrib/test_admin_actions.py index d6ae606f30..5d9dcbcf7d 100644 --- a/cinder/tests/api/contrib/test_admin_actions.py +++ b/manila/tests/api/contrib/test_admin_actions.py @@ -2,18 +2,18 @@ import shutil import tempfile import webob -from cinder import context -from cinder import db -from cinder import exception -from cinder.openstack.common import jsonutils -from cinder import test -from cinder.tests.api import fakes -from cinder.tests.api.v2 import stubs -from cinder.volume import api as volume_api +from manila import context +from manila import db +from manila import exception +from manila.openstack.common import jsonutils +from manila import test +from manila.tests.api import fakes +from manila.tests.api.v2 import stubs +from manila.volume import api as volume_api def app(): - # no auth, just let environ['cinder.context'] pass through + # no auth, just let environ['manila.context'] pass through api = fakes.router.APIRouter() mapper = fakes.urlmap.URLMap() mapper['/v2'] = api @@ -25,7 +25,7 @@ class AdminActionsTest(test.TestCase): def setUp(self): self.tempdir = tempfile.mkdtemp() super(AdminActionsTest, self).setUp() - self.flags(rpc_backend='cinder.openstack.common.rpc.impl_fake') + self.flags(rpc_backend='manila.openstack.common.rpc.impl_fake') self.flags(lock_path=self.tempdir) self.volume_api = volume_api.API() @@ -43,7 +43,7 @@ class AdminActionsTest(test.TestCase): # request status of 'error' req.body = jsonutils.dumps({'os-reset_status': {'status': 'error'}}) # attach admin context to request - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx resp = req.get_response(app()) # request is accepted self.assertEquals(resp.status_int, 202) @@ -62,7 +62,7 @@ class AdminActionsTest(test.TestCase): req.body = jsonutils.dumps({'os-reset_status': {'status': 'available'}}) # non-admin context - req.environ['cinder.context'] = context.RequestContext('fake', 'fake') + req.environ['manila.context'] = context.RequestContext('fake', 'fake') resp = req.get_response(app()) # request is not authorized self.assertEquals(resp.status_int, 403) @@ -81,7 +81,7 @@ class AdminActionsTest(test.TestCase): # malformed request body req.body = jsonutils.dumps({'os-reset_status': {'x-status': 'bad'}}) # attach admin context to request - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx resp = req.get_response(app()) # bad request self.assertEquals(resp.status_int, 400) @@ -100,7 +100,7 @@ class AdminActionsTest(test.TestCase): # 'invalid' is not a valid status req.body = jsonutils.dumps({'os-reset_status': {'status': 'invalid'}}) # attach admin context to request - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx resp = req.get_response(app()) # bad request self.assertEquals(resp.status_int, 400) @@ -120,7 +120,7 @@ class AdminActionsTest(test.TestCase): req.body = jsonutils.dumps({'os-reset_status': {'status': 'available'}}) # attach admin context to request - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx resp = req.get_response(app()) # not found self.assertEquals(resp.status_int, 404) @@ -141,7 +141,7 @@ class AdminActionsTest(test.TestCase): 'attach_status': 'detached'}} req.body = jsonutils.dumps(body) # attach admin context to request - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx resp = req.get_response(app()) # request is accepted self.assertEquals(resp.status_int, 202) @@ -165,7 +165,7 @@ class AdminActionsTest(test.TestCase): 'attach_status': 'invalid'}} req.body = jsonutils.dumps(body) # attach admin context to request - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx resp = req.get_response(app()) # bad request self.assertEquals(resp.status_int, 400) @@ -188,7 +188,7 @@ class AdminActionsTest(test.TestCase): # request status of 'error' req.body = jsonutils.dumps({'os-reset_status': {'status': 'error'}}) # attach admin context to request - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx resp = req.get_response(app()) # request is accepted self.assertEquals(resp.status_int, 202) @@ -211,7 +211,7 @@ class AdminActionsTest(test.TestCase): req.body = jsonutils.dumps({'os-reset_status': {'status': 'attaching'}}) # attach admin context to request - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx resp = req.get_response(app()) # request is accepted self.assertEquals(resp.status_int, 400) @@ -229,7 +229,7 @@ class AdminActionsTest(test.TestCase): req.headers['content-type'] = 'application/json' req.body = jsonutils.dumps({'os-force_delete': {}}) # attach admin context to request - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx resp = req.get_response(app()) # request is accepted self.assertEquals(resp.status_int, 202) @@ -250,7 +250,7 @@ class AdminActionsTest(test.TestCase): req.headers['content-type'] = 'application/json' req.body = jsonutils.dumps({'os-force_delete': {}}) # attach admin context to request - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx # start service to handle rpc.cast for 'delete snapshot' svc = self.start_service('volume', host='test') # make request @@ -288,7 +288,7 @@ class AdminActionsTest(test.TestCase): # request status of 'error' req.body = jsonutils.dumps({'os-force_detach': None}) # attach admin context to request - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx # make request resp = req.get_response(app()) # request is accepted diff --git a/cinder/tests/api/contrib/test_backups.py b/manila/tests/api/contrib/test_backups.py similarity index 98% rename from cinder/tests/api/contrib/test_backups.py rename to manila/tests/api/contrib/test_backups.py index 899814a70d..c0cb781303 100644 --- a/cinder/tests/api/contrib/test_backups.py +++ b/manila/tests/api/contrib/test_backups.py @@ -23,15 +23,15 @@ from xml.dom import minidom import webob # needed for stubs to work -import cinder.backup -from cinder import context -from cinder import db -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import test -from cinder.tests.api import fakes +import manila.backup +from manila import context +from manila import db +from manila import exception +from manila.openstack.common import log as logging +from manila import test +from manila.tests.api import fakes # needed for stubs to work -import cinder.volume +import manila.volume LOG = logging.getLogger(__name__) @@ -613,7 +613,7 @@ class BackupsAPITestCase(test.TestCase): volume_id = self._create_volume(status='available', size=size) return db.volume_get(context, volume_id) - self.stubs.Set(cinder.volume.API, 'create', + self.stubs.Set(manila.volume.API, 'create', fake_volume_api_create) backup_id = self._create_backup(size=5, status='available') @@ -638,7 +638,7 @@ class BackupsAPITestCase(test.TestCase): msg = _("Invalid input") raise exception.InvalidInput(reason=msg) - self.stubs.Set(cinder.backup.API, 'restore', + self.stubs.Set(manila.backup.API, 'restore', fake_backup_api_restore_throwing_InvalidInput) backup_id = self._create_backup(status='available') @@ -754,7 +754,7 @@ class BackupsAPITestCase(test.TestCase): raise exception.VolumeSizeExceedsAvailableQuota() self.stubs.Set( - cinder.backup.API, + manila.backup.API, 'restore', fake_backup_api_restore_throwing_VolumeSizeExceedsAvailableQuota) @@ -787,7 +787,7 @@ class BackupsAPITestCase(test.TestCase): volume_id): raise exception.VolumeLimitExceeded(allowed=1) - self.stubs.Set(cinder.backup.API, 'restore', + self.stubs.Set(manila.backup.API, 'restore', fake_backup_api_restore_throwing_VolumeLimitExceeded) backup_id = self._create_backup(status='available') diff --git a/cinder/tests/api/contrib/test_extended_snapshot_attributes.py b/manila/tests/api/contrib/test_extended_snapshot_attributes.py similarity index 94% rename from cinder/tests/api/contrib/test_extended_snapshot_attributes.py rename to manila/tests/api/contrib/test_extended_snapshot_attributes.py index 5937ac9628..6fbd04a9c5 100644 --- a/cinder/tests/api/contrib/test_extended_snapshot_attributes.py +++ b/manila/tests/api/contrib/test_extended_snapshot_attributes.py @@ -16,13 +16,13 @@ from lxml import etree import webob -from cinder.api.contrib import extended_snapshot_attributes -from cinder import exception -from cinder import flags -from cinder.openstack.common import jsonutils -from cinder import test -from cinder.tests.api import fakes -from cinder import volume +from manila.api.contrib import extended_snapshot_attributes +from manila import exception +from manila import flags +from manila.openstack.common import jsonutils +from manila import test +from manila.tests.api import fakes +from manila import volume FLAGS = flags.FLAGS diff --git a/cinder/tests/api/contrib/test_hosts.py b/manila/tests/api/contrib/test_hosts.py similarity index 79% rename from cinder/tests/api/contrib/test_hosts.py rename to manila/tests/api/contrib/test_hosts.py index 525f963051..c146ccc76a 100644 --- a/cinder/tests/api/contrib/test_hosts.py +++ b/manila/tests/api/contrib/test_hosts.py @@ -20,13 +20,13 @@ import datetime from lxml import etree import webob.exc -from cinder.api.contrib import hosts as os_hosts -from cinder import context -from cinder import db -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder import test +from manila.api.contrib import hosts as os_hosts +from manila import context +from manila import db +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils +from manila import test FLAGS = flags.FLAGS @@ -36,29 +36,29 @@ curr_time = timeutils.utcnow() SERVICE_LIST = [ {'created_at': created_time, 'updated_at': curr_time, - 'host': 'test.host.1', 'topic': 'cinder-volume', 'disabled': 0, - 'availability_zone': 'cinder'}, + 'host': 'test.host.1', 'topic': 'manila-volume', 'disabled': 0, + 'availability_zone': 'manila'}, {'created_at': created_time, 'updated_at': curr_time, - 'host': 'test.host.1', 'topic': 'cinder-volume', 'disabled': 0, - 'availability_zone': 'cinder'}, + 'host': 'test.host.1', 'topic': 'manila-volume', 'disabled': 0, + 'availability_zone': 'manila'}, {'created_at': created_time, 'updated_at': curr_time, - 'host': 'test.host.1', 'topic': 'cinder-volume', 'disabled': 0, - 'availability_zone': 'cinder'}, + 'host': 'test.host.1', 'topic': 'manila-volume', 'disabled': 0, + 'availability_zone': 'manila'}, {'created_at': created_time, 'updated_at': curr_time, - 'host': 'test.host.1', 'topic': 'cinder-volume', 'disabled': 0, - 'availability_zone': 'cinder'}] + 'host': 'test.host.1', 'topic': 'manila-volume', 'disabled': 0, + 'availability_zone': 'manila'}] -LIST_RESPONSE = [{'service-status': 'available', 'service': 'cinder-volume', - 'zone': 'cinder', 'service-state': 'enabled', +LIST_RESPONSE = [{'service-status': 'available', 'service': 'manila-volume', + 'zone': 'manila', 'service-state': 'enabled', 'host_name': 'test.host.1', 'last-update': curr_time}, - {'service-status': 'available', 'service': 'cinder-volume', - 'zone': 'cinder', 'service-state': 'enabled', + {'service-status': 'available', 'service': 'manila-volume', + 'zone': 'manila', 'service-state': 'enabled', 'host_name': 'test.host.1', 'last-update': curr_time}, - {'service-status': 'available', 'service': 'cinder-volume', - 'zone': 'cinder', 'service-state': 'enabled', + {'service-status': 'available', 'service': 'manila-volume', + 'zone': 'manila', 'service-state': 'enabled', 'host_name': 'test.host.1', 'last-update': curr_time}, - {'service-status': 'available', 'service': 'cinder-volume', - 'zone': 'cinder', 'service-state': 'enabled', + {'service-status': 'available', 'service': 'manila-volume', + 'zone': 'manila', 'service-state': 'enabled', 'host_name': 'test.host.1', 'last-update': curr_time}] @@ -67,13 +67,13 @@ def stub_service_get_all(self, req): class FakeRequest(object): - environ = {'cinder.context': context.get_admin_context()} + environ = {'manila.context': context.get_admin_context()} GET = {} class FakeRequestWithcinderZone(object): - environ = {'cinder.context': context.get_admin_context()} - GET = {'zone': 'cinder'} + environ = {'manila.context': context.get_admin_context()} + GET = {'zone': 'manila'} class HostTestCase(test.TestCase): @@ -96,9 +96,9 @@ class HostTestCase(test.TestCase): hosts = os_hosts._list_hosts(self.req) self.assertEqual(hosts, LIST_RESPONSE) - cinder_hosts = os_hosts._list_hosts(self.req, 'cinder-volume') + cinder_hosts = os_hosts._list_hosts(self.req, 'manila-volume') expected = [host for host in LIST_RESPONSE - if host['service'] == 'cinder-volume'] + if host['service'] == 'manila-volume'] self.assertEqual(cinder_hosts, expected) def test_list_hosts_with_zone(self): @@ -138,16 +138,16 @@ class HostTestCase(test.TestCase): body={'disabled': 0}) def test_show_forbidden(self): - self.req.environ['cinder.context'].is_admin = False + self.req.environ['manila.context'].is_admin = False dest = 'dummydest' self.assertRaises(webob.exc.HTTPForbidden, self.controller.show, self.req, dest) - self.req.environ['cinder.context'].is_admin = True + self.req.environ['manila.context'].is_admin = True def test_show_host_not_exist(self): """A host given as an argument does not exists.""" - self.req.environ['cinder.context'].is_admin = True + self.req.environ['manila.context'].is_admin = True dest = 'dummydest' self.assertRaises(webob.exc.HTTPNotFound, self.controller.show, diff --git a/cinder/tests/api/contrib/test_services.py b/manila/tests/api/contrib/test_services.py similarity index 74% rename from cinder/tests/api/contrib/test_services.py rename to manila/tests/api/contrib/test_services.py index 1f823c356a..3fb65b270e 100644 --- a/cinder/tests/api/contrib/test_services.py +++ b/manila/tests/api/contrib/test_services.py @@ -14,41 +14,41 @@ # under the License. -from cinder.api.contrib import services -from cinder import context -from cinder import db -from cinder import exception -from cinder.openstack.common import timeutils -from cinder import policy -from cinder import test -from cinder.tests.api import fakes +from manila.api.contrib import services +from manila import context +from manila import db +from manila import exception +from manila.openstack.common import timeutils +from manila import policy +from manila import test +from manila.tests.api import fakes from datetime import datetime -fake_services_list = [{'binary': 'cinder-scheduler', +fake_services_list = [{'binary': 'manila-scheduler', 'host': 'host1', - 'availability_zone': 'cinder', + 'availability_zone': 'manila', 'id': 1, 'disabled': True, 'updated_at': datetime(2012, 10, 29, 13, 42, 2), 'created_at': datetime(2012, 9, 18, 2, 46, 27)}, - {'binary': 'cinder-volume', + {'binary': 'manila-volume', 'host': 'host1', - 'availability_zone': 'cinder', + 'availability_zone': 'manila', 'id': 2, 'disabled': True, 'updated_at': datetime(2012, 10, 29, 13, 42, 5), 'created_at': datetime(2012, 9, 18, 2, 46, 27)}, - {'binary': 'cinder-scheduler', + {'binary': 'manila-scheduler', 'host': 'host2', - 'availability_zone': 'cinder', + 'availability_zone': 'manila', 'id': 3, 'disabled': False, 'updated_at': datetime(2012, 9, 19, 6, 55, 34), 'created_at': datetime(2012, 9, 18, 2, 46, 28)}, - {'binary': 'cinder-volume', + {'binary': 'manila-volume', 'host': 'host2', - 'availability_zone': 'cinder', + 'availability_zone': 'manila', 'id': 4, 'disabled': True, 'updated_at': datetime(2012, 9, 18, 8, 3, 38), @@ -57,23 +57,23 @@ fake_services_list = [{'binary': 'cinder-scheduler', class FakeRequest(object): - environ = {"cinder.context": context.get_admin_context()} + environ = {"manila.context": context.get_admin_context()} GET = {} class FakeRequestWithSevice(object): - environ = {"cinder.context": context.get_admin_context()} - GET = {"service": "cinder-volume"} + environ = {"manila.context": context.get_admin_context()} + GET = {"service": "manila-volume"} class FakeRequestWithHost(object): - environ = {"cinder.context": context.get_admin_context()} + environ = {"manila.context": context.get_admin_context()} GET = {"host": "host1"} class FakeRequestWithHostService(object): - environ = {"cinder.context": context.get_admin_context()} - GET = {"host": "host1", "service": "cinder-volume"} + environ = {"manila.context": context.get_admin_context()} + GET = {"host": "host1", "service": "manila-volume"} def fake_servcie_get_all(context): @@ -99,7 +99,7 @@ def fake_service_update(context, service_id, values): if service is None: raise exception.ServiceNotFound(service_id=service_id) else: - {'host': 'host1', 'service': 'cinder-volume', + {'host': 'host1', 'service': 'manila-volume', 'disabled': values['disabled']} @@ -133,20 +133,20 @@ class ServicesTest(test.TestCase): req = FakeRequest() res_dict = self.controller.index(req) - response = {'services': [{'binary': 'cinder-scheduler', - 'host': 'host1', 'zone': 'cinder', + response = {'services': [{'binary': 'manila-scheduler', + 'host': 'host1', 'zone': 'manila', 'status': 'disabled', 'state': 'up', 'updated_at': datetime(2012, 10, 29, 13, 42, 2)}, - {'binary': 'cinder-volume', - 'host': 'host1', 'zone': 'cinder', + {'binary': 'manila-volume', + 'host': 'host1', 'zone': 'manila', 'status': 'disabled', 'state': 'up', 'updated_at': datetime(2012, 10, 29, 13, 42, 5)}, - {'binary': 'cinder-scheduler', 'host': 'host2', - 'zone': 'cinder', + {'binary': 'manila-scheduler', 'host': 'host2', + 'zone': 'manila', 'status': 'enabled', 'state': 'up', 'updated_at': datetime(2012, 9, 19, 6, 55, 34)}, - {'binary': 'cinder-volume', 'host': 'host2', - 'zone': 'cinder', + {'binary': 'manila-volume', 'host': 'host2', + 'zone': 'manila', 'status': 'disabled', 'state': 'up', 'updated_at': datetime(2012, 9, 18, 8, 3, 38)}]} self.assertEqual(res_dict, response) @@ -155,14 +155,14 @@ class ServicesTest(test.TestCase): req = FakeRequestWithHost() res_dict = self.controller.index(req) - response = {'services': [{'binary': 'cinder-scheduler', + response = {'services': [{'binary': 'manila-scheduler', 'host': 'host1', - 'zone': 'cinder', + 'zone': 'manila', 'status': 'disabled', 'state': 'up', 'updated_at': datetime(2012, 10, 29, 13, 42, 2)}, - {'binary': 'cinder-volume', 'host': 'host1', - 'zone': 'cinder', + {'binary': 'manila-volume', 'host': 'host1', + 'zone': 'manila', 'status': 'disabled', 'state': 'up', 'updated_at': datetime(2012, 10, 29, 13, 42, 5)}]} @@ -172,16 +172,16 @@ class ServicesTest(test.TestCase): req = FakeRequestWithSevice() res_dict = self.controller.index(req) - response = {'services': [{'binary': 'cinder-volume', + response = {'services': [{'binary': 'manila-volume', 'host': 'host1', - 'zone': 'cinder', + 'zone': 'manila', 'status': 'disabled', 'state': 'up', 'updated_at': datetime(2012, 10, 29, 13, 42, 5)}, - {'binary': 'cinder-volume', + {'binary': 'manila-volume', 'host': 'host2', - 'zone': 'cinder', + 'zone': 'manila', 'status': 'disabled', 'state': 'up', 'updated_at': datetime(2012, 9, 18, @@ -192,9 +192,9 @@ class ServicesTest(test.TestCase): req = FakeRequestWithHostService() res_dict = self.controller.index(req) - response = {'services': [{'binary': 'cinder-volume', + response = {'services': [{'binary': 'manila-volume', 'host': 'host1', - 'zone': 'cinder', + 'zone': 'manila', 'status': 'disabled', 'state': 'up', 'updated_at': datetime(2012, 10, 29, @@ -202,7 +202,7 @@ class ServicesTest(test.TestCase): self.assertEqual(res_dict, response) def test_services_enable(self): - body = {'host': 'host1', 'service': 'cinder-volume'} + body = {'host': 'host1', 'service': 'manila-volume'} req = fakes.HTTPRequest.blank('/v1/fake/os-services/enable') res_dict = self.controller.update(req, "enable", body) @@ -210,7 +210,7 @@ class ServicesTest(test.TestCase): def test_services_disable(self): req = fakes.HTTPRequest.blank('/v1/fake/os-services/disable') - body = {'host': 'host1', 'service': 'cinder-volume'} + body = {'host': 'host1', 'service': 'manila-volume'} res_dict = self.controller.update(req, "disable", body) self.assertEqual(res_dict['disabled'], True) diff --git a/cinder/tests/api/contrib/test_share_actions.py b/manila/tests/api/contrib/test_share_actions.py similarity index 91% rename from cinder/tests/api/contrib/test_share_actions.py rename to manila/tests/api/contrib/test_share_actions.py index 20bc3a3027..1c043d5e9f 100644 --- a/cinder/tests/api/contrib/test_share_actions.py +++ b/manila/tests/api/contrib/test_share_actions.py @@ -18,16 +18,16 @@ import datetime import uuid import webob -from cinder.api.contrib import share_actions -from cinder import exception -from cinder import flags -from cinder.openstack.common import jsonutils -from cinder.openstack.common.rpc import common as rpc_common -from cinder import share -from cinder.share import api as share_api -from cinder import test -from cinder.tests.api.contrib import stubs -from cinder.tests.api import fakes +from manila.api.contrib import share_actions +from manila import exception +from manila import flags +from manila.openstack.common import jsonutils +from manila.openstack.common.rpc import common as rpc_common +from manila import share +from manila.share import api as share_api +from manila import test +from manila.tests.api.contrib import stubs +from manila.tests.api import fakes FLAGS = flags.FLAGS diff --git a/cinder/tests/api/contrib/test_share_snapshots.py b/manila/tests/api/contrib/test_share_snapshots.py similarity index 96% rename from cinder/tests/api/contrib/test_share_snapshots.py rename to manila/tests/api/contrib/test_share_snapshots.py index bc9d2ae94f..fcb11d0aa5 100644 --- a/cinder/tests/api/contrib/test_share_snapshots.py +++ b/manila/tests/api/contrib/test_share_snapshots.py @@ -17,12 +17,12 @@ import datetime import webob -from cinder.api.contrib import share_snapshots -from cinder import exception -from cinder.share import api as share_api -from cinder import test -from cinder.tests.api.contrib import stubs -from cinder.tests.api import fakes +from manila.api.contrib import share_snapshots +from manila import exception +from manila.share import api as share_api +from manila import test +from manila.tests.api.contrib import stubs +from manila.tests.api import fakes class ShareSnapshotApiTest(test.TestCase): diff --git a/cinder/tests/api/contrib/test_shares.py b/manila/tests/api/contrib/test_shares.py similarity index 97% rename from cinder/tests/api/contrib/test_shares.py rename to manila/tests/api/contrib/test_shares.py index ef0e98fe49..899c8d5ecb 100644 --- a/cinder/tests/api/contrib/test_shares.py +++ b/manila/tests/api/contrib/test_shares.py @@ -17,13 +17,13 @@ import datetime import webob -from cinder.api.contrib import shares -from cinder import context -from cinder import exception -from cinder.share import api as share_api -from cinder import test -from cinder.tests.api.contrib import stubs -from cinder.tests.api import fakes +from manila.api.contrib import shares +from manila import context +from manila import exception +from manila.share import api as share_api +from manila import test +from manila.tests.api.contrib import stubs +from manila.tests.api import fakes class ShareApiTest(test.TestCase): diff --git a/cinder/tests/api/contrib/test_types_extra_specs.py b/manila/tests/api/contrib/test_types_extra_specs.py similarity index 90% rename from cinder/tests/api/contrib/test_types_extra_specs.py rename to manila/tests/api/contrib/test_types_extra_specs.py index 7b5b46931e..babc636f5c 100644 --- a/cinder/tests/api/contrib/test_types_extra_specs.py +++ b/manila/tests/api/contrib/test_types_extra_specs.py @@ -20,12 +20,12 @@ from lxml import etree import webob -from cinder.api.contrib import types_extra_specs -from cinder.openstack.common.notifier import api as notifier_api -from cinder.openstack.common.notifier import test_notifier -from cinder import test -from cinder.tests.api import fakes -import cinder.wsgi +from manila.api.contrib import types_extra_specs +from manila.openstack.common.notifier import api as notifier_api +from manila.openstack.common.notifier import test_notifier +from manila import test +from manila.tests.api import fakes +import manila.wsgi def return_create_volume_type_extra_specs(context, volume_type_id, @@ -66,7 +66,7 @@ class VolumeTypesExtraSpecsTest(test.TestCase): self.flags(connection_type='fake', host='fake', notification_driver=[test_notifier.__name__]) - self.stubs.Set(cinder.db, 'volume_type_get', volume_type_get) + self.stubs.Set(manila.db, 'volume_type_get', volume_type_get) self.api_path = '/v2/fake/os-volume-types/1/extra_specs' self.controller = types_extra_specs.VolumeTypeExtraSpecsController() """to reset notifier drivers left over from other api/contrib tests""" @@ -78,7 +78,7 @@ class VolumeTypesExtraSpecsTest(test.TestCase): super(VolumeTypesExtraSpecsTest, self).tearDown() def test_index(self): - self.stubs.Set(cinder.db, 'volume_type_extra_specs_get', + self.stubs.Set(manila.db, 'volume_type_extra_specs_get', return_volume_type_extra_specs) req = fakes.HTTPRequest.blank(self.api_path) @@ -87,7 +87,7 @@ class VolumeTypesExtraSpecsTest(test.TestCase): self.assertEqual('value1', res_dict['extra_specs']['key1']) def test_index_no_data(self): - self.stubs.Set(cinder.db, 'volume_type_extra_specs_get', + self.stubs.Set(manila.db, 'volume_type_extra_specs_get', return_empty_volume_type_extra_specs) req = fakes.HTTPRequest.blank(self.api_path) @@ -96,7 +96,7 @@ class VolumeTypesExtraSpecsTest(test.TestCase): self.assertEqual(0, len(res_dict['extra_specs'])) def test_show(self): - self.stubs.Set(cinder.db, 'volume_type_extra_specs_get', + self.stubs.Set(manila.db, 'volume_type_extra_specs_get', return_volume_type_extra_specs) req = fakes.HTTPRequest.blank(self.api_path + '/key5') @@ -105,7 +105,7 @@ class VolumeTypesExtraSpecsTest(test.TestCase): self.assertEqual('value5', res_dict['key5']) def test_show_spec_not_found(self): - self.stubs.Set(cinder.db, 'volume_type_extra_specs_get', + self.stubs.Set(manila.db, 'volume_type_extra_specs_get', return_empty_volume_type_extra_specs) req = fakes.HTTPRequest.blank(self.api_path + '/key6') @@ -113,7 +113,7 @@ class VolumeTypesExtraSpecsTest(test.TestCase): req, 1, 'key6') def test_delete(self): - self.stubs.Set(cinder.db, 'volume_type_extra_specs_delete', + self.stubs.Set(manila.db, 'volume_type_extra_specs_delete', delete_volume_type_extra_specs) self.assertEquals(len(test_notifier.NOTIFICATIONS), 0) @@ -122,7 +122,7 @@ class VolumeTypesExtraSpecsTest(test.TestCase): self.assertEquals(len(test_notifier.NOTIFICATIONS), 1) def test_create(self): - self.stubs.Set(cinder.db, + self.stubs.Set(manila.db, 'volume_type_extra_specs_update_or_create', return_create_volume_type_extra_specs) body = {"extra_specs": {"key1": "value1"}} @@ -135,7 +135,7 @@ class VolumeTypesExtraSpecsTest(test.TestCase): self.assertEqual('value1', res_dict['extra_specs']['key1']) def test_update_item(self): - self.stubs.Set(cinder.db, + self.stubs.Set(manila.db, 'volume_type_extra_specs_update_or_create', return_create_volume_type_extra_specs) body = {"key1": "value1"} @@ -148,7 +148,7 @@ class VolumeTypesExtraSpecsTest(test.TestCase): self.assertEqual('value1', res_dict['key1']) def test_update_item_too_many_keys(self): - self.stubs.Set(cinder.db, + self.stubs.Set(manila.db, 'volume_type_extra_specs_update_or_create', return_create_volume_type_extra_specs) body = {"key1": "value1", "key2": "value2"} @@ -158,7 +158,7 @@ class VolumeTypesExtraSpecsTest(test.TestCase): req, 1, 'key1', body) def test_update_item_body_uri_mismatch(self): - self.stubs.Set(cinder.db, + self.stubs.Set(manila.db, 'volume_type_extra_specs_update_or_create', return_create_volume_type_extra_specs) body = {"key1": "value1"} diff --git a/cinder/tests/api/contrib/test_types_manage.py b/manila/tests/api/contrib/test_types_manage.py similarity index 93% rename from cinder/tests/api/contrib/test_types_manage.py rename to manila/tests/api/contrib/test_types_manage.py index c007236ec4..2baf4ccf51 100644 --- a/cinder/tests/api/contrib/test_types_manage.py +++ b/manila/tests/api/contrib/test_types_manage.py @@ -15,13 +15,13 @@ import webob -from cinder.api.contrib import types_manage -from cinder import exception -from cinder.openstack.common.notifier import api as notifier_api -from cinder.openstack.common.notifier import test_notifier -from cinder import test -from cinder.tests.api import fakes -from cinder.volume import volume_types +from manila.api.contrib import types_manage +from manila import exception +from manila.openstack.common.notifier import api as notifier_api +from manila.openstack.common.notifier import test_notifier +from manila import test +from manila.tests.api import fakes +from manila.volume import volume_types def stub_volume_type(id): diff --git a/cinder/tests/api/contrib/test_volume_actions.py b/manila/tests/api/contrib/test_volume_actions.py similarity index 95% rename from cinder/tests/api/contrib/test_volume_actions.py rename to manila/tests/api/contrib/test_volume_actions.py index aed906985d..c3bfcada8d 100644 --- a/cinder/tests/api/contrib/test_volume_actions.py +++ b/manila/tests/api/contrib/test_volume_actions.py @@ -18,16 +18,16 @@ import datetime import uuid import webob -from cinder.api.contrib import volume_actions -from cinder import exception -from cinder import flags -from cinder.openstack.common import jsonutils -from cinder.openstack.common.rpc import common as rpc_common -from cinder import test -from cinder.tests.api import fakes -from cinder.tests.api.v2 import stubs -from cinder import volume -from cinder.volume import api as volume_api +from manila.api.contrib import volume_actions +from manila import exception +from manila import flags +from manila.openstack.common import jsonutils +from manila.openstack.common.rpc import common as rpc_common +from manila import test +from manila.tests.api import fakes +from manila.tests.api.v2 import stubs +from manila import volume +from manila.volume import api as volume_api FLAGS = flags.FLAGS diff --git a/cinder/tests/api/contrib/test_volume_host_attribute.py b/manila/tests/api/contrib/test_volume_host_attribute.py similarity index 90% rename from cinder/tests/api/contrib/test_volume_host_attribute.py rename to manila/tests/api/contrib/test_volume_host_attribute.py index a54c53f93d..16358b21f5 100644 --- a/cinder/tests/api/contrib/test_volume_host_attribute.py +++ b/manila/tests/api/contrib/test_volume_host_attribute.py @@ -21,10 +21,10 @@ import uuid from lxml import etree import webob -from cinder import context -from cinder import test -from cinder.tests.api import fakes -from cinder import volume +from manila import context +from manila import test +from manila.tests.api import fakes +from manila import volume def fake_volume_get(*args, **kwargs): @@ -49,7 +49,7 @@ def fake_volume_get_all(*args, **kwargs): def app(): - # no auth, just let environ['cinder.context'] pass through + # no auth, just let environ['manila.context'] pass through api = fakes.router.APIRouter() mapper = fakes.urlmap.URLMap() mapper['/v2'] = api @@ -68,7 +68,7 @@ class VolumeHostAttributeTest(test.TestCase): ctx = context.RequestContext('admin', 'fake', True) req = webob.Request.blank('/v2/fake/volumes/%s' % self.UUID) req.method = 'GET' - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx res = req.get_response(app()) vol = json.loads(res.body)['volume'] self.assertEqual(vol['os-vol-host-attr:host'], 'host001') @@ -77,7 +77,7 @@ class VolumeHostAttributeTest(test.TestCase): ctx = context.RequestContext('non-admin', 'fake', False) req = webob.Request.blank('/v2/fake/volumes/%s' % self.UUID) req.method = 'GET' - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx res = req.get_response(app()) vol = json.loads(res.body)['volume'] self.assertFalse('os-vol-host-attr:host' in vol) @@ -86,7 +86,7 @@ class VolumeHostAttributeTest(test.TestCase): ctx = context.RequestContext('admin', 'fake', True) req = webob.Request.blank('/v2/fake/volumes/detail') req.method = 'GET' - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx res = req.get_response(app()) vol = json.loads(res.body)['volumes'] self.assertEqual(vol[0]['os-vol-host-attr:host'], 'host001') @@ -95,7 +95,7 @@ class VolumeHostAttributeTest(test.TestCase): ctx = context.RequestContext('non-admin', 'fake', False) req = webob.Request.blank('/v2/fake/volumes/detail') req.method = 'GET' - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx res = req.get_response(app()) vol = json.loads(res.body)['volumes'] self.assertFalse('os-vol-host-attr:host' in vol[0]) @@ -104,7 +104,7 @@ class VolumeHostAttributeTest(test.TestCase): ctx = context.RequestContext('admin', 'fake', True) req = webob.Request.blank('/v2/fake/volumes') req.method = 'GET' - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx res = req.get_response(app()) vol = json.loads(res.body)['volumes'] self.assertFalse('os-vol-host-attr:host' in vol[0]) @@ -114,7 +114,7 @@ class VolumeHostAttributeTest(test.TestCase): req = webob.Request.blank('/v2/fake/volumes/%s' % self.UUID) req.method = 'GET' req.accept = 'application/xml' - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx res = req.get_response(app()) vol = etree.XML(res.body) host_key = ('{http://docs.openstack.org/volume/ext/' @@ -126,7 +126,7 @@ class VolumeHostAttributeTest(test.TestCase): req = webob.Request.blank('/v2/fake/volumes/detail') req.method = 'GET' req.accept = 'application/xml' - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx res = req.get_response(app()) vol = list(etree.XML(res.body))[0] host_key = ('{http://docs.openstack.org/volume/ext/' diff --git a/cinder/tests/api/contrib/test_volume_image_metadata.py b/manila/tests/api/contrib/test_volume_image_metadata.py similarity index 94% rename from cinder/tests/api/contrib/test_volume_image_metadata.py rename to manila/tests/api/contrib/test_volume_image_metadata.py index 2c343cfcb4..c7ad435554 100644 --- a/cinder/tests/api/contrib/test_volume_image_metadata.py +++ b/manila/tests/api/contrib/test_volume_image_metadata.py @@ -21,12 +21,12 @@ from xml.dom import minidom import webob -from cinder.api import common -from cinder.api.openstack.wsgi import MetadataXMLDeserializer -from cinder.api.openstack.wsgi import XMLDeserializer -from cinder import test -from cinder.tests.api import fakes -from cinder import volume +from manila.api import common +from manila.api.openstack.wsgi import MetadataXMLDeserializer +from manila.api.openstack.wsgi import XMLDeserializer +from manila import test +from manila.tests.api import fakes +from manila import volume def fake_volume_get(*args, **kwargs): diff --git a/cinder/tests/api/contrib/test_volume_tenant_attribute.py b/manila/tests/api/contrib/test_volume_tenant_attribute.py similarity index 90% rename from cinder/tests/api/contrib/test_volume_tenant_attribute.py rename to manila/tests/api/contrib/test_volume_tenant_attribute.py index e6e10e1e2a..5292ff57c3 100644 --- a/cinder/tests/api/contrib/test_volume_tenant_attribute.py +++ b/manila/tests/api/contrib/test_volume_tenant_attribute.py @@ -21,10 +21,10 @@ import uuid from lxml import etree import webob -from cinder import context -from cinder import test -from cinder.tests.api import fakes -from cinder import volume +from manila import context +from manila import test +from manila.tests.api import fakes +from manila import volume PROJECT_ID = '88fd1da4-f464-4a87-9ce5-26f2f40743b9' @@ -52,7 +52,7 @@ def fake_volume_get_all(*args, **kwargs): def app(): - # no auth, just let environ['cinder.context'] pass through + # no auth, just let environ['manila.context'] pass through api = fakes.router.APIRouter() mapper = fakes.urlmap.URLMap() mapper['/v2'] = api @@ -71,7 +71,7 @@ class VolumeTenantAttributeTest(test.TestCase): ctx = context.RequestContext('admin', 'fake', True) req = webob.Request.blank('/v2/fake/volumes/%s' % self.UUID) req.method = 'GET' - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx res = req.get_response(app()) vol = json.loads(res.body)['volume'] self.assertEqual(vol['os-vol-tenant-attr:tenant_id'], PROJECT_ID) @@ -80,7 +80,7 @@ class VolumeTenantAttributeTest(test.TestCase): ctx = context.RequestContext('non-admin', 'fake', False) req = webob.Request.blank('/v2/fake/volumes/%s' % self.UUID) req.method = 'GET' - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx res = req.get_response(app()) vol = json.loads(res.body)['volume'] self.assertFalse('os-vol-tenant-attr:tenant_id' in vol) @@ -89,7 +89,7 @@ class VolumeTenantAttributeTest(test.TestCase): ctx = context.RequestContext('admin', 'fake', True) req = webob.Request.blank('/v2/fake/volumes/detail') req.method = 'GET' - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx res = req.get_response(app()) vol = json.loads(res.body)['volumes'] self.assertEqual(vol[0]['os-vol-tenant-attr:tenant_id'], PROJECT_ID) @@ -98,7 +98,7 @@ class VolumeTenantAttributeTest(test.TestCase): ctx = context.RequestContext('non-admin', 'fake', False) req = webob.Request.blank('/v2/fake/volumes/detail') req.method = 'GET' - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx res = req.get_response(app()) vol = json.loads(res.body)['volumes'] self.assertFalse('os-vol-tenant-attr:tenant_id' in vol[0]) @@ -107,7 +107,7 @@ class VolumeTenantAttributeTest(test.TestCase): ctx = context.RequestContext('admin', 'fake', True) req = webob.Request.blank('/v2/fake/volumes') req.method = 'GET' - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx res = req.get_response(app()) vol = json.loads(res.body)['volumes'] self.assertFalse('os-vol-tenant-attr:tenant_id' in vol[0]) @@ -117,7 +117,7 @@ class VolumeTenantAttributeTest(test.TestCase): req = webob.Request.blank('/v2/fake/volumes/%s' % self.UUID) req.method = 'GET' req.accept = 'application/xml' - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx res = req.get_response(app()) vol = etree.XML(res.body) tenant_key = ('{http://docs.openstack.org/volume/ext/' @@ -129,7 +129,7 @@ class VolumeTenantAttributeTest(test.TestCase): req = webob.Request.blank('/v2/fake/volumes/detail') req.method = 'GET' req.accept = 'application/xml' - req.environ['cinder.context'] = ctx + req.environ['manila.context'] = ctx res = req.get_response(app()) vol = list(etree.XML(res.body))[0] tenant_key = ('{http://docs.openstack.org/volume/ext/' diff --git a/cinder/tests/api/extensions/__init__.py b/manila/tests/api/extensions/__init__.py similarity index 100% rename from cinder/tests/api/extensions/__init__.py rename to manila/tests/api/extensions/__init__.py diff --git a/cinder/tests/api/extensions/foxinsocks.py b/manila/tests/api/extensions/foxinsocks.py similarity index 97% rename from cinder/tests/api/extensions/foxinsocks.py rename to manila/tests/api/extensions/foxinsocks.py index 45fc106b88..6a2a1c741f 100644 --- a/cinder/tests/api/extensions/foxinsocks.py +++ b/manila/tests/api/extensions/foxinsocks.py @@ -17,8 +17,8 @@ import webob.exc -from cinder.api import extensions -from cinder.api.openstack import wsgi +from manila.api import extensions +from manila.api.openstack import wsgi class FoxInSocksController(object): diff --git a/cinder/tests/api/fakes.py b/manila/tests/api/fakes.py similarity index 89% rename from cinder/tests/api/fakes.py rename to manila/tests/api/fakes.py index 3fd21cfbaf..e9bb22a750 100644 --- a/cinder/tests/api/fakes.py +++ b/manila/tests/api/fakes.py @@ -22,17 +22,17 @@ import webob import webob.dec import webob.request -from cinder.api.middleware import auth -from cinder.api.middleware import fault -from cinder.api.openstack import wsgi as os_wsgi -from cinder.api import urlmap -from cinder.api.v2 import limits -from cinder.api.v2 import router -from cinder.api import versions -from cinder import context -from cinder import exception as exc -from cinder.openstack.common import timeutils -from cinder import wsgi +from manila.api.middleware import auth +from manila.api.middleware import fault +from manila.api.openstack import wsgi as os_wsgi +from manila.api import urlmap +from manila.api.v2 import limits +from manila.api.v2 import router +from manila.api import versions +from manila import context +from manila import exception as exc +from manila.openstack.common import timeutils +from manila import wsgi FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' @@ -91,10 +91,10 @@ def stub_out_rate_limiting(stubs): self.application = app # FIXME(ja): unsure about limits in volumes - # stubs.Set(cinder.api.openstack.compute.limits.RateLimitingMiddleware, + # stubs.Set(manila.api.openstack.compute.limits.RateLimitingMiddleware, # '__init__', fake_rate_init) - # stubs.Set(cinder.api.openstack.compute.limits.RateLimitingMiddleware, + # stubs.Set(manila.api.openstack.compute.limits.RateLimitingMiddleware, # '__call__', fake_wsgi) @@ -138,7 +138,7 @@ class HTTPRequest(webob.Request): kwargs['base_url'] = 'http://localhost/v1' use_admin_context = kwargs.pop('use_admin_context', False) out = webob.Request.blank(*args, **kwargs) - out.environ['cinder.context'] = FakeRequestContext( + out.environ['manila.context'] = FakeRequestContext( 'fake_user', 'fake', is_admin=use_admin_context) diff --git a/cinder/tests/api/middleware/__init__.py b/manila/tests/api/middleware/__init__.py similarity index 100% rename from cinder/tests/api/middleware/__init__.py rename to manila/tests/api/middleware/__init__.py diff --git a/cinder/tests/api/middleware/test_auth.py b/manila/tests/api/middleware/test_auth.py similarity index 92% rename from cinder/tests/api/middleware/test_auth.py rename to manila/tests/api/middleware/test_auth.py index 4fca13fe62..1cc0e207d3 100644 --- a/cinder/tests/api/middleware/test_auth.py +++ b/manila/tests/api/middleware/test_auth.py @@ -14,8 +14,8 @@ import webob -import cinder.api.middleware.auth -from cinder import test +import manila.api.middleware.auth +from manila import test class TestCinderKeystoneContextMiddleware(test.TestCase): @@ -25,11 +25,11 @@ class TestCinderKeystoneContextMiddleware(test.TestCase): @webob.dec.wsgify() def fake_app(req): - self.context = req.environ['cinder.context'] + self.context = req.environ['manila.context'] return webob.Response() self.context = None - self.middleware = (cinder.api.middleware.auth + self.middleware = (manila.api.middleware.auth .CinderKeystoneContext(fake_app)) self.request = webob.Request.blank('/') self.request.headers['X_TENANT_ID'] = 'testtenantid' diff --git a/cinder/tests/api/middleware/test_faults.py b/manila/tests/api/middleware/test_faults.py similarity index 96% rename from cinder/tests/api/middleware/test_faults.py rename to manila/tests/api/middleware/test_faults.py index aff1dfbcc9..5a3a2fe2d9 100644 --- a/cinder/tests/api/middleware/test_faults.py +++ b/manila/tests/api/middleware/test_faults.py @@ -21,14 +21,14 @@ import webob import webob.dec import webob.exc -from cinder.api import common -from cinder.api.openstack import wsgi -from cinder.openstack.common import jsonutils -from cinder import test +from manila.api import common +from manila.api.openstack import wsgi +from manila.openstack.common import jsonutils +from manila import test class TestFaults(test.TestCase): - """Tests covering `cinder.api.openstack.faults:Fault` class.""" + """Tests covering `manila.api.openstack.faults:Fault` class.""" def _prepare_xml(self, xml_string): """Remove characters from string which hinder XML equality testing.""" @@ -128,7 +128,7 @@ class TestFaults(test.TestCase): class FaultsXMLSerializationTestV11(test.TestCase): - """Tests covering `cinder.api.openstack.faults:Fault` class.""" + """Tests covering `manila.api.openstack.faults:Fault` class.""" def _prepare_xml(self, xml_string): xml_string = xml_string.replace(" ", "") diff --git a/cinder/tests/api/middleware/test_sizelimit.py b/manila/tests/api/middleware/test_sizelimit.py similarity index 97% rename from cinder/tests/api/middleware/test_sizelimit.py rename to manila/tests/api/middleware/test_sizelimit.py index 3b87a2cd96..f85172d4b4 100644 --- a/cinder/tests/api/middleware/test_sizelimit.py +++ b/manila/tests/api/middleware/test_sizelimit.py @@ -15,9 +15,9 @@ import StringIO import webob -from cinder.api.middleware import sizelimit -from cinder import flags -from cinder import test +from manila.api.middleware import sizelimit +from manila import flags +from manila import test FLAGS = flags.FLAGS MAX_REQUEST_BODY_SIZE = FLAGS.osapi_max_request_body_size diff --git a/cinder/tests/api/openstack/__init__.py b/manila/tests/api/openstack/__init__.py similarity index 96% rename from cinder/tests/api/openstack/__init__.py rename to manila/tests/api/openstack/__init__.py index 3be5ce944c..9488909d3c 100644 --- a/cinder/tests/api/openstack/__init__.py +++ b/manila/tests/api/openstack/__init__.py @@ -16,4 +16,4 @@ # under the License. # NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from cinder.tests import * +from manila.tests import * diff --git a/cinder/tests/api/openstack/test_wsgi.py b/manila/tests/api/openstack/test_wsgi.py similarity index 99% rename from cinder/tests/api/openstack/test_wsgi.py rename to manila/tests/api/openstack/test_wsgi.py index 77308602d0..2425c10aeb 100644 --- a/cinder/tests/api/openstack/test_wsgi.py +++ b/manila/tests/api/openstack/test_wsgi.py @@ -3,10 +3,10 @@ import inspect import webob -from cinder.api.openstack import wsgi -from cinder import exception -from cinder import test -from cinder.tests.api import fakes +from manila.api.openstack import wsgi +from manila import exception +from manila import test +from manila.tests.api import fakes class RequestTest(test.TestCase): diff --git a/cinder/tests/api/test_common.py b/manila/tests/api/test_common.py similarity index 98% rename from cinder/tests/api/test_common.py rename to manila/tests/api/test_common.py index bcea2befc1..50c4101cce 100644 --- a/cinder/tests/api/test_common.py +++ b/manila/tests/api/test_common.py @@ -22,8 +22,8 @@ Test suites for 'common' code used throughout the OpenStack HTTP API. import webob import webob.exc -from cinder.api import common -from cinder import test +from manila.api import common +from manila import test NS = "{http://docs.openstack.org/compute/api/v1.1}" @@ -32,7 +32,7 @@ ATOMNS = "{http://www.w3.org/2005/Atom}" class LimiterTest(test.TestCase): """ - Unit tests for the `cinder.api.common.limited` method which takes + Unit tests for the `manila.api.common.limited` method which takes in a list of items and, depending on the 'offset' and 'limit' GET params, returns a subset or complete set of the given items. """ @@ -156,7 +156,7 @@ class LimiterTest(test.TestCase): class PaginationParamsTest(test.TestCase): """ - Unit tests for the `cinder.api.common.get_pagination_params` + Unit tests for the `manila.api.common.get_pagination_params` method which takes in a request object and returns 'marker' and 'limit' GET params. """ diff --git a/cinder/tests/api/test_extensions.py b/manila/tests/api/test_extensions.py similarity index 96% rename from cinder/tests/api/test_extensions.py rename to manila/tests/api/test_extensions.py index 9ad19f18ed..a21f99e4b4 100644 --- a/cinder/tests/api/test_extensions.py +++ b/manila/tests/api/test_extensions.py @@ -20,11 +20,11 @@ import iso8601 from lxml import etree import webob -from cinder.api.v1 import router -from cinder.api import xmlutil -from cinder import flags -from cinder.openstack.common import jsonutils -from cinder import test +from manila.api.v1 import router +from manila.api import xmlutil +from manila import flags +from manila.openstack.common import jsonutils +from manila import test FLAGS = flags.FLAGS NS = "{http://docs.openstack.org/common/api/v1.0}" @@ -34,7 +34,7 @@ class ExtensionTestCase(test.TestCase): def setUp(self): super(ExtensionTestCase, self).setUp() ext_list = FLAGS.osapi_volume_extension[:] - fox = ('cinder.tests.api.extensions.foxinsocks.Foxinsocks') + fox = ('manila.tests.api.extensions.foxinsocks.Foxinsocks') if fox not in ext_list: ext_list.append(fox) self.flags(osapi_volume_extension=ext_list) diff --git a/cinder/tests/api/test_router.py b/manila/tests/api/test_router.py similarity index 94% rename from cinder/tests/api/test_router.py rename to manila/tests/api/test_router.py index 9a3f3da2a8..0bff31d5dd 100644 --- a/cinder/tests/api/test_router.py +++ b/manila/tests/api/test_router.py @@ -14,15 +14,15 @@ # under the License. -from cinder.api.openstack import wsgi -from cinder.api.v1 import router -from cinder.api.v1 import snapshots -from cinder.api.v1 import volumes -from cinder.api import versions -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import test -from cinder.tests.api import fakes +from manila.api.openstack import wsgi +from manila.api.v1 import router +from manila.api.v1 import snapshots +from manila.api.v1 import volumes +from manila.api import versions +from manila import flags +from manila.openstack.common import log as logging +from manila import test +from manila.tests.api import fakes FLAGS = flags.FLAGS diff --git a/cinder/tests/api/test_wsgi.py b/manila/tests/api/test_wsgi.py similarity index 97% rename from cinder/tests/api/test_wsgi.py rename to manila/tests/api/test_wsgi.py index c68f8158eb..6afc88bf7f 100644 --- a/cinder/tests/api/test_wsgi.py +++ b/manila/tests/api/test_wsgi.py @@ -21,12 +21,12 @@ Test WSGI basics and provide some helper functions for other WSGI tests. """ -from cinder import test +from manila import test import routes import webob -from cinder import wsgi +from manila import wsgi class Test(test.TestCase): diff --git a/cinder/tests/api/test_xmlutil.py b/manila/tests/api/test_xmlutil.py similarity index 99% rename from cinder/tests/api/test_xmlutil.py rename to manila/tests/api/test_xmlutil.py index 4e145e741d..87e42ae537 100644 --- a/cinder/tests/api/test_xmlutil.py +++ b/manila/tests/api/test_xmlutil.py @@ -17,8 +17,8 @@ from lxml import etree -from cinder.api import xmlutil -from cinder import test +from manila.api import xmlutil +from manila import test class SelectorTest(test.TestCase): diff --git a/cinder/tests/api/v1/__init__.py b/manila/tests/api/v1/__init__.py similarity index 100% rename from cinder/tests/api/v1/__init__.py rename to manila/tests/api/v1/__init__.py diff --git a/cinder/tests/api/v1/stubs.py b/manila/tests/api/v1/stubs.py similarity index 98% rename from cinder/tests/api/v1/stubs.py rename to manila/tests/api/v1/stubs.py index 72d91dbf1b..7701041610 100644 --- a/cinder/tests/api/v1/stubs.py +++ b/manila/tests/api/v1/stubs.py @@ -17,7 +17,7 @@ import datetime -from cinder import exception as exc +from manila import exception as exc FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' FAKE_UUIDS = {} @@ -73,7 +73,7 @@ def stub_volume_create_from_image(self, context, size, name, description, vol['size'] = size vol['display_name'] = name vol['display_description'] = description - vol['availability_zone'] = 'cinder' + vol['availability_zone'] = 'manila' return vol diff --git a/cinder/tests/api/v1/test_limits.py b/manila/tests/api/v1/test_limits.py similarity index 98% rename from cinder/tests/api/v1/test_limits.py rename to manila/tests/api/v1/test_limits.py index 74110bb872..372fb81ab2 100644 --- a/cinder/tests/api/v1/test_limits.py +++ b/manila/tests/api/v1/test_limits.py @@ -24,12 +24,12 @@ from xml.dom import minidom from lxml import etree import webob -from cinder.api.v1 import limits -from cinder.api import views -from cinder.api import xmlutil -import cinder.context -from cinder.openstack.common import jsonutils -from cinder import test +from manila.api.v1 import limits +from manila.api import views +from manila.api import xmlutil +import manila.context +from manila.openstack.common import jsonutils +from manila import test TEST_LIMITS = [ @@ -58,7 +58,7 @@ class BaseLimitTestSuite(test.TestCase): return dict((k, dict(limit=v)) for k, v in self.absolute_limits.items()) - self.stubs.Set(cinder.quota.QUOTAS, "get_project_quotas", + self.stubs.Set(manila.quota.QUOTAS, "get_project_quotas", stub_get_project_quotas) def _get_time(self): @@ -84,8 +84,8 @@ class LimitsControllerTest(BaseLimitTestSuite): "action": "index", "controller": "", }) - context = cinder.context.RequestContext('testuser', 'testproject') - request.environ["cinder.context"] = context + context = manila.context.RequestContext('testuser', 'testproject') + request.environ["manila.context"] = context return request def _populate_limits(self, request): @@ -96,7 +96,7 @@ class LimitsControllerTest(BaseLimitTestSuite): limits.Limit("GET", "changes-since*", "changes-since", 5, 60).display(), ] - request.environ["cinder.limits"] = _limits + request.environ["manila.limits"] = _limits return request def test_empty_index_json(self): @@ -172,7 +172,7 @@ class LimitsControllerTest(BaseLimitTestSuite): limits.Limit("GET", "*", ".*", 10, 60).display(), limits.Limit("GET", "*", "*.*", 10, 60).display(), ] - request.environ["cinder.limits"] = _limits + request.environ["manila.limits"] = _limits return request def test_index_diff_regex(self): diff --git a/cinder/tests/api/v1/test_snapshot_metadata.py b/manila/tests/api/v1/test_snapshot_metadata.py similarity index 87% rename from cinder/tests/api/v1/test_snapshot_metadata.py rename to manila/tests/api/v1/test_snapshot_metadata.py index 5720e88dc9..034da7067d 100644 --- a/cinder/tests/api/v1/test_snapshot_metadata.py +++ b/manila/tests/api/v1/test_snapshot_metadata.py @@ -20,14 +20,14 @@ import uuid from oslo.config import cfg import webob -from cinder.api import extensions -from cinder.api.v1 import snapshot_metadata -from cinder.api.v1 import snapshots -import cinder.db -from cinder import exception -from cinder.openstack.common import jsonutils -from cinder import test -from cinder.tests.api import fakes +from manila.api import extensions +from manila.api.v1 import snapshot_metadata +from manila.api.v1 import snapshots +import manila.db +from manila import exception +from manila.openstack.common import jsonutils +from manila import test +from manila.tests.api import fakes CONF = cfg.CONF @@ -103,11 +103,11 @@ class SnapshotMetaDataTest(test.TestCase): def setUp(self): super(SnapshotMetaDataTest, self).setUp() - self.volume_api = cinder.volume.api.API() + self.volume_api = manila.volume.api.API() fakes.stub_out_key_pair_funcs(self.stubs) - self.stubs.Set(cinder.db, 'volume_get', return_volume) - self.stubs.Set(cinder.db, 'snapshot_get', return_snapshot) - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'volume_get', return_volume) + self.stubs.Set(manila.db, 'snapshot_get', return_snapshot) + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_snapshot_metadata) self.stubs.Set(self.volume_api, 'update_snapshot_metadata', @@ -145,14 +145,14 @@ class SnapshotMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_index_nonexistent_snapshot(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_snapshot_nonexistent) req = fakes.HTTPRequest.blank(self.url) self.assertRaises(webob.exc.HTTPNotFound, self.controller.index, req, self.url) def test_index_no_data(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_empty_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url) res_dict = self.controller.index(req, self.id) @@ -166,23 +166,23 @@ class SnapshotMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_show_nonexistent_snapshot(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_snapshot_nonexistent) req = fakes.HTTPRequest.blank(self.url + '/key2') self.assertRaises(webob.exc.HTTPNotFound, self.controller.show, req, self.id, 'key2') def test_show_meta_not_found(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_empty_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key6') self.assertRaises(webob.exc.HTTPNotFound, self.controller.show, req, self.id, 'key6') def test_delete(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_snapshot_metadata) - self.stubs.Set(cinder.db, 'snapshot_metadata_delete', + self.stubs.Set(manila.db, 'snapshot_metadata_delete', delete_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key2') req.method = 'DELETE' @@ -191,7 +191,7 @@ class SnapshotMetaDataTest(test.TestCase): self.assertEqual(200, res.status_int) def test_delete_nonexistent_snapshot(self): - self.stubs.Set(cinder.db, 'snapshot_get', + self.stubs.Set(manila.db, 'snapshot_get', return_snapshot_nonexistent) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'DELETE' @@ -199,7 +199,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.delete, req, self.id, 'key1') def test_delete_meta_not_found(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_empty_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key6') req.method = 'DELETE' @@ -207,9 +207,9 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.delete, req, self.id, 'key6') def test_create(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_empty_snapshot_metadata) - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank('/v1/snapshot_metadata') @@ -221,7 +221,7 @@ class SnapshotMetaDataTest(test.TestCase): self.assertEqual(body, res_dict) def test_create_empty_body(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'POST' @@ -231,7 +231,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.create, req, self.id, None) def test_create_item_empty_key(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -243,7 +243,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.create, req, self.id, body) def test_create_item_key_too_long(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -256,11 +256,11 @@ class SnapshotMetaDataTest(test.TestCase): req, self.id, body) def test_create_nonexistent_snapshot(self): - self.stubs.Set(cinder.db, 'snapshot_get', + self.stubs.Set(manila.db, 'snapshot_get', return_snapshot_nonexistent) - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_snapshot_metadata) - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank('/v1/snapshot_metadata') @@ -272,7 +272,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.create, req, self.id, body) def test_update_all(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' @@ -289,7 +289,7 @@ class SnapshotMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_update_all_empty_container(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' @@ -301,7 +301,7 @@ class SnapshotMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_update_all_malformed_container(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' @@ -313,7 +313,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update_all, req, self.id, expected) def test_update_all_malformed_data(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' @@ -325,7 +325,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update_all, req, self.id, expected) def test_update_all_nonexistent_snapshot(self): - self.stubs.Set(cinder.db, 'snapshot_get', return_snapshot_nonexistent) + self.stubs.Set(manila.db, 'snapshot_get', return_snapshot_nonexistent) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' req.content_type = "application/json" @@ -336,7 +336,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update_all, req, '100', body) def test_update_item(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -348,7 +348,7 @@ class SnapshotMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_update_item_nonexistent_snapshot(self): - self.stubs.Set(cinder.db, 'snapshot_get', + self.stubs.Set(manila.db, 'snapshot_get', return_snapshot_nonexistent) req = fakes.HTTPRequest.blank( '/v1.1/fake/snapshots/asdf/metadata/key1') @@ -361,7 +361,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update, req, self.id, 'key1', body) def test_update_item_empty_body(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -371,7 +371,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update, req, self.id, 'key1', None) def test_update_item_empty_key(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -383,7 +383,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update, req, self.id, '', body) def test_update_item_key_too_long(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -396,7 +396,7 @@ class SnapshotMetaDataTest(test.TestCase): req, self.id, ("a" * 260), body) def test_update_item_value_too_long(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -409,7 +409,7 @@ class SnapshotMetaDataTest(test.TestCase): req, self.id, "key1", body) def test_update_item_too_many_keys(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -421,7 +421,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update, req, self.id, 'key1', body) def test_update_item_body_uri_mismatch(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/bad') req.method = 'PUT' @@ -433,7 +433,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update, req, self.id, 'bad', body) def test_invalid_metadata_items_on_create(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'POST' diff --git a/cinder/tests/api/v1/test_snapshots.py b/manila/tests/api/v1/test_snapshots.py similarity index 98% rename from cinder/tests/api/v1/test_snapshots.py rename to manila/tests/api/v1/test_snapshots.py index 6a13179ac3..e380368a29 100644 --- a/cinder/tests/api/v1/test_snapshots.py +++ b/manila/tests/api/v1/test_snapshots.py @@ -18,15 +18,15 @@ import datetime from lxml import etree import webob -from cinder.api.v1 import snapshots -from cinder import db -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import test -from cinder.tests.api import fakes -from cinder.tests.api.v1 import stubs -from cinder import volume +from manila.api.v1 import snapshots +from manila import db +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila import test +from manila.tests.api import fakes +from manila.tests.api.v1 import stubs +from manila import volume FLAGS = flags.FLAGS diff --git a/cinder/tests/api/v1/test_types.py b/manila/tests/api/v1/test_types.py similarity index 96% rename from cinder/tests/api/v1/test_types.py rename to manila/tests/api/v1/test_types.py index 97a10e7917..b1ee4d4ef0 100644 --- a/cinder/tests/api/v1/test_types.py +++ b/manila/tests/api/v1/test_types.py @@ -16,13 +16,13 @@ from lxml import etree import webob -from cinder.api.v1 import types -from cinder.api.views import types as views_types -from cinder import exception -from cinder.openstack.common import timeutils -from cinder import test -from cinder.tests.api import fakes -from cinder.volume import volume_types +from manila.api.v1 import types +from manila.api.views import types as views_types +from manila import exception +from manila.openstack.common import timeutils +from manila import test +from manila.tests.api import fakes +from manila.volume import volume_types def stub_volume_type(id): diff --git a/cinder/tests/api/v1/test_volume_metadata.py b/manila/tests/api/v1/test_volume_metadata.py similarity index 87% rename from cinder/tests/api/v1/test_volume_metadata.py rename to manila/tests/api/v1/test_volume_metadata.py index 4dc09a8744..82f5741f25 100644 --- a/cinder/tests/api/v1/test_volume_metadata.py +++ b/manila/tests/api/v1/test_volume_metadata.py @@ -20,14 +20,14 @@ import uuid from oslo.config import cfg import webob -from cinder.api import extensions -from cinder.api.v1 import volume_metadata -from cinder.api.v1 import volumes -import cinder.db -from cinder import exception -from cinder.openstack.common import jsonutils -from cinder import test -from cinder.tests.api import fakes +from manila.api import extensions +from manila.api.v1 import volume_metadata +from manila.api.v1 import volumes +import manila.db +from manila import exception +from manila.openstack.common import jsonutils +from manila import test +from manila.tests.api import fakes CONF = cfg.CONF @@ -90,10 +90,10 @@ class volumeMetaDataTest(test.TestCase): def setUp(self): super(volumeMetaDataTest, self).setUp() - self.volume_api = cinder.volume.api.API() + self.volume_api = manila.volume.api.API() fakes.stub_out_key_pair_funcs(self.stubs) - self.stubs.Set(cinder.db, 'volume_get', return_volume) - self.stubs.Set(cinder.db, 'volume_metadata_get', + self.stubs.Set(manila.db, 'volume_get', return_volume) + self.stubs.Set(manila.db, 'volume_metadata_get', return_volume_metadata) self.stubs.Set(self.volume_api, 'update_volume_metadata', @@ -129,14 +129,14 @@ class volumeMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_index_nonexistent_volume(self): - self.stubs.Set(cinder.db, 'volume_metadata_get', + self.stubs.Set(manila.db, 'volume_metadata_get', return_volume_nonexistent) req = fakes.HTTPRequest.blank(self.url) self.assertRaises(webob.exc.HTTPNotFound, self.controller.index, req, self.url) def test_index_no_data(self): - self.stubs.Set(cinder.db, 'volume_metadata_get', + self.stubs.Set(manila.db, 'volume_metadata_get', return_empty_volume_metadata) req = fakes.HTTPRequest.blank(self.url) res_dict = self.controller.index(req, self.id) @@ -150,23 +150,23 @@ class volumeMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_show_nonexistent_volume(self): - self.stubs.Set(cinder.db, 'volume_metadata_get', + self.stubs.Set(manila.db, 'volume_metadata_get', return_volume_nonexistent) req = fakes.HTTPRequest.blank(self.url + '/key2') self.assertRaises(webob.exc.HTTPNotFound, self.controller.show, req, self.id, 'key2') def test_show_meta_not_found(self): - self.stubs.Set(cinder.db, 'volume_metadata_get', + self.stubs.Set(manila.db, 'volume_metadata_get', return_empty_volume_metadata) req = fakes.HTTPRequest.blank(self.url + '/key6') self.assertRaises(webob.exc.HTTPNotFound, self.controller.show, req, self.id, 'key6') def test_delete(self): - self.stubs.Set(cinder.db, 'volume_metadata_get', + self.stubs.Set(manila.db, 'volume_metadata_get', return_volume_metadata) - self.stubs.Set(cinder.db, 'volume_metadata_delete', + self.stubs.Set(manila.db, 'volume_metadata_delete', delete_volume_metadata) req = fakes.HTTPRequest.blank(self.url + '/key2') req.method = 'DELETE' @@ -175,7 +175,7 @@ class volumeMetaDataTest(test.TestCase): self.assertEqual(200, res.status_int) def test_delete_nonexistent_volume(self): - self.stubs.Set(cinder.db, 'volume_get', + self.stubs.Set(manila.db, 'volume_get', return_volume_nonexistent) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'DELETE' @@ -183,7 +183,7 @@ class volumeMetaDataTest(test.TestCase): self.controller.delete, req, self.id, 'key1') def test_delete_meta_not_found(self): - self.stubs.Set(cinder.db, 'volume_metadata_get', + self.stubs.Set(manila.db, 'volume_metadata_get', return_empty_volume_metadata) req = fakes.HTTPRequest.blank(self.url + '/key6') req.method = 'DELETE' @@ -191,9 +191,9 @@ class volumeMetaDataTest(test.TestCase): self.controller.delete, req, self.id, 'key6') def test_create(self): - self.stubs.Set(cinder.db, 'volume_metadata_get', + self.stubs.Set(manila.db, 'volume_metadata_get', return_empty_volume_metadata) - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank('/v1/volume_metadata') @@ -205,7 +205,7 @@ class volumeMetaDataTest(test.TestCase): self.assertEqual(body, res_dict) def test_create_empty_body(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'POST' @@ -215,7 +215,7 @@ class volumeMetaDataTest(test.TestCase): self.controller.create, req, self.id, None) def test_create_item_empty_key(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -227,7 +227,7 @@ class volumeMetaDataTest(test.TestCase): self.controller.create, req, self.id, body) def test_create_item_key_too_long(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -240,11 +240,11 @@ class volumeMetaDataTest(test.TestCase): req, self.id, body) def test_create_nonexistent_volume(self): - self.stubs.Set(cinder.db, 'volume_get', + self.stubs.Set(manila.db, 'volume_get', return_volume_nonexistent) - self.stubs.Set(cinder.db, 'volume_metadata_get', + self.stubs.Set(manila.db, 'volume_metadata_get', return_volume_metadata) - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank('/v1/volume_metadata') @@ -256,7 +256,7 @@ class volumeMetaDataTest(test.TestCase): self.controller.create, req, self.id, body) def test_update_all(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' @@ -273,7 +273,7 @@ class volumeMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_update_all_empty_container(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' @@ -285,7 +285,7 @@ class volumeMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_update_all_malformed_container(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' @@ -297,7 +297,7 @@ class volumeMetaDataTest(test.TestCase): self.controller.update_all, req, self.id, expected) def test_update_all_malformed_data(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' @@ -309,7 +309,7 @@ class volumeMetaDataTest(test.TestCase): self.controller.update_all, req, self.id, expected) def test_update_all_nonexistent_volume(self): - self.stubs.Set(cinder.db, 'volume_get', return_volume_nonexistent) + self.stubs.Set(manila.db, 'volume_get', return_volume_nonexistent) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' req.content_type = "application/json" @@ -320,7 +320,7 @@ class volumeMetaDataTest(test.TestCase): self.controller.update_all, req, '100', body) def test_update_item(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -332,7 +332,7 @@ class volumeMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_update_item_nonexistent_volume(self): - self.stubs.Set(cinder.db, 'volume_get', + self.stubs.Set(manila.db, 'volume_get', return_volume_nonexistent) req = fakes.HTTPRequest.blank('/v1.1/fake/volumes/asdf/metadata/key1') req.method = 'PUT' @@ -344,7 +344,7 @@ class volumeMetaDataTest(test.TestCase): self.controller.update, req, self.id, 'key1', body) def test_update_item_empty_body(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -354,7 +354,7 @@ class volumeMetaDataTest(test.TestCase): self.controller.update, req, self.id, 'key1', None) def test_update_item_empty_key(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -366,7 +366,7 @@ class volumeMetaDataTest(test.TestCase): self.controller.update, req, self.id, '', body) def test_update_item_key_too_long(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -379,7 +379,7 @@ class volumeMetaDataTest(test.TestCase): req, self.id, ("a" * 260), body) def test_update_item_value_too_long(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -392,7 +392,7 @@ class volumeMetaDataTest(test.TestCase): req, self.id, "key1", body) def test_update_item_too_many_keys(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -404,7 +404,7 @@ class volumeMetaDataTest(test.TestCase): self.controller.update, req, self.id, 'key1', body) def test_update_item_body_uri_mismatch(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url + '/bad') req.method = 'PUT' @@ -416,7 +416,7 @@ class volumeMetaDataTest(test.TestCase): self.controller.update, req, self.id, 'bad', body) def test_invalid_metadata_items_on_create(self): - self.stubs.Set(cinder.db, 'volume_metadata_update', + self.stubs.Set(manila.db, 'volume_metadata_update', return_create_volume_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'POST' diff --git a/cinder/tests/api/v1/test_volumes.py b/manila/tests/api/v1/test_volumes.py similarity index 98% rename from cinder/tests/api/v1/test_volumes.py rename to manila/tests/api/v1/test_volumes.py index b199ca40e8..43288c967c 100644 --- a/cinder/tests/api/v1/test_volumes.py +++ b/manila/tests/api/v1/test_volumes.py @@ -18,17 +18,17 @@ import datetime from lxml import etree import webob -from cinder.api import extensions -from cinder.api.v1 import volumes -from cinder import context -from cinder import db -from cinder import exception -from cinder import flags -from cinder import test -from cinder.tests.api import fakes -from cinder.tests.api.v2 import stubs -from cinder.tests.image import fake as fake_image -from cinder.volume import api as volume_api +from manila.api import extensions +from manila.api.v1 import volumes +from manila import context +from manila import db +from manila import exception +from manila import flags +from manila import test +from manila.tests.api import fakes +from manila.tests.api.v2 import stubs +from manila.tests.image import fake as fake_image +from manila.volume import api as volume_api FLAGS = flags.FLAGS @@ -161,7 +161,7 @@ class VolumeApiTest(test.TestCase): vol = {"size": '1', "display_name": "Volume Test Name", "display_description": "Volume Test Desc", - "availability_zone": "cinder", + "availability_zone": "manila", "imageRef": 1234} body = {"volume": vol} req = fakes.HTTPRequest.blank('/v1/volumes') @@ -176,7 +176,7 @@ class VolumeApiTest(test.TestCase): vol = {"size": '1', "display_name": "Volume Test Name", "display_description": "Volume Test Desc", - "availability_zone": "cinder", + "availability_zone": "manila", "imageRef": '12345'} body = {"volume": vol} req = fakes.HTTPRequest.blank('/v1/volumes') diff --git a/cinder/tests/api/v2/__init__.py b/manila/tests/api/v2/__init__.py similarity index 100% rename from cinder/tests/api/v2/__init__.py rename to manila/tests/api/v2/__init__.py diff --git a/cinder/tests/api/v2/stubs.py b/manila/tests/api/v2/stubs.py similarity index 98% rename from cinder/tests/api/v2/stubs.py rename to manila/tests/api/v2/stubs.py index c787ef78c2..bb01b9fa89 100644 --- a/cinder/tests/api/v2/stubs.py +++ b/manila/tests/api/v2/stubs.py @@ -17,7 +17,7 @@ import datetime -from cinder import exception as exc +from manila import exception as exc FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' FAKE_UUIDS = {} @@ -73,7 +73,7 @@ def stub_volume_create_from_image(self, context, size, name, description, vol['size'] = size vol['display_name'] = name vol['display_description'] = description - vol['availability_zone'] = 'cinder' + vol['availability_zone'] = 'manila' return vol diff --git a/cinder/tests/api/v2/test_limits.py b/manila/tests/api/v2/test_limits.py similarity index 98% rename from cinder/tests/api/v2/test_limits.py rename to manila/tests/api/v2/test_limits.py index bfbff2249e..04ba66ea0d 100644 --- a/cinder/tests/api/v2/test_limits.py +++ b/manila/tests/api/v2/test_limits.py @@ -24,12 +24,12 @@ from lxml import etree import webob from xml.dom import minidom -from cinder.api.v2 import limits -from cinder.api import views -from cinder.api import xmlutil -import cinder.context -from cinder.openstack.common import jsonutils -from cinder import test +from manila.api.v2 import limits +from manila.api import views +from manila.api import xmlutil +import manila.context +from manila.openstack.common import jsonutils +from manila import test TEST_LIMITS = [ @@ -58,7 +58,7 @@ class BaseLimitTestSuite(test.TestCase): return dict((k, dict(limit=v)) for k, v in self.absolute_limits.items()) - self.stubs.Set(cinder.quota.QUOTAS, "get_project_quotas", + self.stubs.Set(manila.quota.QUOTAS, "get_project_quotas", stub_get_project_quotas) def _get_time(self): @@ -84,8 +84,8 @@ class LimitsControllerTest(BaseLimitTestSuite): "action": "index", "controller": "", }) - context = cinder.context.RequestContext('testuser', 'testproject') - request.environ["cinder.context"] = context + context = manila.context.RequestContext('testuser', 'testproject') + request.environ["manila.context"] = context return request def _populate_limits(self, request): @@ -96,7 +96,7 @@ class LimitsControllerTest(BaseLimitTestSuite): limits.Limit("GET", "changes-since*", "changes-since", 5, 60).display(), ] - request.environ["cinder.limits"] = _limits + request.environ["manila.limits"] = _limits return request def test_empty_index_json(self): @@ -172,7 +172,7 @@ class LimitsControllerTest(BaseLimitTestSuite): limits.Limit("GET", "*", ".*", 10, 60).display(), limits.Limit("GET", "*", "*.*", 10, 60).display(), ] - request.environ["cinder.limits"] = _limits + request.environ["manila.limits"] = _limits return request def test_index_diff_regex(self): diff --git a/cinder/tests/api/v2/test_snapshot_metadata.py b/manila/tests/api/v2/test_snapshot_metadata.py similarity index 87% rename from cinder/tests/api/v2/test_snapshot_metadata.py rename to manila/tests/api/v2/test_snapshot_metadata.py index ae0333283a..2eb276908d 100644 --- a/cinder/tests/api/v2/test_snapshot_metadata.py +++ b/manila/tests/api/v2/test_snapshot_metadata.py @@ -20,14 +20,14 @@ import uuid from oslo.config import cfg import webob -from cinder.api import extensions -from cinder.api.v2 import snapshot_metadata -from cinder.api.v2 import snapshots -import cinder.db -from cinder import exception -from cinder.openstack.common import jsonutils -from cinder import test -from cinder.tests.api import fakes +from manila.api import extensions +from manila.api.v2 import snapshot_metadata +from manila.api.v2 import snapshots +import manila.db +from manila import exception +from manila.openstack.common import jsonutils +from manila import test +from manila.tests.api import fakes CONF = cfg.CONF @@ -103,11 +103,11 @@ class SnapshotMetaDataTest(test.TestCase): def setUp(self): super(SnapshotMetaDataTest, self).setUp() - self.volume_api = cinder.volume.api.API() + self.volume_api = manila.volume.api.API() fakes.stub_out_key_pair_funcs(self.stubs) - self.stubs.Set(cinder.db, 'volume_get', return_volume) - self.stubs.Set(cinder.db, 'snapshot_get', return_snapshot) - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'volume_get', return_volume) + self.stubs.Set(manila.db, 'snapshot_get', return_snapshot) + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_snapshot_metadata) self.stubs.Set(self.volume_api, 'update_snapshot_metadata', @@ -145,14 +145,14 @@ class SnapshotMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_index_nonexistent_snapshot(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_snapshot_nonexistent) req = fakes.HTTPRequest.blank(self.url) self.assertRaises(webob.exc.HTTPNotFound, self.controller.index, req, self.url) def test_index_no_data(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_empty_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url) res_dict = self.controller.index(req, self.id) @@ -166,23 +166,23 @@ class SnapshotMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_show_nonexistent_snapshot(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_snapshot_nonexistent) req = fakes.HTTPRequest.blank(self.url + '/key2') self.assertRaises(webob.exc.HTTPNotFound, self.controller.show, req, self.id, 'key2') def test_show_meta_not_found(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_empty_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key6') self.assertRaises(webob.exc.HTTPNotFound, self.controller.show, req, self.id, 'key6') def test_delete(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_snapshot_metadata) - self.stubs.Set(cinder.db, 'snapshot_metadata_delete', + self.stubs.Set(manila.db, 'snapshot_metadata_delete', delete_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key2') req.method = 'DELETE' @@ -191,7 +191,7 @@ class SnapshotMetaDataTest(test.TestCase): self.assertEqual(200, res.status_int) def test_delete_nonexistent_snapshot(self): - self.stubs.Set(cinder.db, 'snapshot_get', + self.stubs.Set(manila.db, 'snapshot_get', return_snapshot_nonexistent) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'DELETE' @@ -199,7 +199,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.delete, req, self.id, 'key1') def test_delete_meta_not_found(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_empty_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key6') req.method = 'DELETE' @@ -207,9 +207,9 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.delete, req, self.id, 'key6') def test_create(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_empty_snapshot_metadata) - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank('/v2/snapshot_metadata') @@ -221,7 +221,7 @@ class SnapshotMetaDataTest(test.TestCase): self.assertEqual(body, res_dict) def test_create_empty_body(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'POST' @@ -231,7 +231,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.create, req, self.id, None) def test_create_item_empty_key(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -243,7 +243,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.create, req, self.id, body) def test_create_item_key_too_long(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -256,11 +256,11 @@ class SnapshotMetaDataTest(test.TestCase): req, self.id, body) def test_create_nonexistent_snapshot(self): - self.stubs.Set(cinder.db, 'snapshot_get', + self.stubs.Set(manila.db, 'snapshot_get', return_snapshot_nonexistent) - self.stubs.Set(cinder.db, 'snapshot_metadata_get', + self.stubs.Set(manila.db, 'snapshot_metadata_get', return_snapshot_metadata) - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank('/v2/snapshot_metadata') @@ -272,7 +272,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.create, req, self.id, body) def test_update_all(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' @@ -289,7 +289,7 @@ class SnapshotMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_update_all_empty_container(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' @@ -301,7 +301,7 @@ class SnapshotMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_update_all_malformed_container(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' @@ -313,7 +313,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update_all, req, self.id, expected) def test_update_all_malformed_data(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' @@ -325,7 +325,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update_all, req, self.id, expected) def test_update_all_nonexistent_snapshot(self): - self.stubs.Set(cinder.db, 'snapshot_get', return_snapshot_nonexistent) + self.stubs.Set(manila.db, 'snapshot_get', return_snapshot_nonexistent) req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' req.content_type = "application/json" @@ -336,7 +336,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update_all, req, '100', body) def test_update_item(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -348,7 +348,7 @@ class SnapshotMetaDataTest(test.TestCase): self.assertEqual(expected, res_dict) def test_update_item_nonexistent_snapshot(self): - self.stubs.Set(cinder.db, 'snapshot_get', + self.stubs.Set(manila.db, 'snapshot_get', return_snapshot_nonexistent) req = fakes.HTTPRequest.blank( '/v2/fake/snapshots/asdf/metadata/key1') @@ -361,7 +361,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update, req, self.id, 'key1', body) def test_update_item_empty_body(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -371,7 +371,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update, req, self.id, 'key1', None) def test_update_item_empty_key(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -383,7 +383,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update, req, self.id, '', body) def test_update_item_key_too_long(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -396,7 +396,7 @@ class SnapshotMetaDataTest(test.TestCase): req, self.id, ("a" * 260), body) def test_update_item_value_too_long(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -409,7 +409,7 @@ class SnapshotMetaDataTest(test.TestCase): req, self.id, "key1", body) def test_update_item_too_many_keys(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/key1') req.method = 'PUT' @@ -421,7 +421,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update, req, self.id, 'key1', body) def test_update_item_body_uri_mismatch(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url + '/bad') req.method = 'PUT' @@ -433,7 +433,7 @@ class SnapshotMetaDataTest(test.TestCase): self.controller.update, req, self.id, 'bad', body) def test_invalid_metadata_items_on_create(self): - self.stubs.Set(cinder.db, 'snapshot_metadata_update', + self.stubs.Set(manila.db, 'snapshot_metadata_update', return_create_snapshot_metadata) req = fakes.HTTPRequest.blank(self.url) req.method = 'POST' diff --git a/cinder/tests/api/v2/test_snapshots.py b/manila/tests/api/v2/test_snapshots.py similarity index 98% rename from cinder/tests/api/v2/test_snapshots.py rename to manila/tests/api/v2/test_snapshots.py index f003cb0b3d..e29ab7c8f1 100644 --- a/cinder/tests/api/v2/test_snapshots.py +++ b/manila/tests/api/v2/test_snapshots.py @@ -18,15 +18,15 @@ import datetime from lxml import etree import webob -from cinder.api.v2 import snapshots -from cinder import db -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import test -from cinder.tests.api import fakes -from cinder.tests.api.v2 import stubs -from cinder import volume +from manila.api.v2 import snapshots +from manila import db +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila import test +from manila.tests.api import fakes +from manila.tests.api.v2 import stubs +from manila import volume FLAGS = flags.FLAGS diff --git a/cinder/tests/api/v2/test_types.py b/manila/tests/api/v2/test_types.py similarity index 96% rename from cinder/tests/api/v2/test_types.py rename to manila/tests/api/v2/test_types.py index 1a3849f822..1ca3253271 100644 --- a/cinder/tests/api/v2/test_types.py +++ b/manila/tests/api/v2/test_types.py @@ -16,13 +16,13 @@ from lxml import etree import webob -from cinder.api.v2 import types -from cinder.api.views import types as views_types -from cinder import exception -from cinder.openstack.common import timeutils -from cinder import test -from cinder.tests.api import fakes -from cinder.volume import volume_types +from manila.api.v2 import types +from manila.api.views import types as views_types +from manila import exception +from manila.openstack.common import timeutils +from manila import test +from manila.tests.api import fakes +from manila.volume import volume_types def stub_volume_type(id): diff --git a/cinder/tests/api/v2/test_volumes.py b/manila/tests/api/v2/test_volumes.py similarity index 98% rename from cinder/tests/api/v2/test_volumes.py rename to manila/tests/api/v2/test_volumes.py index 9b08ab376a..970b9e257f 100644 --- a/cinder/tests/api/v2/test_volumes.py +++ b/manila/tests/api/v2/test_volumes.py @@ -18,17 +18,17 @@ import datetime from lxml import etree import webob -from cinder.api import extensions -from cinder.api.v2 import volumes -from cinder import context -from cinder import db -from cinder import exception -from cinder import flags -from cinder import test -from cinder.tests.api import fakes -from cinder.tests.api.v2 import stubs -from cinder.tests.image import fake as fake_image -from cinder.volume import api as volume_api +from manila.api import extensions +from manila.api.v2 import volumes +from manila import context +from manila import db +from manila import exception +from manila import flags +from manila import test +from manila.tests.api import fakes +from manila.tests.api.v2 import stubs +from manila.tests.image import fake as fake_image +from manila.volume import api as volume_api FLAGS = flags.FLAGS @@ -173,7 +173,7 @@ class VolumeApiTest(test.TestCase): "size": '1', "name": "Volume Test Name", "description": "Volume Test Desc", - "availability_zone": "cinder", + "availability_zone": "manila", "imageRef": 1234, } body = {"volume": vol} @@ -190,7 +190,7 @@ class VolumeApiTest(test.TestCase): "size": '1', "name": "Volume Test Name", "description": "Volume Test Desc", - "availability_zone": "cinder", + "availability_zone": "manila", "imageRef": '12345' } body = {"volume": vol} diff --git a/cinder/tests/backup/__init__.py b/manila/tests/backup/__init__.py similarity index 100% rename from cinder/tests/backup/__init__.py rename to manila/tests/backup/__init__.py diff --git a/cinder/tests/backup/fake_service.py b/manila/tests/backup/fake_service.py similarity index 94% rename from cinder/tests/backup/fake_service.py rename to manila/tests/backup/fake_service.py index c8a182eb26..f4a50f315d 100644 --- a/cinder/tests/backup/fake_service.py +++ b/manila/tests/backup/fake_service.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.db import base -from cinder.openstack.common import log as logging +from manila.db import base +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/tests/backup/fake_swift_client.py b/manila/tests/backup/fake_swift_client.py similarity index 98% rename from cinder/tests/backup/fake_swift_client.py rename to manila/tests/backup/fake_swift_client.py index ff74246797..906ece6ad4 100644 --- a/cinder/tests/backup/fake_swift_client.py +++ b/manila/tests/backup/fake_swift_client.py @@ -19,7 +19,7 @@ import os import socket import zlib -from cinder.openstack.common import log as logging +from manila.openstack.common import log as logging from swiftclient import client as swift LOG = logging.getLogger(__name__) diff --git a/cinder/tests/brick/__init__.py b/manila/tests/brick/__init__.py similarity index 100% rename from cinder/tests/brick/__init__.py rename to manila/tests/brick/__init__.py diff --git a/cinder/tests/brick/test_brick_lvm.py b/manila/tests/brick/test_brick_lvm.py similarity index 96% rename from cinder/tests/brick/test_brick_lvm.py rename to manila/tests/brick/test_brick_lvm.py index 9d3ac6b23e..505e568cc4 100644 --- a/cinder/tests/brick/test_brick_lvm.py +++ b/manila/tests/brick/test_brick_lvm.py @@ -18,11 +18,11 @@ import mox -from cinder.brick.local_dev import lvm as brick -from cinder.openstack.common import log as logging -from cinder.openstack.common import processutils -from cinder import test -from cinder.volume import configuration as conf +from manila.brick.local_dev import lvm as brick +from manila.openstack.common import log as logging +from manila.openstack.common import processutils +from manila import test +from manila.volume import configuration as conf LOG = logging.getLogger(__name__) diff --git a/cinder/tests/db/__init__.py b/manila/tests/db/__init__.py similarity index 100% rename from cinder/tests/db/__init__.py rename to manila/tests/db/__init__.py diff --git a/cinder/tests/db/fakes.py b/manila/tests/db/fakes.py similarity index 98% rename from cinder/tests/db/fakes.py rename to manila/tests/db/fakes.py index c831fdba2c..b5fa1d2190 100644 --- a/cinder/tests/db/fakes.py +++ b/manila/tests/db/fakes.py @@ -18,7 +18,7 @@ """Stubouts, mocks and fixtures for the test suite.""" -from cinder import db +from manila import db class FakeModel(object): diff --git a/cinder/tests/declare_flags.py b/manila/tests/declare_flags.py similarity index 97% rename from cinder/tests/declare_flags.py rename to manila/tests/declare_flags.py index 4f569c0266..c3fa5d0117 100644 --- a/cinder/tests/declare_flags.py +++ b/manila/tests/declare_flags.py @@ -18,7 +18,7 @@ from oslo.config import cfg -from cinder import flags +from manila import flags FLAGS = flags.FLAGS FLAGS.register_opt(cfg.IntOpt('answer', default=42, help='test flag')) diff --git a/cinder/tests/fake_driver.py b/manila/tests/fake_driver.py similarity index 96% rename from cinder/tests/fake_driver.py rename to manila/tests/fake_driver.py index 10f791e77b..9497445b15 100644 --- a/cinder/tests/fake_driver.py +++ b/manila/tests/fake_driver.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.openstack.common import log as logging -from cinder.volume import driver -from cinder.volume.drivers import lvm +from manila.openstack.common import log as logging +from manila.volume import driver +from manila.volume.drivers import lvm LOG = logging.getLogger(__name__) diff --git a/cinder/tests/fake_flags.py b/manila/tests/fake_flags.py similarity index 67% rename from cinder/tests/fake_flags.py rename to manila/tests/fake_flags.py index 900ea4b076..57439e6343 100644 --- a/cinder/tests/fake_flags.py +++ b/manila/tests/fake_flags.py @@ -16,15 +16,15 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder import flags +from manila import flags FLAGS = flags.FLAGS -flags.DECLARE('iscsi_num_targets', 'cinder.volume.drivers.lvm') -flags.DECLARE('policy_file', 'cinder.policy') -flags.DECLARE('volume_driver', 'cinder.volume.manager') -flags.DECLARE('xiv_proxy', 'cinder.volume.drivers.xiv') -flags.DECLARE('backup_service', 'cinder.backup.manager') +flags.DECLARE('iscsi_num_targets', 'manila.volume.drivers.lvm') +flags.DECLARE('policy_file', 'manila.policy') +flags.DECLARE('volume_driver', 'manila.volume.manager') +flags.DECLARE('xiv_proxy', 'manila.volume.drivers.xiv') +flags.DECLARE('backup_service', 'manila.backup.manager') def_vol_type = 'fake_vol_type' @@ -32,15 +32,15 @@ def_vol_type = 'fake_vol_type' def set_defaults(conf): conf.set_default('default_volume_type', def_vol_type) conf.set_default('volume_driver', - 'cinder.tests.fake_driver.FakeISCSIDriver') + 'manila.tests.fake_driver.FakeISCSIDriver') conf.set_default('iscsi_helper', 'fake') conf.set_default('connection_type', 'fake') conf.set_default('fake_rabbit', True) - conf.set_default('rpc_backend', 'cinder.openstack.common.rpc.impl_fake') + conf.set_default('rpc_backend', 'manila.openstack.common.rpc.impl_fake') conf.set_default('iscsi_num_targets', 8) conf.set_default('verbose', True) conf.set_default('sql_connection', "sqlite://") conf.set_default('sqlite_synchronous', False) - conf.set_default('policy_file', 'cinder/tests/policy.json') - conf.set_default('xiv_proxy', 'cinder.tests.test_xiv.XIVFakeProxyDriver') - conf.set_default('backup_service', 'cinder.tests.backup.fake_service') + conf.set_default('policy_file', 'manila/tests/policy.json') + conf.set_default('xiv_proxy', 'manila.tests.test_xiv.XIVFakeProxyDriver') + conf.set_default('backup_service', 'manila.tests.backup.fake_service') diff --git a/cinder/tests/fake_utils.py b/manila/tests/fake_utils.py similarity index 95% rename from cinder/tests/fake_utils.py rename to manila/tests/fake_utils.py index 68aaf79646..c1c389e484 100644 --- a/cinder/tests/fake_utils.py +++ b/manila/tests/fake_utils.py @@ -14,15 +14,15 @@ # License for the specific language governing permissions and limitations # under the License. -"""This modules stubs out functions in cinder.utils.""" +"""This modules stubs out functions in manila.utils.""" import re from eventlet import greenthread -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import utils +from manila import exception +from manila.openstack.common import log as logging +from manila import utils LOG = logging.getLogger(__name__) diff --git a/cinder/tests/glance/__init__.py b/manila/tests/glance/__init__.py similarity index 100% rename from cinder/tests/glance/__init__.py rename to manila/tests/glance/__init__.py diff --git a/cinder/tests/glance/stubs.py b/manila/tests/glance/stubs.py similarity index 100% rename from cinder/tests/glance/stubs.py rename to manila/tests/glance/stubs.py diff --git a/cinder/tests/image/__init__.py b/manila/tests/image/__init__.py similarity index 96% rename from cinder/tests/image/__init__.py rename to manila/tests/image/__init__.py index 387872b21f..a079349176 100644 --- a/cinder/tests/image/__init__.py +++ b/manila/tests/image/__init__.py @@ -17,4 +17,4 @@ # NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from cinder.tests import * +from manila.tests import * diff --git a/cinder/tests/image/fake.py b/manila/tests/image/fake.py similarity index 97% rename from cinder/tests/image/fake.py rename to manila/tests/image/fake.py index e8feb2433d..0b336cc260 100644 --- a/cinder/tests/image/fake.py +++ b/manila/tests/image/fake.py @@ -22,10 +22,10 @@ import copy import datetime import uuid -from cinder import exception -from cinder import flags -import cinder.image.glance -from cinder.openstack.common import log as logging +from manila import exception +from manila import flags +import manila.image.glance +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) @@ -237,7 +237,7 @@ def FakeImageService_reset(): def stub_out_image_service(stubs): def fake_get_remote_image_service(context, image_href): return (FakeImageService(), image_href) - stubs.Set(cinder.image.glance, 'get_remote_image_service', + stubs.Set(manila.image.glance, 'get_remote_image_service', lambda x, y: (FakeImageService(), y)) - stubs.Set(cinder.image.glance, 'get_default_image_service', + stubs.Set(manila.image.glance, 'get_default_image_service', lambda: FakeImageService()) diff --git a/cinder/tests/image/test_glance.py b/manila/tests/image/test_glance.py similarity index 99% rename from cinder/tests/image/test_glance.py rename to manila/tests/image/test_glance.py index 46bbafa9c5..43bba9f5ab 100644 --- a/cinder/tests/image/test_glance.py +++ b/manila/tests/image/test_glance.py @@ -22,12 +22,12 @@ import time import glanceclient.exc -from cinder import context -from cinder import exception -from cinder import flags -from cinder.image import glance -from cinder import test -from cinder.tests.glance import stubs as glance_stubs +from manila import context +from manila import exception +from manila import flags +from manila.image import glance +from manila import test +from manila.tests.glance import stubs as glance_stubs from glanceclient.v2.client import Client as glanceclient_v2 diff --git a/cinder/tests/integrated/__init__.py b/manila/tests/integrated/__init__.py similarity index 96% rename from cinder/tests/integrated/__init__.py rename to manila/tests/integrated/__init__.py index 7c17b5ad74..a4b47b2db3 100644 --- a/cinder/tests/integrated/__init__.py +++ b/manila/tests/integrated/__init__.py @@ -19,4 +19,4 @@ ================================= """ # NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from cinder.tests import * +from manila.tests import * diff --git a/cinder/tests/integrated/api/__init__.py b/manila/tests/integrated/api/__init__.py similarity index 100% rename from cinder/tests/integrated/api/__init__.py rename to manila/tests/integrated/api/__init__.py diff --git a/cinder/tests/integrated/api/client.py b/manila/tests/integrated/api/client.py similarity index 98% rename from cinder/tests/integrated/api/client.py rename to manila/tests/integrated/api/client.py index 516a2a0e70..a5a153665d 100644 --- a/cinder/tests/integrated/api/client.py +++ b/manila/tests/integrated/api/client.py @@ -17,8 +17,8 @@ import httplib import urlparse -from cinder.openstack.common import jsonutils -from cinder.openstack.common import log as logging +from manila.openstack.common import jsonutils +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/tests/integrated/integrated_helpers.py b/manila/tests/integrated/integrated_helpers.py similarity index 95% rename from cinder/tests/integrated/integrated_helpers.py rename to manila/tests/integrated/integrated_helpers.py index ead8bc1dd6..5ba2569ce2 100644 --- a/cinder/tests/integrated/integrated_helpers.py +++ b/manila/tests/integrated/integrated_helpers.py @@ -23,10 +23,10 @@ import random import string import uuid -from cinder.openstack.common import log as logging -from cinder import service -from cinder import test # For the flags -from cinder.tests.integrated.api import client +from manila.openstack.common import log as logging +from manila import service +from manila import test # For the flags +from manila.tests.integrated.api import client LOG = logging.getLogger(__name__) diff --git a/cinder/tests/integrated/test_extensions.py b/manila/tests/integrated/test_extensions.py similarity index 87% rename from cinder/tests/integrated/test_extensions.py rename to manila/tests/integrated/test_extensions.py index 363baed66b..b794f26497 100644 --- a/cinder/tests/integrated/test_extensions.py +++ b/manila/tests/integrated/test_extensions.py @@ -15,9 +15,9 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.tests.integrated import integrated_helpers +from manila import flags +from manila.openstack.common import log as logging +from manila.tests.integrated import integrated_helpers FLAGS = flags.FLAGS @@ -29,7 +29,7 @@ class ExtensionsTest(integrated_helpers._IntegratedTestBase): f = super(ExtensionsTest, self)._get_flags() f['osapi_volume_extension'] = FLAGS.osapi_volume_extension[:] f['osapi_volume_extension'].append( - 'cinder.tests.api.extensions.foxinsocks.Foxinsocks') + 'manila.tests.api.extensions.foxinsocks.Foxinsocks') return f def test_get_foxnsocks(self): diff --git a/cinder/tests/integrated/test_login.py b/manila/tests/integrated/test_login.py similarity index 90% rename from cinder/tests/integrated/test_login.py rename to manila/tests/integrated/test_login.py index 9c1515de82..b6a5b98df9 100644 --- a/cinder/tests/integrated/test_login.py +++ b/manila/tests/integrated/test_login.py @@ -16,8 +16,8 @@ # under the License. -from cinder.openstack.common import log as logging -from cinder.tests.integrated import integrated_helpers +from manila.openstack.common import log as logging +from manila.tests.integrated import integrated_helpers LOG = logging.getLogger(__name__) diff --git a/cinder/tests/integrated/test_volumes.py b/manila/tests/integrated/test_volumes.py similarity index 95% rename from cinder/tests/integrated/test_volumes.py rename to manila/tests/integrated/test_volumes.py index 1ba3d6ea0e..8cc697eb02 100755 --- a/cinder/tests/integrated/test_volumes.py +++ b/manila/tests/integrated/test_volumes.py @@ -18,12 +18,12 @@ import time import unittest -from cinder.openstack.common import log as logging -from cinder import service -from cinder.tests import fake_driver -from cinder.tests.integrated.api import client -from cinder.tests.integrated import integrated_helpers -from cinder.volume import driver +from manila.openstack.common import log as logging +from manila import service +from manila.tests import fake_driver +from manila.tests.integrated.api import client +from manila.tests.integrated import integrated_helpers +from manila.volume import driver LOG = logging.getLogger(__name__) @@ -42,7 +42,7 @@ class VolumesTest(integrated_helpers._IntegratedTestBase): def _get_flags(self): f = super(VolumesTest, self)._get_flags() - f['volume_driver'] = 'cinder.tests.fake_driver.LoggingVolumeDriver' + f['volume_driver'] = 'manila.tests.fake_driver.LoggingVolumeDriver' return f def test_get_volumes_summary(self): diff --git a/cinder/tests/integrated/test_xml.py b/manila/tests/integrated/test_xml.py similarity index 90% rename from cinder/tests/integrated/test_xml.py rename to manila/tests/integrated/test_xml.py index 2017a89e3f..e64fa8a179 100644 --- a/cinder/tests/integrated/test_xml.py +++ b/manila/tests/integrated/test_xml.py @@ -17,9 +17,9 @@ from lxml import etree -from cinder.api import common -from cinder.openstack.common import log as logging -from cinder.tests.integrated import integrated_helpers +from manila.api import common +from manila.openstack.common import log as logging +from manila.tests.integrated import integrated_helpers LOG = logging.getLogger(__name__) @@ -28,7 +28,7 @@ LOG = logging.getLogger(__name__) class XmlTests(integrated_helpers._IntegratedTestBase): """"Some basic XML sanity checks.""" - # FIXME(ja): does cinder need limits? + # FIXME(ja): does manila need limits? # def test_namespace_limits(self): # headers = {} # headers['Accept'] = 'application/xml' diff --git a/cinder/tests/monkey_patch_example/__init__.py b/manila/tests/monkey_patch_example/__init__.py similarity index 100% rename from cinder/tests/monkey_patch_example/__init__.py rename to manila/tests/monkey_patch_example/__init__.py diff --git a/cinder/tests/monkey_patch_example/example_a.py b/manila/tests/monkey_patch_example/example_a.py similarity index 100% rename from cinder/tests/monkey_patch_example/example_a.py rename to manila/tests/monkey_patch_example/example_a.py diff --git a/cinder/tests/monkey_patch_example/example_b.py b/manila/tests/monkey_patch_example/example_b.py similarity index 100% rename from cinder/tests/monkey_patch_example/example_b.py rename to manila/tests/monkey_patch_example/example_b.py diff --git a/cinder/tests/policy.json b/manila/tests/policy.json similarity index 100% rename from cinder/tests/policy.json rename to manila/tests/policy.json diff --git a/cinder/tests/runtime_flags.py b/manila/tests/runtime_flags.py similarity index 97% rename from cinder/tests/runtime_flags.py rename to manila/tests/runtime_flags.py index ad2994cde0..c13a48e25a 100644 --- a/cinder/tests/runtime_flags.py +++ b/manila/tests/runtime_flags.py @@ -18,7 +18,7 @@ from oslo.config import cfg -from cinder import flags +from manila import flags FLAGS = flags.FLAGS FLAGS.register_opt(cfg.IntOpt('runtime_answer', default=54, help='test flag')) diff --git a/cinder/tests/scheduler/__init__.py b/manila/tests/scheduler/__init__.py similarity index 96% rename from cinder/tests/scheduler/__init__.py rename to manila/tests/scheduler/__init__.py index 3be5ce944c..9488909d3c 100644 --- a/cinder/tests/scheduler/__init__.py +++ b/manila/tests/scheduler/__init__.py @@ -16,4 +16,4 @@ # under the License. # NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work -from cinder.tests import * +from manila.tests import * diff --git a/cinder/tests/scheduler/fakes.py b/manila/tests/scheduler/fakes.py similarity index 96% rename from cinder/tests/scheduler/fakes.py rename to manila/tests/scheduler/fakes.py index 08a65fa5da..4d2d2e4f37 100644 --- a/cinder/tests/scheduler/fakes.py +++ b/manila/tests/scheduler/fakes.py @@ -18,10 +18,10 @@ Fakes For Scheduler tests. import mox -from cinder import db -from cinder.openstack.common import timeutils -from cinder.scheduler import filter_scheduler -from cinder.scheduler import host_manager +from manila import db +from manila.openstack.common import timeutils +from manila.scheduler import filter_scheduler +from manila.scheduler import host_manager VOLUME_SERVICES = [ diff --git a/cinder/tests/scheduler/test_capacity_weigher.py b/manila/tests/scheduler/test_capacity_weigher.py similarity index 93% rename from cinder/tests/scheduler/test_capacity_weigher.py rename to manila/tests/scheduler/test_capacity_weigher.py index a569ff2552..7ee6a09c18 100644 --- a/cinder/tests/scheduler/test_capacity_weigher.py +++ b/manila/tests/scheduler/test_capacity_weigher.py @@ -16,18 +16,18 @@ Tests For Capacity Weigher. """ -from cinder import context -from cinder.openstack.common.scheduler.weights import HostWeightHandler -from cinder import test -from cinder.tests.scheduler import fakes -from cinder.tests import utils as test_utils +from manila import context +from manila.openstack.common.scheduler.weights import HostWeightHandler +from manila import test +from manila.tests.scheduler import fakes +from manila.tests import utils as test_utils class CapacityWeigherTestCase(test.TestCase): def setUp(self): super(CapacityWeigherTestCase, self).setUp() self.host_manager = fakes.FakeHostManager() - self.weight_handler = HostWeightHandler('cinder.scheduler.weights') + self.weight_handler = HostWeightHandler('manila.scheduler.weights') self.weight_classes = self.weight_handler.get_all_classes() def _get_weighed_host(self, hosts, weight_properties=None): diff --git a/cinder/tests/scheduler/test_filter_scheduler.py b/manila/tests/scheduler/test_filter_scheduler.py similarity index 97% rename from cinder/tests/scheduler/test_filter_scheduler.py rename to manila/tests/scheduler/test_filter_scheduler.py index 7269aa6aba..da96c7f726 100644 --- a/cinder/tests/scheduler/test_filter_scheduler.py +++ b/manila/tests/scheduler/test_filter_scheduler.py @@ -16,16 +16,16 @@ Tests For Filter Scheduler. """ -from cinder import context -from cinder import exception -from cinder import test +from manila import context +from manila import exception +from manila import test -from cinder.openstack.common.scheduler import weights -from cinder.scheduler import filter_scheduler -from cinder.scheduler import host_manager -from cinder.tests.scheduler import fakes -from cinder.tests.scheduler import test_scheduler -from cinder.tests import utils as test_utils +from manila.openstack.common.scheduler import weights +from manila.scheduler import filter_scheduler +from manila.scheduler import host_manager +from manila.tests.scheduler import fakes +from manila.tests.scheduler import test_scheduler +from manila.tests import utils as test_utils def fake_get_filtered_hosts(hosts, filter_properties): diff --git a/cinder/tests/scheduler/test_host_filters.py b/manila/tests/scheduler/test_host_filters.py similarity index 94% rename from cinder/tests/scheduler/test_host_filters.py rename to manila/tests/scheduler/test_host_filters.py index 810056fd1a..c67b26e3fa 100644 --- a/cinder/tests/scheduler/test_host_filters.py +++ b/manila/tests/scheduler/test_host_filters.py @@ -18,15 +18,15 @@ Tests For Scheduler Host Filters. import httplib import stubout -from cinder import context -from cinder import db -from cinder import exception -from cinder.openstack.common import jsonutils -from cinder.openstack.common.scheduler import filters -from cinder import test -from cinder.tests.scheduler import fakes -from cinder.tests import utils as test_utils -from cinder import utils +from manila import context +from manila import db +from manila import exception +from manila.openstack.common import jsonutils +from manila.openstack.common.scheduler import filters +from manila import test +from manila.tests.scheduler import fakes +from manila.tests import utils as test_utils +from manila import utils DATA = '' @@ -65,7 +65,7 @@ class HostFiltersTestCase(test.TestCase): ['>=', '$total_capacity_gb', 10 * 1024]]) # This has a side effect of testing 'get_filter_classes' # when specifying a method (in this case, our standard filters) - filter_handler = filters.HostFilterHandler('cinder.scheduler.filters') + filter_handler = filters.HostFilterHandler('manila.scheduler.filters') classes = filter_handler.get_all_classes() self.class_map = {} for cls in classes: diff --git a/cinder/tests/scheduler/test_host_manager.py b/manila/tests/scheduler/test_host_manager.py similarity index 97% rename from cinder/tests/scheduler/test_host_manager.py rename to manila/tests/scheduler/test_host_manager.py index 95a8e0d7d6..23b84b786a 100644 --- a/cinder/tests/scheduler/test_host_manager.py +++ b/manila/tests/scheduler/test_host_manager.py @@ -17,14 +17,14 @@ Tests For HostManager """ -from cinder import db -from cinder import exception -from cinder import flags -from cinder.openstack.common.scheduler import filters -from cinder.openstack.common import timeutils -from cinder.scheduler import host_manager -from cinder import test -from cinder.tests.scheduler import fakes +from manila import db +from manila import exception +from manila import flags +from manila.openstack.common.scheduler import filters +from manila.openstack.common import timeutils +from manila.scheduler import host_manager +from manila import test +from manila.tests.scheduler import fakes FLAGS = flags.FLAGS diff --git a/cinder/tests/scheduler/test_rpcapi.py b/manila/tests/scheduler/test_rpcapi.py similarity index 93% rename from cinder/tests/scheduler/test_rpcapi.py rename to manila/tests/scheduler/test_rpcapi.py index 1032f429f4..123554b9fc 100644 --- a/cinder/tests/scheduler/test_rpcapi.py +++ b/manila/tests/scheduler/test_rpcapi.py @@ -15,14 +15,14 @@ # under the License. """ -Unit Tests for cinder.scheduler.rpcapi +Unit Tests for manila.scheduler.rpcapi """ -from cinder import context -from cinder import flags -from cinder.openstack.common import rpc -from cinder.scheduler import rpcapi as scheduler_rpcapi -from cinder import test +from manila import context +from manila import flags +from manila.openstack.common import rpc +from manila.scheduler import rpcapi as scheduler_rpcapi +from manila import test FLAGS = flags.FLAGS diff --git a/cinder/tests/scheduler/test_scheduler.py b/manila/tests/scheduler/test_scheduler.py similarity index 96% rename from cinder/tests/scheduler/test_scheduler.py rename to manila/tests/scheduler/test_scheduler.py index 2101368f32..1c7a54a8de 100644 --- a/cinder/tests/scheduler/test_scheduler.py +++ b/manila/tests/scheduler/test_scheduler.py @@ -21,16 +21,16 @@ Tests For Scheduler from mox import IsA -from cinder import context -from cinder import db -from cinder import exception -from cinder import flags -from cinder.openstack.common import timeutils -from cinder.scheduler import driver -from cinder.scheduler import manager -from cinder.scheduler import simple -from cinder import test -from cinder import utils +from manila import context +from manila import db +from manila import exception +from manila import flags +from manila.openstack.common import timeutils +from manila.scheduler import driver +from manila.scheduler import manager +from manila.scheduler import simple +from manila import test +from manila import utils FLAGS = flags.FLAGS @@ -41,7 +41,7 @@ class SchedulerManagerTestCase(test.TestCase): manager_cls = manager.SchedulerManager driver_cls = driver.Scheduler - driver_cls_name = 'cinder.scheduler.driver.Scheduler' + driver_cls_name = 'manila.scheduler.driver.Scheduler' class AnException(Exception): pass @@ -363,7 +363,7 @@ class SimpleSchedulerSharesTestCase(test.TestCase): self.mox.StubOutWithMock(driver, 'share_update_db') db.service_get_by_args(IsA(context.RequestContext), 'fake', - 'cinder-share').AndReturn('fake_service') + 'manila-share').AndReturn('fake_service') utils.service_is_up('fake_service').AndReturn(True) driver.share_update_db(IsA(context.RequestContext), share_id, 'fake').AndReturn(fake_share) @@ -385,7 +385,7 @@ class SimpleSchedulerSharesTestCase(test.TestCase): self.mox.StubOutWithMock(db, 'service_get_by_args') db.service_get_by_args(IsA(context.RequestContext), 'fake', - 'cinder-share').AndReturn('fake_service') + 'manila-share').AndReturn('fake_service') utils.service_is_up('fake_service').AndReturn(False) self.mox.ReplayAll() diff --git a/cinder/tests/scheduler/test_scheduler_options.py b/manila/tests/scheduler/test_scheduler_options.py similarity index 97% rename from cinder/tests/scheduler/test_scheduler_options.py rename to manila/tests/scheduler/test_scheduler_options.py index 7ecb772baf..0a1f54020c 100644 --- a/cinder/tests/scheduler/test_scheduler_options.py +++ b/manila/tests/scheduler/test_scheduler_options.py @@ -19,9 +19,9 @@ Tests For PickledScheduler. import datetime import StringIO -from cinder.openstack.common import jsonutils -from cinder.scheduler import scheduler_options -from cinder import test +from manila.openstack.common import jsonutils +from manila.scheduler import scheduler_options +from manila import test class FakeSchedulerOptions(scheduler_options.SchedulerOptions): diff --git a/cinder/tests/test_HpSanISCSIDriver.py b/manila/tests/test_HpSanISCSIDriver.py similarity index 97% rename from cinder/tests/test_HpSanISCSIDriver.py rename to manila/tests/test_HpSanISCSIDriver.py index a9ef2106cd..19ca029d06 100644 --- a/cinder/tests/test_HpSanISCSIDriver.py +++ b/manila/tests/test_HpSanISCSIDriver.py @@ -14,11 +14,11 @@ import mox -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import test -from cinder.volume import configuration as conf -from cinder.volume.drivers.san.hp_lefthand import HpSanISCSIDriver +from manila import exception +from manila.openstack.common import log as logging +from manila import test +from manila.volume import configuration as conf +from manila.volume.drivers.san.hp_lefthand import HpSanISCSIDriver LOG = logging.getLogger(__name__) diff --git a/cinder/tests/test_api.py b/manila/tests/test_api.py similarity index 100% rename from cinder/tests/test_api.py rename to manila/tests/test_api.py diff --git a/cinder/tests/test_backup.py b/manila/tests/test_backup.py similarity index 97% rename from cinder/tests/test_backup.py rename to manila/tests/test_backup.py index bffddb36c8..827699e3a0 100644 --- a/cinder/tests/test_backup.py +++ b/manila/tests/test_backup.py @@ -19,14 +19,14 @@ Tests for Backup code. import tempfile -from cinder import context -from cinder import db -from cinder import exception -from cinder import flags -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder import test +from manila import context +from manila import db +from manila import exception +from manila import flags +from manila.openstack.common import importutils +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils +from manila import test FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) @@ -249,7 +249,7 @@ class BackupTestCase(test.TestCase): self.stubs.Set(self.backup_mgr.driver, 'restore_backup', fake_restore_backup) - service = 'cinder.tests.backup.bad_service' + service = 'manila.tests.backup.bad_service' db.backup_update(self.ctxt, backup_id, {'service': service}) self.assertRaises(exception.InvalidBackup, self.backup_mgr.restore_backup, @@ -313,7 +313,7 @@ class BackupTestCase(test.TestCase): vol_id = self._create_volume_db_entry(size=1) backup_id = self._create_backup_db_entry(status='deleting', volume_id=vol_id) - service = 'cinder.tests.backup.bad_service' + service = 'manila.tests.backup.bad_service' db.backup_update(self.ctxt, backup_id, {'service': service}) self.assertRaises(exception.InvalidBackup, self.backup_mgr.delete_backup, diff --git a/cinder/tests/test_backup_swift.py b/manila/tests/test_backup_swift.py similarity index 96% rename from cinder/tests/test_backup_swift.py rename to manila/tests/test_backup_swift.py index 013641729a..548102527d 100644 --- a/cinder/tests/test_backup_swift.py +++ b/manila/tests/test_backup_swift.py @@ -23,14 +23,14 @@ import os import tempfile import zlib -from cinder.backup.services.swift import SwiftBackupService -from cinder import context -from cinder import db -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import test -from cinder.tests.backup.fake_swift_client import FakeSwiftClient +from manila.backup.services.swift import SwiftBackupService +from manila import context +from manila import db +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila import test +from manila.tests.backup.fake_swift_client import FakeSwiftClient from swiftclient import client as swift diff --git a/cinder/tests/test_context.py b/manila/tests/test_context.py similarity index 98% rename from cinder/tests/test_context.py rename to manila/tests/test_context.py index 886ca28825..bfdc6577b4 100644 --- a/cinder/tests/test_context.py +++ b/manila/tests/test_context.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder import context -from cinder import test +from manila import context +from manila import test class ContextTestCase(test.TestCase): diff --git a/cinder/tests/test_coraid.py b/manila/tests/test_coraid.py similarity index 96% rename from cinder/tests/test_coraid.py rename to manila/tests/test_coraid.py index cda121b283..745432c7c8 100644 --- a/cinder/tests/test_coraid.py +++ b/manila/tests/test_coraid.py @@ -17,14 +17,14 @@ import mox -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import test -from cinder.volume import configuration as conf -from cinder.volume.drivers import coraid -from cinder.volume.drivers.coraid import CoraidDriver -from cinder.volume.drivers.coraid import CoraidESMException -from cinder.volume.drivers.coraid import CoraidRESTClient +from manila import exception +from manila.openstack.common import log as logging +from manila import test +from manila.volume import configuration as conf +from manila.volume.drivers import coraid +from manila.volume.drivers.coraid import CoraidDriver +from manila.volume.drivers.coraid import CoraidESMException +from manila.volume.drivers.coraid import CoraidRESTClient import cookielib import urllib2 diff --git a/cinder/tests/test_drivers_compatibility.py b/manila/tests/test_drivers_compatibility.py similarity index 72% rename from cinder/tests/test_drivers_compatibility.py rename to manila/tests/test_drivers_compatibility.py index f69eb65ab2..a0b4390536 100644 --- a/cinder/tests/test_drivers_compatibility.py +++ b/manila/tests/test_drivers_compatibility.py @@ -12,30 +12,30 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder import context -from cinder import flags -from cinder.openstack.common import importutils -from cinder import test -from cinder.volume.drivers.solidfire import SolidFire +from manila import context +from manila import flags +from manila.openstack.common import importutils +from manila import test +from manila.volume.drivers.solidfire import SolidFire FLAGS = flags.FLAGS -RBD_MODULE = "cinder.volume.drivers.rbd.RBDDriver" -SHEEPDOG_MODULE = "cinder.volume.drivers.sheepdog.SheepdogDriver" -NEXENTA_MODULE = "cinder.volume.drivers.nexenta.volume.NexentaDriver" -SAN_MODULE = "cinder.volume.drivers.san.san.SanISCSIDriver" -SOLARIS_MODULE = "cinder.volume.drivers.san.solaris.SolarisISCSIDriver" -LEFTHAND_MODULE = "cinder.volume.drivers.san.hp_lefthand.HpSanISCSIDriver" -NETAPP_MODULE = "cinder.volume.drivers.netapp.iscsi.NetAppISCSIDriver" +RBD_MODULE = "manila.volume.drivers.rbd.RBDDriver" +SHEEPDOG_MODULE = "manila.volume.drivers.sheepdog.SheepdogDriver" +NEXENTA_MODULE = "manila.volume.drivers.nexenta.volume.NexentaDriver" +SAN_MODULE = "manila.volume.drivers.san.san.SanISCSIDriver" +SOLARIS_MODULE = "manila.volume.drivers.san.solaris.SolarisISCSIDriver" +LEFTHAND_MODULE = "manila.volume.drivers.san.hp_lefthand.HpSanISCSIDriver" +NETAPP_MODULE = "manila.volume.drivers.netapp.iscsi.NetAppISCSIDriver" NETAPP_CMODE_MODULE =\ - "cinder.volume.drivers.netapp.iscsi.NetAppCmodeISCSIDriver" -NETAPP_NFS_MODULE = "cinder.volume.drivers.netapp.nfs.NetAppNFSDriver" -NFS_MODULE = "cinder.volume.drivers.nfs.NfsDriver" -SOLIDFIRE_MODULE = "cinder.volume.drivers.solidfire.SolidFire" -STORWIZE_SVC_MODULE = "cinder.volume.drivers.storwize_svc.StorwizeSVCDriver" -WINDOWS_MODULE = "cinder.volume.drivers.windows.WindowsDriver" -XIV_MODULE = "cinder.volume.drivers.xiv.XIVDriver" -ZADARA_MODULE = "cinder.volume.drivers.zadara.ZadaraVPSAISCSIDriver" + "manila.volume.drivers.netapp.iscsi.NetAppCmodeISCSIDriver" +NETAPP_NFS_MODULE = "manila.volume.drivers.netapp.nfs.NetAppNFSDriver" +NFS_MODULE = "manila.volume.drivers.nfs.NfsDriver" +SOLIDFIRE_MODULE = "manila.volume.drivers.solidfire.SolidFire" +STORWIZE_SVC_MODULE = "manila.volume.drivers.storwize_svc.StorwizeSVCDriver" +WINDOWS_MODULE = "manila.volume.drivers.windows.WindowsDriver" +XIV_MODULE = "manila.volume.drivers.xiv.XIVDriver" +ZADARA_MODULE = "manila.volume.drivers.zadara.ZadaraVPSAISCSIDriver" class VolumeDriverCompatibility(test.TestCase): @@ -64,7 +64,7 @@ class VolumeDriverCompatibility(test.TestCase): self.manager.driver.__class__.__name__) def test_rbd_old(self): - self._load_driver('cinder.volume.driver.RBDDriver') + self._load_driver('manila.volume.driver.RBDDriver') self.assertEquals(self._driver_module_name(), RBD_MODULE) def test_rbd_new(self): @@ -72,7 +72,7 @@ class VolumeDriverCompatibility(test.TestCase): self.assertEquals(self._driver_module_name(), RBD_MODULE) def test_sheepdog_old(self): - self._load_driver('cinder.volume.driver.SheepdogDriver') + self._load_driver('manila.volume.driver.SheepdogDriver') self.assertEquals(self._driver_module_name(), SHEEPDOG_MODULE) def test_sheepdog_new(self): @@ -80,7 +80,7 @@ class VolumeDriverCompatibility(test.TestCase): self.assertEquals(self._driver_module_name(), SHEEPDOG_MODULE) def test_nexenta_old(self): - self._load_driver('cinder.volume.nexenta.volume.NexentaDriver') + self._load_driver('manila.volume.nexenta.volume.NexentaDriver') self.assertEquals(self._driver_module_name(), NEXENTA_MODULE) def test_nexenta_new(self): @@ -88,7 +88,7 @@ class VolumeDriverCompatibility(test.TestCase): self.assertEquals(self._driver_module_name(), NEXENTA_MODULE) def test_san_old(self): - self._load_driver('cinder.volume.san.SanISCSIDriver') + self._load_driver('manila.volume.san.SanISCSIDriver') self.assertEquals(self._driver_module_name(), SAN_MODULE) def test_san_new(self): @@ -96,7 +96,7 @@ class VolumeDriverCompatibility(test.TestCase): self.assertEquals(self._driver_module_name(), SAN_MODULE) def test_solaris_old(self): - self._load_driver('cinder.volume.san.SolarisISCSIDriver') + self._load_driver('manila.volume.san.SolarisISCSIDriver') self.assertEquals(self._driver_module_name(), SOLARIS_MODULE) def test_solaris_new(self): @@ -104,7 +104,7 @@ class VolumeDriverCompatibility(test.TestCase): self.assertEquals(self._driver_module_name(), SOLARIS_MODULE) def test_hp_lefthand_old(self): - self._load_driver('cinder.volume.san.HpSanISCSIDriver') + self._load_driver('manila.volume.san.HpSanISCSIDriver') self.assertEquals(self._driver_module_name(), LEFTHAND_MODULE) def test_hp_lefthand_new(self): @@ -112,7 +112,7 @@ class VolumeDriverCompatibility(test.TestCase): self.assertEquals(self._driver_module_name(), LEFTHAND_MODULE) def test_netapp_old(self): - self._load_driver('cinder.volume.netapp.NetAppISCSIDriver') + self._load_driver('manila.volume.netapp.NetAppISCSIDriver') self.assertEquals(self._driver_module_name(), NETAPP_MODULE) def test_netapp_new(self): @@ -120,7 +120,7 @@ class VolumeDriverCompatibility(test.TestCase): self.assertEquals(self._driver_module_name(), NETAPP_MODULE) def test_netapp_cmode_old(self): - self._load_driver('cinder.volume.netapp.NetAppCmodeISCSIDriver') + self._load_driver('manila.volume.netapp.NetAppCmodeISCSIDriver') self.assertEquals(self._driver_module_name(), NETAPP_CMODE_MODULE) def test_netapp_cmode_new(self): @@ -128,7 +128,7 @@ class VolumeDriverCompatibility(test.TestCase): self.assertEquals(self._driver_module_name(), NETAPP_CMODE_MODULE) def test_netapp_nfs_old(self): - self._load_driver('cinder.volume.netapp_nfs.NetAppNFSDriver') + self._load_driver('manila.volume.netapp_nfs.NetAppNFSDriver') self.assertEquals(self._driver_module_name(), NETAPP_NFS_MODULE) def test_netapp_nfs_new(self): @@ -136,7 +136,7 @@ class VolumeDriverCompatibility(test.TestCase): self.assertEquals(self._driver_module_name(), NETAPP_NFS_MODULE) def test_nfs_old(self): - self._load_driver('cinder.volume.nfs.NfsDriver') + self._load_driver('manila.volume.nfs.NfsDriver') self.assertEquals(self._driver_module_name(), NFS_MODULE) def test_nfs_new(self): @@ -144,7 +144,7 @@ class VolumeDriverCompatibility(test.TestCase): self.assertEquals(self._driver_module_name(), NFS_MODULE) def test_solidfire_old(self): - self._load_driver('cinder.volume.solidfire.SolidFire') + self._load_driver('manila.volume.solidfire.SolidFire') self.assertEquals(self._driver_module_name(), SOLIDFIRE_MODULE) def test_solidfire_new(self): @@ -152,7 +152,7 @@ class VolumeDriverCompatibility(test.TestCase): self.assertEquals(self._driver_module_name(), SOLIDFIRE_MODULE) def test_storwize_svc_old(self): - self._load_driver('cinder.volume.storwize_svc.StorwizeSVCDriver') + self._load_driver('manila.volume.storwize_svc.StorwizeSVCDriver') self.assertEquals(self._driver_module_name(), STORWIZE_SVC_MODULE) def test_storwize_svc_new(self): @@ -160,7 +160,7 @@ class VolumeDriverCompatibility(test.TestCase): self.assertEquals(self._driver_module_name(), STORWIZE_SVC_MODULE) def test_windows_old(self): - self._load_driver('cinder.volume.windows.WindowsDriver') + self._load_driver('manila.volume.windows.WindowsDriver') self.assertEquals(self._driver_module_name(), WINDOWS_MODULE) def test_windows_new(self): @@ -168,7 +168,7 @@ class VolumeDriverCompatibility(test.TestCase): self.assertEquals(self._driver_module_name(), WINDOWS_MODULE) def test_xiv_old(self): - self._load_driver('cinder.volume.xiv.XIVDriver') + self._load_driver('manila.volume.xiv.XIVDriver') self.assertEquals(self._driver_module_name(), XIV_MODULE) def test_xiv_new(self): @@ -176,7 +176,7 @@ class VolumeDriverCompatibility(test.TestCase): self.assertEquals(self._driver_module_name(), XIV_MODULE) def test_zadara_old(self): - self._load_driver('cinder.volume.zadara.ZadaraVPSAISCSIDriver') + self._load_driver('manila.volume.zadara.ZadaraVPSAISCSIDriver') self.assertEquals(self._driver_module_name(), ZADARA_MODULE) def test_zadara_new(self): diff --git a/cinder/tests/test_emc.py b/manila/tests/test_emc.py similarity index 98% rename from cinder/tests/test_emc.py rename to manila/tests/test_emc.py index c12070629e..90d8d3802a 100644 --- a/cinder/tests/test_emc.py +++ b/manila/tests/test_emc.py @@ -22,15 +22,15 @@ import shutil import tempfile from xml.dom.minidom import Document -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import test -from cinder.volume import configuration as conf -from cinder.volume.drivers.emc.emc_smis_common import EMCSMISCommon -from cinder.volume.drivers.emc.emc_smis_iscsi import EMCSMISISCSIDriver +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila import test +from manila.volume import configuration as conf +from manila.volume.drivers.emc.emc_smis_common import EMCSMISCommon +from manila.volume.drivers.emc.emc_smis_iscsi import EMCSMISISCSIDriver -CINDER_EMC_CONFIG_FILE = '/etc/cinder/cinder_emc_config.xml' +CINDER_EMC_CONFIG_FILE = '/etc/manila/cinder_emc_config.xml' LOG = logging.getLogger(__name__) config_file_name = 'cinder_emc_config.xml' diff --git a/cinder/tests/test_exception.py b/manila/tests/test_exception.py similarity index 95% rename from cinder/tests/test_exception.py rename to manila/tests/test_exception.py index c47f116e49..08879ab4eb 100644 --- a/cinder/tests/test_exception.py +++ b/manila/tests/test_exception.py @@ -16,13 +16,13 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder import exception -from cinder import test -from cinder import utils +from manila import exception +from manila import test +from manila import utils class FakeNotifier(object): - """Acts like the cinder.openstack.common.notifier.api module.""" + """Acts like the manila.openstack.common.notifier.api module.""" ERROR = 88 def __init__(self): diff --git a/cinder/tests/test_flags.py b/manila/tests/test_flags.py similarity index 93% rename from cinder/tests/test_flags.py rename to manila/tests/test_flags.py index 1619048489..65a4b396d8 100644 --- a/cinder/tests/test_flags.py +++ b/manila/tests/test_flags.py @@ -19,8 +19,8 @@ from oslo.config import cfg -from cinder import flags -from cinder import test +from manila import flags +from manila import test FLAGS = flags.FLAGS FLAGS.register_opt(cfg.StrOpt('flags_unittest', @@ -35,19 +35,19 @@ class FlagsTestCase(test.TestCase): def test_declare(self): self.assert_('answer' not in FLAGS) - flags.DECLARE('answer', 'cinder.tests.declare_flags') + flags.DECLARE('answer', 'manila.tests.declare_flags') self.assert_('answer' in FLAGS) self.assertEqual(FLAGS.answer, 42) # Make sure we don't overwrite anything FLAGS.set_override('answer', 256) self.assertEqual(FLAGS.answer, 256) - flags.DECLARE('answer', 'cinder.tests.declare_flags') + flags.DECLARE('answer', 'manila.tests.declare_flags') self.assertEqual(FLAGS.answer, 256) def test_runtime_and_unknown_flags(self): self.assert_('runtime_answer' not in FLAGS) - import cinder.tests.runtime_flags + import manila.tests.runtime_flags self.assert_('runtime_answer' in FLAGS) self.assertEqual(FLAGS.runtime_answer, 54) diff --git a/cinder/tests/test_glusterfs.py b/manila/tests/test_glusterfs.py similarity index 98% rename from cinder/tests/test_glusterfs.py rename to manila/tests/test_glusterfs.py index a210d57cb1..8b871e8485 100644 --- a/cinder/tests/test_glusterfs.py +++ b/manila/tests/test_glusterfs.py @@ -25,13 +25,13 @@ from mox import IgnoreArg from mox import IsA from mox import stubout -from cinder import context -from cinder import exception -from cinder.exception import ProcessExecutionError -from cinder import test +from manila import context +from manila import exception +from manila.exception import ProcessExecutionError +from manila import test -from cinder.volume import configuration as conf -from cinder.volume.drivers import glusterfs +from manila.volume import configuration as conf +from manila.volume.drivers import glusterfs class DumbVolume(object): @@ -54,7 +54,7 @@ class GlusterFsDriverTestCase(test.TestCase): TEST_MNT_POINT_BASE = '/mnt/test' TEST_LOCAL_PATH = '/mnt/glusterfs/volume-123' TEST_FILE_NAME = 'test.txt' - TEST_SHARES_CONFIG_FILE = '/etc/cinder/test-shares.conf' + TEST_SHARES_CONFIG_FILE = '/etc/manila/test-shares.conf' ONE_GB_IN_BYTES = 1024 * 1024 * 1024 def setUp(self): diff --git a/cinder/tests/test_hp3par.py b/manila/tests/test_hp3par.py similarity index 99% rename from cinder/tests/test_hp3par.py rename to manila/tests/test_hp3par.py index 8651929006..50067754dc 100644 --- a/cinder/tests/test_hp3par.py +++ b/manila/tests/test_hp3par.py @@ -24,12 +24,12 @@ import tempfile from hp3parclient import exceptions as hpexceptions -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import test -from cinder.volume import configuration as conf -from cinder.volume.drivers.san.hp import hp_3par_fc as hpfcdriver -from cinder.volume.drivers.san.hp import hp_3par_iscsi as hpdriver +from manila import exception +from manila.openstack.common import log as logging +from manila import test +from manila.volume import configuration as conf +from manila.volume.drivers.san.hp import hp_3par_fc as hpfcdriver +from manila.volume.drivers.san.hp import hp_3par_iscsi as hpdriver LOG = logging.getLogger(__name__) diff --git a/cinder/tests/test_huawei.py b/manila/tests/test_huawei.py similarity index 99% rename from cinder/tests/test_huawei.py rename to manila/tests/test_huawei.py index 0ff2c0115a..7c874de215 100644 --- a/cinder/tests/test_huawei.py +++ b/manila/tests/test_huawei.py @@ -25,11 +25,11 @@ import tempfile from xml.dom.minidom import Document from xml.etree import ElementTree as ET -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import test -from cinder.volume import configuration as conf -from cinder.volume.drivers.huawei import huawei_iscsi +from manila import exception +from manila.openstack.common import log as logging +from manila import test +from manila.volume import configuration as conf +from manila.volume.drivers.huawei import huawei_iscsi LOG = logging.getLogger(__name__) diff --git a/cinder/tests/test_iscsi.py b/manila/tests/test_iscsi.py similarity index 98% rename from cinder/tests/test_iscsi.py rename to manila/tests/test_iscsi.py index 321e805146..d91bc40d2a 100644 --- a/cinder/tests/test_iscsi.py +++ b/manila/tests/test_iscsi.py @@ -19,9 +19,9 @@ import shutil import string import tempfile -from cinder.brick.iscsi import iscsi -from cinder import test -from cinder.volume import utils as volume_utils +from manila.brick.iscsi import iscsi +from manila import test +from manila.volume import utils as volume_utils class TargetAdminTestCase(object): diff --git a/cinder/tests/test_migrations.conf b/manila/tests/test_migrations.conf similarity index 100% rename from cinder/tests/test_migrations.conf rename to manila/tests/test_migrations.conf diff --git a/cinder/tests/test_migrations.py b/manila/tests/test_migrations.py similarity index 98% rename from cinder/tests/test_migrations.py rename to manila/tests/test_migrations.py index 47b1050c51..f2606c7832 100644 --- a/cinder/tests/test_migrations.py +++ b/manila/tests/test_migrations.py @@ -33,13 +33,13 @@ import uuid from migrate.versioning import repository import sqlalchemy -import cinder.db.migration as migration -import cinder.db.sqlalchemy.migrate_repo -from cinder.db.sqlalchemy.migration import versioning_api as migration_api -from cinder.openstack.common import log as logging -from cinder import test +import manila.db.migration as migration +import manila.db.sqlalchemy.migrate_repo +from manila.db.sqlalchemy.migration import versioning_api as migration_api +from manila.openstack.common import log as logging +from manila import test -LOG = logging.getLogger('cinder.tests.test_migrations') +LOG = logging.getLogger('manila.tests.test_migrations') def _get_connect_string(backend, @@ -110,7 +110,7 @@ class TestMigrations(test.TestCase): # to override the location of the config file for migration testing CONFIG_FILE_PATH = os.environ.get('CINDER_TEST_MIGRATIONS_CONF', DEFAULT_CONFIG_FILE) - MIGRATE_FILE = cinder.db.sqlalchemy.migrate_repo.__file__ + MIGRATE_FILE = manila.db.sqlalchemy.migrate_repo.__file__ REPOSITORY = repository.Repository( os.path.abspath(os.path.dirname(MIGRATE_FILE))) diff --git a/cinder/tests/test_misc.py b/manila/tests/test_misc.py similarity index 94% rename from cinder/tests/test_misc.py rename to manila/tests/test_misc.py index 60ad26b7ed..a54ebf9eb2 100644 --- a/cinder/tests/test_misc.py +++ b/manila/tests/test_misc.py @@ -18,8 +18,8 @@ import glob import os -from cinder import exception -from cinder import test +from manila import exception +from manila import test class ExceptionTestCase(test.TestCase): @@ -39,7 +39,7 @@ class ExceptionTestCase(test.TestCase): class ProjectTestCase(test.TestCase): def test_all_migrations_have_downgrade(self): topdir = os.path.normpath(os.path.dirname(__file__) + '/../../') - py_glob = os.path.join(topdir, "cinder", "db", "sqlalchemy", + py_glob = os.path.join(topdir, "manila", "db", "sqlalchemy", "migrate_repo", "versions", "*.py") missing_downgrade = [] for path in glob.iglob(py_glob): diff --git a/cinder/tests/test_netapp.py b/manila/tests/test_netapp.py similarity index 99% rename from cinder/tests/test_netapp.py rename to manila/tests/test_netapp.py index c5e5738814..a62859f94b 100644 --- a/cinder/tests/test_netapp.py +++ b/manila/tests/test_netapp.py @@ -28,15 +28,15 @@ import tempfile from lxml import etree -from cinder.exception import VolumeBackendAPIException -from cinder.openstack.common import log as logging -from cinder import test -from cinder.volume import configuration as conf -from cinder.volume.drivers.netapp import iscsi -from cinder.volume.drivers.netapp.iscsi import netapp_opts +from manila.exception import VolumeBackendAPIException +from manila.openstack.common import log as logging +from manila import test +from manila.volume import configuration as conf +from manila.volume.drivers.netapp import iscsi +from manila.volume.drivers.netapp.iscsi import netapp_opts -LOG = logging.getLogger("cinder.volume.driver") +LOG = logging.getLogger("manila.volume.driver") #NOTE(rushiagr): A bug in Suds package # (https://fedorahosted.org/suds/ticket/359) causes nasty errors diff --git a/cinder/tests/test_netapp_nfs.py b/manila/tests/test_netapp_nfs.py similarity index 98% rename from cinder/tests/test_netapp_nfs.py rename to manila/tests/test_netapp_nfs.py index b7476d5d62..8f778c0586 100644 --- a/cinder/tests/test_netapp_nfs.py +++ b/manila/tests/test_netapp_nfs.py @@ -16,14 +16,14 @@ # under the License. """Unit tests for the NetApp-specific NFS driver module (netapp_nfs).""" -from cinder import context -from cinder import exception -from cinder import test +from manila import context +from manila import exception +from manila import test -from cinder.volume import configuration as conf -from cinder.volume.drivers.netapp import api -from cinder.volume.drivers.netapp import nfs as netapp_nfs -from cinder.volume.drivers import nfs +from manila.volume import configuration as conf +from manila.volume.drivers.netapp import api +from manila.volume.drivers.netapp import nfs as netapp_nfs +from manila.volume.drivers import nfs from lxml import etree from mox import IgnoreArg from mox import IsA diff --git a/cinder/tests/test_nexenta.py b/manila/tests/test_nexenta.py similarity index 84% rename from cinder/tests/test_nexenta.py rename to manila/tests/test_nexenta.py index aadefc1ffb..94325a840d 100644 --- a/cinder/tests/test_nexenta.py +++ b/manila/tests/test_nexenta.py @@ -22,13 +22,13 @@ Unit tests for OpenStack Cinder volume driver import base64 import urllib2 -import cinder.flags -from cinder import test -from cinder.volume.drivers import nexenta -from cinder.volume.drivers.nexenta import jsonrpc -from cinder.volume.drivers.nexenta import volume +import manila.flags +from manila import test +from manila.volume.drivers import nexenta +from manila.volume.drivers.nexenta import jsonrpc +from manila.volume.drivers.nexenta import volume -FLAGS = cinder.flags.FLAGS +FLAGS = manila.flags.FLAGS class TestNexentaDriver(test.TestCase): @@ -55,9 +55,9 @@ class TestNexentaDriver(test.TestCase): super(TestNexentaDriver, self).setUp() self.flags( nexenta_host='1.1.1.1', - nexenta_volume='cinder', + nexenta_volume='manila', nexenta_target_prefix='iqn:', - nexenta_target_group_prefix='cinder/', + nexenta_target_group_prefix='manila/', nexenta_blocksize='8K', nexenta_sparse=True, ) @@ -71,12 +71,12 @@ class TestNexentaDriver(test.TestCase): self.drv.do_setup({}) def test_setup_error(self): - self.nms_mock.volume.object_exists('cinder').AndReturn(True) + self.nms_mock.volume.object_exists('manila').AndReturn(True) self.mox.ReplayAll() self.drv.check_for_setup_error() def test_setup_error_fail(self): - self.nms_mock.volume.object_exists('cinder').AndReturn(False) + self.nms_mock.volume.object_exists('manila').AndReturn(False) self.mox.ReplayAll() self.assertRaises(LookupError, self.drv.check_for_setup_error) @@ -84,49 +84,49 @@ class TestNexentaDriver(test.TestCase): self.assertRaises(NotImplementedError, self.drv.local_path, '') def test_create_volume(self): - self.nms_mock.zvol.create('cinder/volume1', '1G', '8K', True) + self.nms_mock.zvol.create('manila/volume1', '1G', '8K', True) self.mox.ReplayAll() self.drv.create_volume(self.TEST_VOLUME_REF) def test_delete_volume(self): - self.nms_mock.zvol.destroy('cinder/volume1', '') + self.nms_mock.zvol.destroy('manila/volume1', '') self.mox.ReplayAll() self.drv.delete_volume(self.TEST_VOLUME_REF) def test_create_snapshot(self): - self.nms_mock.zvol.create_snapshot('cinder/volume1', 'snapshot1', '') + self.nms_mock.zvol.create_snapshot('manila/volume1', 'snapshot1', '') self.mox.ReplayAll() self.drv.create_snapshot(self.TEST_SNAPSHOT_REF) def test_create_volume_from_snapshot(self): - self.nms_mock.zvol.clone('cinder/volume1@snapshot1', 'cinder/volume2') + self.nms_mock.zvol.clone('manila/volume1@snapshot1', 'manila/volume2') self.mox.ReplayAll() self.drv.create_volume_from_snapshot(self.TEST_VOLUME_REF2, self.TEST_SNAPSHOT_REF) def test_delete_snapshot(self): - self.nms_mock.snapshot.destroy('cinder/volume1@snapshot1', '') + self.nms_mock.snapshot.destroy('manila/volume1@snapshot1', '') self.mox.ReplayAll() self.drv.delete_snapshot(self.TEST_SNAPSHOT_REF) _CREATE_EXPORT_METHODS = [ ('iscsitarget', 'create_target', ({'target_name': 'iqn:volume1'},), u'Unable to create iscsi target\n' - u' iSCSI target iqn.1986-03.com.sun:02:cinder-volume1 already' + u' iSCSI target iqn.1986-03.com.sun:02:manila-volume1 already' u' configured\n' u' itadm create-target failed with error 17\n', ), - ('stmf', 'create_targetgroup', ('cinder/volume1',), - u'Unable to create targetgroup: stmfadm: cinder/volume1:' + ('stmf', 'create_targetgroup', ('manila/volume1',), + u'Unable to create targetgroup: stmfadm: manila/volume1:' u' already exists\n', ), - ('stmf', 'add_targetgroup_member', ('cinder/volume1', 'iqn:volume1'), + ('stmf', 'add_targetgroup_member', ('manila/volume1', 'iqn:volume1'), u'Unable to add member to targetgroup: stmfadm:' - u' iqn.1986-03.com.sun:02:cinder-volume1: already exists\n', ), - ('scsidisk', 'create_lu', ('cinder/volume1', {}), - u"Unable to create lu with zvol 'cinder/volume1':\n" - u" sbdadm: filename /dev/zvol/rdsk/cinder/volume1: in use\n", ), - ('scsidisk', 'add_lun_mapping_entry', ('cinder/volume1', { - 'target_group': 'cinder/volume1', 'lun': '0'}), - u"Unable to add view to zvol 'cinder/volume1' (LUNs in use: ):\n" + u' iqn.1986-03.com.sun:02:manila-volume1: already exists\n', ), + ('scsidisk', 'create_lu', ('manila/volume1', {}), + u"Unable to create lu with zvol 'manila/volume1':\n" + u" sbdadm: filename /dev/zvol/rdsk/manila/volume1: in use\n", ), + ('scsidisk', 'add_lun_mapping_entry', ('manila/volume1', { + 'target_group': 'manila/volume1', 'lun': '0'}), + u"Unable to add view to zvol 'manila/volume1' (LUNs in use: ):\n" u" stmfadm: view entry exists\n", ), ] @@ -175,23 +175,23 @@ class TestNexentaDriver(test.TestCase): self.drv.ensure_export({}, self.TEST_VOLUME_REF) def test_remove_export(self): - self.nms_mock.scsidisk.delete_lu('cinder/volume1') - self.nms_mock.stmf.destroy_targetgroup('cinder/volume1') + self.nms_mock.scsidisk.delete_lu('manila/volume1') + self.nms_mock.stmf.destroy_targetgroup('manila/volume1') self.nms_mock.iscsitarget.delete_target('iqn:volume1') self.mox.ReplayAll() self.drv.remove_export({}, self.TEST_VOLUME_REF) def test_remove_export_fail_0(self): - self.nms_mock.scsidisk.delete_lu('cinder/volume1') + self.nms_mock.scsidisk.delete_lu('manila/volume1') self.nms_mock.stmf.destroy_targetgroup( - 'cinder/volume1').AndRaise(nexenta.NexentaException()) + 'manila/volume1').AndRaise(nexenta.NexentaException()) self.nms_mock.iscsitarget.delete_target('iqn:volume1') self.mox.ReplayAll() self.drv.remove_export({}, self.TEST_VOLUME_REF) def test_remove_export_fail_1(self): - self.nms_mock.scsidisk.delete_lu('cinder/volume1') - self.nms_mock.stmf.destroy_targetgroup('cinder/volume1') + self.nms_mock.scsidisk.delete_lu('manila/volume1') + self.nms_mock.stmf.destroy_targetgroup('manila/volume1') self.nms_mock.iscsitarget.delete_target( 'iqn:volume1').AndRaise(nexenta.NexentaException()) self.mox.ReplayAll() diff --git a/cinder/tests/test_nfs.py b/manila/tests/test_nfs.py similarity index 98% rename from cinder/tests/test_nfs.py rename to manila/tests/test_nfs.py index 2427554912..3ec1842c99 100644 --- a/cinder/tests/test_nfs.py +++ b/manila/tests/test_nfs.py @@ -27,13 +27,13 @@ from mox import IgnoreArg from mox import IsA from mox import stubout -from cinder import context -from cinder import exception -from cinder.exception import ProcessExecutionError -from cinder import test +from manila import context +from manila import exception +from manila.exception import ProcessExecutionError +from manila import test -from cinder.volume import configuration as conf -from cinder.volume.drivers import nfs +from manila.volume import configuration as conf +from manila.volume.drivers import nfs class DumbVolume(object): @@ -114,7 +114,7 @@ class NfsDriverTestCase(test.TestCase): TEST_MNT_POINT_BASE = '/mnt/test' TEST_LOCAL_PATH = '/mnt/nfs/volume-123' TEST_FILE_NAME = 'test.txt' - TEST_SHARES_CONFIG_FILE = '/etc/cinder/test-shares.conf' + TEST_SHARES_CONFIG_FILE = '/etc/manila/test-shares.conf' ONE_GB_IN_BYTES = 1024 * 1024 * 1024 def setUp(self): diff --git a/cinder/tests/test_policy.py b/manila/tests/test_policy.py similarity index 95% rename from cinder/tests/test_policy.py rename to manila/tests/test_policy.py index ed221a4ae4..d8af1b93e3 100644 --- a/cinder/tests/test_policy.py +++ b/manila/tests/test_policy.py @@ -21,14 +21,14 @@ import os.path import StringIO import urllib2 -from cinder import context -from cinder import exception -from cinder import flags -import cinder.openstack.common.policy -from cinder.openstack.common import policy as common_policy -from cinder import policy -from cinder import test -from cinder import utils +from manila import context +from manila import exception +from manila import flags +import manila.openstack.common.policy +from manila.openstack.common import policy as common_policy +from manila import policy +from manila import test +from manila import utils FLAGS = flags.FLAGS @@ -170,9 +170,9 @@ class DefaultPolicyTestCase(test.TestCase): self.context = context.RequestContext('fake', 'fake') def _set_brain(self, default_rule): - brain = cinder.openstack.common.policy.HttpBrain(self.rules, + brain = manila.openstack.common.policy.HttpBrain(self.rules, default_rule) - cinder.openstack.common.policy.set_brain(brain) + manila.openstack.common.policy.set_brain(brain) def tearDown(self): super(DefaultPolicyTestCase, self).tearDown() diff --git a/cinder/tests/test_quota.py b/manila/tests/test_quota.py similarity index 99% rename from cinder/tests/test_quota.py rename to manila/tests/test_quota.py index c31ed52c25..cf0a32956a 100644 --- a/cinder/tests/test_quota.py +++ b/manila/tests/test_quota.py @@ -18,18 +18,18 @@ import datetime -from cinder import context -from cinder import db -from cinder.db.sqlalchemy import api as sqa_api -from cinder.db.sqlalchemy import models as sqa_models -from cinder import exception -from cinder import flags -from cinder.openstack.common import rpc -from cinder.openstack.common import timeutils -from cinder import quota -from cinder import test -import cinder.tests.image.fake -from cinder import volume +from manila import context +from manila import db +from manila.db.sqlalchemy import api as sqa_api +from manila.db.sqlalchemy import models as sqa_models +from manila import exception +from manila import flags +from manila.openstack.common import rpc +from manila.openstack.common import timeutils +from manila import quota +from manila import test +import manila.tests.image.fake +from manila import volume FLAGS = flags.FLAGS @@ -60,7 +60,7 @@ class QuotaIntegrationTestCase(test.TestCase): def tearDown(self): super(QuotaIntegrationTestCase, self).tearDown() - cinder.tests.image.fake.FakeImageService_reset() + manila.tests.image.fake.FakeImageService_reset() def _create_volume(self, size=10): """Create a test volume.""" @@ -317,7 +317,7 @@ class QuotaEngineTestCase(test.TestCase): def test_init_override_string(self): quota_obj = quota.QuotaEngine( - quota_driver_class='cinder.tests.test_quota.FakeDriver') + quota_driver_class='manila.tests.test_quota.FakeDriver') self.assertEqual(quota_obj._resources, {}) self.assertTrue(isinstance(quota_obj._driver, FakeDriver)) @@ -987,7 +987,7 @@ class FakeUsage(sqa_models.QuotaUsage): class QuotaReserveSqlAlchemyTestCase(test.TestCase): - # cinder.db.sqlalchemy.api.quota_reserve is so complex it needs its + # manila.db.sqlalchemy.api.quota_reserve is so complex it needs its # own test case, and since it's a quota manipulator, this is the # best place to put it... diff --git a/cinder/tests/test_rbd.py b/manila/tests/test_rbd.py similarity index 93% rename from cinder/tests/test_rbd.py rename to manila/tests/test_rbd.py index 54b6ffffa4..86daafaaf8 100644 --- a/cinder/tests/test_rbd.py +++ b/manila/tests/test_rbd.py @@ -20,17 +20,17 @@ import mox import os import tempfile -from cinder import db -from cinder import exception -from cinder.image import image_utils -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder import test -from cinder.tests.image import fake as fake_image -from cinder.tests.test_volume import DriverTestCase -from cinder.volume import configuration as conf -from cinder.volume.drivers.rbd import RBDDriver -from cinder.volume.drivers.rbd import VERSION as DRIVER_VERSION +from manila import db +from manila import exception +from manila.image import image_utils +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils +from manila import test +from manila.tests.image import fake as fake_image +from manila.tests.test_volume import DriverTestCase +from manila.volume import configuration as conf +from manila.volume.drivers.rbd import RBDDriver +from manila.volume.drivers.rbd import VERSION as DRIVER_VERSION LOG = logging.getLogger(__name__) @@ -147,7 +147,7 @@ class RBDTestCase(test.TestCase): self._copy_image() def test_copy_image_volume_tmp(self): - self.configuration.volume_tmp_dir = '/var/run/cinder/tmp' + self.configuration.volume_tmp_dir = '/var/run/manila/tmp' self._copy_image() def test_update_volume_stats(self): @@ -192,7 +192,7 @@ class RBDTestCase(test.TestCase): class ManagedRBDTestCase(DriverTestCase): - driver_name = "cinder.volume.drivers.rbd.RBDDriver" + driver_name = "manila.volume.drivers.rbd.RBDDriver" def setUp(self): super(ManagedRBDTestCase, self).setUp() diff --git a/cinder/tests/test_scality.py b/manila/tests/test_scality.py similarity index 98% rename from cinder/tests/test_scality.py rename to manila/tests/test_scality.py index f32261cc86..b3cfdf0318 100644 --- a/cinder/tests/test_scality.py +++ b/manila/tests/test_scality.py @@ -19,10 +19,10 @@ Unit tests for the Scality SOFS Volume Driver. import errno import os -from cinder import exception -from cinder import test -from cinder import utils -from cinder.volume.drivers import scality +from manila import exception +from manila import test +from manila import utils +from manila.volume.drivers import scality class ScalityDriverTestCase(test.TestCase): diff --git a/cinder/tests/test_service.py b/manila/tests/test_service.py similarity index 92% rename from cinder/tests/test_service.py rename to manila/tests/test_service.py index 38bdff33e5..0ed5e8105a 100644 --- a/cinder/tests/test_service.py +++ b/manila/tests/test_service.py @@ -23,18 +23,18 @@ Unit Tests for remote procedure calls using queue import mox from oslo.config import cfg -from cinder import context -from cinder import db -from cinder import exception -from cinder import flags -from cinder import manager -from cinder import service -from cinder import test -from cinder import wsgi +from manila import context +from manila import db +from manila import exception +from manila import flags +from manila import manager +from manila import service +from manila import test +from manila import wsgi test_service_opts = [ cfg.StrOpt("fake_manager", - default="cinder.tests.test_service.FakeManager", + default="manila.tests.test_service.FakeManager", help="Manager for testing"), cfg.StrOpt("test_service_listen", default=None, @@ -69,7 +69,7 @@ class ServiceManagerTestCase(test.TestCase): serv = service.Service('test', 'test', 'test', - 'cinder.tests.test_service.FakeManager') + 'manila.tests.test_service.FakeManager') serv.start() self.assertEqual(serv.test_method(), 'manager') @@ -77,7 +77,7 @@ class ServiceManagerTestCase(test.TestCase): serv = ExtendedService('test', 'test', 'test', - 'cinder.tests.test_service.FakeManager') + 'manila.tests.test_service.FakeManager') serv.start() self.assertEqual(serv.test_method(), 'service') @@ -86,7 +86,7 @@ class ServiceFlagsTestCase(test.TestCase): def test_service_enabled_on_create_based_on_flag(self): self.flags(enable_new_services=True) host = 'foo' - binary = 'cinder-fake' + binary = 'manila-fake' app = service.Service.create(host=host, binary=binary) app.start() app.stop() @@ -97,7 +97,7 @@ class ServiceFlagsTestCase(test.TestCase): def test_service_disabled_on_create_based_on_flag(self): self.flags(enable_new_services=False) host = 'foo' - binary = 'cinder-fake' + binary = 'manila-fake' app = service.Service.create(host=host, binary=binary) app.start() app.stop() @@ -115,7 +115,7 @@ class ServiceTestCase(test.TestCase): def test_create(self): host = 'foo' - binary = 'cinder-fake' + binary = 'manila-fake' topic = 'fake' # NOTE(vish): Create was moved out of mox replay to make sure that @@ -152,7 +152,7 @@ class ServiceTestCase(test.TestCase): serv = service.Service(host, binary, topic, - 'cinder.tests.test_service.FakeManager') + 'manila.tests.test_service.FakeManager') serv.start() serv.report_state() self.assert_(serv.model_disconnected) @@ -187,7 +187,7 @@ class ServiceTestCase(test.TestCase): serv = service.Service(host, binary, topic, - 'cinder.tests.test_service.FakeManager') + 'manila.tests.test_service.FakeManager') serv.start() serv.model_disconnected = True serv.report_state() diff --git a/cinder/tests/test_share.py b/manila/tests/test_share.py similarity index 95% rename from cinder/tests/test_share.py rename to manila/tests/test_share.py index 341bc5ab92..b5494819aa 100644 --- a/cinder/tests/test_share.py +++ b/manila/tests/test_share.py @@ -26,19 +26,19 @@ import mox import shutil import tempfile -from cinder import context -from cinder import db -from cinder import exception -from cinder import flags -from cinder.image import image_utils -from cinder.openstack.common import importutils -from cinder.openstack.common.notifier import api as notifier_api -from cinder.openstack.common.notifier import test_notifier -from cinder.openstack.common import rpc -import cinder.policy -from cinder.share import manager -from cinder import test -from cinder.tests import fake_flags +from manila import context +from manila import db +from manila import exception +from manila import flags +from manila.image import image_utils +from manila.openstack.common import importutils +from manila.openstack.common.notifier import api as notifier_api +from manila.openstack.common.notifier import test_notifier +from manila.openstack.common import rpc +import manila.policy +from manila.share import manager +from manila import test +from manila.tests import fake_flags FLAGS = flags.FLAGS @@ -99,7 +99,7 @@ class ShareTestCase(test.TestCase): def setUp(self): super(ShareTestCase, self).setUp() self.flags(connection_type='fake', - share_driver='cinder.tests.test_share.FakeShareDriver') + share_driver='manila.tests.test_share.FakeShareDriver') self.share = importutils.import_object(FLAGS.share_manager) self.context = context.get_admin_context() diff --git a/cinder/tests/test_share_api.py b/manila/tests/test_share_api.py similarity index 98% rename from cinder/tests/test_share_api.py rename to manila/tests/test_share_api.py index d11e07414f..991dfb0140 100644 --- a/cinder/tests/test_share_api.py +++ b/manila/tests/test_share_api.py @@ -20,16 +20,16 @@ import mox import random import suds -from cinder import context -from cinder import db as db_driver -from cinder import exception -from cinder.openstack.common import timeutils -from cinder.scheduler import rpcapi as scheduler_rpcapi -from cinder import share -from cinder.share import api as share_api -from cinder.share import rpcapi as share_rpcapi -from cinder import test -from cinder.tests.db import fakes as db_fakes +from manila import context +from manila import db as db_driver +from manila import exception +from manila.openstack.common import timeutils +from manila.scheduler import rpcapi as scheduler_rpcapi +from manila import share +from manila.share import api as share_api +from manila.share import rpcapi as share_rpcapi +from manila import test +from manila.tests.db import fakes as db_fakes def fake_share(id, **kwargs): diff --git a/cinder/tests/test_share_driver.py b/manila/tests/test_share_driver.py similarity index 89% rename from cinder/tests/test_share_driver.py rename to manila/tests/test_share_driver.py index 92eb77924a..ae515d0277 100644 --- a/cinder/tests/test_share_driver.py +++ b/manila/tests/test_share_driver.py @@ -17,11 +17,11 @@ import time -from cinder import exception -from cinder.share.configuration import Configuration -from cinder.share import driver -from cinder import test -from cinder import utils +from manila import exception +from manila.share.configuration import Configuration +from manila.share import driver +from manila import test +from manila import utils def fake_execute_with_raise(*cmd, **kwargs): diff --git a/cinder/tests/test_share_lvm.py b/manila/tests/test_share_lvm.py similarity index 98% rename from cinder/tests/test_share_lvm.py rename to manila/tests/test_share_lvm.py index b2dc8bf89e..39477763e1 100644 --- a/cinder/tests/test_share_lvm.py +++ b/manila/tests/test_share_lvm.py @@ -18,17 +18,17 @@ import mox import os -from cinder import context -from cinder.db.sqlalchemy import models -from cinder import exception -from cinder import flags -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging -from cinder.share.configuration import Configuration -from cinder.share.drivers import lvm -from cinder import test -from cinder.tests.db import fakes as db_fakes -from cinder.tests import fake_utils +from manila import context +from manila.db.sqlalchemy import models +from manila import exception +from manila import flags +from manila.openstack.common import importutils +from manila.openstack.common import log as logging +from manila.share.configuration import Configuration +from manila.share.drivers import lvm +from manila import test +from manila.tests.db import fakes as db_fakes +from manila.tests import fake_utils FLAGS = flags.FLAGS @@ -107,8 +107,8 @@ class LVMShareDriverTestCase(test.TestCase): def test_do_setup(self): self.mox.StubOutWithMock(importutils, 'import_class') helpers = [ - (self._helper_cifs, 'cinder.share.drivers.lvm.CIFSNetConfHelper'), - (self._helper_nfs, 'cinder.share.drivers.lvm.NFSHelper'), + (self._helper_cifs, 'manila.share.drivers.lvm.CIFSNetConfHelper'), + (self._helper_nfs, 'manila.share.drivers.lvm.NFSHelper'), ] for helper, path in helpers: importutils.import_class(path).AndReturn(helper) diff --git a/cinder/tests/test_share_netapp.py b/manila/tests/test_share_netapp.py similarity index 99% rename from cinder/tests/test_share_netapp.py rename to manila/tests/test_share_netapp.py index 89e697c247..ea40a831f7 100644 --- a/cinder/tests/test_share_netapp.py +++ b/manila/tests/test_share_netapp.py @@ -20,11 +20,11 @@ from mox import IgnoreArg import random import suds -from cinder import context -from cinder import exception -from cinder.share.configuration import Configuration -from cinder.share.drivers import netapp -from cinder import test +from manila import context +from manila import exception +from manila.share.configuration import Configuration +from manila.share.drivers import netapp +from manila import test class FakeObject(object): diff --git a/cinder/tests/test_share_rpcapi.py b/manila/tests/test_share_rpcapi.py similarity index 95% rename from cinder/tests/test_share_rpcapi.py rename to manila/tests/test_share_rpcapi.py index e63a2ae07f..a37ba40a72 100644 --- a/cinder/tests/test_share_rpcapi.py +++ b/manila/tests/test_share_rpcapi.py @@ -15,17 +15,17 @@ # under the License. """ -Unit Tests for cinder.volume.rpcapi. +Unit Tests for manila.volume.rpcapi. """ -from cinder import context -from cinder import db -from cinder import flags -from cinder.openstack.common import jsonutils -from cinder.openstack.common import rpc -from cinder.share import rpcapi as share_rpcapi -from cinder import test +from manila import context +from manila import db +from manila import flags +from manila.openstack.common import jsonutils +from manila.openstack.common import rpc +from manila.share import rpcapi as share_rpcapi +from manila import test FLAGS = flags.FLAGS diff --git a/cinder/tests/test_sheepdog.py b/manila/tests/test_sheepdog.py similarity index 95% rename from cinder/tests/test_sheepdog.py rename to manila/tests/test_sheepdog.py index 70fab1afd1..f00061c7c2 100644 --- a/cinder/tests/test_sheepdog.py +++ b/manila/tests/test_sheepdog.py @@ -15,9 +15,9 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder import exception -from cinder import test -from cinder.volume.drivers.sheepdog import SheepdogDriver +from manila import exception +from manila import test +from manila.volume.drivers.sheepdog import SheepdogDriver COLLIE_NODE_INFO = """ 0 107287605248 3623897354 3% diff --git a/cinder/tests/test_skip_examples.py b/manila/tests/test_skip_examples.py similarity index 98% rename from cinder/tests/test_skip_examples.py rename to manila/tests/test_skip_examples.py index 2e51aef342..372181467a 100644 --- a/cinder/tests/test_skip_examples.py +++ b/manila/tests/test_skip_examples.py @@ -16,7 +16,7 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder import test +from manila import test class ExampleSkipTestCase(test.TestCase): diff --git a/cinder/tests/test_solidfire.py b/manila/tests/test_solidfire.py similarity index 97% rename from cinder/tests/test_solidfire.py rename to manila/tests/test_solidfire.py index 8679f4142d..369ec3ed4e 100644 --- a/cinder/tests/test_solidfire.py +++ b/manila/tests/test_solidfire.py @@ -21,11 +21,11 @@ from mox import IsA from mox import stubout -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import test -from cinder.volume import configuration as conf -from cinder.volume.drivers.solidfire import SolidFire +from manila import exception +from manila.openstack.common import log as logging +from manila import test +from manila.volume import configuration as conf +from manila.volume.drivers.solidfire import SolidFire LOG = logging.getLogger(__name__) @@ -44,7 +44,7 @@ class SolidFireVolumeTestCase(test.TestCase): self.configuration.sf_allow_tenant_qos = True self.configuration.san_is_local = True self.configuration.sf_emulate_512 = True - self.configuration.sf_account_prefix = 'cinder' + self.configuration.sf_account_prefix = 'manila' super(SolidFireVolumeTestCase, self).setUp() self.stubs.Set(SolidFire, '_issue_api_request', diff --git a/cinder/tests/test_storwize_svc.py b/manila/tests/test_storwize_svc.py similarity index 99% rename from cinder/tests/test_storwize_svc.py rename to manila/tests/test_storwize_svc.py index d26b449550..732f45eaa5 100755 --- a/cinder/tests/test_storwize_svc.py +++ b/manila/tests/test_storwize_svc.py @@ -29,15 +29,15 @@ import re import socket import unittest -from cinder import context -from cinder import exception -from cinder.openstack.common import excutils -from cinder.openstack.common import log as logging -from cinder import test -from cinder import utils -from cinder.volume import configuration as conf -from cinder.volume.drivers import storwize_svc -from cinder.volume import volume_types +from manila import context +from manila import exception +from manila.openstack.common import excutils +from manila.openstack.common import log as logging +from manila import test +from manila import utils +from manila.volume import configuration as conf +from manila.volume.drivers import storwize_svc +from manila.volume import volume_types LOG = logging.getLogger(__name__) diff --git a/cinder/tests/test_test.py b/manila/tests/test_test.py similarity index 95% rename from cinder/tests/test_test.py rename to manila/tests/test_test.py index fe62d9abd1..4191492cea 100644 --- a/cinder/tests/test_test.py +++ b/manila/tests/test_test.py @@ -18,8 +18,8 @@ """Tests for the testing base code.""" -from cinder.openstack.common import rpc -from cinder import test +from manila.openstack.common import rpc +from manila import test class IsolationTestCase(test.TestCase): diff --git a/cinder/tests/test_test_utils.py b/manila/tests/test_test_utils.py similarity index 93% rename from cinder/tests/test_test_utils.py rename to manila/tests/test_test_utils.py index c8c79b2519..7f109c038b 100644 --- a/cinder/tests/test_test_utils.py +++ b/manila/tests/test_test_utils.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder import test -from cinder.tests import utils as test_utils +from manila import test +from manila.tests import utils as test_utils class TestUtilsTestCase(test.TestCase): diff --git a/cinder/tests/test_utils.py b/manila/tests/test_utils.py similarity index 97% rename from cinder/tests/test_utils.py rename to manila/tests/test_utils.py index 2e7b08629a..b89aaded73 100644 --- a/cinder/tests/test_utils.py +++ b/manila/tests/test_utils.py @@ -26,13 +26,13 @@ import uuid import mox -import cinder -from cinder import exception -from cinder import flags -from cinder.openstack.common import strutils -from cinder.openstack.common import timeutils -from cinder import test -from cinder import utils +import manila +from manila import exception +from manila import flags +from manila.openstack.common import strutils +from manila.openstack.common import timeutils +from manila import test +from manila import utils FLAGS = flags.FLAGS @@ -460,7 +460,7 @@ class MonkeyPatchTestCase(test.TestCase): """Unit test for utils.monkey_patch().""" def setUp(self): super(MonkeyPatchTestCase, self).setUp() - self.example_package = 'cinder.tests.monkey_patch_example.' + self.example_package = 'manila.tests.monkey_patch_example.' self.flags( monkey_patch=True, monkey_patch_modules=[self.example_package + 'example_a' + ':' @@ -469,9 +469,9 @@ class MonkeyPatchTestCase(test.TestCase): def test_monkey_patch(self): utils.monkey_patch() - cinder.tests.monkey_patch_example.CALLED_FUNCTION = [] - from cinder.tests.monkey_patch_example import example_a - from cinder.tests.monkey_patch_example import example_b + manila.tests.monkey_patch_example.CALLED_FUNCTION = [] + from manila.tests.monkey_patch_example import example_a + from manila.tests.monkey_patch_example import example_b self.assertEqual('Example function', example_a.example_function_a()) exampleA = example_a.ExampleClassA() @@ -487,19 +487,19 @@ class MonkeyPatchTestCase(test.TestCase): self.assertEqual(ret_b, 8) package_a = self.example_package + 'example_a.' self.assertTrue(package_a + 'example_function_a' - in cinder.tests.monkey_patch_example.CALLED_FUNCTION) + in manila.tests.monkey_patch_example.CALLED_FUNCTION) self.assertTrue(package_a + 'ExampleClassA.example_method' - in cinder.tests.monkey_patch_example.CALLED_FUNCTION) + in manila.tests.monkey_patch_example.CALLED_FUNCTION) self.assertTrue(package_a + 'ExampleClassA.example_method_add' - in cinder.tests.monkey_patch_example.CALLED_FUNCTION) + in manila.tests.monkey_patch_example.CALLED_FUNCTION) package_b = self.example_package + 'example_b.' self.assertFalse(package_b + 'example_function_b' - in cinder.tests.monkey_patch_example.CALLED_FUNCTION) + in manila.tests.monkey_patch_example.CALLED_FUNCTION) self.assertFalse(package_b + 'ExampleClassB.example_method' - in cinder.tests.monkey_patch_example.CALLED_FUNCTION) + in manila.tests.monkey_patch_example.CALLED_FUNCTION) self.assertFalse(package_b + 'ExampleClassB.example_method_add' - in cinder.tests.monkey_patch_example.CALLED_FUNCTION) + in manila.tests.monkey_patch_example.CALLED_FUNCTION) class AuditPeriodTest(test.TestCase): diff --git a/cinder/tests/test_volume.py b/manila/tests/test_volume.py similarity index 95% rename from cinder/tests/test_volume.py rename to manila/tests/test_volume.py index 55cd8a2564..d2dbddc15c 100644 --- a/cinder/tests/test_volume.py +++ b/manila/tests/test_volume.py @@ -27,23 +27,23 @@ import mox import shutil import tempfile -from cinder.brick.iscsi import iscsi -from cinder import context -from cinder import db -from cinder import exception -from cinder import flags -from cinder.image import image_utils -from cinder.openstack.common import importutils -from cinder.openstack.common.notifier import api as notifier_api -from cinder.openstack.common.notifier import test_notifier -from cinder.openstack.common import rpc -import cinder.policy -from cinder import quota -from cinder import test -from cinder.tests import fake_flags -from cinder.tests.image import fake as fake_image -from cinder.volume import configuration as conf -from cinder.volume import driver +from manila.brick.iscsi import iscsi +from manila import context +from manila import db +from manila import exception +from manila import flags +from manila.image import image_utils +from manila.openstack.common import importutils +from manila.openstack.common.notifier import api as notifier_api +from manila.openstack.common.notifier import test_notifier +from manila.openstack.common import rpc +import manila.policy +from manila import quota +from manila import test +from manila.tests import fake_flags +from manila.tests.image import fake as fake_image +from manila.volume import configuration as conf +from manila.volume import driver QUOTAS = quota.QUOTAS FLAGS = flags.FLAGS @@ -218,7 +218,7 @@ class VolumeTestCase(test.TestCase): def test_create_volume_with_invalid_metadata(self): """Test volume create with too much metadata fails.""" - volume_api = cinder.volume.api.API() + volume_api = manila.volume.api.API() test_meta = {'fake_key': 'fake_value' * 256} self.assertRaises(exception.InvalidVolumeMetadataSize, volume_api.create, @@ -246,7 +246,7 @@ class VolumeTestCase(test.TestCase): self.stubs.Set(QUOTAS, "commit", fake_commit) self.stubs.Set(QUOTAS, "rollback", fake_rollback) - volume_api = cinder.volume.api.API() + volume_api = manila.volume.api.API() # Create volume with default volume type while default # volume type doesn't exist, volume_type_id should be NULL @@ -328,7 +328,7 @@ class VolumeTestCase(test.TestCase): def test_create_volume_from_snapshot_fail_bad_size(self): """Test volume can't be created from snapshot with bad volume size.""" - volume_api = cinder.volume.api.API() + volume_api = manila.volume.api.API() snapshot = dict(id=1234, status='available', volume_size=10) @@ -342,7 +342,7 @@ class VolumeTestCase(test.TestCase): def test_create_volume_with_invalid_exclusive_options(self): """Test volume create with multiple exclusive options fails.""" - volume_api = cinder.volume.api.API() + volume_api = manila.volume.api.API() self.assertRaises(exception.InvalidInput, volume_api.create, self.context, @@ -524,7 +524,7 @@ class VolumeTestCase(test.TestCase): volume['status'] = 'in-use' volume['host'] = 'fakehost' - volume_api = cinder.volume.api.API() + volume_api = manila.volume.api.API() # 'in-use' status raises InvalidVolume self.assertRaises(exception.InvalidVolume, @@ -543,7 +543,7 @@ class VolumeTestCase(test.TestCase): volume['status'] = 'error_deleting' volume['host'] = 'fakehost' - volume_api = cinder.volume.api.API() + volume_api = manila.volume.api.API() # 'error_deleting' volumes can't be deleted self.assertRaises(exception.InvalidVolume, @@ -574,7 +574,7 @@ class VolumeTestCase(test.TestCase): volume['status'] = 'available' volume['host'] = 'fakehost' - volume_api = cinder.volume.api.API() + volume_api = manila.volume.api.API() self.assertRaises(exception.InvalidVolume, volume_api.delete, @@ -592,7 +592,7 @@ class VolumeTestCase(test.TestCase): snapshot = db.snapshot_get(context.get_admin_context(), snapshot_id) - volume_api = cinder.volume.api.API() + volume_api = manila.volume.api.API() snapshot['status'] = 'badstatus' self.assertRaises(exception.InvalidSnapshot, @@ -617,7 +617,7 @@ class VolumeTestCase(test.TestCase): db.volume_attached(self.context, volume['id'], instance_uuid, '/dev/sda1') - volume_api = cinder.volume.api.API() + volume_api = manila.volume.api.API() volume = volume_api.get(self.context, volume['id']) self.assertRaises(exception.InvalidVolume, volume_api.create_snapshot, @@ -863,7 +863,7 @@ class VolumeTestCase(test.TestCase): try: volume_id = None - volume_api = cinder.volume.api.API( + volume_api = manila.volume.api.API( image_service=_FakeImageService()) volume = volume_api.create(self.context, 2, 'name', 'description', image_id=1) @@ -887,7 +887,7 @@ class VolumeTestCase(test.TestCase): image_id = '70a599e0-31e7-49b7-b260-868f441e862b' - volume_api = cinder.volume.api.API(image_service=_FakeImageService()) + volume_api = manila.volume.api.API(image_service=_FakeImageService()) self.assertRaises(exception.InvalidInput, volume_api.create, @@ -908,7 +908,7 @@ class VolumeTestCase(test.TestCase): image_id = '70a599e0-31e7-49b7-b260-868f441e862b' - volume_api = cinder.volume.api.API(image_service=_FakeImageService()) + volume_api = manila.volume.api.API(image_service=_FakeImageService()) self.assertRaises(exception.InvalidInput, volume_api.create, @@ -929,7 +929,7 @@ class VolumeTestCase(test.TestCase): self.stubs.Set(QUOTAS, "commit", fake_commit) self.stubs.Set(QUOTAS, "rollback", fake_rollback) - volume_api = cinder.volume.api.API() + volume_api = manila.volume.api.API() volume = volume_api.create(self.context, size, @@ -959,7 +959,7 @@ class VolumeTestCase(test.TestCase): self.stubs.Set(QUOTAS, "commit", fake_commit) self.stubs.Set(QUOTAS, "rollback", fake_rollback) - volume_api = cinder.volume.api.API() + volume_api = manila.volume.api.API() self.assertRaises(exception.InvalidInput, volume_api.create, @@ -971,7 +971,7 @@ class VolumeTestCase(test.TestCase): def test_begin_roll_detaching_volume(self): """Test begin_detaching and roll_detaching functions.""" volume = self._create_volume() - volume_api = cinder.volume.api.API() + volume_api = manila.volume.api.API() volume_api.begin_detaching(self.context, volume) volume = db.volume_get(self.context, volume['id']) self.assertEqual(volume['status'], "detaching") @@ -983,7 +983,7 @@ class VolumeTestCase(test.TestCase): # create a raw vol volume = self._create_volume() # use volume.api to update name - volume_api = cinder.volume.api.API() + volume_api = manila.volume.api.API() update_dict = {'display_name': 'test update name'} volume_api.update(self.context, volume, update_dict) # read changes from db @@ -996,7 +996,7 @@ class VolumeTestCase(test.TestCase): snapshot = self._create_snapshot(volume['id']) self.assertEquals(snapshot['display_name'], None) # use volume.api to update name - volume_api = cinder.volume.api.API() + volume_api = manila.volume.api.API() update_dict = {'display_name': 'test update name'} volume_api.update_snapshot(self.context, snapshot, update_dict) # read changes from db @@ -1159,7 +1159,7 @@ class VolumeTestCase(test.TestCase): class DriverTestCase(test.TestCase): """Base Test class for Drivers.""" - driver_name = "cinder.volume.driver.FakeBaseDriver" + driver_name = "manila.volume.driver.FakeBaseDriver" def setUp(self): super(DriverTestCase, self).setUp() @@ -1199,7 +1199,7 @@ class DriverTestCase(test.TestCase): class VolumeDriverTestCase(DriverTestCase): """Test case for VolumeDriver""" - driver_name = "cinder.volume.drivers.lvm.LVMVolumeDriver" + driver_name = "manila.volume.drivers.lvm.LVMVolumeDriver" def test_delete_busy_volume(self): """Test deleting a busy volume.""" @@ -1221,7 +1221,7 @@ class VolumeDriverTestCase(DriverTestCase): class ISCSITestCase(DriverTestCase): """Test Case for ISCSIDriver""" - driver_name = "cinder.volume.drivers.lvm.LVMISCSIDriver" + driver_name = "manila.volume.drivers.lvm.LVMISCSIDriver" def _attach_volume(self): """Attach volumes to an instance. """ @@ -1283,7 +1283,7 @@ class ISCSITestCase(DriverTestCase): class FibreChannelTestCase(DriverTestCase): """Test Case for FibreChannelDriver""" - driver_name = "cinder.volume.driver.FibreChannelDriver" + driver_name = "manila.volume.driver.FibreChannelDriver" def test_initialize_connection(self): self.driver = driver.FibreChannelDriver() @@ -1297,35 +1297,35 @@ class VolumePolicyTestCase(test.TestCase): def setUp(self): super(VolumePolicyTestCase, self).setUp() - cinder.policy.reset() - cinder.policy.init() + manila.policy.reset() + manila.policy.init() self.context = context.get_admin_context() def tearDown(self): super(VolumePolicyTestCase, self).tearDown() - cinder.policy.reset() + manila.policy.reset() def _set_rules(self, rules): - cinder.common.policy.set_brain(cinder.common.policy.HttpBrain(rules)) + manila.common.policy.set_brain(manila.common.policy.HttpBrain(rules)) def test_check_policy(self): - self.mox.StubOutWithMock(cinder.policy, 'enforce') + self.mox.StubOutWithMock(manila.policy, 'enforce') target = { 'project_id': self.context.project_id, 'user_id': self.context.user_id, } - cinder.policy.enforce(self.context, 'volume:attach', target) + manila.policy.enforce(self.context, 'volume:attach', target) self.mox.ReplayAll() - cinder.volume.api.check_policy(self.context, 'attach') + manila.volume.api.check_policy(self.context, 'attach') def test_check_policy_with_target(self): - self.mox.StubOutWithMock(cinder.policy, 'enforce') + self.mox.StubOutWithMock(manila.policy, 'enforce') target = { 'project_id': self.context.project_id, 'user_id': self.context.user_id, 'id': 2, } - cinder.policy.enforce(self.context, 'volume:attach', target) + manila.policy.enforce(self.context, 'volume:attach', target) self.mox.ReplayAll() - cinder.volume.api.check_policy(self.context, 'attach', {'id': 2}) + manila.volume.api.check_policy(self.context, 'attach', {'id': 2}) diff --git a/cinder/tests/test_volume_configuration.py b/manila/tests/test_volume_configuration.py similarity index 92% rename from cinder/tests/test_volume_configuration.py rename to manila/tests/test_volume_configuration.py index d2751c1d98..1826f78e50 100644 --- a/cinder/tests/test_volume_configuration.py +++ b/manila/tests/test_volume_configuration.py @@ -20,11 +20,11 @@ from oslo.config import cfg -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import test -from cinder.volume import configuration -from cinder.volume import driver +from manila import flags +from manila.openstack.common import log as logging +from manila import test +from manila.volume import configuration +from manila.volume import driver LOG = logging.getLogger(__name__) diff --git a/cinder/tests/test_volume_glance_metadata.py b/manila/tests/test_volume_glance_metadata.py similarity index 98% rename from cinder/tests/test_volume_glance_metadata.py rename to manila/tests/test_volume_glance_metadata.py index 5aa42d8b1c..364b3cfbb0 100644 --- a/cinder/tests/test_volume_glance_metadata.py +++ b/manila/tests/test_volume_glance_metadata.py @@ -18,10 +18,10 @@ Unit Tests for volume types extra specs code """ -from cinder import context -from cinder import db -from cinder import exception -from cinder import test +from manila import context +from manila import db +from manila import exception +from manila import test class VolumeGlanceMetadataTestCase(test.TestCase): diff --git a/cinder/tests/test_volume_rpcapi.py b/manila/tests/test_volume_rpcapi.py similarity index 95% rename from cinder/tests/test_volume_rpcapi.py rename to manila/tests/test_volume_rpcapi.py index 7a75224b81..f8250b1279 100644 --- a/cinder/tests/test_volume_rpcapi.py +++ b/manila/tests/test_volume_rpcapi.py @@ -15,17 +15,17 @@ # under the License. """ -Unit Tests for cinder.volume.rpcapi +Unit Tests for manila.volume.rpcapi """ -from cinder import context -from cinder import db -from cinder import flags -from cinder.openstack.common import jsonutils -from cinder.openstack.common import rpc -from cinder import test -from cinder.volume import rpcapi as volume_rpcapi +from manila import context +from manila import db +from manila import flags +from manila.openstack.common import jsonutils +from manila.openstack.common import rpc +from manila import test +from manila.volume import rpcapi as volume_rpcapi FLAGS = flags.FLAGS diff --git a/cinder/tests/test_volume_types.py b/manila/tests/test_volume_types.py similarity index 96% rename from cinder/tests/test_volume_types.py rename to manila/tests/test_volume_types.py index 8b639690ee..bcd7bb6687 100644 --- a/cinder/tests/test_volume_types.py +++ b/manila/tests/test_volume_types.py @@ -18,15 +18,15 @@ Unit Tests for volume types code """ import time -from cinder import context -from cinder.db.sqlalchemy import models -from cinder.db.sqlalchemy import session as sql_session -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import test -from cinder.tests import fake_flags -from cinder.volume import volume_types +from manila import context +from manila.db.sqlalchemy import models +from manila.db.sqlalchemy import session as sql_session +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila import test +from manila.tests import fake_flags +from manila.volume import volume_types FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) diff --git a/cinder/tests/test_volume_types_extra_specs.py b/manila/tests/test_volume_types_extra_specs.py similarity index 98% rename from cinder/tests/test_volume_types_extra_specs.py rename to manila/tests/test_volume_types_extra_specs.py index f8d4fac998..7ec644b340 100644 --- a/cinder/tests/test_volume_types_extra_specs.py +++ b/manila/tests/test_volume_types_extra_specs.py @@ -18,9 +18,9 @@ Unit Tests for volume types extra specs code """ -from cinder import context -from cinder import db -from cinder import test +from manila import context +from manila import db +from manila import test class VolumeTypeExtraSpecsTestCase(test.TestCase): diff --git a/cinder/tests/test_volume_utils.py b/manila/tests/test_volume_utils.py similarity index 91% rename from cinder/tests/test_volume_utils.py rename to manila/tests/test_volume_utils.py index 1521149ac0..c6dc0818a8 100644 --- a/cinder/tests/test_volume_utils.py +++ b/manila/tests/test_volume_utils.py @@ -17,15 +17,15 @@ """Tests For miscellaneous util methods used with volume.""" -from cinder import context -from cinder import db -from cinder import flags -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging -from cinder.openstack.common.notifier import api as notifier_api -from cinder.openstack.common.notifier import test_notifier -from cinder import test -from cinder.volume import utils as volume_utils +from manila import context +from manila import db +from manila import flags +from manila.openstack.common import importutils +from manila.openstack.common import log as logging +from manila.openstack.common.notifier import api as notifier_api +from manila.openstack.common.notifier import test_notifier +from manila import test +from manila.volume import utils as volume_utils LOG = logging.getLogger(__name__) @@ -34,7 +34,7 @@ FLAGS = flags.FLAGS class UsageInfoTestCase(test.TestCase): - QUEUE_NAME = 'cinder-volume' + QUEUE_NAME = 'manila-volume' HOSTNAME = 'my-host.com' HOSTIP = '10.0.0.1' BACKEND = 'test_backend' diff --git a/cinder/tests/test_windows.py b/manila/tests/test_windows.py similarity index 97% rename from cinder/tests/test_windows.py rename to manila/tests/test_windows.py index 2ee09b73db..234598d788 100644 --- a/cinder/tests/test_windows.py +++ b/manila/tests/test_windows.py @@ -20,13 +20,13 @@ Unit tests for Windows Server 2012 OpenStack Cinder volume driver """ import sys -import cinder.flags -from cinder.tests.windows import basetestcase -from cinder.tests.windows import db_fakes -from cinder.tests.windows import windowsutils -from cinder.volume.drivers import windows +import manila.flags +from manila.tests.windows import basetestcase +from manila.tests.windows import db_fakes +from manila.tests.windows import windowsutils +from manila.volume.drivers import windows -FLAGS = cinder.flags.FLAGS +FLAGS = manila.flags.FLAGS class TestWindowsDriver(basetestcase.BaseTestCase): diff --git a/cinder/tests/test_wsgi.py b/manila/tests/test_wsgi.py similarity index 91% rename from cinder/tests/test_wsgi.py rename to manila/tests/test_wsgi.py index d5a80b0d94..8ac0e20dad 100644 --- a/cinder/tests/test_wsgi.py +++ b/manila/tests/test_wsgi.py @@ -16,7 +16,7 @@ # License for the specific language governing permissions and limitations # under the License. -"""Unit tests for `cinder.wsgi`.""" +"""Unit tests for `manila.wsgi`.""" import os.path import ssl @@ -28,11 +28,11 @@ from oslo.config import cfg import webob import webob.dec -from cinder.api.middleware import fault -from cinder import exception -from cinder import test -from cinder import utils -import cinder.wsgi +from manila.api.middleware import fault +from manila import exception +from manila import test +from manila import utils +import manila.wsgi CONF = cfg.CONF @@ -49,8 +49,8 @@ class TestLoaderNothingExists(test.TestCase): def test_config_not_found(self): self.assertRaises( - cinder.exception.ConfigNotFound, - cinder.wsgi.Loader, + manila.exception.ConfigNotFound, + manila.wsgi.Loader, ) @@ -68,14 +68,14 @@ document_root = /tmp self.config.write(self._paste_config.lstrip()) self.config.seek(0) self.config.flush() - self.loader = cinder.wsgi.Loader(self.config.name) + self.loader = manila.wsgi.Loader(self.config.name) def test_config_found(self): self.assertEquals(self.config.name, self.loader.config_path) def test_app_not_found(self): self.assertRaises( - cinder.exception.PasteAppNotFound, + manila.exception.PasteAppNotFound, self.loader.load_app, "non-existent app", ) @@ -101,11 +101,11 @@ class TestWSGIServer(unittest.TestCase): return True def test_no_app(self): - server = cinder.wsgi.Server("test_app", None) + server = manila.wsgi.Server("test_app", None) self.assertEquals("test_app", server.name) def test_start_random_port(self): - server = cinder.wsgi.Server("test_random_port", None, host="127.0.0.1") + server = manila.wsgi.Server("test_random_port", None, host="127.0.0.1") self.assertEqual(0, server.port) server.start() self.assertNotEqual(0, server.port) @@ -115,7 +115,7 @@ class TestWSGIServer(unittest.TestCase): @test.skip_if(not _ipv6_configured(), "Test requires an IPV6 configured interface") def test_start_random_port_with_ipv6(self): - server = cinder.wsgi.Server("test_random_port", + server = manila.wsgi.Server("test_random_port", None, host="::1") server.start() @@ -135,7 +135,7 @@ class TestWSGIServer(unittest.TestCase): start_response('200 OK', [('Content-Type', 'text/plain')]) return [greetings] - server = cinder.wsgi.Server("test_app", hello_world) + server = manila.wsgi.Server("test_app", hello_world) server.start() response = urllib2.urlopen('http://127.0.0.1:%d/' % server.port) @@ -155,7 +155,7 @@ class TestWSGIServer(unittest.TestCase): def hello_world(req): return greetings - server = cinder.wsgi.Server("test_app", hello_world) + server = manila.wsgi.Server("test_app", hello_world) server.start() response = urllib2.urlopen('https://127.0.0.1:%d/' % server.port) @@ -177,7 +177,7 @@ class TestWSGIServer(unittest.TestCase): def hello_world(req): return greetings - server = cinder.wsgi.Server("test_app", + server = manila.wsgi.Server("test_app", hello_world, host="::1", port=0) diff --git a/cinder/tests/test_xenapi_sm.py b/manila/tests/test_xenapi_sm.py similarity index 97% rename from cinder/tests/test_xenapi_sm.py rename to manila/tests/test_xenapi_sm.py index fecf133fae..3e98368dfc 100644 --- a/cinder/tests/test_xenapi_sm.py +++ b/manila/tests/test_xenapi_sm.py @@ -24,13 +24,13 @@ import mock import mox from oslo.config import cfg -from cinder.db import api as db_api -from cinder import exception -from cinder.volume import configuration as conf -from cinder.volume import driver as parent_driver -from cinder.volume.drivers.xenapi import lib -from cinder.volume.drivers.xenapi import sm as driver -from cinder.volume.drivers.xenapi import tools +from manila.db import api as db_api +from manila import exception +from manila.volume import configuration as conf +from manila.volume import driver as parent_driver +from manila.volume.drivers.xenapi import lib +from manila.volume.drivers.xenapi import sm as driver +from manila.volume.drivers.xenapi import tools class MockContext(object): @@ -489,7 +489,7 @@ class DriverTestCase(unittest.TestCase): class ToolsTest(unittest.TestCase): - @mock.patch('cinder.volume.drivers.xenapi.tools._stripped_first_line_of') + @mock.patch('manila.volume.drivers.xenapi.tools._stripped_first_line_of') def test_get_this_vm_uuid(self, mock_read_first_line): mock_read_first_line.return_value = 'someuuid' self.assertEquals('someuuid', tools.get_this_vm_uuid()) diff --git a/cinder/tests/test_xiv.py b/manila/tests/test_xiv.py similarity index 98% rename from cinder/tests/test_xiv.py rename to manila/tests/test_xiv.py index 8db11a0cad..51905abc49 100644 --- a/cinder/tests/test_xiv.py +++ b/manila/tests/test_xiv.py @@ -22,11 +22,11 @@ import mox -from cinder import exception -from cinder import flags -from cinder import test -from cinder.volume import configuration as conf -from cinder.volume.drivers import xiv +from manila import exception +from manila import flags +from manila import test +from manila.volume import configuration as conf +from manila.volume.drivers import xiv FLAGS = flags.FLAGS diff --git a/cinder/tests/test_zadara.py b/manila/tests/test_zadara.py similarity index 99% rename from cinder/tests/test_zadara.py rename to manila/tests/test_zadara.py index 88c3bb7310..a2f8d44b95 100644 --- a/cinder/tests/test_zadara.py +++ b/manila/tests/test_zadara.py @@ -22,14 +22,14 @@ Tests for Zadara VPSA volume driver import copy import httplib -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import test -from cinder.volume.drivers import zadara +from manila import exception +from manila.openstack.common import log as logging +from manila import test +from manila.volume.drivers import zadara from lxml import etree -LOG = logging.getLogger("cinder.volume.driver") +LOG = logging.getLogger("manila.volume.driver") DEFAULT_RUNTIME_VARS = { 'status': 200, diff --git a/cinder/tests/utils.py b/manila/tests/utils.py similarity index 83% rename from cinder/tests/utils.py rename to manila/tests/utils.py index 221e6b097b..3faf70bb6b 100644 --- a/cinder/tests/utils.py +++ b/manila/tests/utils.py @@ -16,17 +16,17 @@ import os -import cinder.context +import manila.context -FLAGS = cinder.flags.FLAGS +FLAGS = manila.flags.FLAGS def get_test_admin_context(): - return cinder.context.get_admin_context() + return manila.context.get_admin_context() def is_cinder_installed(): - if os.path.exists('../../cinder.cinder.egg-info'): + if os.path.exists('../../manila.manila.egg-info'): return True else: return False diff --git a/cinder/tests/var/ca.crt b/manila/tests/var/ca.crt similarity index 100% rename from cinder/tests/var/ca.crt rename to manila/tests/var/ca.crt diff --git a/cinder/tests/var/certificate.crt b/manila/tests/var/certificate.crt similarity index 100% rename from cinder/tests/var/certificate.crt rename to manila/tests/var/certificate.crt diff --git a/cinder/tests/var/privatekey.key b/manila/tests/var/privatekey.key similarity index 100% rename from cinder/tests/var/privatekey.key rename to manila/tests/var/privatekey.key diff --git a/cinder/tests/windows/__init__.py b/manila/tests/windows/__init__.py similarity index 100% rename from cinder/tests/windows/__init__.py rename to manila/tests/windows/__init__.py diff --git a/cinder/tests/windows/basetestcase.py b/manila/tests/windows/basetestcase.py similarity index 95% rename from cinder/tests/windows/basetestcase.py rename to manila/tests/windows/basetestcase.py index 44a9adb6a0..cfc0e2795d 100644 --- a/cinder/tests/windows/basetestcase.py +++ b/manila/tests/windows/basetestcase.py @@ -18,17 +18,17 @@ TestCase for MockProxy based tests and related classes. """ -import cinder.test +import manila.test import gzip import os import pickle -from cinder.tests.windows import mockproxy +from manila.tests.windows import mockproxy gen_test_mocks_key = 'CINDER_GENERATE_TEST_MOCKS' -class BaseTestCase(cinder.test.TestCase): +class BaseTestCase(manila.test.TestCase): """TestCase for MockProxy based tests.""" def run(self, result=None): @@ -56,7 +56,7 @@ class BaseTestCase(cinder.test.TestCase): def _get_stub_file_path(self, test_name, mock_name): # test naming differs between platforms - prefix = 'cinder.tests.' + prefix = 'manila.tests.' if test_name.startswith(prefix): test_name = test_name[len(prefix):] file_name = '{0}_{1}.p.gz'.format(test_name, mock_name) diff --git a/cinder/tests/windows/db_fakes.py b/manila/tests/windows/db_fakes.py similarity index 100% rename from cinder/tests/windows/db_fakes.py rename to manila/tests/windows/db_fakes.py diff --git a/cinder/tests/windows/mockproxy.py b/manila/tests/windows/mockproxy.py similarity index 100% rename from cinder/tests/windows/mockproxy.py rename to manila/tests/windows/mockproxy.py diff --git a/cinder/tests/windows/stubs/README.rst b/manila/tests/windows/stubs/README.rst similarity index 100% rename from cinder/tests/windows/stubs/README.rst rename to manila/tests/windows/stubs/README.rst diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_check_for_setup_errors_wmi.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_check_for_setup_errors_wmi.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_check_for_setup_errors_wmi.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_check_for_setup_errors_wmi.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_os.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_os.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_os.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_os.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_wmi.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_wmi.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_wmi.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_wmi.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_os.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_os.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_os.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_os.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_wmi.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_wmi.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_wmi.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_wmi.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_os.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_os.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_os.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_os.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_wmi.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_wmi.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_wmi.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_wmi.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_os.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_os.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_os.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_os.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_wmi.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_wmi.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_wmi.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_wmi.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_os.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_os.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_os.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_os.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_wmi.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_wmi.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_wmi.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_wmi.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_os.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_os.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_os.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_os.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_wmi.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_wmi.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_wmi.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_wmi.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_os.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_os.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_os.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_os.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_wmi.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_wmi.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_wmi.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_wmi.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_os.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_os.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_os.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_os.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_wmi.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_wmi.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_wmi.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_wmi.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_os.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_os.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_os.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_os.p.gz diff --git a/cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_wmi.p.gz b/manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_wmi.p.gz similarity index 100% rename from cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_wmi.p.gz rename to manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_wmi.p.gz diff --git a/cinder/tests/windows/windowsutils.py b/manila/tests/windows/windowsutils.py similarity index 99% rename from cinder/tests/windows/windowsutils.py rename to manila/tests/windows/windowsutils.py index 4ef3212ebb..7100b2cb2c 100644 --- a/cinder/tests/windows/windowsutils.py +++ b/manila/tests/windows/windowsutils.py @@ -21,7 +21,7 @@ Windows storage classes to be used in testing. import os import sys -from cinder import flags +from manila import flags # Check needed for unit testing on Unix if os.name == 'nt': diff --git a/cinder/tests/xenapi/__init__.py b/manila/tests/xenapi/__init__.py similarity index 100% rename from cinder/tests/xenapi/__init__.py rename to manila/tests/xenapi/__init__.py diff --git a/cinder/utils.py b/manila/utils.py similarity index 97% rename from cinder/utils.py rename to manila/utils.py index 281dd65864..7017013792 100644 --- a/cinder/utils.py +++ b/manila/utils.py @@ -52,13 +52,13 @@ from eventlet.green import subprocess from eventlet import greenthread from eventlet import pools -from cinder import exception -from cinder import flags -from cinder.openstack.common import excutils -from cinder.openstack.common import importutils -from cinder.openstack.common import lockutils -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils +from manila import exception +from manila import flags +from manila.openstack.common import excutils +from manila.openstack.common import importutils +from manila.openstack.common import lockutils +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils LOG = logging.getLogger(__name__) @@ -66,7 +66,7 @@ ISO_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S" PERFECT_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f" FLAGS = flags.FLAGS -synchronized = lockutils.synchronized_with_prefix('cinder-') +synchronized = lockutils.synchronized_with_prefix('manila-') def find_config(config_path): @@ -74,15 +74,15 @@ def find_config(config_path): :param config_path: Full or relative path to the config. :returns: Full path of the config, if it exists. - :raises: `cinder.exception.ConfigNotFound` + :raises: `manila.exception.ConfigNotFound` """ possible_locations = [ config_path, - os.path.join(FLAGS.state_path, "etc", "cinder", config_path), + os.path.join(FLAGS.state_path, "etc", "manila", config_path), os.path.join(FLAGS.state_path, "etc", config_path), os.path.join(FLAGS.state_path, config_path), - "/etc/cinder/%s" % config_path, + "/etc/manila/%s" % config_path, ] for path in possible_locations: @@ -107,7 +107,7 @@ def execute(*cmd, **kwargs): """Helper method to execute command with optional retry. If you add a run_as_root=True command, don't forget to add the - corresponding filter to etc/cinder/rootwrap.d ! + corresponding filter to etc/manila/rootwrap.d ! :param cmd: Passed to subprocess.Popen. :param process_input: Send to opened process. @@ -151,13 +151,13 @@ def execute(*cmd, **kwargs): if FLAGS.rootwrap_config is None or FLAGS.root_helper != 'sudo': LOG.deprecated(_('The root_helper option (which lets you specify ' - 'a root wrapper different from cinder-rootwrap, ' + 'a root wrapper different from manila-rootwrap, ' 'and defaults to using sudo) is now deprecated. ' 'You should use the rootwrap_config option ' 'instead.')) if (FLAGS.rootwrap_config is not None): - cmd = ['sudo', 'cinder-rootwrap', + cmd = ['sudo', 'manila-rootwrap', FLAGS.rootwrap_config] + list(cmd) else: cmd = shlex.split(FLAGS.root_helper) + list(cmd) @@ -365,8 +365,8 @@ class SSHPool(pools.Pool): def cinderdir(): - import cinder - return os.path.abspath(cinder.__file__).split('cinder/__init__.py')[0] + import manila + return os.path.abspath(manila.__file__).split('manila/__init__.py')[0] def debug(arg): @@ -847,11 +847,11 @@ def monkey_patch(): You can set decorators for each modules using FLAGS.monkey_patch_modules. The format is "Module path:Decorator function". - Example: 'cinder.api.ec2.cloud:' \ - cinder.openstack.common.notifier.api.notify_decorator' + Example: 'manila.api.ec2.cloud:' \ + manila.openstack.common.notifier.api.notify_decorator' Parameters of the decorator is as follows. - (See cinder.openstack.common.notifier.api.notify_decorator) + (See manila.openstack.common.notifier.api.notify_decorator) name - name of the function function - object of the function @@ -1056,7 +1056,7 @@ def generate_mac_address(): # conflict with libvirt, so we use the next highest octet # that has the unicast and locally administered bits set # properly: 0xfa. - # Discussion: https://bugs.launchpad.net/cinder/+bug/921838 + # Discussion: https://bugs.launchpad.net/manila/+bug/921838 mac = [0xfa, 0x16, 0x3e, random.randint(0x00, 0x7f), random.randint(0x00, 0xff), diff --git a/cinder/version.py b/manila/version.py similarity index 94% rename from cinder/version.py rename to manila/version.py index ad1ebc0837..05988266d9 100644 --- a/cinder/version.py +++ b/manila/version.py @@ -21,5 +21,5 @@ CINDER_PRODUCT = "OpenStack Cinder" CINDER_PACKAGE = None # OS distro package version suffix loaded = False -version_info = pbr_version.VersionInfo('cinder') +version_info = pbr_version.VersionInfo('manila') version_string = version_info.version_string diff --git a/cinder/volume/__init__.py b/manila/volume/__init__.py similarity index 78% rename from cinder/volume/__init__.py rename to manila/volume/__init__.py index e810a93d48..4f2558595f 100644 --- a/cinder/volume/__init__.py +++ b/manila/volume/__init__.py @@ -17,9 +17,9 @@ # under the License. # Importing full names to not pollute the namespace and cause possible -# collisions with use of 'from cinder.volume import ' elsewhere. -import cinder.flags -import cinder.openstack.common.importutils +# collisions with use of 'from manila.volume import ' elsewhere. +import manila.flags +import manila.openstack.common.importutils -API = cinder.openstack.common.importutils.import_class( - cinder.flags.FLAGS.volume_api_class) +API = manila.openstack.common.importutils.import_class( + manila.flags.FLAGS.volume_api_class) diff --git a/cinder/volume/api.py b/manila/volume/api.py similarity index 98% rename from cinder/volume/api.py rename to manila/volume/api.py index 042ae6802a..ec7bfdf7be 100644 --- a/cinder/volume/api.py +++ b/manila/volume/api.py @@ -24,18 +24,18 @@ import functools from oslo.config import cfg -from cinder.db import base -from cinder import exception -from cinder import flags -from cinder.image import glance -from cinder.openstack.common import excutils -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -import cinder.policy -from cinder import quota -from cinder.scheduler import rpcapi as scheduler_rpcapi -from cinder.volume import rpcapi as volume_rpcapi -from cinder.volume import volume_types +from manila.db import base +from manila import exception +from manila import flags +from manila.image import glance +from manila.openstack.common import excutils +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils +import manila.policy +from manila import quota +from manila.scheduler import rpcapi as scheduler_rpcapi +from manila.volume import rpcapi as volume_rpcapi +from manila.volume import volume_types volume_host_opt = cfg.BoolOpt('snapshot_same_host', default=True, @@ -44,7 +44,7 @@ volume_host_opt = cfg.BoolOpt('snapshot_same_host', FLAGS = flags.FLAGS FLAGS.register_opt(volume_host_opt) -flags.DECLARE('storage_availability_zone', 'cinder.volume.manager') +flags.DECLARE('storage_availability_zone', 'manila.volume.manager') LOG = logging.getLogger(__name__) GB = 1048576 * 1024 @@ -72,7 +72,7 @@ def check_policy(context, action, target_obj=None): } target.update(target_obj or {}) _action = 'volume:%s' % action - cinder.policy.enforce(context, _action, target) + manila.policy.enforce(context, _action, target) class API(base.Base): diff --git a/cinder/volume/configuration.py b/manila/volume/configuration.py similarity index 97% rename from cinder/volume/configuration.py rename to manila/volume/configuration.py index 13935be676..38fdf49d6b 100644 --- a/cinder/volume/configuration.py +++ b/manila/volume/configuration.py @@ -44,8 +44,8 @@ and registered in the group in which they are used. from oslo.config import cfg -from cinder import flags -from cinder.openstack.common import log as logging +from manila import flags +from manila.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/cinder/volume/driver.py b/manila/volume/driver.py similarity index 98% rename from cinder/volume/driver.py rename to manila/volume/driver.py index 275ced42fd..53fb898ec5 100644 --- a/cinder/volume/driver.py +++ b/manila/volume/driver.py @@ -26,10 +26,10 @@ import time from oslo.config import cfg -from cinder import exception -from cinder.image import image_utils -from cinder.openstack.common import log as logging -from cinder import utils +from manila import exception +from manila.image import image_utils +from manila.openstack.common import log as logging +from manila import utils LOG = logging.getLogger(__name__) @@ -61,7 +61,7 @@ volume_opts = [ CONF = cfg.CONF CONF.register_opts(volume_opts) -CONF.import_opt('iscsi_helper', 'cinder.brick.iscsi.iscsi') +CONF.import_opt('iscsi_helper', 'manila.brick.iscsi.iscsi') class VolumeDriver(object): @@ -280,8 +280,8 @@ class ISCSIDriver(VolumeDriver): properties['target_lun'] = int(results[2]) except (IndexError, ValueError): if (self.configuration.volume_driver in - ['cinder.volume.drivers.lvm.LVMISCSIDriver', - 'cinder.volume.drivers.lvm.ThinLVMVolumeDriver'] and + ['manila.volume.drivers.lvm.LVMISCSIDriver', + 'manila.volume.drivers.lvm.ThinLVMVolumeDriver'] and self.configuration.iscsi_helper == 'tgtadm'): properties['target_lun'] = 1 else: diff --git a/cinder/volume/drivers/__init__.py b/manila/volume/drivers/__init__.py similarity index 90% rename from cinder/volume/drivers/__init__.py rename to manila/volume/drivers/__init__.py index 815a442c69..387a1b9a9d 100644 --- a/cinder/volume/drivers/__init__.py +++ b/manila/volume/drivers/__init__.py @@ -13,10 +13,10 @@ # under the License. """ -:mod:`cinder.volume.driver` -- Cinder Drivers +:mod:`manila.volume.driver` -- Cinder Drivers ===================================================== -.. automodule:: cinder.volume.driver +.. automodule:: manila.volume.driver :platform: Unix :synopsis: Module containing all the Cinder drivers. """ diff --git a/cinder/volume/drivers/coraid.py b/manila/volume/drivers/coraid.py similarity index 98% rename from cinder/volume/drivers/coraid.py rename to manila/volume/drivers/coraid.py index 0c251304bc..c9f3bfd304 100644 --- a/cinder/volume/drivers/coraid.py +++ b/manila/volume/drivers/coraid.py @@ -28,13 +28,13 @@ import urllib2 from oslo.config import cfg -from cinder import context -from cinder import exception -from cinder import flags -from cinder.openstack.common import jsonutils -from cinder.openstack.common import log as logging -from cinder.volume import driver -from cinder.volume import volume_types +from manila import context +from manila import exception +from manila import flags +from manila.openstack.common import jsonutils +from manila.openstack.common import log as logging +from manila.volume import driver +from manila.volume import volume_types LOG = logging.getLogger(__name__) @@ -270,7 +270,7 @@ class CoraidRESTClient(object): class CoraidDriver(driver.VolumeDriver): - """This is the Class to set in cinder.conf (volume_driver).""" + """This is the Class to set in manila.conf (volume_driver).""" def __init__(self, *args, **kwargs): super(CoraidDriver, self).__init__(*args, **kwargs) diff --git a/cinder/volume/drivers/emc/__init__.py b/manila/volume/drivers/emc/__init__.py similarity index 100% rename from cinder/volume/drivers/emc/__init__.py rename to manila/volume/drivers/emc/__init__.py diff --git a/cinder/volume/drivers/emc/cinder_emc_config.xml.sample b/manila/volume/drivers/emc/cinder_emc_config.xml.sample similarity index 100% rename from cinder/volume/drivers/emc/cinder_emc_config.xml.sample rename to manila/volume/drivers/emc/cinder_emc_config.xml.sample diff --git a/cinder/volume/drivers/emc/emc_smis_common.py b/manila/volume/drivers/emc/emc_smis_common.py similarity index 99% rename from cinder/volume/drivers/emc/emc_smis_common.py rename to manila/volume/drivers/emc/emc_smis_common.py index 31f094bfe0..7ccdfee3d1 100644 --- a/cinder/volume/drivers/emc/emc_smis_common.py +++ b/manila/volume/drivers/emc/emc_smis_common.py @@ -28,9 +28,9 @@ import time from oslo.config import cfg from xml.dom.minidom import parseString -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging +from manila import exception +from manila import flags +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) @@ -42,7 +42,7 @@ except ImportError: LOG.info(_('Module PyWBEM not installed. ' 'Install PyWBEM using the python-pywbem package.')) -CINDER_EMC_CONFIG_FILE = '/etc/cinder/cinder_emc_config.xml' +CINDER_EMC_CONFIG_FILE = '/etc/manila/cinder_emc_config.xml' class EMCSMISCommon(): @@ -60,7 +60,7 @@ class EMCSMISCommon(): opt = cfg.StrOpt('cinder_emc_config_file', default=CINDER_EMC_CONFIG_FILE, - help='use this file for cinder emc plugin ' + help='use this file for manila emc plugin ' 'config data') FLAGS.register_opt(opt) self.protocol = prtcl diff --git a/cinder/volume/drivers/emc/emc_smis_iscsi.py b/manila/volume/drivers/emc/emc_smis_iscsi.py similarity index 97% rename from cinder/volume/drivers/emc/emc_smis_iscsi.py rename to manila/volume/drivers/emc/emc_smis_iscsi.py index 25308c53a3..6c63f21170 100644 --- a/cinder/volume/drivers/emc/emc_smis_iscsi.py +++ b/manila/volume/drivers/emc/emc_smis_iscsi.py @@ -23,12 +23,12 @@ ISCSI Drivers for EMC VNX and VMAX arrays based on SMI-S. import os import time -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import utils -from cinder.volume import driver -from cinder.volume.drivers.emc import emc_smis_common +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila import utils +from manila.volume import driver +from manila.volume.drivers.emc import emc_smis_common LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/glusterfs.py b/manila/volume/drivers/glusterfs.py similarity index 97% rename from cinder/volume/drivers/glusterfs.py rename to manila/volume/drivers/glusterfs.py index 21f3c30c90..c804a6cebd 100644 --- a/cinder/volume/drivers/glusterfs.py +++ b/manila/volume/drivers/glusterfs.py @@ -20,16 +20,16 @@ import os from oslo.config import cfg -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.volume.drivers import nfs +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.volume.drivers import nfs LOG = logging.getLogger(__name__) volume_opts = [ cfg.StrOpt('glusterfs_shares_config', - default='/etc/cinder/glusterfs_shares', + default='/etc/manila/glusterfs_shares', help='File with the list of available gluster shares'), cfg.StrOpt('glusterfs_mount_point_base', default='$state_path/mnt', @@ -49,7 +49,7 @@ FLAGS.register_opts(volume_opts) class GlusterfsDriver(nfs.RemoteFsDriver): - """Gluster based cinder driver. Creates file on Gluster share for using it + """Gluster based manila driver. Creates file on Gluster share for using it as block device on hypervisor.""" def __init__(self, *args, **kwargs): diff --git a/cinder/volume/drivers/huawei/__init__.py b/manila/volume/drivers/huawei/__init__.py similarity index 100% rename from cinder/volume/drivers/huawei/__init__.py rename to manila/volume/drivers/huawei/__init__.py diff --git a/cinder/volume/drivers/huawei/cinder_huawei_conf.xml.sample b/manila/volume/drivers/huawei/cinder_huawei_conf.xml.sample similarity index 100% rename from cinder/volume/drivers/huawei/cinder_huawei_conf.xml.sample rename to manila/volume/drivers/huawei/cinder_huawei_conf.xml.sample diff --git a/cinder/volume/drivers/huawei/huawei_iscsi.py b/manila/volume/drivers/huawei/huawei_iscsi.py similarity index 99% rename from cinder/volume/drivers/huawei/huawei_iscsi.py rename to manila/volume/drivers/huawei/huawei_iscsi.py index 869552d030..3f13fbc76d 100644 --- a/cinder/volume/drivers/huawei/huawei_iscsi.py +++ b/manila/volume/drivers/huawei/huawei_iscsi.py @@ -28,18 +28,18 @@ import time from oslo.config import cfg from xml.etree import ElementTree as ET -from cinder import exception -from cinder.openstack.common import excutils -from cinder.openstack.common import log as logging -from cinder import utils -from cinder.volume import driver +from manila import exception +from manila.openstack.common import excutils +from manila.openstack.common import log as logging +from manila import utils +from manila.volume import driver LOG = logging.getLogger(__name__) huawei_opt = [ cfg.StrOpt('cinder_huawei_conf_file', - default='/etc/cinder/cinder_huawei_conf.xml', - help='config data for cinder huawei plugin')] + default='/etc/manila/cinder_huawei_conf.xml', + help='config data for manila huawei plugin')] HOST_GROUP_NAME = 'HostGroup_OpenStack' HOST_NAME_PREFIX = 'Host_' @@ -835,7 +835,7 @@ class HuaweiISCSIDriver(driver.ISCSIDriver): """Form new names because of the 32-character limit on names.""" newname = VOL_AND_SNAP_NAME_PREFIX + str(hash(name)) - LOG.debug(_('_name_translate:Name in cinder: %(old)s, ' + LOG.debug(_('_name_translate:Name in manila: %(old)s, ' 'new name in storage system: %(new)s') % {'old': name, 'new': newname}) diff --git a/cinder/volume/drivers/lvm.py b/manila/volume/drivers/lvm.py similarity index 98% rename from cinder/volume/drivers/lvm.py rename to manila/volume/drivers/lvm.py index 7317c2901b..e7d24bd065 100644 --- a/cinder/volume/drivers/lvm.py +++ b/manila/volume/drivers/lvm.py @@ -26,19 +26,19 @@ import re from oslo.config import cfg -from cinder.brick.iscsi import iscsi -from cinder import exception -from cinder import flags -from cinder.image import image_utils -from cinder.openstack.common import log as logging -from cinder import utils -from cinder.volume import driver +from manila.brick.iscsi import iscsi +from manila import exception +from manila import flags +from manila.image import image_utils +from manila.openstack.common import log as logging +from manila import utils +from manila.volume import driver LOG = logging.getLogger(__name__) volume_opts = [ cfg.StrOpt('volume_group', - default='cinder-volumes', + default='manila-volumes', help='Name for the VG that will contain exported volumes'), cfg.StrOpt('volume_clear', default='zero', @@ -53,7 +53,7 @@ volume_opts = [ cfg.StrOpt('pool_size', default=None, help='Size of thin provisioning pool ' - '(None uses entire cinder VG)'), + '(None uses entire manila VG)'), cfg.IntOpt('lvm_mirrors', default=0, help='If set, create lvms with multiple mirrors. Note that ' @@ -369,7 +369,7 @@ class LVMISCSIDriver(LVMVolumeDriver, driver.ISCSIDriver): chap_auth = None - # Check for https://bugs.launchpad.net/cinder/+bug/1065702 + # Check for https://bugs.launchpad.net/manila/+bug/1065702 old_name = None volume_name = volume['name'] if (volume['provider_location'] is not None and @@ -405,7 +405,7 @@ class LVMISCSIDriver(LVMVolumeDriver, driver.ISCSIDriver): and when detach is called we'll feed back into ensure_export again if necessary and fix things up then. - Details at: https://bugs.launchpad.net/cinder/+bug/1065702 + Details at: https://bugs.launchpad.net/manila/+bug/1065702 """ model_update = {} diff --git a/cinder/volume/drivers/netapp/__init__.py b/manila/volume/drivers/netapp/__init__.py similarity index 100% rename from cinder/volume/drivers/netapp/__init__.py rename to manila/volume/drivers/netapp/__init__.py diff --git a/cinder/volume/drivers/netapp/api.py b/manila/volume/drivers/netapp/api.py similarity index 99% rename from cinder/volume/drivers/netapp/api.py rename to manila/volume/drivers/netapp/api.py index 241a22daa0..94b84b7b26 100644 --- a/cinder/volume/drivers/netapp/api.py +++ b/manila/volume/drivers/netapp/api.py @@ -24,7 +24,7 @@ Contains classes required to issue api calls to ONTAP and OnCommand DFM. from lxml import etree import urllib2 -from cinder.openstack.common import log as logging +from manila.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/netapp/iscsi.py b/manila/volume/drivers/netapp/iscsi.py similarity index 99% rename from cinder/volume/drivers/netapp/iscsi.py rename to manila/volume/drivers/netapp/iscsi.py index 7fe24b6f79..4e4613e35e 100644 --- a/cinder/volume/drivers/netapp/iscsi.py +++ b/manila/volume/drivers/netapp/iscsi.py @@ -31,14 +31,14 @@ import suds from suds import client from suds.sax import text -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import utils -from cinder.volume import driver -from cinder.volume.drivers.netapp.api import NaApiError -from cinder.volume.drivers.netapp.api import NaElement -from cinder.volume.drivers.netapp.api import NaServer -from cinder.volume import volume_types +from manila import exception +from manila.openstack.common import log as logging +from manila import utils +from manila.volume import driver +from manila.volume.drivers.netapp.api import NaApiError +from manila.volume.drivers.netapp.api import NaElement +from manila.volume.drivers.netapp.api import NaServer +from manila.volume import volume_types LOG = logging.getLogger(__name__) @@ -394,7 +394,7 @@ class NetAppISCSIDriver(driver.ISCSIDriver): The LUN will be created inside a dataset associated with the project. If the dataset doesn't already exist, we create it using the storage - service specified in the cinder conf. + service specified in the manila conf. """ dataset_name = self._dataset_name(project, ss_type) dataset = self._get_dataset(dataset_name) diff --git a/cinder/volume/drivers/netapp/nfs.py b/manila/volume/drivers/netapp/nfs.py similarity index 98% rename from cinder/volume/drivers/netapp/nfs.py rename to manila/volume/drivers/netapp/nfs.py index bb3890aae2..80acf83d12 100644 --- a/cinder/volume/drivers/netapp/nfs.py +++ b/manila/volume/drivers/netapp/nfs.py @@ -26,13 +26,13 @@ from oslo.config import cfg import suds from suds.sax import text -from cinder import exception -from cinder.openstack.common import log as logging -from cinder.volume.drivers.netapp.api import NaApiError -from cinder.volume.drivers.netapp.api import NaElement -from cinder.volume.drivers.netapp.api import NaServer -from cinder.volume.drivers.netapp.iscsi import netapp_opts -from cinder.volume.drivers import nfs +from manila import exception +from manila.openstack.common import log as logging +from manila.volume.drivers.netapp.api import NaApiError +from manila.volume.drivers.netapp.api import NaElement +from manila.volume.drivers.netapp.api import NaServer +from manila.volume.drivers.netapp.iscsi import netapp_opts +from manila.volume.drivers import nfs LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/nexenta/__init__.py b/manila/volume/drivers/nexenta/__init__.py similarity index 100% rename from cinder/volume/drivers/nexenta/__init__.py rename to manila/volume/drivers/nexenta/__init__.py diff --git a/cinder/volume/drivers/nexenta/jsonrpc.py b/manila/volume/drivers/nexenta/jsonrpc.py similarity index 95% rename from cinder/volume/drivers/nexenta/jsonrpc.py rename to manila/volume/drivers/nexenta/jsonrpc.py index ddeb5bdd87..4663c7044b 100644 --- a/cinder/volume/drivers/nexenta/jsonrpc.py +++ b/manila/volume/drivers/nexenta/jsonrpc.py @@ -24,9 +24,9 @@ import urllib2 -from cinder.openstack.common import jsonutils -from cinder.openstack.common import log as logging -from cinder.volume.drivers import nexenta +from manila.openstack.common import jsonutils +from manila.openstack.common import log as logging +from manila.volume.drivers import nexenta LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/nexenta/volume.py b/manila/volume/drivers/nexenta/volume.py similarity index 97% rename from cinder/volume/drivers/nexenta/volume.py rename to manila/volume/drivers/nexenta/volume.py index 94b73fd3aa..89fd5e71ea 100644 --- a/cinder/volume/drivers/nexenta/volume.py +++ b/manila/volume/drivers/nexenta/volume.py @@ -24,12 +24,12 @@ from oslo.config import cfg -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.volume import driver -from cinder.volume.drivers import nexenta -from cinder.volume.drivers.nexenta import jsonrpc +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.volume import driver +from manila.volume.drivers import nexenta +from manila.volume.drivers.nexenta import jsonrpc VERSION = '1.0' LOG = logging.getLogger(__name__) @@ -56,13 +56,13 @@ nexenta_opts = [ default=3260, help='Nexenta target portal port'), cfg.StrOpt('nexenta_volume', - default='cinder', + default='manila', help='pool on SA that will hold all volumes'), cfg.StrOpt('nexenta_target_prefix', - default='iqn.1986-03.com.sun:02:cinder-', + default='iqn.1986-03.com.sun:02:manila-', help='IQN prefix for iSCSI targets'), cfg.StrOpt('nexenta_target_group_prefix', - default='cinder/', + default='manila/', help='prefix for iSCSI target groups on SA'), cfg.StrOpt('nexenta_blocksize', default='', diff --git a/cinder/volume/drivers/nfs.py b/manila/volume/drivers/nfs.py similarity index 97% rename from cinder/volume/drivers/nfs.py rename to manila/volume/drivers/nfs.py index 5914ed72ab..53b9c3ff73 100755 --- a/cinder/volume/drivers/nfs.py +++ b/manila/volume/drivers/nfs.py @@ -21,16 +21,16 @@ import os from oslo.config import cfg -from cinder import exception -from cinder.image import image_utils -from cinder.openstack.common import log as logging -from cinder.volume import driver +from manila import exception +from manila.image import image_utils +from manila.openstack.common import log as logging +from manila.volume import driver LOG = logging.getLogger(__name__) volume_opts = [ cfg.StrOpt('nfs_shares_config', - default='/etc/cinder/nfs_shares', + default='/etc/manila/nfs_shares', help='File with the list of available nfs shares'), cfg.StrOpt('nfs_mount_point_base', default='$state_path/mnt', @@ -126,7 +126,7 @@ class RemoteFsDriver(driver.VolumeDriver): class NfsDriver(RemoteFsDriver): - """NFS based cinder driver. Creates file on NFS share for using it + """NFS based manila driver. Creates file on NFS share for using it as block device on hypervisor.""" def __init__(self, *args, **kwargs): super(NfsDriver, self).__init__(*args, **kwargs) diff --git a/cinder/volume/drivers/rbd.py b/manila/volume/drivers/rbd.py similarity index 98% rename from cinder/volume/drivers/rbd.py rename to manila/volume/drivers/rbd.py index f31c4cdaeb..b7b3dee075 100644 --- a/cinder/volume/drivers/rbd.py +++ b/manila/volume/drivers/rbd.py @@ -22,11 +22,11 @@ import urllib from oslo.config import cfg -from cinder import exception -from cinder.image import image_utils -from cinder.openstack.common import log as logging -from cinder import utils -from cinder.volume import driver +from manila import exception +from manila.image import image_utils +from manila.openstack.common import log as logging +from manila import utils +from manila.volume import driver LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/san/__init__.py b/manila/volume/drivers/san/__init__.py similarity index 92% rename from cinder/volume/drivers/san/__init__.py rename to manila/volume/drivers/san/__init__.py index f890b1e792..949a3ec182 100644 --- a/cinder/volume/drivers/san/__init__.py +++ b/manila/volume/drivers/san/__init__.py @@ -13,10 +13,10 @@ # under the License. """ -:mod:`cinder.volume.san` -- Cinder San Drivers +:mod:`manila.volume.san` -- Cinder San Drivers ===================================================== -.. automodule:: cinder.volume.san +.. automodule:: manila.volume.san :platform: Unix :synopsis: Module containing all the Cinder San drivers. """ diff --git a/cinder/volume/drivers/san/hp/__init__.py b/manila/volume/drivers/san/hp/__init__.py similarity index 100% rename from cinder/volume/drivers/san/hp/__init__.py rename to manila/volume/drivers/san/hp/__init__.py diff --git a/cinder/volume/drivers/san/hp/hp_3par_common.py b/manila/volume/drivers/san/hp/hp_3par_common.py similarity index 99% rename from cinder/volume/drivers/san/hp/hp_3par_common.py rename to manila/volume/drivers/san/hp/hp_3par_common.py index 9468904994..2df5bf08d9 100644 --- a/cinder/volume/drivers/san/hp/hp_3par_common.py +++ b/manila/volume/drivers/san/hp/hp_3par_common.py @@ -48,11 +48,11 @@ from eventlet import greenthread from hp3parclient import exceptions as hpexceptions from oslo.config import cfg -from cinder import context -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import utils -from cinder.volume import volume_types +from manila import context +from manila import exception +from manila.openstack.common import log as logging +from manila import utils +from manila.volume import volume_types LOG = logging.getLogger(__name__) @@ -644,7 +644,7 @@ exit client.deleteVolume(volume_name) except hpexceptions.HTTPNotFound as ex: # We'll let this act as if it worked - # it helps clean up the cinder entries. + # it helps clean up the manila entries. LOG.error(str(ex)) except hpexceptions.HTTPForbidden as ex: LOG.error(str(ex)) diff --git a/cinder/volume/drivers/san/hp/hp_3par_fc.py b/manila/volume/drivers/san/hp/hp_3par_fc.py similarity index 95% rename from cinder/volume/drivers/san/hp/hp_3par_fc.py rename to manila/volume/drivers/san/hp/hp_3par_fc.py index 7af686268f..a69606c54d 100644 --- a/cinder/volume/drivers/san/hp/hp_3par_fc.py +++ b/manila/volume/drivers/san/hp/hp_3par_fc.py @@ -24,28 +24,28 @@ on the 3PAR array. You will need to install the python hp3parclient. sudo pip install hp3parclient -Set the following in the cinder.conf file to enable the +Set the following in the manila.conf file to enable the 3PAR Fibre Channel Driver along with the required flags: -volume_driver=cinder.volume.drivers.san.hp.hp_3par_fc.HP3PARFCDriver +volume_driver=manila.volume.drivers.san.hp.hp_3par_fc.HP3PARFCDriver """ from hp3parclient import client from hp3parclient import exceptions as hpexceptions from oslo.config import cfg -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import utils -import cinder.volume.driver -from cinder.volume.drivers.san.hp import hp_3par_common as hpcommon -from cinder.volume.drivers.san import san +from manila import exception +from manila.openstack.common import log as logging +from manila import utils +import manila.volume.driver +from manila.volume.drivers.san.hp import hp_3par_common as hpcommon +from manila.volume.drivers.san import san VERSION = 1.0 LOG = logging.getLogger(__name__) -class HP3PARFCDriver(cinder.volume.driver.FibreChannelDriver): +class HP3PARFCDriver(manila.volume.driver.FibreChannelDriver): """OpenStack Fibre Channel driver to enable 3PAR storage array. Version history: diff --git a/cinder/volume/drivers/san/hp/hp_3par_iscsi.py b/manila/volume/drivers/san/hp/hp_3par_iscsi.py similarity index 96% rename from cinder/volume/drivers/san/hp/hp_3par_iscsi.py rename to manila/volume/drivers/san/hp/hp_3par_iscsi.py index f1b1b83552..025e715091 100644 --- a/cinder/volume/drivers/san/hp/hp_3par_iscsi.py +++ b/manila/volume/drivers/san/hp/hp_3par_iscsi.py @@ -24,27 +24,27 @@ on the 3PAR array. You will need to install the python hp3parclient. sudo pip install hp3parclient -Set the following in the cinder.conf file to enable the +Set the following in the manila.conf file to enable the 3PAR iSCSI Driver along with the required flags: -volume_driver=cinder.volume.drivers.san.hp.hp_3par_iscsi.HP3PARISCSIDriver +volume_driver=manila.volume.drivers.san.hp.hp_3par_iscsi.HP3PARISCSIDriver """ from hp3parclient import client from hp3parclient import exceptions as hpexceptions -from cinder import exception -from cinder.openstack.common import log as logging -from cinder import utils -import cinder.volume.driver -from cinder.volume.drivers.san.hp import hp_3par_common as hpcommon -from cinder.volume.drivers.san import san +from manila import exception +from manila.openstack.common import log as logging +from manila import utils +import manila.volume.driver +from manila.volume.drivers.san.hp import hp_3par_common as hpcommon +from manila.volume.drivers.san import san VERSION = 1.0 LOG = logging.getLogger(__name__) -class HP3PARISCSIDriver(cinder.volume.driver.ISCSIDriver): +class HP3PARISCSIDriver(manila.volume.driver.ISCSIDriver): """OpenStack iSCSI driver to enable 3PAR storage array. Version history: diff --git a/cinder/volume/drivers/san/hp_lefthand.py b/manila/volume/drivers/san/hp_lefthand.py similarity index 98% rename from cinder/volume/drivers/san/hp_lefthand.py rename to manila/volume/drivers/san/hp_lefthand.py index 6dff285a0a..f4c82a6ccc 100644 --- a/cinder/volume/drivers/san/hp_lefthand.py +++ b/manila/volume/drivers/san/hp_lefthand.py @@ -19,9 +19,9 @@ operations on the SAN. """ from lxml import etree -from cinder import exception -from cinder.openstack.common import log as logging -from cinder.volume.drivers.san.san import SanISCSIDriver +from manila import exception +from manila.openstack.common import log as logging +from manila.volume.drivers.san.san import SanISCSIDriver LOG = logging.getLogger(__name__) @@ -45,7 +45,7 @@ class HpSanISCSIDriver(SanISCSIDriver): The 'trick' here is that the HP SAN enforces security by default, so normally a volume mount would need both to configure the SAN in the volume layer and do the mount on the compute layer. Multi-layer operations are - not catered for at the moment in the cinder architecture, so instead we + not catered for at the moment in the manila architecture, so instead we share the volume using CHAP at volume creation time. Then the mount need only use those CHAP credentials, so can take place exclusively in the compute layer. diff --git a/cinder/volume/drivers/san/san.py b/manila/volume/drivers/san/san.py similarity index 97% rename from cinder/volume/drivers/san/san.py rename to manila/volume/drivers/san/san.py index fbd9c2ead8..851daf7c46 100644 --- a/cinder/volume/drivers/san/san.py +++ b/manila/volume/drivers/san/san.py @@ -26,11 +26,11 @@ import random from eventlet import greenthread from oslo.config import cfg -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import utils -from cinder.volume.driver import ISCSIDriver +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila import utils +from manila.volume.driver import ISCSIDriver LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/san/solaris.py b/manila/volume/drivers/san/solaris.py similarity index 98% rename from cinder/volume/drivers/san/solaris.py rename to manila/volume/drivers/san/solaris.py index ca478cd186..f56a4302b9 100644 --- a/cinder/volume/drivers/san/solaris.py +++ b/manila/volume/drivers/san/solaris.py @@ -14,10 +14,10 @@ from oslo.config import cfg -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.volume.drivers.san.san import SanISCSIDriver +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.volume.drivers.san.san import SanISCSIDriver LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/scality.py b/manila/volume/drivers/scality.py similarity index 97% rename from cinder/volume/drivers/scality.py rename to manila/volume/drivers/scality.py index b59fe26be4..bd28fcd802 100644 --- a/cinder/volume/drivers/scality.py +++ b/manila/volume/drivers/scality.py @@ -23,11 +23,11 @@ import urlparse from oslo.config import cfg -from cinder import exception -from cinder import flags -from cinder.image import image_utils -from cinder.openstack.common import log as logging -from cinder.volume import driver +from manila import exception +from manila import flags +from manila.image import image_utils +from manila.openstack.common import log as logging +from manila.volume import driver LOG = logging.getLogger(__name__) @@ -39,7 +39,7 @@ volume_opts = [ default='$state_path/scality', help='Base dir where Scality SOFS shall be mounted'), cfg.StrOpt('scality_sofs_volume_dir', - default='cinder/volumes', + default='manila/volumes', help='Path from Scality SOFS root to volume dir'), ] @@ -48,7 +48,7 @@ FLAGS.register_opts(volume_opts) class ScalityDriver(driver.VolumeDriver): - """Scality SOFS cinder driver. + """Scality SOFS manila driver. Creates sparse files on SOFS for hypervisors to use as block devices. diff --git a/cinder/volume/drivers/sheepdog.py b/manila/volume/drivers/sheepdog.py similarity index 97% rename from cinder/volume/drivers/sheepdog.py rename to manila/volume/drivers/sheepdog.py index a539ce1815..efa34ccf41 100644 --- a/cinder/volume/drivers/sheepdog.py +++ b/manila/volume/drivers/sheepdog.py @@ -18,10 +18,10 @@ SheepDog Volume Driver. """ import re -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.volume import driver +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.volume import driver LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/solidfire.py b/manila/volume/drivers/solidfire.py similarity index 98% rename from cinder/volume/drivers/solidfire.py rename to manila/volume/drivers/solidfire.py index daab58a6af..4c8a9e95b7 100644 --- a/cinder/volume/drivers/solidfire.py +++ b/manila/volume/drivers/solidfire.py @@ -27,11 +27,11 @@ import uuid from oslo.config import cfg -from cinder import context -from cinder import exception -from cinder.openstack.common import log as logging -from cinder.volume.drivers.san.san import SanISCSIDriver -from cinder.volume import volume_types +from manila import context +from manila import exception +from manila.openstack.common import log as logging +from manila.volume.drivers.san.san import SanISCSIDriver +from manila.volume import volume_types VERSION = '1.2' LOG = logging.getLogger(__name__) @@ -395,7 +395,7 @@ class SolidFire(SanISCSIDriver): found_count += 1 sf_volref = v LOG.debug(_("Mapped SolidFire volumeID %(sfid)s " - "to cinder ID %(uuid)s.") % + "to manila ID %(uuid)s.") % {'sfid': v['volumeID'], 'uuid': uuid}) @@ -422,7 +422,7 @@ class SolidFire(SanISCSIDriver): One caveat here is that an existing user account must be specified in the API call to create a new volume. We use a set algorithm to - determine account info based on passed in cinder volume object. First + determine account info based on passed in manila volume object. First we check to see if the account already exists (and use it), or if it does not already exist, we'll go ahead and create it. diff --git a/cinder/volume/drivers/storwize_svc.py b/manila/volume/drivers/storwize_svc.py similarity index 99% rename from cinder/volume/drivers/storwize_svc.py rename to manila/volume/drivers/storwize_svc.py index 8f44477fa5..e585e1ca2d 100755 --- a/cinder/volume/drivers/storwize_svc.py +++ b/manila/volume/drivers/storwize_svc.py @@ -47,14 +47,14 @@ import time from oslo.config import cfg -from cinder import context -from cinder import exception -from cinder.openstack.common import excutils -from cinder.openstack.common import log as logging -from cinder.openstack.common import strutils -from cinder import utils -from cinder.volume.drivers.san import san -from cinder.volume import volume_types +from manila import context +from manila import exception +from manila.openstack.common import excutils +from manila.openstack.common import log as logging +from manila.openstack.common import strutils +from manila import utils +from manila.volume.drivers.san import san +from manila.volume import volume_types VERSION = 1.1 LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/windows.py b/manila/volume/drivers/windows.py similarity index 98% rename from cinder/volume/drivers/windows.py rename to manila/volume/drivers/windows.py index a0113b1535..b0f49b4503 100644 --- a/cinder/volume/drivers/windows.py +++ b/manila/volume/drivers/windows.py @@ -25,10 +25,10 @@ import sys from oslo.config import cfg -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.volume import driver +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila.volume import driver # Check needed for unit testing on Unix if os.name == 'nt': diff --git a/cinder/volume/drivers/xenapi/__init__.py b/manila/volume/drivers/xenapi/__init__.py similarity index 100% rename from cinder/volume/drivers/xenapi/__init__.py rename to manila/volume/drivers/xenapi/__init__.py diff --git a/cinder/volume/drivers/xenapi/lib.py b/manila/volume/drivers/xenapi/lib.py similarity index 99% rename from cinder/volume/drivers/xenapi/lib.py rename to manila/volume/drivers/xenapi/lib.py index 4c48fc2dbb..a03985b7d5 100644 --- a/cinder/volume/drivers/xenapi/lib.py +++ b/manila/volume/drivers/xenapi/lib.py @@ -16,7 +16,7 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.volume.drivers.xenapi import tools +from manila.volume.drivers.xenapi import tools import contextlib import os import pickle diff --git a/cinder/volume/drivers/xenapi/sm.py b/manila/volume/drivers/xenapi/sm.py similarity index 97% rename from cinder/volume/drivers/xenapi/sm.py rename to manila/volume/drivers/xenapi/sm.py index c1b64e2c9c..94ad22dca6 100644 --- a/cinder/volume/drivers/xenapi/sm.py +++ b/manila/volume/drivers/xenapi/sm.py @@ -18,13 +18,13 @@ from oslo.config import cfg -from cinder import exception -from cinder import flags -from cinder.image import glance -from cinder.image import image_utils -from cinder.openstack.common import log as logging -from cinder.volume import driver -from cinder.volume.drivers.xenapi import lib as xenapi_lib +from manila import exception +from manila import flags +from manila.image import glance +from manila.image import image_utils +from manila.openstack.common import log as logging +from manila.volume import driver +from manila.volume.drivers.xenapi import lib as xenapi_lib LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/xenapi/tools.py b/manila/volume/drivers/xenapi/tools.py similarity index 100% rename from cinder/volume/drivers/xenapi/tools.py rename to manila/volume/drivers/xenapi/tools.py diff --git a/cinder/volume/drivers/xiv.py b/manila/volume/drivers/xiv.py similarity index 93% rename from cinder/volume/drivers/xiv.py rename to manila/volume/drivers/xiv.py index 2b60497e8f..cf5fce570f 100644 --- a/cinder/volume/drivers/xiv.py +++ b/manila/volume/drivers/xiv.py @@ -26,11 +26,11 @@ Volume driver for IBM XIV storage systems. from oslo.config import cfg -from cinder import exception -from cinder import flags -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging -from cinder.volume.drivers.san import san +from manila import exception +from manila import flags +from manila.openstack.common import importutils +from manila.openstack.common import log as logging +from manila.volume.drivers.san import san ibm_xiv_opts = [ cfg.StrOpt('xiv_proxy', @@ -41,7 +41,7 @@ ibm_xiv_opts = [ FLAGS = flags.FLAGS FLAGS.register_opts(ibm_xiv_opts) -LOG = logging.getLogger('cinder.volume.xiv') +LOG = logging.getLogger('manila.volume.xiv') class XIVDriver(san.SanISCSIDriver): diff --git a/cinder/volume/drivers/zadara.py b/manila/volume/drivers/zadara.py similarity index 98% rename from cinder/volume/drivers/zadara.py rename to manila/volume/drivers/zadara.py index 988ac647af..3b7edcd5d1 100644 --- a/cinder/volume/drivers/zadara.py +++ b/manila/volume/drivers/zadara.py @@ -26,13 +26,13 @@ import httplib from lxml import etree from oslo.config import cfg -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import utils -from cinder.volume import driver +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila import utils +from manila.volume import driver -LOG = logging.getLogger("cinder.volume.driver") +LOG = logging.getLogger("manila.volume.driver") zadara_opts = [ cfg.StrOpt('zadara_vpsa_ip', diff --git a/cinder/volume/manager.py b/manila/volume/manager.py similarity index 92% rename from cinder/volume/manager.py rename to manila/volume/manager.py index 82871a538d..eec670fdfb 100644 --- a/cinder/volume/manager.py +++ b/manila/volume/manager.py @@ -25,14 +25,14 @@ intact. **Related Flags** -:volume_topic: What :mod:`rpc` topic to listen to (default: `cinder-volume`). +:volume_topic: What :mod:`rpc` topic to listen to (default: `manila-volume`). :volume_manager: The module name of a class derived from :class:`manager.Manager` (default: - :class:`cinder.volume.manager.Manager`). + :class:`manila.volume.manager.Manager`). :volume_driver: Used by :class:`Manager`. Defaults to - :class:`cinder.volume.drivers.lvm.LVMISCSIDriver`. + :class:`manila.volume.drivers.lvm.LVMISCSIDriver`. :volume_group: Name of the group that will contain exported volumes (default: - `cinder-volumes`) + `manila-volumes`) :num_shell_tries: Number of times to attempt to run commands (default: 3) """ @@ -43,19 +43,19 @@ import traceback from oslo.config import cfg -from cinder import context -from cinder import exception -from cinder.image import glance -from cinder import manager -from cinder.openstack.common import excutils -from cinder.openstack.common import importutils -from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder.openstack.common import uuidutils -from cinder import quota -from cinder import utils -from cinder.volume.configuration import Configuration -from cinder.volume import utils as volume_utils +from manila import context +from manila import exception +from manila.image import glance +from manila import manager +from manila.openstack.common import excutils +from manila.openstack.common import importutils +from manila.openstack.common import log as logging +from manila.openstack.common import timeutils +from manila.openstack.common import uuidutils +from manila import quota +from manila import utils +from manila.volume.configuration import Configuration +from manila.volume import utils as volume_utils LOG = logging.getLogger(__name__) @@ -63,7 +63,7 @@ QUOTAS = quota.QUOTAS volume_manager_opts = [ cfg.StrOpt('volume_driver', - default='cinder.volume.drivers.lvm.LVMISCSIDriver', + default='manila.volume.drivers.lvm.LVMISCSIDriver', help='Driver to use for volume creation'), ] @@ -71,37 +71,37 @@ CONF = cfg.CONF CONF.register_opts(volume_manager_opts) MAPPING = { - 'cinder.volume.driver.RBDDriver': 'cinder.volume.drivers.rbd.RBDDriver', - 'cinder.volume.driver.SheepdogDriver': - 'cinder.volume.drivers.sheepdog.SheepdogDriver', - 'cinder.volume.nexenta.volume.NexentaDriver': - 'cinder.volume.drivers.nexenta.volume.NexentaDriver', - 'cinder.volume.san.SanISCSIDriver': - 'cinder.volume.drivers.san.san.SanISCSIDriver', - 'cinder.volume.san.SolarisISCSIDriver': - 'cinder.volume.drivers.san.solaris.SolarisISCSIDriver', - 'cinder.volume.san.HpSanISCSIDriver': - 'cinder.volume.drivers.san.hp_lefthand.HpSanISCSIDriver', - 'cinder.volume.netapp.NetAppISCSIDriver': - 'cinder.volume.drivers.netapp.iscsi.NetAppISCSIDriver', - 'cinder.volume.netapp.NetAppCmodeISCSIDriver': - 'cinder.volume.drivers.netapp.iscsi.NetAppCmodeISCSIDriver', - 'cinder.volume.netapp_nfs.NetAppNFSDriver': - 'cinder.volume.drivers.netapp.nfs.NetAppNFSDriver', - 'cinder.volume.nfs.NfsDriver': - 'cinder.volume.drivers.nfs.NfsDriver', - 'cinder.volume.solidfire.SolidFire': - 'cinder.volume.drivers.solidfire.SolidFire', - 'cinder.volume.storwize_svc.StorwizeSVCDriver': - 'cinder.volume.drivers.storwize_svc.StorwizeSVCDriver', - 'cinder.volume.windows.WindowsDriver': - 'cinder.volume.drivers.windows.WindowsDriver', - 'cinder.volume.xiv.XIVDriver': - 'cinder.volume.drivers.xiv.XIVDriver', - 'cinder.volume.zadara.ZadaraVPSAISCSIDriver': - 'cinder.volume.drivers.zadara.ZadaraVPSAISCSIDriver', - 'cinder.volume.driver.ISCSIDriver': - 'cinder.volume.drivers.lvm.LVMISCSIDriver'} + 'manila.volume.driver.RBDDriver': 'manila.volume.drivers.rbd.RBDDriver', + 'manila.volume.driver.SheepdogDriver': + 'manila.volume.drivers.sheepdog.SheepdogDriver', + 'manila.volume.nexenta.volume.NexentaDriver': + 'manila.volume.drivers.nexenta.volume.NexentaDriver', + 'manila.volume.san.SanISCSIDriver': + 'manila.volume.drivers.san.san.SanISCSIDriver', + 'manila.volume.san.SolarisISCSIDriver': + 'manila.volume.drivers.san.solaris.SolarisISCSIDriver', + 'manila.volume.san.HpSanISCSIDriver': + 'manila.volume.drivers.san.hp_lefthand.HpSanISCSIDriver', + 'manila.volume.netapp.NetAppISCSIDriver': + 'manila.volume.drivers.netapp.iscsi.NetAppISCSIDriver', + 'manila.volume.netapp.NetAppCmodeISCSIDriver': + 'manila.volume.drivers.netapp.iscsi.NetAppCmodeISCSIDriver', + 'manila.volume.netapp_nfs.NetAppNFSDriver': + 'manila.volume.drivers.netapp.nfs.NetAppNFSDriver', + 'manila.volume.nfs.NfsDriver': + 'manila.volume.drivers.nfs.NfsDriver', + 'manila.volume.solidfire.SolidFire': + 'manila.volume.drivers.solidfire.SolidFire', + 'manila.volume.storwize_svc.StorwizeSVCDriver': + 'manila.volume.drivers.storwize_svc.StorwizeSVCDriver', + 'manila.volume.windows.WindowsDriver': + 'manila.volume.drivers.windows.WindowsDriver', + 'manila.volume.xiv.XIVDriver': + 'manila.volume.drivers.xiv.XIVDriver', + 'manila.volume.zadara.ZadaraVPSAISCSIDriver': + 'manila.volume.drivers.zadara.ZadaraVPSAISCSIDriver', + 'manila.volume.driver.ISCSIDriver': + 'manila.volume.drivers.lvm.LVMISCSIDriver'} class VolumeManager(manager.SchedulerDependentManager): @@ -593,7 +593,7 @@ class VolumeManager(manager.SchedulerDependentManager): self.db.volume_detached(context.elevated(), volume_id) - # Check for https://bugs.launchpad.net/cinder/+bug/1065702 + # Check for https://bugs.launchpad.net/manila/+bug/1065702 volume_ref = self.db.volume_get(context, volume_id) if (volume_ref['provider_location'] and volume_ref['name'] not in volume_ref['provider_location']): diff --git a/cinder/volume/rpcapi.py b/manila/volume/rpcapi.py similarity index 96% rename from cinder/volume/rpcapi.py rename to manila/volume/rpcapi.py index 1788873d5d..c3fdc86ee1 100644 --- a/cinder/volume/rpcapi.py +++ b/manila/volume/rpcapi.py @@ -18,16 +18,16 @@ Client side of the volume RPC API. """ -from cinder import exception -from cinder import flags -from cinder.openstack.common import rpc -import cinder.openstack.common.rpc.proxy +from manila import exception +from manila import flags +from manila.openstack.common import rpc +import manila.openstack.common.rpc.proxy FLAGS = flags.FLAGS -class VolumeAPI(cinder.openstack.common.rpc.proxy.RpcProxy): +class VolumeAPI(manila.openstack.common.rpc.proxy.RpcProxy): '''Client side of the volume rpc API. API version history: diff --git a/cinder/volume/utils.py b/manila/volume/utils.py similarity index 93% rename from cinder/volume/utils.py rename to manila/volume/utils.py index 9ddd309c18..9e80b71d3b 100644 --- a/cinder/volume/utils.py +++ b/manila/volume/utils.py @@ -19,11 +19,11 @@ import os import stat -from cinder import flags -from cinder.openstack.common import log as logging -from cinder.openstack.common.notifier import api as notifier_api -from cinder.openstack.common import timeutils -from cinder import utils +from manila import flags +from manila.openstack.common import log as logging +from manila.openstack.common.notifier import api as notifier_api +from manila.openstack.common import timeutils +from manila import utils FLAGS = flags.FLAGS @@ -31,7 +31,7 @@ LOG = logging.getLogger(__name__) def get_host_from_queue(queuename): - # This assumes the queue is named something like cinder-volume + # This assumes the queue is named something like manila-volume # and does not have dot separators in the queue name return queuename.split('@', 1)[0].split('.', 1)[1] diff --git a/cinder/volume/volume_types.py b/manila/volume/volume_types.py similarity index 97% rename from cinder/volume/volume_types.py rename to manila/volume/volume_types.py index dab9626857..3a4cd86bf5 100644 --- a/cinder/volume/volume_types.py +++ b/manila/volume/volume_types.py @@ -21,11 +21,11 @@ """Built-in volume type properties.""" -from cinder import context -from cinder import db -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging +from manila import context +from manila import db +from manila import exception +from manila import flags +from manila.openstack.common import log as logging FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) diff --git a/cinder/wsgi.py b/manila/wsgi.py similarity index 97% rename from cinder/wsgi.py rename to manila/wsgi.py index bcd63006af..c0a9266634 100644 --- a/cinder/wsgi.py +++ b/manila/wsgi.py @@ -35,10 +35,10 @@ import routes.middleware import webob.dec import webob.exc -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import utils +from manila import exception +from manila import flags +from manila.openstack.common import log as logging +from manila import utils socket_opts = [ cfg.IntOpt('backlog', @@ -192,7 +192,7 @@ class Server(object): :param backlog: Maximum number of queued connections. :returns: None - :raises: cinder.exception.InvalidInput + :raises: manila.exception.InvalidInput """ if backlog < 1: @@ -259,11 +259,11 @@ class Application(object): [app:wadl] latest_version = 1.3 - paste.app_factory = cinder.api.fancy_api:Wadl.factory + paste.app_factory = manila.api.fancy_api:Wadl.factory which would result in a call to the `Wadl` class as - import cinder.api.fancy_api + import manila.api.fancy_api fancy_api.Wadl(latest_version='1.3') You could of course re-implement the `factory` method in subclasses, @@ -331,11 +331,11 @@ class Middleware(Application): [filter:analytics] redis_host = 127.0.0.1 - paste.filter_factory = cinder.api.analytics:Analytics.factory + paste.filter_factory = manila.api.analytics:Analytics.factory which would result in a call to the `Analytics` class as - import cinder.api.analytics + import manila.api.analytics analytics.Analytics(app_from_paste, redis_host='127.0.0.1') You could of course re-implement the `factory` method in subclasses, @@ -483,7 +483,7 @@ class Loader(object): :param name: Name of the application to load. :returns: Paste URLMap object wrapping the requested application. - :raises: `cinder.exception.PasteAppNotFound` + :raises: `manila.exception.PasteAppNotFound` """ try: diff --git a/setup.cfg b/setup.cfg index 4828ddf1e7..db37d5457c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] -name = cinder +name = manila version = 2013.2 -summary = OpenStack Block Storage +summary = OpenStack Share Storage description-file = README.rst author = OpenStack @@ -24,29 +24,29 @@ setup-hooks = [files] packages = - cinder + manila scripts = - bin/cinder-all - bin/cinder-api - bin/cinder-backup - bin/cinder-clear-rabbit-queues - bin/cinder-manage - bin/cinder-rootwrap - bin/cinder-rpc-zmq-receiver - bin/cinder-scheduler - bin/cinder-share - bin/cinder-volume - bin/cinder-volume-usage-audit + bin/manila-all + bin/manila-api + bin/manila-backup + bin/manila-clear-rabbit-queues + bin/manila-manage + bin/manila-rootwrap + bin/manila-rpc-zmq-receiver + bin/manila-scheduler + bin/manila-share + bin/manila-volume + bin/manila-volume-usage-audit [entry_points] -cinder.scheduler.filters = - AvailabilityZoneFilter = cinder.openstack.common.scheduler.filters.availability_zone_filter:AvailabilityZoneFilter - CapabilitiesFilter = cinder.openstack.common.scheduler.filters.capabilities_filter:CapabilitiesFilter - CapacityFilter = cinder.scheduler.filters.capacity_filter:CapacityFilter - JsonFilter = cinder.openstack.common.scheduler.filters.json_filter:JsonFilter - RetryFilter = cinder.scheduler.filters.retry_filter:RetryFilter -cinder.scheduler.weights = - CapacityWeigher = cinder.scheduler.weights.capacity:CapacityWeigher +manila.scheduler.filters = + AvailabilityZoneFilter = manila.openstack.common.scheduler.filters.availability_zone_filter:AvailabilityZoneFilter + CapabilitiesFilter = manila.openstack.common.scheduler.filters.capabilities_filter:CapabilitiesFilter + CapacityFilter = manila.scheduler.filters.capacity_filter:CapacityFilter + JsonFilter = manila.openstack.common.scheduler.filters.json_filter:JsonFilter + RetryFilter = manila.scheduler.filters.retry_filter:RetryFilter +manila.scheduler.weights = + CapacityWeigher = manila.scheduler.weights.capacity:CapacityWeigher [build_sphinx] all_files = 1 @@ -59,22 +59,22 @@ tag_date = 0 tag_svn_revision = 0 [compile_catalog] -directory = cinder/locale -domain = cinder +directory = manila/locale +domain = manila [update_catalog] -domain = cinder -output_dir = cinder/locale -input_file = cinder/locale/cinder.pot +domain = manila +output_dir = manila/locale +input_file = manila/locale/manila.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = cinder/locale/cinder.pot +output_file = manila/locale/manila.pot [nosetests] -tests=cinder/tests -cover-package = cinder +tests=manila/tests +cover-package = manila cover-erase = true cover-inclusive = true verbosity=2 diff --git a/tools/conf/extract_opts.py b/tools/conf/extract_opts.py index db9e8d7a7d..6aecf220ff 100644 --- a/tools/conf/extract_opts.py +++ b/tools/conf/extract_opts.py @@ -26,7 +26,7 @@ import textwrap from oslo.config import cfg -from cinder.openstack.common import importutils +from manila.openstack.common import importutils STROPT = "StrOpt" BOOLOPT = "BoolOpt" @@ -47,7 +47,7 @@ WORDWRAP_WIDTH = 60 def main(srcfiles): - print '\n'.join(['#' * 20, '# cinder.conf sample #', '#' * 20, + print '\n'.join(['#' * 20, '# manila.conf sample #', '#' * 20, '', '[DEFAULT]', '']) _list_opts(cfg.ConfigOpts, cfg.__name__ + ':' + cfg.ConfigOpts.__name__) @@ -131,7 +131,7 @@ def _sanitize_default(s): elif s == MY_IP: return '10.0.0.1' elif s == HOST: - return 'cinder' + return 'manila' elif s.strip() != s: return '"%s"' % s return s diff --git a/tools/lintstack.py b/tools/lintstack.py index 4130d105f6..24140df1f5 100755 --- a/tools/lintstack.py +++ b/tools/lintstack.py @@ -29,12 +29,12 @@ from pylint.reporters import text # Note(maoy): E1103 is error code related to partial type inference ignore_codes = ["E1103"] # Note(maoy): the error message is the pattern of E0202. It should be ignored -# for cinder.tests modules -ignore_messages = ["An attribute affected in cinder.tests"] +# for manila.tests modules +ignore_messages = ["An attribute affected in manila.tests"] # Note(maoy): we ignore all errors in openstack.common because it should be -# checked elsewhere. We also ignore cinder.tests for now due to high false +# checked elsewhere. We also ignore manila.tests for now due to high false # positive rate. -ignore_modules = ["cinder/openstack/common/", "cinder/tests/"] +ignore_modules = ["manila/openstack/common/", "manila/tests/"] KNOWN_PYLINT_EXCEPTIONS_FILE = "tools/pylint_exceptions" @@ -129,7 +129,7 @@ class ErrorKeys(object): def run_pylint(): buff = StringIO.StringIO() reporter = text.ParseableTextReporter(output=buff) - args = ["--include-ids=y", "-E", "cinder"] + args = ["--include-ids=y", "-E", "manila"] lint.Run(args, reporter=reporter, exit=False) val = buff.getvalue() buff.close() diff --git a/tools/patch_tox_venv.py b/tools/patch_tox_venv.py index dc87af99f7..fde2cd86cb 100644 --- a/tools/patch_tox_venv.py +++ b/tools/patch_tox_venv.py @@ -28,7 +28,7 @@ def main(argv): pip_requires = os.path.join(root, 'tools', 'pip-requires') test_requires = os.path.join(root, 'tools', 'test-requires') py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) - project = 'cinder' + project = 'manila' install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, py_version, project) #NOTE(dprince): For Tox we only run post_process (which patches files, etc)