Imported Translations from Transifex

Change-Id: I8899e6ade1eb38e6d183cb35a509fcbecdc04b47

diff --git a/neutron/locale/ar/LC_MESSAGES/neutron.po b/neutron/locale/ar/LC_MESSAGES/neutron.po
index 9e375d60b64a9c7e3b11196d72c3ca5f3713b49f..239cc2252b19ea4d26f9dc52b8d41da2fed139b6 100644 (file)
--- 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 <jenkins@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 413bf3cff0d6226037f0f3d2e2a14617881594da..29f397f4e92e9a19e52e435ff1bc14ab551d4580 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 f7f66efc6dc069273a922c89a9224e6bf8643f4c..c12ca39e7a143bf124372e2d5c8d0d00a432b41c 100644 (file)
--- 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 <tom@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 5cfeb85ad7984cfea60cea83109533d79468fd8b..2afdf79cfddf5866478d531f3b524a01498b8e36 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 e8ccaccb1ffed5b846b47d2893bff1e511d3d650..37c2e11067f6982bc4bcf98c19c206ac3566e0f8 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 306aa53353ccbab139af3e919032389c6e7e0711..f8ddb69b88da3cce160590f446172f2929fa5b11 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 37832d5a52f242a6e04e63351db894e1cf203273..7835ecc07eb6784237c3badb7290e25e56be0e20 100644 (file)
--- 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 <jenkins@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 b39f085291e7e127203d1ae2d3922efdc775f5f9..423093403bbb9800c14acb7cd3383d0a08cc4026 100644 (file)
--- 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 <daisy.ycguo@gmail.com>\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 <physical_network>:<physical_interface>"
 msgstr "Liste mit <physical_network>:<physical_interface>"
 
 #: 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 af542d23f74aaf7677d275ea573eebc775085faf..343a5b5ba737e7496d2dc8aa6ef94fc419d4cdba 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 f9df8b07f0a862ede1f6d544170a378caeb84807..db3e568bc7792772860b9ccbd2b6cfcd9c75a2b6 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 178b057f54acbeba45e62c67ec5c0f1da99dd805..1ffdcb15f89dc7d327140c462372382a28b11c74 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 4c30c34a6a6f93822f0ff67a7af1b5cdc6d16161..858e91f9d4ae603b465a597009b817a3641fd000 100644 (file)
--- 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 <jenkins@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 11b447bf8caa159c58c30a44ffe7ecc6d831a6f2..5cec6b1576cec06f6937cd233dcebd71c28107c2 100644 (file)
--- 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 <tom@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 82dcb81568425c50f0484bf947c82dc4cff74997..38b5df89c49b8804c18929072dfb9d4e7f420710 100644 (file)
--- 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 <jenkins@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 3e190626d1ab3ae32b21d6eddc8c8177501eb8d8..4e50475147c6341320b1a18787584f816f921508 100644 (file)
--- 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 <daisy.ycguo@gmail.com>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 5531c645aa56580584fa810244b802363b4d8e00..aae18014d6f34485c98837b265cb83f20d3528ef 100644 (file)
--- 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 <tom@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 023677dbd9d4b0964d6d0ddde03cbba016e77092..b1620e09349a0170480d3a608e90a7f3edacd304 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 31202c04bb7be0dcd86a3980e26b567e0720928e..0166aa9c5b33e8e5ac46e904a60efe8d7fda7707 100644 (file)
--- 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 <jenkins@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 52ef7cfd1c03c26e9b93c767fb7a66774e236da3..516e840a62908ebf4b5fbb59d6071c67cff840ac 100644 (file)
--- 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 <jenkins@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 10ebb0c5a121f65b729b1dd3ba7306fd9c8d6415..b33bc1148e1d0773a3980484d654da4d259fdc6c 100644 (file)
--- 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 <tom@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 53255b56e372035b5451eb1db6175ffeb649d48a..d10674cc7ddb5c11e35feeae87045a28a389b4bf 100644 (file)
--- 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 <daisy.ycguo@gmail.com>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 b48f05c1a64b68d483488527070a08b8d923e81a..565e70366de4f34be0e75f8ccbb13430fce3f939 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 288a3cae7a1324721b233cab17ab37eb1baab725..c30ced85863d17218978f93f217b71cfb6b9809c 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 8226d27e395192ed90ff8044badb607270998d78..7f081314b20dbf13bdbb923f872cb0ea34470798 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 d8daae7e3aa060d402e4e6e0a69462f741caa1b2..9b13418986cf7d76b91eac00005c3683b05e8b6c 100644 (file)
--- 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 <jenkins@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 2f897f128c50bf802324f6cce25e66024a56172c..fb259697af3a2372c90b1338dfec59d0c6e91553 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 ab4d2a9dddadfd51ae1084ffae48680bdd7e45d0..d81831deed037172faf2e0b66b566acecb00d805 100644 (file)
--- 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 <tomo@dream.daynight.jp>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 0216d4c1301822fb07793620fe496a0206217503..660e6ad9ea12ecd9320f6e6e55d4a28f1f66cde5 100644 (file)
--- 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 <frrrredo@gmail.com>\n"
 "Language-Team: ka_GE <LL@li.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 adfca7285dc787d28f10399728208fe59d39a9da..530d5d22ae63dacd405d589a76738ff67227d1dc 100644 (file)
