From 672818a7820535c5d8c96ca53ab4eb1b4e9cb52f Mon Sep 17 00:00:00 2001 From: OpenStack Jenkins Date: Mon, 9 Dec 2013 06:32:38 +0000 Subject: [PATCH] Imported Translations from Transifex Change-Id: I8899e6ade1eb38e6d183cb35a509fcbecdc04b47 --- neutron/locale/ar/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/bg_BG/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/bn_IN/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/bs/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/ca/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/cs/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/da/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/de/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/en_AU/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/en_GB/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/en_US/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/es/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/es_MX/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/eu/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/eu_ES/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/fa/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/fi_FI/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/fil/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/fr/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/gl/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/hi/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/hr/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/hu/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/id/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/it/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/it_IT/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/ja/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/ka_GE/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/km/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/kn/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/ko/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/ko_KR/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/ml_IN/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/mr_IN/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/ms/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/nb/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/ne/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/neutron.pot | 128 +++++++++++-------- neutron/locale/nl_NL/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/pl_PL/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/pt/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/pt_BR/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/ro/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/ru/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/ru_RU/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/sk/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/sl_SI/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/sv/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/sw_KE/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/tl/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/tl_PH/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/tr_TR/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/uk/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/ur/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/vi_VN/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/zh_CN/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/zh_HK/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- neutron/locale/zh_TW/LC_MESSAGES/neutron.po | 129 ++++++++++++-------- 58 files changed, 4638 insertions(+), 2843 deletions(-) diff --git a/neutron/locale/ar/LC_MESSAGES/neutron.po b/neutron/locale/ar/LC_MESSAGES/neutron.po index 9e375d60b64..239cc2252b1 100644 --- a/neutron/locale/ar/LC_MESSAGES/neutron.po +++ b/neutron/locale/ar/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-09-12 23:31+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Arabic " @@ -505,7 +505,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -513,7 +513,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -524,7 +524,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -625,78 +625,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1054,25 +1054,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6034,7 +6034,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6176,7 +6176,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6597,13 +6597,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6646,7 +6646,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8284,66 +8284,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8362,11 +8369,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13063,3 +13091,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/bg_BG/LC_MESSAGES/neutron.po b/neutron/locale/bg_BG/LC_MESSAGES/neutron.po index 413bf3cff0d..29f397f4e92 100644 --- a/neutron/locale/bg_BG/LC_MESSAGES/neutron.po +++ b/neutron/locale/bg_BG/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Bulgarian (Bulgaria) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/bn_IN/LC_MESSAGES/neutron.po b/neutron/locale/bn_IN/LC_MESSAGES/neutron.po index f7f66efc6dc..c12ca39e7a1 100644 --- a/neutron/locale/bn_IN/LC_MESSAGES/neutron.po +++ b/neutron/locale/bn_IN/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-10-20 01:34+0000\n" "Last-Translator: Tom Fifield \n" "Language-Team: Bengali (India) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -12993,3 +13021,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/bs/LC_MESSAGES/neutron.po b/neutron/locale/bs/LC_MESSAGES/neutron.po index 5cfeb85ad79..2afdf79cfdd 100644 --- a/neutron/locale/bs/LC_MESSAGES/neutron.po +++ b/neutron/locale/bs/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Bosnian " @@ -505,7 +505,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -513,7 +513,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -524,7 +524,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -625,78 +625,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1054,25 +1054,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6034,7 +6034,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6176,7 +6176,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6597,13 +6597,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6646,7 +6646,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8284,66 +8284,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8362,11 +8369,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13711,3 +13739,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/ca/LC_MESSAGES/neutron.po b/neutron/locale/ca/LC_MESSAGES/neutron.po index e8ccaccb1ff..37c2e11067f 100644 --- a/neutron/locale/ca/LC_MESSAGES/neutron.po +++ b/neutron/locale/ca/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Catalan " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/cs/LC_MESSAGES/neutron.po b/neutron/locale/cs/LC_MESSAGES/neutron.po index 306aa53353c..f8ddb69b88d 100644 --- a/neutron/locale/cs/LC_MESSAGES/neutron.po +++ b/neutron/locale/cs/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Czech " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/da/LC_MESSAGES/neutron.po b/neutron/locale/da/LC_MESSAGES/neutron.po index 37832d5a52f..7835ecc07eb 100644 --- a/neutron/locale/da/LC_MESSAGES/neutron.po +++ b/neutron/locale/da/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-05-16 09:23+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Danish " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/de/LC_MESSAGES/neutron.po b/neutron/locale/de/LC_MESSAGES/neutron.po index b39f085291e..423093403bb 100644 --- a/neutron/locale/de/LC_MESSAGES/neutron.po +++ b/neutron/locale/de/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-05-22 08:17+0000\n" "Last-Translator: daisy.ycguo \n" "Language-Team: German " @@ -512,7 +512,7 @@ msgstr "" "%(port_num)d Routerports auf dem Zugangsnetz für Metadaten gefunden. Nur " "Port '%(port_id)s' für Router '%(router_id)s' wird berücksichtigt" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -520,7 +520,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -531,7 +531,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "Erstellung des Statusberichts fehlgeschlagen!" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -635,78 +635,78 @@ msgstr "Ignorieren mehrerer IP-Adressen auf Routerport %s" msgid "Failed sending gratuitous ARP: %s" msgstr "Gratuitous ARP wurde nicht gesendet: %s" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "Die externe Netzbrücke '%s' ist nicht vorhanden" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "Synchronisation von Routern fehlgeschlagen" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "Agent der Ebene 3 gestartet" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "Der hinzugefügte Routeneintrag lautet '%s'" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "Der entfernte Routeneintrag lautet '%s'" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1066,25 +1066,25 @@ msgstr "Der zu verwendende Authentifizierungtyp" msgid "Authentication region" msgstr "Authentifizierungsregion" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "Gerät %s ist bereits vorhanden" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "Verbindung zu Schnittstelle '%s' getrennt" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "Fehler beim Trennen von Verbindung zu Schnittstelle '%s'" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "Treiberposition: %s" @@ -6287,7 +6287,7 @@ msgstr "Für lokale Netze verwendeter privater virtueller Switchname" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6431,7 +6431,7 @@ msgid "Error in agent event loop: %s" msgstr "Fehler bei Agentenereignisschleife: %s" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6872,7 +6872,7 @@ msgstr "" "%(elapsed)s) überschritten!" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" @@ -6880,7 +6880,7 @@ msgstr "" "beendet!" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "Schnittstellenzuordnungen: %s" @@ -6923,7 +6923,7 @@ msgid "List of :" msgstr "Liste mit :" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8595,66 +8595,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "Fehler in Agentenereignisschleife" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8673,11 +8680,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -14168,3 +14196,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "Fehler bei REST-Aufruf an Controller von fernem Netz" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/en_AU/LC_MESSAGES/neutron.po b/neutron/locale/en_AU/LC_MESSAGES/neutron.po index af542d23f74..343a5b5ba73 100644 --- a/neutron/locale/en_AU/LC_MESSAGES/neutron.po +++ b/neutron/locale/en_AU/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: English (Australia) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/en_GB/LC_MESSAGES/neutron.po b/neutron/locale/en_GB/LC_MESSAGES/neutron.po index f9df8b07f0a..db3e568bc77 100644 --- a/neutron/locale/en_GB/LC_MESSAGES/neutron.po +++ b/neutron/locale/en_GB/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: English (United Kingdom) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/en_US/LC_MESSAGES/neutron.po b/neutron/locale/en_US/LC_MESSAGES/neutron.po index 178b057f54a..1ffdcb15f89 100644 --- a/neutron/locale/en_US/LC_MESSAGES/neutron.po +++ b/neutron/locale/en_US/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: English (United States) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/es/LC_MESSAGES/neutron.po b/neutron/locale/es/LC_MESSAGES/neutron.po index 4c30c34a6a6..858e91f9d4a 100644 --- a/neutron/locale/es/LC_MESSAGES/neutron.po +++ b/neutron/locale/es/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-05-13 06:01+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Spanish " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/es_MX/LC_MESSAGES/neutron.po b/neutron/locale/es_MX/LC_MESSAGES/neutron.po index 11b447bf8ca..5cec6b1576c 100644 --- a/neutron/locale/es_MX/LC_MESSAGES/neutron.po +++ b/neutron/locale/es_MX/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-08-29 05:16+0000\n" "Last-Translator: Tom Fifield \n" "Language-Team: Spanish (Mexico) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13410,3 +13438,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/eu/LC_MESSAGES/neutron.po b/neutron/locale/eu/LC_MESSAGES/neutron.po index 82dcb815684..38b5df89c49 100644 --- a/neutron/locale/eu/LC_MESSAGES/neutron.po +++ b/neutron/locale/eu/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-11-15 00:14+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Basque " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -12951,3 +12979,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/eu_ES/LC_MESSAGES/neutron.po b/neutron/locale/eu_ES/LC_MESSAGES/neutron.po index 3e190626d1a..4e50475147c 100644 --- a/neutron/locale/eu_ES/LC_MESSAGES/neutron.po +++ b/neutron/locale/eu_ES/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-11-15 02:27+0000\n" "Last-Translator: daisy.ycguo \n" "Language-Team: Basque (Spain) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -12951,3 +12979,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/fa/LC_MESSAGES/neutron.po b/neutron/locale/fa/LC_MESSAGES/neutron.po index 5531c645aa5..aae18014d6f 100644 --- a/neutron/locale/fa/LC_MESSAGES/neutron.po +++ b/neutron/locale/fa/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-11-15 02:28+0000\n" "Last-Translator: Tom Fifield \n" "Language-Team: Persian " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -12951,3 +12979,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/fi_FI/LC_MESSAGES/neutron.po b/neutron/locale/fi_FI/LC_MESSAGES/neutron.po index 023677dbd9d..b1620e09349 100644 --- a/neutron/locale/fi_FI/LC_MESSAGES/neutron.po +++ b/neutron/locale/fi_FI/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Finnish (Finland) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/fil/LC_MESSAGES/neutron.po b/neutron/locale/fil/LC_MESSAGES/neutron.po index 31202c04bb7..0166aa9c5b3 100644 --- a/neutron/locale/fil/LC_MESSAGES/neutron.po +++ b/neutron/locale/fil/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-09-28 05:40+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Filipino " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13050,3 +13078,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/fr/LC_MESSAGES/neutron.po b/neutron/locale/fr/LC_MESSAGES/neutron.po index 52ef7cfd1c0..516e840a629 100644 --- a/neutron/locale/fr/LC_MESSAGES/neutron.po +++ b/neutron/locale/fr/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-05-13 06:01+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: French " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/gl/LC_MESSAGES/neutron.po b/neutron/locale/gl/LC_MESSAGES/neutron.po index 10ebb0c5a12..b33bc1148e1 100644 --- a/neutron/locale/gl/LC_MESSAGES/neutron.po +++ b/neutron/locale/gl/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-10-28 23:23+0000\n" "Last-Translator: Tom Fifield \n" "Language-Team: Galician " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -12975,3 +13003,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/hi/LC_MESSAGES/neutron.po b/neutron/locale/hi/LC_MESSAGES/neutron.po index 53255b56e37..d10674cc7dd 100644 --- a/neutron/locale/hi/LC_MESSAGES/neutron.po +++ b/neutron/locale/hi/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-08-27 04:58+0000\n" "Last-Translator: daisy.ycguo \n" "Language-Team: Hindi " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13428,3 +13456,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/hr/LC_MESSAGES/neutron.po b/neutron/locale/hr/LC_MESSAGES/neutron.po index b48f05c1a64..565e70366de 100644 --- a/neutron/locale/hr/LC_MESSAGES/neutron.po +++ b/neutron/locale/hr/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Croatian " @@ -505,7 +505,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -513,7 +513,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -524,7 +524,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -625,78 +625,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1054,25 +1054,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6034,7 +6034,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6176,7 +6176,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6597,13 +6597,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6646,7 +6646,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8284,66 +8284,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8362,11 +8369,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13711,3 +13739,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/hu/LC_MESSAGES/neutron.po b/neutron/locale/hu/LC_MESSAGES/neutron.po index 288a3cae7a1..c30ced85863 100644 --- a/neutron/locale/hu/LC_MESSAGES/neutron.po +++ b/neutron/locale/hu/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Hungarian " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/id/LC_MESSAGES/neutron.po b/neutron/locale/id/LC_MESSAGES/neutron.po index 8226d27e395..7f081314b20 100644 --- a/neutron/locale/id/LC_MESSAGES/neutron.po +++ b/neutron/locale/id/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Indonesian " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/it/LC_MESSAGES/neutron.po b/neutron/locale/it/LC_MESSAGES/neutron.po index d8daae7e3aa..9b13418986c 100644 --- a/neutron/locale/it/LC_MESSAGES/neutron.po +++ b/neutron/locale/it/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-05-16 09:23+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Italian " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/it_IT/LC_MESSAGES/neutron.po b/neutron/locale/it_IT/LC_MESSAGES/neutron.po index 2f897f128c5..fb259697af3 100644 --- a/neutron/locale/it_IT/LC_MESSAGES/neutron.po +++ b/neutron/locale/it_IT/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Italian (Italy) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/ja/LC_MESSAGES/neutron.po b/neutron/locale/ja/LC_MESSAGES/neutron.po index ab4d2a9ddda..d81831deed0 100644 --- a/neutron/locale/ja/LC_MESSAGES/neutron.po +++ b/neutron/locale/ja/LC_MESSAGES/neutron.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-30 10:28+0000\n" "Last-Translator: Tomoyuki KATO \n" "Language-Team: Japanese " @@ -505,7 +505,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -513,7 +513,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -524,7 +524,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -625,78 +625,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1054,25 +1054,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6034,7 +6034,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6176,7 +6176,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6597,13 +6597,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6646,7 +6646,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8284,66 +8284,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8362,11 +8369,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13711,3 +13739,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/ka_GE/LC_MESSAGES/neutron.po b/neutron/locale/ka_GE/LC_MESSAGES/neutron.po index 0216d4c1301..660e6ad9ea1 100644 --- a/neutron/locale/ka_GE/LC_MESSAGES/neutron.po +++ b/neutron/locale/ka_GE/LC_MESSAGES/neutron.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-04-19 14:53+0000\n" "Last-Translator: Nika Chkhikvishvili \n" "Language-Team: ka_GE \n" @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "L3 აგენტი ჩაირთულია" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "მოწყობილობა %s უკვე არსებობს" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "დრაივერის მდებარეობა: %s" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8284,66 +8284,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8362,11 +8369,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13711,3 +13739,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/km/LC_MESSAGES/neutron.po b/neutron/locale/km/LC_MESSAGES/neutron.po index adfca7285dc..530d5d22ae6 100644 --- a/neutron/locale/km/LC_MESSAGES/neutron.po +++ b/neutron/locale/km/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-11-15 02:27+0000\n" "Last-Translator: Tom Fifield \n" "Language-Team: Khmer " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -12951,3 +12979,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/kn/LC_MESSAGES/neutron.po b/neutron/locale/kn/LC_MESSAGES/neutron.po index 15bf42a6c1a..e886c52d6a4 100644 --- a/neutron/locale/kn/LC_MESSAGES/neutron.po +++ b/neutron/locale/kn/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-09-18 00:19+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Kannada " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13062,3 +13090,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/ko/LC_MESSAGES/neutron.po b/neutron/locale/ko/LC_MESSAGES/neutron.po index 89a8a6cc6f3..b015ecd27ba 100644 --- a/neutron/locale/ko/LC_MESSAGES/neutron.po +++ b/neutron/locale/ko/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Korean " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/ko_KR/LC_MESSAGES/neutron.po b/neutron/locale/ko_KR/LC_MESSAGES/neutron.po index 0d30db0fd18..697076041f3 100644 --- a/neutron/locale/ko_KR/LC_MESSAGES/neutron.po +++ b/neutron/locale/ko_KR/LC_MESSAGES/neutron.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-04-28 05:13+0000\n" "Last-Translator: ujuc Gang \n" "Language-Team: ko_KR \n" @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/ml_IN/LC_MESSAGES/neutron.po b/neutron/locale/ml_IN/LC_MESSAGES/neutron.po index 9f51226bb3a..2529409222d 100644 --- a/neutron/locale/ml_IN/LC_MESSAGES/neutron.po +++ b/neutron/locale/ml_IN/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-11-17 05:24+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Malayalam (India) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -12951,3 +12979,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/mr_IN/LC_MESSAGES/neutron.po b/neutron/locale/mr_IN/LC_MESSAGES/neutron.po index ec77f3ec45f..5df8b5887cf 100644 --- a/neutron/locale/mr_IN/LC_MESSAGES/neutron.po +++ b/neutron/locale/mr_IN/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-10-16 22:17+0000\n" "Last-Translator: Tom Fifield \n" "Language-Team: Marathi (India) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -12996,3 +13024,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/ms/LC_MESSAGES/neutron.po b/neutron/locale/ms/LC_MESSAGES/neutron.po index 6ba1d11da65..d793f0783eb 100644 --- a/neutron/locale/ms/LC_MESSAGES/neutron.po +++ b/neutron/locale/ms/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Malay " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/nb/LC_MESSAGES/neutron.po b/neutron/locale/nb/LC_MESSAGES/neutron.po index 10d565cecaa..85df143357b 100644 --- a/neutron/locale/nb/LC_MESSAGES/neutron.po +++ b/neutron/locale/nb/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Norwegian Bokmål " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/ne/LC_MESSAGES/neutron.po b/neutron/locale/ne/LC_MESSAGES/neutron.po index 782dbfff9d1..5e96c9a29c5 100644 --- a/neutron/locale/ne/LC_MESSAGES/neutron.po +++ b/neutron/locale/ne/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-09-05 06:03+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Nepali " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13314,3 +13342,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/neutron.pot b/neutron/locale/neutron.pot index e453cbc51f6..96ffe0fecd1 100644 --- a/neutron/locale/neutron.pot +++ b/neutron/locale/neutron.pot @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: neutron " -"jenkins.neutron.propose.translation.update.162\n" +"jenkins.neutron.propose.translation.update.164\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format diff --git a/neutron/locale/nl_NL/LC_MESSAGES/neutron.po b/neutron/locale/nl_NL/LC_MESSAGES/neutron.po index 42a29d6b853..28c608d2d9b 100644 --- a/neutron/locale/nl_NL/LC_MESSAGES/neutron.po +++ b/neutron/locale/nl_NL/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Dutch (Netherlands) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/pl_PL/LC_MESSAGES/neutron.po b/neutron/locale/pl_PL/LC_MESSAGES/neutron.po index 5c090946133..021ec47724c 100644 --- a/neutron/locale/pl_PL/LC_MESSAGES/neutron.po +++ b/neutron/locale/pl_PL/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-06-28 06:06+0000\n" "Last-Translator: daisy.ycguo \n" "Language-Team: Polish (Poland) " @@ -505,7 +505,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -513,7 +513,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -524,7 +524,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -625,78 +625,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1054,25 +1054,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6034,7 +6034,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6176,7 +6176,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6597,13 +6597,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6646,7 +6646,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8284,66 +8284,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8362,11 +8369,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13711,3 +13739,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/pt/LC_MESSAGES/neutron.po b/neutron/locale/pt/LC_MESSAGES/neutron.po index 3f61e5df35f..4a5b11e7e29 100644 --- a/neutron/locale/pt/LC_MESSAGES/neutron.po +++ b/neutron/locale/pt/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Portuguese " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/pt_BR/LC_MESSAGES/neutron.po b/neutron/locale/pt_BR/LC_MESSAGES/neutron.po index c4c78de269f..e8694769d30 100644 --- a/neutron/locale/pt_BR/LC_MESSAGES/neutron.po +++ b/neutron/locale/pt_BR/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Portuguese (Brazil) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/ro/LC_MESSAGES/neutron.po b/neutron/locale/ro/LC_MESSAGES/neutron.po index 4d8b0733db6..beeb53e2c99 100644 --- a/neutron/locale/ro/LC_MESSAGES/neutron.po +++ b/neutron/locale/ro/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-06-08 07:51+0000\n" "Last-Translator: daisy.ycguo \n" "Language-Team: Romanian " @@ -505,7 +505,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -513,7 +513,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -524,7 +524,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -625,78 +625,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1054,25 +1054,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6034,7 +6034,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6176,7 +6176,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6597,13 +6597,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6646,7 +6646,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8284,66 +8284,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8362,11 +8369,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13711,3 +13739,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/ru/LC_MESSAGES/neutron.po b/neutron/locale/ru/LC_MESSAGES/neutron.po index 164be831289..62b75c59848 100644 --- a/neutron/locale/ru/LC_MESSAGES/neutron.po +++ b/neutron/locale/ru/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-05-13 06:01+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Russian " @@ -505,7 +505,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -513,7 +513,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -524,7 +524,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -625,78 +625,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1054,25 +1054,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6034,7 +6034,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6176,7 +6176,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6597,13 +6597,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6646,7 +6646,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8284,66 +8284,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8362,11 +8369,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13711,3 +13739,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/ru_RU/LC_MESSAGES/neutron.po b/neutron/locale/ru_RU/LC_MESSAGES/neutron.po index 587a7094a5a..fae9e6d4e81 100644 --- a/neutron/locale/ru_RU/LC_MESSAGES/neutron.po +++ b/neutron/locale/ru_RU/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Russian (Russia) " @@ -505,7 +505,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -513,7 +513,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -524,7 +524,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -625,78 +625,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1054,25 +1054,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6034,7 +6034,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6176,7 +6176,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6597,13 +6597,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6646,7 +6646,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8284,66 +8284,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8362,11 +8369,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13711,3 +13739,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/sk/LC_MESSAGES/neutron.po b/neutron/locale/sk/LC_MESSAGES/neutron.po index 32b515e4d53..2963908153d 100644 --- a/neutron/locale/sk/LC_MESSAGES/neutron.po +++ b/neutron/locale/sk/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-08-27 04:58+0000\n" "Last-Translator: daisy.ycguo \n" "Language-Team: Slovak " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13428,3 +13456,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/sl_SI/LC_MESSAGES/neutron.po b/neutron/locale/sl_SI/LC_MESSAGES/neutron.po index 024ac6882df..5c26c51549a 100644 --- a/neutron/locale/sl_SI/LC_MESSAGES/neutron.po +++ b/neutron/locale/sl_SI/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-06-28 06:06+0000\n" "Last-Translator: daisy.ycguo \n" "Language-Team: Slovenian (Slovenia) " @@ -505,7 +505,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -513,7 +513,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -524,7 +524,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -625,78 +625,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1054,25 +1054,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6034,7 +6034,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6176,7 +6176,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6597,13 +6597,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6646,7 +6646,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8284,66 +8284,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8362,11 +8369,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13711,3 +13739,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/sv/LC_MESSAGES/neutron.po b/neutron/locale/sv/LC_MESSAGES/neutron.po index d13fcb49b27..eaa91abdd34 100644 --- a/neutron/locale/sv/LC_MESSAGES/neutron.po +++ b/neutron/locale/sv/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-11-15 02:27+0000\n" "Last-Translator: Tom Fifield \n" "Language-Team: Swedish " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -12951,3 +12979,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/sw_KE/LC_MESSAGES/neutron.po b/neutron/locale/sw_KE/LC_MESSAGES/neutron.po index 43965b04588..9caefcc7c9d 100644 --- a/neutron/locale/sw_KE/LC_MESSAGES/neutron.po +++ b/neutron/locale/sw_KE/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Swahili (Kenya) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/tl/LC_MESSAGES/neutron.po b/neutron/locale/tl/LC_MESSAGES/neutron.po index b1af839dd4e..ae3322b8615 100644 --- a/neutron/locale/tl/LC_MESSAGES/neutron.po +++ b/neutron/locale/tl/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Tagalog " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/tl_PH/LC_MESSAGES/neutron.po b/neutron/locale/tl_PH/LC_MESSAGES/neutron.po index 0c3c8f0acf6..f3eacd737a9 100644 --- a/neutron/locale/tl_PH/LC_MESSAGES/neutron.po +++ b/neutron/locale/tl_PH/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-09-28 05:40+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Tagalog (Philippines) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13050,3 +13078,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/tr_TR/LC_MESSAGES/neutron.po b/neutron/locale/tr_TR/LC_MESSAGES/neutron.po index 44bb662550c..28b11fb1793 100644 --- a/neutron/locale/tr_TR/LC_MESSAGES/neutron.po +++ b/neutron/locale/tr_TR/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Turkish (Turkey) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/uk/LC_MESSAGES/neutron.po b/neutron/locale/uk/LC_MESSAGES/neutron.po index ecec1c8464a..ad829da39e3 100644 --- a/neutron/locale/uk/LC_MESSAGES/neutron.po +++ b/neutron/locale/uk/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Ukrainian " @@ -505,7 +505,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -513,7 +513,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -524,7 +524,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -625,78 +625,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1054,25 +1054,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6034,7 +6034,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6176,7 +6176,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6597,13 +6597,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6646,7 +6646,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8284,66 +8284,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8362,11 +8369,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13711,3 +13739,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/ur/LC_MESSAGES/neutron.po b/neutron/locale/ur/LC_MESSAGES/neutron.po index f2cbf3a6fc3..c566c3d04df 100644 --- a/neutron/locale/ur/LC_MESSAGES/neutron.po +++ b/neutron/locale/ur/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-10-07 01:13+0000\n" "Last-Translator: Tom Fifield \n" "Language-Team: Urdu " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13032,3 +13060,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/vi_VN/LC_MESSAGES/neutron.po b/neutron/locale/vi_VN/LC_MESSAGES/neutron.po index 1516bac4076..ec8e989accc 100644 --- a/neutron/locale/vi_VN/LC_MESSAGES/neutron.po +++ b/neutron/locale/vi_VN/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-05-13 06:01+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Vietnamese (Viet Nam) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/zh_CN/LC_MESSAGES/neutron.po b/neutron/locale/zh_CN/LC_MESSAGES/neutron.po index b5c0ef3dfcd..d63cb9179a6 100644 --- a/neutron/locale/zh_CN/LC_MESSAGES/neutron.po +++ b/neutron/locale/zh_CN/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-05-13 06:01+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: Chinese (China) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/zh_HK/LC_MESSAGES/neutron.po b/neutron/locale/zh_HK/LC_MESSAGES/neutron.po index 7398663af48..96073235b79 100644 --- a/neutron/locale/zh_HK/LC_MESSAGES/neutron.po +++ b/neutron/locale/zh_HK/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Neutron\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-01-28 21:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Chinese (Hong Kong) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -624,78 +624,78 @@ msgstr "" msgid "Failed sending gratuitous ARP: %s" msgstr "" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1053,25 +1053,25 @@ msgstr "" msgid "Authentication region" msgstr "" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "" @@ -6033,7 +6033,7 @@ msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6175,7 +6175,7 @@ msgid "Error in agent event loop: %s" msgstr "" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "" @@ -6596,13 +6596,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "" @@ -6645,7 +6645,7 @@ msgid "List of :" msgstr "" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8283,66 +8283,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8361,11 +8368,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13710,3 +13738,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" + diff --git a/neutron/locale/zh_TW/LC_MESSAGES/neutron.po b/neutron/locale/zh_TW/LC_MESSAGES/neutron.po index 893712d885f..3f2e8e5f346 100644 --- a/neutron/locale/zh_TW/LC_MESSAGES/neutron.po +++ b/neutron/locale/zh_TW/LC_MESSAGES/neutron.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quantum\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-12-07 06:31+0000\n" +"POT-Creation-Date: 2013-12-09 06:31+0000\n" "PO-Revision-Date: 2013-05-22 03:25+0000\n" "Last-Translator: daisy.ycguo \n" "Language-Team: Chinese (Taiwan) " @@ -504,7 +504,7 @@ msgid "" "port %(port_id)s, for router %(router_id)s will be considered" msgstr "在 meta 資料存取網路上找到 %(port_num)d 個路由器埠。將僅考量路由器 %(router_id)s 的埠 %(port_id)s" -#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:836 +#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:845 #: neutron/agent/metadata/agent.py:261 #: neutron/services/metering/agents/metering_agent.py:272 msgid "" @@ -512,7 +512,7 @@ msgid "" " will be disabled." msgstr "" -#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:841 +#: neutron/agent/dhcp_agent.py:599 neutron/agent/l3_agent.py:850 #: neutron/agent/metadata/agent.py:266 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:806 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256 @@ -523,7 +523,7 @@ msgstr "" msgid "Failed reporting state!" msgstr "無法報告狀態！" -#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:846 +#: neutron/agent/dhcp_agent.py:607 neutron/agent/l3_agent.py:855 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:279 #: neutron/services/metering/agents/metering_agent.py:280 #, python-format @@ -625,78 +625,78 @@ msgstr "正在忽略路由器埠 %s 上的多個 IP" msgid "Failed sending gratuitous ARP: %s" msgstr "傳送無償 ARP 時失敗：%s" -#: neutron/agent/l3_agent.py:628 +#: neutron/agent/l3_agent.py:637 #, python-format msgid "Got router deleted notification for %s" msgstr "" -#: neutron/agent/l3_agent.py:633 +#: neutron/agent/l3_agent.py:642 #, python-format msgid "Got routers updated notification :%s" msgstr "" -#: neutron/agent/l3_agent.py:641 +#: neutron/agent/l3_agent.py:650 #, python-format msgid "Got router removed from agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:645 +#: neutron/agent/l3_agent.py:654 #, python-format msgid "Got router added to agent :%r" msgstr "" -#: neutron/agent/l3_agent.py:652 +#: neutron/agent/l3_agent.py:661 #, python-format msgid "The external network bridge '%s' does not exist" msgstr "外部網路橋接器 '%s' 不存在" -#: neutron/agent/l3_agent.py:700 +#: neutron/agent/l3_agent.py:709 #, python-format msgid "Starting RPC loop for %d updated routers" msgstr "" -#: neutron/agent/l3_agent.py:709 +#: neutron/agent/l3_agent.py:718 msgid "RPC loop successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:711 neutron/agent/l3_agent.py:745 +#: neutron/agent/l3_agent.py:720 neutron/agent/l3_agent.py:754 #: neutron/services/metering/agents/metering_agent.py:58 msgid "Failed synchronizing routers" msgstr "同步路由器時失敗" -#: neutron/agent/l3_agent.py:729 +#: neutron/agent/l3_agent.py:738 #, python-format msgid "Starting _sync_routers_task - fullsync:%s" msgstr "" -#: neutron/agent/l3_agent.py:740 +#: neutron/agent/l3_agent.py:749 #, python-format msgid "Processing :%r" msgstr "" -#: neutron/agent/l3_agent.py:743 +#: neutron/agent/l3_agent.py:752 msgid "_sync_routers_task successfully completed" msgstr "" -#: neutron/agent/l3_agent.py:749 +#: neutron/agent/l3_agent.py:758 msgid "L3 agent started" msgstr "已啟動 L3 代理程式" -#: neutron/agent/l3_agent.py:769 +#: neutron/agent/l3_agent.py:778 #, python-format msgid "Added route entry is '%s'" msgstr "所新增的路徑項目是 '%s'" -#: neutron/agent/l3_agent.py:777 +#: neutron/agent/l3_agent.py:786 #, python-format msgid "Removed route entry is '%s'" msgstr "所移除的路徑項目是 '%s'" -#: neutron/agent/l3_agent.py:809 +#: neutron/agent/l3_agent.py:818 msgid "Report state task started" msgstr "" -#: neutron/agent/l3_agent.py:833 +#: neutron/agent/l3_agent.py:842 msgid "Report state task successfully completed" msgstr "" @@ -1054,25 +1054,25 @@ msgstr "要使用的鑑別類型" msgid "Authentication region" msgstr "鑑別區域" -#: neutron/agent/linux/interface.py:199 neutron/agent/linux/interface.py:253 -#: neutron/agent/linux/interface.py:312 neutron/agent/linux/interface.py:361 +#: neutron/agent/linux/interface.py:202 neutron/agent/linux/interface.py:256 +#: neutron/agent/linux/interface.py:315 neutron/agent/linux/interface.py:364 #, python-format msgid "Device %s already exists" msgstr "裝置 %s 已存在" -#: neutron/agent/linux/interface.py:217 neutron/agent/linux/interface.py:261 -#: neutron/agent/linux/interface.py:324 neutron/agent/linux/interface.py:368 +#: neutron/agent/linux/interface.py:220 neutron/agent/linux/interface.py:264 +#: neutron/agent/linux/interface.py:327 neutron/agent/linux/interface.py:371 #, python-format msgid "Unplugged interface '%s'" msgstr "已拔除介面 '%s'" -#: neutron/agent/linux/interface.py:219 neutron/agent/linux/interface.py:326 -#: neutron/agent/linux/interface.py:370 +#: neutron/agent/linux/interface.py:222 neutron/agent/linux/interface.py:329 +#: neutron/agent/linux/interface.py:373 #, python-format msgid "Failed unplugging interface '%s'" msgstr "拔除介面 '%s' 時失敗" -#: neutron/agent/linux/interface.py:428 +#: neutron/agent/linux/interface.py:431 #, python-format msgid "Driver location: %s" msgstr "驅動程式位置：%s" @@ -6054,7 +6054,7 @@ msgstr "用於本端網路的專用 vSwitch 名稱" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:55 #: neutron/plugins/linuxbridge/common/config.py:66 -#: neutron/plugins/mlnx/common/config.py:55 +#: neutron/plugins/mlnx/common/config.py:62 #: neutron/plugins/nec/common/config.py:32 #: neutron/plugins/openvswitch/common/config.py:63 #: neutron/plugins/ryu/common/config.py:45 @@ -6196,7 +6196,7 @@ msgid "Error in agent event loop: %s" msgstr "代理程式事件迴圈發生錯誤：%s" #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:376 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:403 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:407 #, python-format msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)" msgstr "迴圈反覆運算已超出間隔（%(polling_interval)s 與 %(elapsed)s）" @@ -6619,13 +6619,13 @@ msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!" msgstr "迴圈反覆運算已超出間隔（%(polling_interval)s 與 %(elapsed)s）！" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:987 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:418 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422 #, python-format msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!" msgstr "剖析 physical_interface_mappings 失敗：%s。已終止代理程式！" #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:990 -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:421 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:425 #, python-format msgid "Interface mappings: %s" msgstr "介面對映：%s" @@ -6668,7 +6668,7 @@ msgid "List of :" msgstr ": 的清單" #: neutron/plugins/linuxbridge/common/config.py:69 -#: neutron/plugins/mlnx/common/config.py:58 +#: neutron/plugins/mlnx/common/config.py:65 msgid "Enable server RPC compatibility with old agents" msgstr "" @@ -8324,66 +8324,73 @@ msgid "Agent loop process devices!" msgstr "" #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:396 +msgid "" +"Request timeout in agent event loop eSwitchD is not responding - " +"exiting..." +msgstr "" + +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400 #: neutron/plugins/nec/agent/nec_neutron_agent.py:224 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1161 #: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275 msgid "Error in agent event loop" msgstr "代理程式事件迴圈發生錯誤" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:426 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430 #, python-format msgid "Failed on Agent initialisation : %s. Agent terminated!" msgstr "" -#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:431 +#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:435 msgid "Agent initialised successfully, now running... " msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:58 -msgid "eSwitchD: Request timeout" -msgstr "" - -#: neutron/plugins/mlnx/agent/utils.py:68 -#, python-format -msgid "Action %(action)s failed: %(reason)s" -msgstr "" - #: neutron/plugins/mlnx/agent/utils.py:70 #, python-format +msgid "Action %(action)s failed: %(reason)s" +msgstr "" + +#: neutron/plugins/mlnx/agent/utils.py:72 +#, python-format msgid "Unknown operation status %s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:75 +#: neutron/plugins/mlnx/agent/utils.py:77 msgid "get_attached_vnics" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:82 +#: neutron/plugins/mlnx/agent/utils.py:84 #, python-format msgid "" "Set Vlan %(segmentation_id)s on Port %(port_mac)s on Fabric " "%(physical_network)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:95 +#: neutron/plugins/mlnx/agent/utils.py:97 #, python-format msgid "Define Fabric %(fabric)s on interface %(ifc)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:104 +#: neutron/plugins/mlnx/agent/utils.py:106 #, python-format msgid "Port Up for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:113 +#: neutron/plugins/mlnx/agent/utils.py:115 #, python-format msgid "Port Down for %(port_mac)s on fabric %(fabric)s" msgstr "" -#: neutron/plugins/mlnx/agent/utils.py:122 +#: neutron/plugins/mlnx/agent/utils.py:124 #, python-format msgid "Port Release for %(port_mac)s on fabric %(fabric)s" msgstr "" +#: neutron/plugins/mlnx/common/comm_utils.py:59 +#, python-format +msgid "Request timeout - call again after %s seconds" +msgstr "" + #: neutron/plugins/mlnx/common/config.py:28 msgid "Network type for tenant networks (local, ib, vlan, or none)" msgstr "" @@ -8402,11 +8409,32 @@ msgid "" " daemon." msgstr "" +#: neutron/plugins/mlnx/common/config.py:52 +msgid "" +"The number of retries the agent will send request to daemon before giving" +" up" +msgstr "" + +#: neutron/plugins/mlnx/common/config.py:55 +msgid "" +"backoff rate multiplier for waiting period between retries for request to" +" daemon, i.e. value of 2 will double the request timeout each retry" +msgstr "" + #: neutron/plugins/mlnx/common/exceptions.py:22 #, python-format msgid "Mlnx Exception: %(err_msg)s" msgstr "" +#: neutron/plugins/mlnx/common/exceptions.py:26 +msgid "Request Timeout: no response from eSwitchD" +msgstr "" + +#: neutron/plugins/mlnx/common/exceptions.py:30 +#, python-format +msgid "Operation Failed: %(err_msg)s" +msgstr "" + #: neutron/plugins/mlnx/db/mlnx_db_v2.py:47 #: neutron/plugins/mlnx/db/mlnx_db_v2.py:68 #, python-format @@ -13761,3 +13789,6 @@ msgstr "" #~ msgid "Error in REST call to remote network controller" #~ msgstr "對遠端網路控制器進行 REST 呼叫時發生錯誤" +#~ msgid "eSwitchD: Request timeout" +#~ msgstr "" +