From d72c2bbe2a3496fc16eccf68be4427211408d4e4 Mon Sep 17 00:00:00 2001 From: OpenStack Jenkins Date: Wed, 16 Oct 2013 06:13:33 +0000 Subject: [PATCH] Imported Translations from Transifex Change-Id: I79473cf2987822f655b674bc49ad60ebb840a87f --- cinder/locale/ar/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/bg_BG/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/bs/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/ca/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/cinder.pot | 298 ++++++++++---------- cinder/locale/cs/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/da/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/de/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/en_AU/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/en_GB/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/en_US/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/es/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/es_MX/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/fi_FI/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/fil/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/fr/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/hi/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/hr/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/hu/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/id/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/it/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/it_IT/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/ja/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/ka_GE/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/kn/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/ko/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/ko_KR/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/ms/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/nb/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/ne/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/nl_NL/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/pl_PL/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/pt/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/pt_BR/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/ro/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/ru/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/ru_RU/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/sk/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/sl_SI/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/sw_KE/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/tl/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/tl_PH/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/tr/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/tr_TR/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/uk/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/ur/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/vi_VN/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/zh_CN/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/zh_HK/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- cinder/locale/zh_TW/LC_MESSAGES/cinder.po | 316 ++++++++++++---------- 50 files changed, 8481 insertions(+), 7301 deletions(-) diff --git a/cinder/locale/ar/LC_MESSAGES/cinder.po b/cinder/locale/ar/LC_MESSAGES/cinder.po index a65c649bd..60b6dee51 100644 --- a/cinder/locale/ar/LC_MESSAGES/cinder.po +++ b/cinder/locale/ar/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-09-12 07:56+0000\n" "Last-Translator: Tom Fifield \n" "Language-Team: Arabic " @@ -2745,9 +2745,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2780,7 +2780,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2788,7 +2788,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2798,7 +2798,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2810,39 +2810,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4398,25 +4398,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4643,7 +4643,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4663,7 +4663,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4797,7 +4797,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4895,99 +4895,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6814,231 +6814,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7046,65 +7051,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7112,111 +7122,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7224,7 +7234,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7267,35 +7277,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9489,3 +9493,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/bg_BG/LC_MESSAGES/cinder.po b/cinder/locale/bg_BG/LC_MESSAGES/cinder.po index c0f2ad59e..e4c4ac1bf 100644 --- a/cinder/locale/bg_BG/LC_MESSAGES/cinder.po +++ b/cinder/locale/bg_BG/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-08 11:44+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Bulgarian (Bulgaria) " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/bs/LC_MESSAGES/cinder.po b/cinder/locale/bs/LC_MESSAGES/cinder.po index ec048060b..d406b71ac 100644 --- a/cinder/locale/bs/LC_MESSAGES/cinder.po +++ b/cinder/locale/bs/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2012-01-19 20:22+0000\n" "Last-Translator: yazar \n" "Language-Team: Bosnian \n" @@ -2748,9 +2748,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2783,7 +2783,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2791,7 +2791,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2801,7 +2801,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2813,39 +2813,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4404,25 +4404,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4649,7 +4649,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4669,7 +4669,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4803,7 +4803,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4901,99 +4901,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6820,231 +6820,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7052,65 +7057,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7118,111 +7128,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7230,7 +7240,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7273,35 +7283,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9810,3 +9814,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/ca/LC_MESSAGES/cinder.po b/cinder/locale/ca/LC_MESSAGES/cinder.po index 89e1832d3..e729dfa69 100644 --- a/cinder/locale/ca/LC_MESSAGES/cinder.po +++ b/cinder/locale/ca/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-29 08:13+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Catalan " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/cinder.pot b/cinder/locale/cinder.pot index adabe55a5..8e430c259 100644 --- a/cinder/locale/cinder.pot +++ b/cinder/locale/cinder.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: cinder jenkins.cinder.propose.translation.update.159\n" +"Project-Id-Version: cinder jenkins.cinder.propose.translation.update.161\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2743,9 +2743,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2778,7 +2778,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2786,7 +2786,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2796,7 +2796,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2808,39 +2808,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4396,25 +4396,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4641,7 +4641,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4661,7 +4661,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4795,7 +4795,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4893,99 +4893,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6812,231 +6812,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7044,65 +7049,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7110,111 +7120,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7222,7 +7232,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7265,35 +7275,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" diff --git a/cinder/locale/cs/LC_MESSAGES/cinder.po b/cinder/locale/cs/LC_MESSAGES/cinder.po index 1cb7af641..b4d74996a 100644 --- a/cinder/locale/cs/LC_MESSAGES/cinder.po +++ b/cinder/locale/cs/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2012-04-04 20:28+0000\n" "Last-Translator: Zbyněk Schwarz \n" "Language-Team: Czech \n" @@ -2766,9 +2766,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2801,7 +2801,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2809,7 +2809,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2819,7 +2819,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2831,39 +2831,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4428,25 +4428,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4673,7 +4673,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4693,7 +4693,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4827,7 +4827,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, fuzzy, python-format msgid "Exception during mounting %s" msgstr "Výjimka při načítání rozšíření: %s" @@ -4925,99 +4925,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, fuzzy, python-format msgid "Symbolic link %s not found" msgstr "značka [%s] nenalezena" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, fuzzy, python-format msgid "%s is already mounted" msgstr "skupina %s již existuje" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6858,231 +6858,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7090,65 +7095,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7156,111 +7166,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7268,7 +7278,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7311,35 +7321,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9849,3 +9853,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/da/LC_MESSAGES/cinder.po b/cinder/locale/da/LC_MESSAGES/cinder.po index bac6fc588..c84a58b8d 100644 --- a/cinder/locale/da/LC_MESSAGES/cinder.po +++ b/cinder/locale/da/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2011-01-15 21:46+0000\n" "Last-Translator: Soren Hansen \n" "Language-Team: Danish \n" @@ -2743,9 +2743,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2778,7 +2778,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2786,7 +2786,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2796,7 +2796,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2808,39 +2808,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4396,25 +4396,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4641,7 +4641,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4661,7 +4661,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4795,7 +4795,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4893,99 +4893,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6812,231 +6812,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7044,65 +7049,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7110,111 +7120,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7222,7 +7232,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7265,35 +7275,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9802,3 +9806,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/de/LC_MESSAGES/cinder.po b/cinder/locale/de/LC_MESSAGES/cinder.po index 4475a3285..93860bf43 100644 --- a/cinder/locale/de/LC_MESSAGES/cinder.po +++ b/cinder/locale/de/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2011-08-23 11:23+0000\n" "Last-Translator: Thierry Carrez \n" "Language-Team: German \n" @@ -2745,9 +2745,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2780,7 +2780,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2788,7 +2788,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2798,7 +2798,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2810,39 +2810,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4398,25 +4398,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4643,7 +4643,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4663,7 +4663,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4797,7 +4797,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4895,99 +4895,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6819,231 +6819,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7051,65 +7056,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7117,111 +7127,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7229,7 +7239,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7272,35 +7282,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9809,3 +9813,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/en_AU/LC_MESSAGES/cinder.po b/cinder/locale/en_AU/LC_MESSAGES/cinder.po index a9844d2cf..6fe5648fd 100644 --- a/cinder/locale/en_AU/LC_MESSAGES/cinder.po +++ b/cinder/locale/en_AU/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2011-10-21 11:27+0000\n" "Last-Translator: Tom Fifield \n" "Language-Team: English (Australia) \n" @@ -2751,9 +2751,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2786,7 +2786,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2794,7 +2794,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2804,7 +2804,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2816,39 +2816,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4411,25 +4411,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4656,7 +4656,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, fuzzy, python-format msgid "casted to %s" @@ -4676,7 +4676,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4810,7 +4810,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4908,99 +4908,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, fuzzy, python-format msgid "%s is already mounted" msgstr "%s is already mounted" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6837,231 +6837,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7069,65 +7074,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7135,111 +7145,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7247,7 +7257,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7290,35 +7300,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9827,3 +9831,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/en_GB/LC_MESSAGES/cinder.po b/cinder/locale/en_GB/LC_MESSAGES/cinder.po index 988dfcd76..673adae63 100644 --- a/cinder/locale/en_GB/LC_MESSAGES/cinder.po +++ b/cinder/locale/en_GB/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2012-03-30 11:10+0000\n" "Last-Translator: Anthony Harrington \n" "Language-Team: English (United Kingdom) \n" @@ -2754,9 +2754,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2789,7 +2789,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2807,7 +2807,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2819,39 +2819,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4415,25 +4415,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4660,7 +4660,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, fuzzy, python-format msgid "casted to %s" @@ -4680,7 +4680,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4814,7 +4814,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4912,99 +4912,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6838,231 +6838,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7070,65 +7075,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7136,111 +7146,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7248,7 +7258,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7291,35 +7301,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9828,3 +9832,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/en_US/LC_MESSAGES/cinder.po b/cinder/locale/en_US/LC_MESSAGES/cinder.po index d99abb951..88575099c 100644 --- a/cinder/locale/en_US/LC_MESSAGES/cinder.po +++ b/cinder/locale/en_US/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-08 11:44+0000\n" "Last-Translator: markmc \n" "Language-Team: en_US \n" @@ -2784,9 +2784,9 @@ msgstr "Downgrade from initial Cinder install is unsupported." #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "Table |%s| not created!" @@ -2820,7 +2820,7 @@ msgstr "backups table not dropped" msgid "snapshot_metadata table not dropped" msgstr "snapshot_metadata table not dropped" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 #, fuzzy msgid "transfers table not dropped" msgstr "transfers table not dropped" @@ -2829,7 +2829,7 @@ msgstr "transfers table not dropped" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2839,7 +2839,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2851,39 +2851,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4486,13 +4486,13 @@ msgstr "" "config: %s" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "Skipping remove_export. No iscsi_target provisioned for volume: %s" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" @@ -4501,12 +4501,12 @@ msgstr "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "Skipping ensure_export. No iscsi_target provision for volume: %s" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "Skipping ensure_export. No iscsi_target provisioned for volume: %s" @@ -4733,7 +4733,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4753,7 +4753,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "Volume %s does not have provider_location specified, skipping" @@ -4887,7 +4887,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "Exception during mounting %s" @@ -4985,99 +4985,99 @@ msgstr "snapshot: %s not found, skipping delete operations" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "Detected inconsistency in provider_location id" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "Symbolic link %s not found" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "%s is already mounted" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "There's no NFS config file configured (%s)" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "NFS config file at %(config)s doesn't exist" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -7096,231 +7096,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "_read_xml:%s" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7328,65 +7333,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7394,111 +7404,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7506,7 +7516,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7549,35 +7559,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -10096,3 +10100,23 @@ msgstr "Retry info not present, will not reschedule" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "Deploy v2 of the Cinder API. " +#~ msgid "_read_xml:%s" +#~ msgstr "_read_xml:%s" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/es/LC_MESSAGES/cinder.po b/cinder/locale/es/LC_MESSAGES/cinder.po index 5c9bcdd95..8da5fd38c 100644 --- a/cinder/locale/es/LC_MESSAGES/cinder.po +++ b/cinder/locale/es/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2012-03-10 06:08+0000\n" "Last-Translator: Oscar Rosario \n" "Language-Team: Spanish \n" @@ -2757,9 +2757,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2792,7 +2792,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2800,7 +2800,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2810,7 +2810,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2822,39 +2822,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4420,25 +4420,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4665,7 +4665,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4685,7 +4685,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4819,7 +4819,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4917,99 +4917,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, fuzzy, python-format msgid "%s is already mounted" msgstr "el grupo %s ya existe" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6846,231 +6846,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7078,65 +7083,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7144,111 +7154,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7256,7 +7266,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7299,35 +7309,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9836,3 +9840,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/es_MX/LC_MESSAGES/cinder.po b/cinder/locale/es_MX/LC_MESSAGES/cinder.po index 35fc0d2f9..0fe735063 100644 --- a/cinder/locale/es_MX/LC_MESSAGES/cinder.po +++ b/cinder/locale/es_MX/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-08-30 09:12+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Spanish (Mexico) " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9515,3 +9519,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/fi_FI/LC_MESSAGES/cinder.po b/cinder/locale/fi_FI/LC_MESSAGES/cinder.po index 34060864e..c6e1ddb87 100644 --- a/cinder/locale/fi_FI/LC_MESSAGES/cinder.po +++ b/cinder/locale/fi_FI/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-08 11:44+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Finnish (Finland) " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/fil/LC_MESSAGES/cinder.po b/cinder/locale/fil/LC_MESSAGES/cinder.po index bbd1d035c..946df7bff 100644 --- a/cinder/locale/fil/LC_MESSAGES/cinder.po +++ b/cinder/locale/fil/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-09-26 22:10+0000\n" "Last-Translator: Tom Fifield \n" "Language-Team: Filipino " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9479,3 +9483,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/fr/LC_MESSAGES/cinder.po b/cinder/locale/fr/LC_MESSAGES/cinder.po index 99068d72f..a5c2ddeed 100644 --- a/cinder/locale/fr/LC_MESSAGES/cinder.po +++ b/cinder/locale/fr/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2012-04-06 14:54+0000\n" "Last-Translator: EmmanuelLeNormand \n" "Language-Team: French \n" @@ -2757,9 +2757,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2792,7 +2792,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2800,7 +2800,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2810,7 +2810,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2822,39 +2822,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4422,25 +4422,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4667,7 +4667,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, fuzzy, python-format msgid "casted to %s" @@ -4687,7 +4687,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4821,7 +4821,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4919,99 +4919,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, fuzzy, python-format msgid "%s is already mounted" msgstr "le groupe %s existe déjà" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6852,231 +6852,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7084,65 +7089,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7150,111 +7160,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7262,7 +7272,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7305,35 +7315,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9842,3 +9846,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/hi/LC_MESSAGES/cinder.po b/cinder/locale/hi/LC_MESSAGES/cinder.po index bcffb8007..1ae2c09b3 100644 --- a/cinder/locale/hi/LC_MESSAGES/cinder.po +++ b/cinder/locale/hi/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-08-27 04:58+0000\n" "Last-Translator: daisy.ycguo \n" "Language-Team: Hindi " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9548,3 +9552,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/hr/LC_MESSAGES/cinder.po b/cinder/locale/hr/LC_MESSAGES/cinder.po index 6fe4f6a2d..f0bec22d2 100644 --- a/cinder/locale/hr/LC_MESSAGES/cinder.po +++ b/cinder/locale/hr/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-29 08:13+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Croatian " @@ -2745,9 +2745,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2780,7 +2780,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2788,7 +2788,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2798,7 +2798,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2810,39 +2810,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4398,25 +4398,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4643,7 +4643,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4663,7 +4663,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4797,7 +4797,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4895,99 +4895,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6814,231 +6814,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7046,65 +7051,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7112,111 +7122,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7224,7 +7234,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7267,35 +7277,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9804,3 +9808,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/hu/LC_MESSAGES/cinder.po b/cinder/locale/hu/LC_MESSAGES/cinder.po index 272b3605d..a823efd32 100644 --- a/cinder/locale/hu/LC_MESSAGES/cinder.po +++ b/cinder/locale/hu/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-29 08:13+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Hungarian " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/id/LC_MESSAGES/cinder.po b/cinder/locale/id/LC_MESSAGES/cinder.po index 4fa0f3cf7..144b3b240 100644 --- a/cinder/locale/id/LC_MESSAGES/cinder.po +++ b/cinder/locale/id/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-29 08:13+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Indonesian " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/it/LC_MESSAGES/cinder.po b/cinder/locale/it/LC_MESSAGES/cinder.po index 4d3767801..300bac719 100644 --- a/cinder/locale/it/LC_MESSAGES/cinder.po +++ b/cinder/locale/it/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2012-04-01 18:59+0000\n" "Last-Translator: simone.sandri \n" "Language-Team: Italian \n" @@ -2754,9 +2754,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2789,7 +2789,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2807,7 +2807,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2819,39 +2819,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4414,25 +4414,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4659,7 +4659,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4679,7 +4679,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4813,7 +4813,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4911,99 +4911,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6838,231 +6838,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7070,65 +7075,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7136,111 +7146,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7248,7 +7258,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7291,35 +7301,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9828,3 +9832,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/it_IT/LC_MESSAGES/cinder.po b/cinder/locale/it_IT/LC_MESSAGES/cinder.po index 932496a07..97e6d4c60 100644 --- a/cinder/locale/it_IT/LC_MESSAGES/cinder.po +++ b/cinder/locale/it_IT/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-29 08:13+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Italian (Italy) " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/ja/LC_MESSAGES/cinder.po b/cinder/locale/ja/LC_MESSAGES/cinder.po index d018923b2..88a984490 100644 --- a/cinder/locale/ja/LC_MESSAGES/cinder.po +++ b/cinder/locale/ja/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2011-08-23 11:22+0000\n" "Last-Translator: Thierry Carrez \n" "Language-Team: \n" @@ -2752,9 +2752,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2795,7 +2795,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2805,7 +2805,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2817,39 +2817,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4412,25 +4412,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4657,7 +4657,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, fuzzy, python-format msgid "casted to %s" @@ -4677,7 +4677,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4811,7 +4811,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4909,99 +4909,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, fuzzy, python-format msgid "%s is already mounted" msgstr "グループ %s は既に存在しています。" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6838,231 +6838,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7070,65 +7075,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7136,111 +7146,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7248,7 +7258,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7291,35 +7301,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9828,3 +9832,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/ka_GE/LC_MESSAGES/cinder.po b/cinder/locale/ka_GE/LC_MESSAGES/cinder.po index 586c0d9b6..28b86ff70 100644 --- a/cinder/locale/ka_GE/LC_MESSAGES/cinder.po +++ b/cinder/locale/ka_GE/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-29 08:13+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Georgian (Georgia) " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/kn/LC_MESSAGES/cinder.po b/cinder/locale/kn/LC_MESSAGES/cinder.po index 77365cd38..201de085c 100644 --- a/cinder/locale/kn/LC_MESSAGES/cinder.po +++ b/cinder/locale/kn/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-09-17 14:44+0000\n" "Last-Translator: Tom Fifield \n" "Language-Team: Kannada " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9479,3 +9483,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/ko/LC_MESSAGES/cinder.po b/cinder/locale/ko/LC_MESSAGES/cinder.po index 8612d8283..f32fffeef 100644 --- a/cinder/locale/ko/LC_MESSAGES/cinder.po +++ b/cinder/locale/ko/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2011-12-16 04:42+0000\n" "Last-Translator: Zhongyue Luo \n" "Language-Team: Korean \n" @@ -2749,9 +2749,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2784,7 +2784,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2792,7 +2792,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2802,7 +2802,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2814,39 +2814,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4405,25 +4405,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4650,7 +4650,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4670,7 +4670,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4804,7 +4804,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4902,99 +4902,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6827,231 +6827,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7059,65 +7064,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7125,111 +7135,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7237,7 +7247,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7280,35 +7290,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9817,3 +9821,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/ko_KR/LC_MESSAGES/cinder.po b/cinder/locale/ko_KR/LC_MESSAGES/cinder.po index b52605eb4..5fc396c63 100644 --- a/cinder/locale/ko_KR/LC_MESSAGES/cinder.po +++ b/cinder/locale/ko_KR/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-08 11:44+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Korean (Korea) " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/ms/LC_MESSAGES/cinder.po b/cinder/locale/ms/LC_MESSAGES/cinder.po index 67b3479e1..bbd7f27c9 100644 --- a/cinder/locale/ms/LC_MESSAGES/cinder.po +++ b/cinder/locale/ms/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-29 08:13+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Malay " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/nb/LC_MESSAGES/cinder.po b/cinder/locale/nb/LC_MESSAGES/cinder.po index 631d7b94b..f11f7d32c 100644 --- a/cinder/locale/nb/LC_MESSAGES/cinder.po +++ b/cinder/locale/nb/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-29 08:13+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Norwegian Bokmål " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/ne/LC_MESSAGES/cinder.po b/cinder/locale/ne/LC_MESSAGES/cinder.po index 28693d216..70ebbf174 100644 --- a/cinder/locale/ne/LC_MESSAGES/cinder.po +++ b/cinder/locale/ne/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-08-30 22:38+0000\n" "Last-Translator: daisy.ycguo \n" "Language-Team: Nepali " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9515,3 +9519,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/nl_NL/LC_MESSAGES/cinder.po b/cinder/locale/nl_NL/LC_MESSAGES/cinder.po index 039755d14..49b7c72f9 100644 --- a/cinder/locale/nl_NL/LC_MESSAGES/cinder.po +++ b/cinder/locale/nl_NL/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-29 08:13+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Dutch (Netherlands) " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/pl_PL/LC_MESSAGES/cinder.po b/cinder/locale/pl_PL/LC_MESSAGES/cinder.po index 212c414d9..6dc811e3e 100644 --- a/cinder/locale/pl_PL/LC_MESSAGES/cinder.po +++ b/cinder/locale/pl_PL/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-07-01 16:14+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Polish (Poland) " @@ -2745,9 +2745,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2780,7 +2780,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2788,7 +2788,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2798,7 +2798,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2810,39 +2810,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4398,25 +4398,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4643,7 +4643,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4663,7 +4663,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4797,7 +4797,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4895,99 +4895,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6814,231 +6814,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7046,65 +7051,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7112,111 +7122,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7224,7 +7234,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7267,35 +7277,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9804,3 +9808,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/pt/LC_MESSAGES/cinder.po b/cinder/locale/pt/LC_MESSAGES/cinder.po index de9a40229..70ec7d41f 100644 --- a/cinder/locale/pt/LC_MESSAGES/cinder.po +++ b/cinder/locale/pt/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-29 08:13+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Portuguese " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po b/cinder/locale/pt_BR/LC_MESSAGES/cinder.po index 2a4b7e228..a26b0ebf3 100644 --- a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po +++ b/cinder/locale/pt_BR/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2012-02-06 21:07+0000\n" "Last-Translator: Adriano Steffler \n" "Language-Team: Brazilian Portuguese \n" @@ -2753,9 +2753,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2788,7 +2788,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2796,7 +2796,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2806,7 +2806,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2818,39 +2818,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4412,25 +4412,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4657,7 +4657,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4677,7 +4677,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4811,7 +4811,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4909,99 +4909,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, fuzzy, python-format msgid "%s is already mounted" msgstr "group %s já existe" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6837,231 +6837,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7069,65 +7074,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7135,111 +7145,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7247,7 +7257,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7290,35 +7300,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9827,3 +9831,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/ro/LC_MESSAGES/cinder.po b/cinder/locale/ro/LC_MESSAGES/cinder.po index f8190f4e9..006c836f1 100644 --- a/cinder/locale/ro/LC_MESSAGES/cinder.po +++ b/cinder/locale/ro/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-06-12 07:55+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Romanian " @@ -2745,9 +2745,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2780,7 +2780,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2788,7 +2788,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2798,7 +2798,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2810,39 +2810,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4398,25 +4398,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4643,7 +4643,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4663,7 +4663,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4797,7 +4797,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4895,99 +4895,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6814,231 +6814,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7046,65 +7051,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7112,111 +7122,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7224,7 +7234,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7267,35 +7277,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9804,3 +9808,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/ru/LC_MESSAGES/cinder.po b/cinder/locale/ru/LC_MESSAGES/cinder.po index 773f1bbfe..1880db73d 100644 --- a/cinder/locale/ru/LC_MESSAGES/cinder.po +++ b/cinder/locale/ru/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2012-03-25 09:34+0000\n" "Last-Translator: Eugene Marshal \n" "Language-Team: Russian \n" @@ -2768,9 +2768,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "Таблица |%s| не создана!" @@ -2803,7 +2803,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2811,7 +2811,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2821,7 +2821,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2833,39 +2833,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4448,25 +4448,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4693,7 +4693,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, fuzzy, python-format msgid "casted to %s" @@ -4713,7 +4713,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4847,7 +4847,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, fuzzy, python-format msgid "Exception during mounting %s" msgstr "Расширенный ресурс: %s" @@ -4945,99 +4945,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, fuzzy, python-format msgid "Symbolic link %s not found" msgstr "маркер [%s] не найден" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, fuzzy, python-format msgid "%s is already mounted" msgstr "образ уже присоединён" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6880,231 +6880,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, fuzzy, python-format -msgid "_read_xml:%s" -msgstr "_создать: %s" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7112,65 +7117,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7178,111 +7188,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7290,7 +7300,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7333,35 +7343,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9874,3 +9878,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "_создать: %s" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/ru_RU/LC_MESSAGES/cinder.po b/cinder/locale/ru_RU/LC_MESSAGES/cinder.po index 11ce29240..3de37b7c5 100644 --- a/cinder/locale/ru_RU/LC_MESSAGES/cinder.po +++ b/cinder/locale/ru_RU/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-29 08:13+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Russian (Russia) " @@ -2745,9 +2745,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2780,7 +2780,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2788,7 +2788,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2798,7 +2798,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2810,39 +2810,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4398,25 +4398,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4643,7 +4643,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4663,7 +4663,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4797,7 +4797,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4895,99 +4895,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6814,231 +6814,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7046,65 +7051,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7112,111 +7122,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7224,7 +7234,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7267,35 +7277,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9804,3 +9808,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/sk/LC_MESSAGES/cinder.po b/cinder/locale/sk/LC_MESSAGES/cinder.po index 7829d3f71..6a9acb81f 100644 --- a/cinder/locale/sk/LC_MESSAGES/cinder.po +++ b/cinder/locale/sk/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-08-27 04:58+0000\n" "Last-Translator: daisy.ycguo \n" "Language-Team: Slovak " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9548,3 +9552,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/sl_SI/LC_MESSAGES/cinder.po b/cinder/locale/sl_SI/LC_MESSAGES/cinder.po index 43b7f1e0c..eb2e91ad0 100644 --- a/cinder/locale/sl_SI/LC_MESSAGES/cinder.po +++ b/cinder/locale/sl_SI/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-07-01 16:14+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Slovenian (Slovenia) " @@ -2745,9 +2745,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2780,7 +2780,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2788,7 +2788,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2798,7 +2798,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2810,39 +2810,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4398,25 +4398,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4643,7 +4643,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4663,7 +4663,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4797,7 +4797,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4895,99 +4895,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6814,231 +6814,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7046,65 +7051,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7112,111 +7122,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7224,7 +7234,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7267,35 +7277,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9804,3 +9808,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/sw_KE/LC_MESSAGES/cinder.po b/cinder/locale/sw_KE/LC_MESSAGES/cinder.po index 87d1d1a2d..906c9f3b9 100644 --- a/cinder/locale/sw_KE/LC_MESSAGES/cinder.po +++ b/cinder/locale/sw_KE/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-29 08:13+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Swahili (Kenya) " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/tl/LC_MESSAGES/cinder.po b/cinder/locale/tl/LC_MESSAGES/cinder.po index 416a138a5..0942f2a7a 100644 --- a/cinder/locale/tl/LC_MESSAGES/cinder.po +++ b/cinder/locale/tl/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2011-08-23 11:21+0000\n" "Last-Translator: Thierry Carrez \n" "Language-Team: Tagalog \n" @@ -2743,9 +2743,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2778,7 +2778,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2786,7 +2786,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2796,7 +2796,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2808,39 +2808,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4396,25 +4396,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4641,7 +4641,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4661,7 +4661,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4795,7 +4795,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4893,99 +4893,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/tl_PH/LC_MESSAGES/cinder.po b/cinder/locale/tl_PH/LC_MESSAGES/cinder.po index a9b276667..6906f3b50 100644 --- a/cinder/locale/tl_PH/LC_MESSAGES/cinder.po +++ b/cinder/locale/tl_PH/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-09-26 22:10+0000\n" "Last-Translator: Tom Fifield \n" "Language-Team: Tagalog (Philippines) " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9479,3 +9483,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/tr/LC_MESSAGES/cinder.po b/cinder/locale/tr/LC_MESSAGES/cinder.po index ea7359671..341231299 100644 --- a/cinder/locale/tr/LC_MESSAGES/cinder.po +++ b/cinder/locale/tr/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2011-12-14 18:10+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Turkish \n" @@ -2743,9 +2743,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2778,7 +2778,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2786,7 +2786,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2796,7 +2796,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2808,39 +2808,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4396,25 +4396,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4641,7 +4641,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4661,7 +4661,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4795,7 +4795,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4893,99 +4893,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6812,231 +6812,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7044,65 +7049,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7110,111 +7120,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7222,7 +7232,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7265,35 +7275,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9802,3 +9806,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/tr_TR/LC_MESSAGES/cinder.po b/cinder/locale/tr_TR/LC_MESSAGES/cinder.po index 140677e62..ad8a17c4d 100644 --- a/cinder/locale/tr_TR/LC_MESSAGES/cinder.po +++ b/cinder/locale/tr_TR/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-29 08:13+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Turkish (Turkey) " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/uk/LC_MESSAGES/cinder.po b/cinder/locale/uk/LC_MESSAGES/cinder.po index 35c99c308..3064f9ef3 100644 --- a/cinder/locale/uk/LC_MESSAGES/cinder.po +++ b/cinder/locale/uk/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2011-08-23 11:21+0000\n" "Last-Translator: Thierry Carrez \n" "Language-Team: Ukrainian \n" @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6814,231 +6814,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7046,65 +7051,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7112,111 +7122,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7224,7 +7234,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7267,35 +7277,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9804,3 +9808,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/ur/LC_MESSAGES/cinder.po b/cinder/locale/ur/LC_MESSAGES/cinder.po index 460064e44..f9f1801fa 100644 --- a/cinder/locale/ur/LC_MESSAGES/cinder.po +++ b/cinder/locale/ur/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-10-07 06:14+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Urdu " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9173,3 +9177,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/vi_VN/LC_MESSAGES/cinder.po b/cinder/locale/vi_VN/LC_MESSAGES/cinder.po index d0b2d1604..67013f430 100644 --- a/cinder/locale/vi_VN/LC_MESSAGES/cinder.po +++ b/cinder/locale/vi_VN/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-08 11:44+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Vietnamese (Viet Nam) " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po b/cinder/locale/zh_CN/LC_MESSAGES/cinder.po index 127307233..4d86f0950 100644 --- a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po +++ b/cinder/locale/zh_CN/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2012-04-03 23:36+0000\n" "Last-Translator: cheesecake \n" "Language-Team: Chinese (Simplified) \n" @@ -2759,9 +2759,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "表 |%s| 没有创建" @@ -2800,7 +2800,7 @@ msgstr "dns_domains 表没有删除" msgid "snapshot_metadata table not dropped" msgstr "instance_info_caches 没有删除掉" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 #, fuzzy msgid "transfers table not dropped" msgstr "dns_domains 表没有删除" @@ -2809,7 +2809,7 @@ msgstr "dns_domains 表没有删除" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2819,7 +2819,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2831,39 +2831,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4450,25 +4450,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, fuzzy, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "跳过remove_export。没有为卷提供iscsi_target：%d" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, fuzzy, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "跳过remove_export。没有为卷导出iscsi_target：%d" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, fuzzy, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "跳过ensure_export。没有为卷提供iscsi_target：%d" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, fuzzy, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "跳过ensure_export。没有为卷提供iscsi_target：%d" @@ -4695,7 +4695,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, fuzzy, python-format msgid "casted to %s" @@ -4715,7 +4715,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4849,7 +4849,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, fuzzy, python-format msgid "Exception during mounting %s" msgstr "加载扩展发生异常：%s" @@ -4947,99 +4947,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, fuzzy, python-format msgid "Symbolic link %s not found" msgstr "没有找到标记 [%s]" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, fuzzy, python-format msgid "%s is already mounted" msgstr "镜像已经挂载" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6885,231 +6885,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, fuzzy, python-format -msgid "_read_xml:%s" -msgstr "_create: %s" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7117,65 +7122,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7183,111 +7193,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7295,7 +7305,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7338,35 +7348,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9876,3 +9880,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "_create: %s" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/zh_HK/LC_MESSAGES/cinder.po b/cinder/locale/zh_HK/LC_MESSAGES/cinder.po index e4b3b370c..2ba763a22 100644 --- a/cinder/locale/zh_HK/LC_MESSAGES/cinder.po +++ b/cinder/locale/zh_HK/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cinder\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2013-05-29 08:13+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Chinese (Hong Kong) " @@ -2744,9 +2744,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2779,7 +2779,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2787,7 +2787,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2797,7 +2797,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2809,39 +2809,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4397,25 +4397,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4642,7 +4642,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4662,7 +4662,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4796,7 +4796,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4894,99 +4894,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6813,231 +6813,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7045,65 +7050,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7111,111 +7121,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7223,7 +7233,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7266,35 +7276,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9803,3 +9807,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + diff --git a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po b/cinder/locale/zh_TW/LC_MESSAGES/cinder.po index c3d8862e4..8c663014c 100644 --- a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po +++ b/cinder/locale/zh_TW/LC_MESSAGES/cinder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cinder\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-14 06:12+0000\n" +"POT-Creation-Date: 2013-10-16 06:12+0000\n" "PO-Revision-Date: 2012-03-07 02:00+0000\n" "Last-Translator: Charles Hsu \n" "Language-Team: Chinese (Traditional) \n" @@ -2750,9 +2750,9 @@ msgstr "" #: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106 #: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58 #: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:84 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:48 #, python-format msgid "Table |%s| not created!" msgstr "" @@ -2785,7 +2785,7 @@ msgstr "" msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:63 msgid "transfers table not dropped" msgstr "" @@ -2793,7 +2793,7 @@ msgstr "" msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:63 #, python-format msgid "Table |%s| not created" msgstr "" @@ -2803,7 +2803,7 @@ msgstr "" msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:102 #, python-format msgid "Exception while creating table %s." msgstr "" @@ -2815,39 +2815,39 @@ msgstr "" msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:96 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:104 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:109 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:117 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:76 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:84 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:61 msgid "volume_admin_metadata table not dropped" msgstr "" @@ -4408,25 +4408,25 @@ msgid "" msgstr "" #: cinder/volume/drivers/block_device.py:131 -#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:635 -#: cinder/volume/drivers/lvm.py:650 +#: cinder/volume/drivers/block_device.py:143 cinder/volume/drivers/lvm.py:636 +#: cinder/volume/drivers/lvm.py:651 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:668 +#: cinder/volume/drivers/block_device.py:157 cinder/volume/drivers/lvm.py:669 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume:" " %s" msgstr "" -#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:464 +#: cinder/volume/drivers/block_device.py:183 cinder/volume/drivers/lvm.py:465 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:485 +#: cinder/volume/drivers/block_device.py:200 cinder/volume/drivers/lvm.py:486 #, python-format msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s" msgstr "" @@ -4653,7 +4653,7 @@ msgstr "" msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:105 +#: cinder/volume/drivers/glusterfs.py:197 cinder/volume/drivers/nfs.py:107 #: cinder/volume/drivers/netapp/nfs.py:753 #, python-format msgid "casted to %s" @@ -4673,7 +4673,7 @@ msgstr "" msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:155 +#: cinder/volume/drivers/glusterfs.py:266 cinder/volume/drivers/nfs.py:157 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" @@ -4807,7 +4807,7 @@ msgstr "" msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:142 +#: cinder/volume/drivers/glusterfs.py:967 cinder/volume/drivers/nfs.py:144 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -4905,99 +4905,99 @@ msgstr "" msgid "Unable to update stats on non-intialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:443 +#: cinder/volume/drivers/lvm.py:444 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:463 +#: cinder/volume/drivers/lvm.py:464 #, python-format msgid "volume_info:%s" msgstr "" -#: cinder/volume/drivers/lvm.py:499 cinder/volume/drivers/lvm.py:784 +#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:785 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/drivers/lvm.py:500 cinder/volume/drivers/lvm.py:704 -#: cinder/volume/drivers/huawei/rest_common.py:1231 +#: cinder/volume/drivers/lvm.py:501 cinder/volume/drivers/lvm.py:705 +#: cinder/volume/drivers/huawei/rest_common.py:1225 #, python-format msgid "%s" msgstr "" -#: cinder/volume/drivers/lvm.py:554 +#: cinder/volume/drivers/lvm.py:555 #, python-format msgid "Symbolic link %s not found" msgstr "" -#: cinder/volume/drivers/lvm.py:770 +#: cinder/volume/drivers/lvm.py:771 #, python-format msgid "Skipping ensure_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:861 +#: cinder/volume/drivers/lvm.py:862 #, python-format msgid "Skipping remove_export. No iser_target provisioned for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:877 +#: cinder/volume/drivers/lvm.py:878 #, python-format msgid "" "Skipping remove_export. No iser_target is presently exported for volume: " "%s" msgstr "" -#: cinder/volume/drivers/nfs.py:244 +#: cinder/volume/drivers/nfs.py:246 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:245 +#: cinder/volume/drivers/nfs.py:247 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:337 +#: cinder/volume/drivers/nfs.py:339 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:396 +#: cinder/volume/drivers/nfs.py:398 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:401 +#: cinder/volume/drivers/nfs.py:403 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:406 +#: cinder/volume/drivers/nfs.py:408 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:414 +#: cinder/volume/drivers/nfs.py:416 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:468 +#: cinder/volume/drivers/nfs.py:470 #, python-format msgid "Selected %s as target nfs share." msgstr "" -#: cinder/volume/drivers/nfs.py:501 +#: cinder/volume/drivers/nfs.py:503 #, python-format msgid "%s is above nfs_used_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:504 +#: cinder/volume/drivers/nfs.py:506 #, python-format msgid "%s is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/nfs.py:507 +#: cinder/volume/drivers/nfs.py:509 #, python-format msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" @@ -6831,231 +6831,236 @@ msgid "" msgstr "" #: cinder/volume/drivers/huawei/huawei_dorado.py:94 -#: cinder/volume/drivers/huawei/huawei_t.py:454 +#: cinder/volume/drivers/huawei/huawei_t.py:455 #, python-format msgid "initialize_connection: Target FC ports WWNS: %s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:98 +#: cinder/volume/drivers/huawei/huawei_t.py:99 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:156 -#: cinder/volume/drivers/huawei/rest_common.py:1273 +#: cinder/volume/drivers/huawei/huawei_t.py:157 +#: cinder/volume/drivers/huawei/rest_common.py:1278 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " "check config file." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:203 -#: cinder/volume/drivers/huawei/rest_common.py:1084 +#: cinder/volume/drivers/huawei/huawei_t.py:204 +#: cinder/volume/drivers/huawei/rest_common.py:1078 #, python-format msgid "_get_tgt_iqn: iSCSI IP is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:231 +#: cinder/volume/drivers/huawei/huawei_t.py:232 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:245 +#: cinder/volume/drivers/huawei/huawei_t.py:246 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure" " the iSCSI port IP %s is configured in array." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:320 -#: cinder/volume/drivers/huawei/huawei_t.py:545 +#: cinder/volume/drivers/huawei/huawei_t.py:321 +#: cinder/volume/drivers/huawei/huawei_t.py:546 #, python-format msgid "" "terminate_connection: volume: %(vol)s, host: %(host)s, connector: " "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:348 +#: cinder/volume/drivers/huawei/huawei_t.py:349 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:429 +#: cinder/volume/drivers/huawei/huawei_t.py:430 msgid "validate_connector: The FC driver requires thewwpns in the connector." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:436 +#: cinder/volume/drivers/huawei/huawei_t.py:437 #, python-format msgid "" "initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: " "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:571 +#: cinder/volume/drivers/huawei/huawei_t.py:572 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:59 +#: cinder/volume/drivers/huawei/huawei_utils.py:43 +#, python-format +msgid "parse_xml_file: %s" +msgstr "" + +#: cinder/volume/drivers/huawei/huawei_utils.py:132 +#, python-format +msgid "_get_host_os_type: Host %(ip)s OS type is %(os)s." +msgstr "" + +#: cinder/volume/drivers/huawei/rest_common.py:61 #, python-format msgid "HVS Request URL: %(url)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:60 +#: cinder/volume/drivers/huawei/rest_common.py:62 #, python-format msgid "HVS Request Data: %(data)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:73 +#: cinder/volume/drivers/huawei/rest_common.py:75 #, python-format msgid "HVS Response Data: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:75 +#: cinder/volume/drivers/huawei/rest_common.py:77 #, python-format msgid "Bad reponse from server: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:82 +#: cinder/volume/drivers/huawei/rest_common.py:84 msgid "JSON transfer error" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:102 +#: cinder/volume/drivers/huawei/rest_common.py:104 #, python-format msgid "Login error, reason is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:166 +#: cinder/volume/drivers/huawei/rest_common.py:168 #, python-format msgid "" "%(err)s\n" "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:175 #, python-format msgid "%s \"data\" was not in result." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:208 +#: cinder/volume/drivers/huawei/rest_common.py:210 msgid "Can't find the Qos policy in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:246 +#: cinder/volume/drivers/huawei/rest_common.py:248 msgid "Can't find lun or lun goup in array" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:276 -#, python-format -msgid "_read_xml:%s" -msgstr "" - -#: cinder/volume/drivers/huawei/rest_common.py:291 +#: cinder/volume/drivers/huawei/rest_common.py:282 #, python-format msgid "Invalid resource pool: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:309 +#: cinder/volume/drivers/huawei/rest_common.py:300 #, python-format msgid "Get pool info error, pool name is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:338 +#: cinder/volume/drivers/huawei/rest_common.py:329 #, python-format msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:365 +#: cinder/volume/drivers/huawei/rest_common.py:356 #, python-format msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:483 +#: cinder/volume/drivers/huawei/rest_common.py:476 #, python-format msgid "" "_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: " "%(view_id)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:521 -#: cinder/volume/drivers/huawei/rest_common.py:552 +#: cinder/volume/drivers/huawei/rest_common.py:513 +#: cinder/volume/drivers/huawei/rest_common.py:545 #, python-format msgid "initiator name:%(initiator_name)s, volume name:%(volume)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:535 +#: cinder/volume/drivers/huawei/rest_common.py:529 #, python-format msgid "host lun id is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:561 +#: cinder/volume/drivers/huawei/rest_common.py:555 #, python-format msgid "the free wwns %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:582 +#: cinder/volume/drivers/huawei/rest_common.py:576 #, python-format msgid "the fc server properties is:%s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:696 +#: cinder/volume/drivers/huawei/rest_common.py:690 #, python-format msgid "JSON transfer data error. %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:882 +#: cinder/volume/drivers/huawei/rest_common.py:876 #, python-format msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:945 +#: cinder/volume/drivers/huawei/rest_common.py:939 #, python-format msgid "" "Config file is wrong. LUNType must be \"Thin\" or \"Thick\". " "LUNType:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:972 +#: cinder/volume/drivers/huawei/rest_common.py:966 #, python-format msgid "" "PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype " "is:%(fetchtype)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:978 +#: cinder/volume/drivers/huawei/rest_common.py:972 msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:990 +#: cinder/volume/drivers/huawei/rest_common.py:984 #, python-format msgid "" "_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: " "%(luncopyname)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1087 +#: cinder/volume/drivers/huawei/rest_common.py:1081 #, python-format msgid "request ip info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1090 +#: cinder/volume/drivers/huawei/rest_common.py:1084 #, python-format msgid "new str info is %s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1105 +#: cinder/volume/drivers/huawei/rest_common.py:1099 #, python-format msgid "_get_tgt_iqn: iSCSI target iqn is %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1130 +#: cinder/volume/drivers/huawei/rest_common.py:1124 #, python-format msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1163 +#: cinder/volume/drivers/huawei/rest_common.py:1157 #, python-format msgid "" "_parse_volume_type: Unacceptable paramater %(key)s. Please check this key" @@ -7063,65 +7068,70 @@ msgid "" "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1168 +#: cinder/volume/drivers/huawei/rest_common.py:1162 #, python-format msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1247 -msgid "" -"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword " -"must be set." +#: cinder/volume/drivers/huawei/rest_common.py:1239 +#: cinder/volume/drivers/huawei/ssh_common.py:117 +#: cinder/volume/drivers/huawei/ssh_common.py:1187 +#, python-format +msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1253 -#: cinder/volume/drivers/huawei/ssh_common.py:139 +#: cinder/volume/drivers/huawei/rest_common.py:1246 +#: cinder/volume/drivers/huawei/ssh_common.py:124 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/rest_common.py:1256 #, python-format -msgid "parse_xml_file: %s" +msgid "" +"_check_conf_file: Config file invalid. Host OSType invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:66 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:82 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:112 +#: cinder/volume/drivers/huawei/ssh_common.py:102 #: cinder/volume/drivers/huawei/ssh_common.py:1173 msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:130 +#: cinder/volume/drivers/huawei/ssh_common.py:134 +#: cinder/volume/drivers/huawei/ssh_common.py:1209 +#, python-format msgid "" -"_check_conf_file: Config file invalid. Controler IP, UserName and " -"UserPassword must be set." +"_check_conf_file: Config file invalid. Host OSType is invalid.\n" +"The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:171 +#: cinder/volume/drivers/huawei/ssh_common.py:168 #, python-format msgid "_get_login_info: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:217 +#: cinder/volume/drivers/huawei/ssh_common.py:214 #, python-format msgid "create_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:235 +#: cinder/volume/drivers/huawei/ssh_common.py:232 #, python-format msgid "" "_name_translate: Name in cinder: %(old)s, new name in storage system: " "%(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:272 +#: cinder/volume/drivers/huawei/ssh_common.py:269 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key" @@ -7129,111 +7139,111 @@ msgid "" "file %(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:366 -#: cinder/volume/drivers/huawei/ssh_common.py:1343 +#: cinder/volume/drivers/huawei/ssh_common.py:363 +#: cinder/volume/drivers/huawei/ssh_common.py:1354 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:388 +#: cinder/volume/drivers/huawei/ssh_common.py:385 msgid "" "_parse_conf_lun_params: Use default prefetch type. Prefetch type: " "Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:414 +#: cinder/volume/drivers/huawei/ssh_common.py:411 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config" " file and make sure the StoragePool %s is created in storage array." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:429 +#: cinder/volume/drivers/huawei/ssh_common.py:426 #, python-format msgid "CLI command: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:459 +#: cinder/volume/drivers/huawei/ssh_common.py:456 #, python-format msgid "" "_execute_cli: Can not connect to IP %(old)s, try to connect to the other " "IP %(new)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:494 +#: cinder/volume/drivers/huawei/ssh_common.py:491 #, python-format msgid "_execute_cli: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:504 +#: cinder/volume/drivers/huawei/ssh_common.py:501 #, python-format msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:511 +#: cinder/volume/drivers/huawei/ssh_common.py:508 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:541 +#: cinder/volume/drivers/huawei/ssh_common.py:538 #, python-format msgid "" "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: " "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:551 +#: cinder/volume/drivers/huawei/ssh_common.py:548 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:621 +#: cinder/volume/drivers/huawei/ssh_common.py:618 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:659 +#: cinder/volume/drivers/huawei/ssh_common.py:656 #, python-format msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:668 +#: cinder/volume/drivers/huawei/ssh_common.py:665 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:706 +#: cinder/volume/drivers/huawei/ssh_common.py:703 #, python-format msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:712 +#: cinder/volume/drivers/huawei/ssh_common.py:709 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:719 +#: cinder/volume/drivers/huawei/ssh_common.py:716 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:782 +#: cinder/volume/drivers/huawei/ssh_common.py:779 #, python-format msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:789 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:800 +#: cinder/volume/drivers/huawei/ssh_common.py:797 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:843 +#: cinder/volume/drivers/huawei/ssh_common.py:840 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7241,7 +7251,7 @@ msgid "" "CLI out: %(out)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:860 +#: cinder/volume/drivers/huawei/ssh_common.py:857 #, python-format msgid "map_volume: Volume %s was not found." msgstr "" @@ -7284,35 +7294,29 @@ msgstr "" msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1188 -msgid "" -"Config file invalid. Controler IP, UserName, UserPassword must be " -"specified." -msgstr "" - -#: cinder/volume/drivers/huawei/ssh_common.py:1200 +#: cinder/volume/drivers/huawei/ssh_common.py:1199 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1222 +#: cinder/volume/drivers/huawei/ssh_common.py:1233 msgid "" "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 " "now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1290 +#: cinder/volume/drivers/huawei/ssh_common.py:1301 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume " "from snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1297 +#: cinder/volume/drivers/huawei/ssh_common.py:1308 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1305 +#: cinder/volume/drivers/huawei/ssh_common.py:1316 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" @@ -9821,3 +9825,23 @@ msgstr "" #~ msgid "Deploy v2 of the Cinder API. " #~ msgstr "" +#~ msgid "_read_xml:%s" +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. HVSURL," +#~ " UserName and UserPassword must be " +#~ "set." +#~ msgstr "" + +#~ msgid "" +#~ "_check_conf_file: Config file invalid. " +#~ "Controler IP, UserName and UserPassword " +#~ "must be set." +#~ msgstr "" + +#~ msgid "" +#~ "Config file invalid. Controler IP, " +#~ "UserName, UserPassword must be specified." +#~ msgstr "" + -- 2.45.2