--- 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 <tom@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 15bf42a6c1a5a3f44bfb0ef0d4e8c947a96a9974..e886c52d6a4cde92ac5da73c4c398f987b189363 100644 (file)
--- 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 <jenkins@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 89a8a6cc6f37ca9e63c36914e95c02ef3bc50c0d..b015ecd27ba210c93ca862389261074617bae531 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 0d30db0fd18ee362c52a9d06135375e37e0cdcae..697076041f3cd23637472ecf0ef22458e0111097 100644 (file)
--- 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 <potopro@gmail.com>\n"
 "Language-Team: ko_KR <LL@li.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 9f51226bb3a32d0f6b0f6367d6de7181cae2ac73..2529409222dc03ec2e41c77c8029ddee810db1f5 100644 (file)
--- 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 <jenkins@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 ec77f3ec45fed59e11fe986315221c53d413ab24..5df8b5887cffea2389bde33c76c35bbae8402630 100644 (file)
--- 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 <tom@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 6ba1d11da658ef22d8257b4151fd997709ce3d0f..d793f0783ebdb76f483e9fea1de20cfccf316dc3 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 10d565cecaac9c9c543fef7a72443c9d444e9cf9..85df143357b0c6f936fde9876f752d2e4fbfba1b 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 782dbfff9d158709b20a1b2840b8103b1aa83177..5e96c9a29c540c7039cbd3394559827f61da02d5 100644 (file)
--- 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 <jenkins@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 e453cbc51f64ccb195b9db19189d04f66339f5b2..96ffe0fecd1e724f8b9eed24670a594384fafcee 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 42a29d6b8535ac1e5409f7fe997b8a292ff0a8d9..28c608d2d9b0fd541fb84f6735cfc19abca65d44 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 5c0909461336a306827395cf0c5e6ba8698f6a7f..021ec47724cca553252925b0cf5303ec8d941a73 100644 (file)
--- 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 <daisy.ycguo@gmail.com>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 3f61e5df35fb8dcec372d2032a68f94f0af74f61..4a5b11e7e293f3849e6f71d3103d62429a076507 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 c4c78de269f42e0c24e18c4770ac283ae76348ac..e8694769d30c50dbc15f01b9f20a4326c90e06cd 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 4d8b0733db6c22592f73b58ca7b0dda238413f7d..beeb53e2c995e4e6326f8724406b56ffc017da5a 100644 (file)
--- 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 <daisy.ycguo@gmail.com>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 164be831289cd6c2a4f47373cda031c88ea320c7..62b75c598488263689b45477e997238dd0736e92 100644 (file)
--- 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 <jenkins@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 587a7094a5ae14be672e40be9925a3d89f8f7226..fae9e6d4e81f874c5274660085dae6325e9cd5f6 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 32b515e4d53f03e54f6a16967699e27612f2a672..2963908153d1bb3bd0ae9ad469a0ad85b7c367bb 100644 (file)
--- 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 <daisy.ycguo@gmail.com>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 024ac6882dfd32298c1563130421320c3815dc55..5c26c51549aeffc3bddfed71e7dabd2ae824656f 100644 (file)
--- 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 <daisy.ycguo@gmail.com>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 d13fcb49b275ba59e0604846c07509af24ff20e8..eaa91abdd34dba7e16424d936e7eb9f38eae143c 100644 (file)
--- 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 <tom@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 43965b045888f5827151c0b3928bf7524fb6300d..9caefcc7c9d364fc85f1da0d10dc329197bb3c6a 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 b1af839dd4e4d8c4e43d02e776154905e8c48f41..ae3322b86154f8459177fc82e64d06f6581962f8 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 0c3c8f0acf6fc59a316397f77c68dba4a07c03b2..f3eacd737a98f7107b984598232ed3cc2ee99574 100644 (file)
--- 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 <jenkins@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 44bb662550c05180d728094bce060a353dea4140..28b11fb179356d37b6523368a3fe81c2145297f6 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 ecec1c8464a1c8fdd7d8c8b0e01d2358de6b1035..ad829da39e34a62f76e404fd4a756ca4accbe378 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 f2cbf3a6fc30160e7abd0510abb44ea006b6dcaa..c566c3d04df79287aef661fb885f519320219076 100644 (file)
--- 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 <tom@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 1516bac40766c19ffcae1ccb2bb72130092358a6..ec8e989acccb47d75e929e994bb67ddfbe5d040a 100644 (file)
--- 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 <jenkins@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 b5c0ef3dfcd9f3b3c8226df9805bbcf5dea0e80b..d63cb9179a6c48bffbeb2bf2ab8f975243ff0e04 100644 (file)
--- 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 <jenkins@openstack.org>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 7398663af487ee90814e901fa7d2a40d4ed9725b..96073235b7933a7bb955aee7c957106b93f573d9 100644 (file)
--- 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 <EMAIL@ADDRESS>\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 <physical_network>:<physical_interface>"
 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 893712d885f18540bdbc1ad523e24a92c54a6096..3f2e8e5f346e7245e71a8aabaad963363b91c6a8 100644 (file)
--- 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 <daisy.ycguo@gmail.com>\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 <physical_network>:<physical_interface>"
 msgstr "<physical_network>:<physical_interface> 的清單"
 
 #: 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
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/utils.py:70
+#: 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 ""
+