Imported Translations from Transifex

Change-Id: I77134cdd6b3a8177d94a1deac3646d5cd4abb20d

diff --git a/neutron/locale/en_US/LC_MESSAGES/neutron.po b/neutron/locale/en_US/LC_MESSAGES/neutron.po
index 4269106838333aed92be572ddbff0ac5b091e043..f2085bffada8c15ce0e8a69a8ab3c3f421487610 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: 2014-06-20 06:08+0000\n"
+"POT-Creation-Date: 2014-06-21 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (United States) "
@@ -531,8 +531,8 @@ msgstr ""
 #: neutron/agent/dhcp_agent.py:588 neutron/agent/l3_agent.py:966
 #: neutron/agent/metadata/agent.py:369
 #: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:111
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:857
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:259
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:798
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:250
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:182
 #: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:265
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:240
@@ -759,7 +759,7 @@ msgid ""
 msgstr ""
 
 #: neutron/agent/ovs_cleanup_util.py:75
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:678
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:668
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:278
 #, python-format
 msgid "Delete %s"
@@ -1843,7 +1843,7 @@ msgid "'%s' is not a valid input"
 msgstr ""
 
 #: neutron/api/v2/attributes.py:357
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:559
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:551
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
@@ -2882,8 +2882,8 @@ msgid ""
 msgstr ""
 
 #: neutron/db/l3_db.py:416 neutron/db/l3_db.py:542
-#: neutron/plugins/bigswitch/plugin.py:992
-#: neutron/plugins/bigswitch/plugin.py:1001
+#: neutron/plugins/bigswitch/plugin.py:989
+#: neutron/plugins/bigswitch/plugin.py:998
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
@@ -3011,97 +3011,97 @@ msgid ""
 "sort '%(resource)s'"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:234
+#: neutron/db/firewall/firewall_db.py:241
 #: neutron/plugins/vmware/plugins/service.py:915
-#: neutron/services/firewall/fwaas_plugin.py:234
+#: neutron/services/firewall/fwaas_plugin.py:229
 msgid "create_firewall() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:250
+#: neutron/db/firewall/firewall_db.py:257
 #: neutron/plugins/vmware/plugins/service.py:942
-#: neutron/services/firewall/fwaas_plugin.py:249
+#: neutron/services/firewall/fwaas_plugin.py:244
 msgid "update_firewall() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:260
+#: neutron/db/firewall/firewall_db.py:267
 #: neutron/plugins/vmware/plugins/service.py:968
-#: neutron/services/firewall/fwaas_plugin.py:264
+#: neutron/services/firewall/fwaas_plugin.py:259
 msgid "delete_firewall() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:270
+#: neutron/db/firewall/firewall_db.py:277
 msgid "get_firewall() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:275
+#: neutron/db/firewall/firewall_db.py:282
 msgid "get_firewalls() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:281
+#: neutron/db/firewall/firewall_db.py:288
 msgid "get_firewalls_count() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:286
+#: neutron/db/firewall/firewall_db.py:293
 msgid "create_firewall_policy() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:302
+#: neutron/db/firewall/firewall_db.py:309
 #: neutron/plugins/vmware/plugins/service.py:1030
-#: neutron/services/firewall/fwaas_plugin.py:273
+#: neutron/services/firewall/fwaas_plugin.py:268
 msgid "update_firewall_policy() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:314
+#: neutron/db/firewall/firewall_db.py:321
 msgid "delete_firewall_policy() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:326
+#: neutron/db/firewall/firewall_db.py:333
 msgid "get_firewall_policy() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:331
+#: neutron/db/firewall/firewall_db.py:338
 msgid "get_firewall_policies() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:337
+#: neutron/db/firewall/firewall_db.py:344
 msgid "get_firewall_policies_count() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:342
+#: neutron/db/firewall/firewall_db.py:349
 msgid "create_firewall_rule() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:370
+#: neutron/db/firewall/firewall_db.py:378
 #: neutron/plugins/vmware/plugins/service.py:1004
-#: neutron/services/firewall/fwaas_plugin.py:281
+#: neutron/services/firewall/fwaas_plugin.py:276
 msgid "update_firewall_rule() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:394
+#: neutron/db/firewall/firewall_db.py:402
 msgid "delete_firewall_rule() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:402
+#: neutron/db/firewall/firewall_db.py:410
 msgid "get_firewall_rule() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:407
+#: neutron/db/firewall/firewall_db.py:415
 msgid "get_firewall_rules() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:413
+#: neutron/db/firewall/firewall_db.py:421
 msgid "get_firewall_rules_count() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:422
+#: neutron/db/firewall/firewall_db.py:430
 #: neutron/plugins/vmware/plugins/service.py:1057
-#: neutron/services/firewall/fwaas_plugin.py:291
+#: neutron/services/firewall/fwaas_plugin.py:286
 msgid "insert_rule() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:462
+#: neutron/db/firewall/firewall_db.py:470
 #: neutron/plugins/vmware/plugins/service.py:1086
-#: neutron/services/firewall/fwaas_plugin.py:299
+#: neutron/services/firewall/fwaas_plugin.py:294
 msgid "remove_rule() called"
 msgstr ""
 
@@ -3118,7 +3118,7 @@ msgstr ""
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: neutron/db/metering/metering_rpc.py:49
+#: neutron/db/metering/metering_rpc.py:46
 #, python-format
 msgid "Unable to find agent %s."
 msgstr ""
@@ -3428,44 +3428,49 @@ msgstr ""
 
 #: neutron/extensions/firewall.py:82
 #, python-format
+msgid "%(param)s are not allowed when protocol is set to ICMP."
+msgstr ""
+
+#: neutron/extensions/firewall.py:87
+#, python-format
 msgid "Invalid value for port %(port)s."
 msgstr ""
 
-#: neutron/extensions/firewall.py:86
+#: neutron/extensions/firewall.py:91
 msgid "Missing rule info argument for insert/remove rule operation."
 msgstr ""
 
-#: neutron/extensions/firewall.py:96
+#: neutron/extensions/firewall.py:101
 #, python-format
 msgid "%(driver)s: Internal driver error."
 msgstr ""
 
-#: neutron/extensions/firewall.py:145
+#: neutron/extensions/firewall.py:150
 #, python-format
 msgid "Port '%s' is not a valid number"
 msgstr ""
 
-#: neutron/extensions/firewall.py:149
+#: neutron/extensions/firewall.py:154
 #, python-format
 msgid "Invalid port '%s'"
 msgstr ""
 
-#: neutron/extensions/firewall.py:163
+#: neutron/extensions/firewall.py:168
 #, python-format
 msgid "%(msg_ip)s and %(msg_subnet)s"
 msgstr ""
 
-#: neutron/extensions/firewall.py:284
+#: neutron/extensions/firewall.py:289
 msgid "Number of firewalls allowed per tenant. A negative value means unlimited."
 msgstr ""
 
-#: neutron/extensions/firewall.py:288
+#: neutron/extensions/firewall.py:293
 msgid ""
 "Number of firewall policies allowed per tenant. A negative value means "
 "unlimited."
 msgstr ""
 
-#: neutron/extensions/firewall.py:292
+#: neutron/extensions/firewall.py:297
 msgid ""
 "Number of firewall rules allowed per tenant. A negative value means "
 "unlimited."
@@ -3727,7 +3732,7 @@ msgid "Port does not have port security binding."
 msgstr ""
 
 #: neutron/extensions/providernet.py:54
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:297
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:289
 msgid "Plugin does not support updating provider attributes"
 msgstr ""
 
@@ -4239,171 +4244,6 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: neutron/openstack/common/notifier/api.py:125
-#, python-format
-msgid "%s not in valid priorities"
-msgstr ""
-
-#: neutron/openstack/common/notifier/api.py:141
-#, python-format
-msgid ""
-"Problem '%(e)s' attempting to send to notification system. "
-"Payload=%(payload)s"
-msgstr ""
-
-#: neutron/openstack/common/notifier/api.py:171
-#, python-format
-msgid "Failed to load notifier %s. These notifications will not be sent."
-msgstr ""
-
-#: neutron/openstack/common/notifier/rabbit_notifier.py:27
-msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
-msgstr ""
-
-#: neutron/openstack/common/notifier/rpc_notifier.py:45
-#: neutron/openstack/common/notifier/rpc_notifier2.py:51
-#, python-format
-msgid "Could not send notification to %(topic)s. Payload=%(message)s"
-msgstr ""
-
-#: neutron/openstack/common/rpc/amqp.py:202
-#, python-format
-msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
-msgstr ""
-
-#: neutron/openstack/common/rpc/amqp.py:205
-#, python-format
-msgid "_call_waiters: %s"
-msgstr ""
-
-#: neutron/openstack/common/rpc/amqp.py:212
-#, python-format
-msgid ""
-"Number of call waiters is greater than warning threshold: %d. There could"
-" be a MulticallProxyWaiter leak."
-msgstr ""
-
-#: neutron/openstack/common/rpc/amqp.py:443
-#, python-format
-msgid "no method for message: %s"
-msgstr ""
-
-#: neutron/openstack/common/rpc/amqp.py:444
-#, python-format
-msgid "No method for message: %s"
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:76
-msgid "An unknown RPC related exception occurred."
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:106
-#, python-format
-msgid ""
-"Remote error: %(exc_type)s %(value)s\n"
-"%(traceback)s."
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:123
-#, python-format
-msgid ""
-"Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
-" \"%(method)s\" info: \"%(info)s\""
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:140
-#: neutron/openstack/common/rpc/common.py:141
-#: neutron/openstack/common/rpc/common.py:142
-msgid "<unknown>"
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:146
-#, python-format
-msgid "Found duplicate message(%(msg_id)s). Skipping it."
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:150
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:154
-#, python-format
-msgid "Specified RPC version, %(version)s, not supported by this endpoint."
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:159
-#, python-format
-msgid ""
-"Specified RPC envelope version, %(version)s, not supported by this "
-"endpoint."
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:164
-#, python-format
-msgid "Specified RPC version cap, %(version_cap)s, is too low"
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_kombu.py:557
-#, python-format
-msgid ""
-"Unable to connect to AMQP server on %(hostname)s:%(port)d after "
-"%(max_retries)d tries: %(err_str)s"
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_qpid.py:87
-#, python-format
-msgid "Invalid value for qpid_topology_version: %d"
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:146
-msgid "Could not open socket."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:200
-msgid "You cannot recv on this socket."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:205
-msgid "You cannot send on this socket."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:444
-msgid "Topic contained dangerous characters."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:692
-msgid "Unsupported or unknown ZMQ envelope returned."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:699
-msgid "RPC Message Invalid."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:729
-msgid "No matchmaker results. Not casting."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:732
-msgid "No match from matchmaker."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:814
-#, python-format
-msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
-msgstr ""
-
-#: neutron/openstack/common/rpc/matchmaker.py:46
-msgid "Match not found by MatchMaker."
-msgstr ""
-
-#: neutron/openstack/common/rpc/matchmaker.py:80
-msgid "Matchmaker does not implement registration or heartbeat."
-msgstr ""
-
-#: neutron/openstack/common/rpc/matchmaker.py:228
-msgid "Register before starting heartbeat."
-msgstr ""
-
 #: neutron/plugins/bigswitch/config.py:33
 msgid ""
 "A comma separated list of Big Switch or Floodlight servers and port "
@@ -4525,140 +4365,140 @@ msgstr ""
 msgid "Syntax error in server config file, aborting plugin"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:135 neutron/plugins/ml2/db.py:100
+#: neutron/plugins/bigswitch/plugin.py:132 neutron/plugins/ml2/db.py:100
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:241
+#: neutron/plugins/bigswitch/plugin.py:238
 #, python-format
 msgid "Unable to update remote topology: %s"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:325
+#: neutron/plugins/bigswitch/plugin.py:322
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:331
+#: neutron/plugins/bigswitch/plugin.py:328
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:356
+#: neutron/plugins/bigswitch/plugin.py:353
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs."
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:402
+#: neutron/plugins/bigswitch/plugin.py:399
 #: neutron/plugins/ml2/drivers/mech_bigswitch/driver.py:98
 msgid "Iconsistency with backend controller triggering full synchronization."
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:419
+#: neutron/plugins/bigswitch/plugin.py:416
 #, python-format
 msgid "NeutronRestProxyV2: Unable to create port: %s"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:470
+#: neutron/plugins/bigswitch/plugin.py:467
 #, python-format
 msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:497
+#: neutron/plugins/bigswitch/plugin.py:494
 msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:539
+#: neutron/plugins/bigswitch/plugin.py:536
 msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:581
+#: neutron/plugins/bigswitch/plugin.py:578
 msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:608
+#: neutron/plugins/bigswitch/plugin.py:605
 msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:645
+#: neutron/plugins/bigswitch/plugin.py:642
 msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:736
+#: neutron/plugins/bigswitch/plugin.py:733
 msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:795
+#: neutron/plugins/bigswitch/plugin.py:792
 msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:811
+#: neutron/plugins/bigswitch/plugin.py:808
 msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:827
+#: neutron/plugins/bigswitch/plugin.py:824
 msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:845
+#: neutron/plugins/bigswitch/plugin.py:842
 msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:883
+#: neutron/plugins/bigswitch/plugin.py:880
 msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:905
+#: neutron/plugins/bigswitch/plugin.py:902
 msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:927
+#: neutron/plugins/bigswitch/plugin.py:924
 msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:956
+#: neutron/plugins/bigswitch/plugin.py:953
 msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:984
+#: neutron/plugins/bigswitch/plugin.py:981
 msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1017
+#: neutron/plugins/bigswitch/plugin.py:1014
 msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1034
+#: neutron/plugins/bigswitch/plugin.py:1031
 #, python-format
 msgid "NeutronRestProxyV2: Unable to create remote floating IP: %s"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1040
+#: neutron/plugins/bigswitch/plugin.py:1037
 msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1056
+#: neutron/plugins/bigswitch/plugin.py:1053
 msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1071
+#: neutron/plugins/bigswitch/plugin.py:1068
 msgid "NeutronRestProxyV2: diassociate_floatingips() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1101
+#: neutron/plugins/bigswitch/plugin.py:1098
 msgid "NeutronRestProxyV2: too many external networks"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1116
+#: neutron/plugins/bigswitch/plugin.py:1113
 msgid "Adding host route: "
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1117
+#: neutron/plugins/bigswitch/plugin.py:1114
 #, python-format
 msgid "Destination:%(dst)s nexthop:%(next)s"
 msgstr ""
@@ -4862,7 +4702,7 @@ msgid "Encountered an error checking controller health."
 msgstr ""
 
 #: neutron/plugins/bigswitch/agent/restproxy_agent.py:116
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:238
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:235
 msgid "Port update received"
 msgstr ""
 
@@ -4877,24 +4717,24 @@ msgid "Port %s found. Refreshing firewall."
 msgstr ""
 
 #: neutron/plugins/bigswitch/agent/restproxy_agent.py:151
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:271
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:268
 msgid "Agent loop has new device"
 msgstr ""
 
 #: neutron/plugins/bigswitch/agent/restproxy_agent.py:155
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:409
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:398
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:225
 #: neutron/plugins/oneconvergence/agent/nvsd_neutron_agent.py:159
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:272
 msgid "Error in agent event loop"
 msgstr ""
 
 #: neutron/plugins/bigswitch/agent/restproxy_agent.py:161
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:229
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1024
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1373
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1443
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:281
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:226
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:996
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1365
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1429
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:278
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
@@ -4978,52 +4818,52 @@ msgstr ""
 msgid "The network interface to use when creatinga port"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:132
-#: neutron/plugins/hyperv/rpc_callbacks.py:56
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:87
-#: neutron/plugins/mlnx/rpc_callbacks.py:73
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/hyperv/rpc_callbacks.py:47
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:79
+#: neutron/plugins/mlnx/rpc_callbacks.py:63
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:87
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:146
-#: neutron/plugins/brocade/NeutronPlugin.py:163
-#: neutron/plugins/hyperv/rpc_callbacks.py:72
-#: neutron/plugins/hyperv/rpc_callbacks.py:91
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:110
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:137
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:160
-#: neutron/plugins/mlnx/rpc_callbacks.py:95
-#: neutron/plugins/mlnx/rpc_callbacks.py:114
-#: neutron/plugins/mlnx/rpc_callbacks.py:129
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:163
+#: neutron/plugins/brocade/NeutronPlugin.py:138
+#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/hyperv/rpc_callbacks.py:63
+#: neutron/plugins/hyperv/rpc_callbacks.py:82
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:102
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:129
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:152
+#: neutron/plugins/mlnx/rpc_callbacks.py:85
+#: neutron/plugins/mlnx/rpc_callbacks.py:104
+#: neutron/plugins/mlnx/rpc_callbacks.py:119
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:132
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:155
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:298
-#: neutron/plugins/brocade/NeutronPlugin.py:342
-#: neutron/plugins/brocade/NeutronPlugin.py:395
-#: neutron/plugins/brocade/NeutronPlugin.py:425
+#: neutron/plugins/brocade/NeutronPlugin.py:290
+#: neutron/plugins/brocade/NeutronPlugin.py:334
+#: neutron/plugins/brocade/NeutronPlugin.py:387
+#: neutron/plugins/brocade/NeutronPlugin.py:417
 msgid "Brocade NOS driver error"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:299
+#: neutron/plugins/brocade/NeutronPlugin.py:291
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:302
-#: neutron/plugins/brocade/NeutronPlugin.py:343
-#: neutron/plugins/brocade/NeutronPlugin.py:396
-#: neutron/plugins/brocade/NeutronPlugin.py:427
+#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:335
+#: neutron/plugins/brocade/NeutronPlugin.py:388
+#: neutron/plugins/brocade/NeutronPlugin.py:419
 msgid "Brocade plugin raised exception, check logs"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:308
+#: neutron/plugins/brocade/NeutronPlugin.py:300
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -5773,311 +5613,311 @@ msgstr ""
 msgid "VSM: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:154
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:146
 msgid "_setup_vsm"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:173
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:165
 msgid "_populate_policy_profiles"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:200
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:192
 msgid "No policy profile populated from VSM"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:237
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:344
-#: neutron/plugins/mlnx/mlnx_plugin.py:218
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:406
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:229
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:219
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:398
 msgid "provider:network_type required"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:241
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:255
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:354
-#: neutron/plugins/mlnx/mlnx_plugin.py:248
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:416
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:435
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:233
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:247
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:249
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:427
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:244
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:236
 msgid "provider:segmentation_id out of range (1 through 4094)"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:249
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:241
 msgid "provider:physical_network specified for Overlay network"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:258
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:250
 msgid "provider:segmentation_id out of range (5000+)"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:262
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:376
-#: neutron/plugins/mlnx/mlnx_plugin.py:234
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:451
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:254
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:368
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:443
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:273
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:382
-#: neutron/plugins/mlnx/mlnx_plugin.py:274
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:457
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:265
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:374
+#: neutron/plugins/mlnx/mlnx_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:449
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:277
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:388
-#: neutron/plugins/mlnx/mlnx_plugin.py:280
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:463
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:269
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:380
+#: neutron/plugins/mlnx/mlnx_plugin.py:281
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:455
 msgid "provider:physical_network required"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:455
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:447
 #, python-format
 msgid "_populate_member_segments %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:494
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:486
 msgid "Invalid pairing supplied"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:499
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:491
 #, python-format
 msgid "Invalid UUID supplied in %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:500
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:492
 msgid "Invalid UUID supplied"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:529
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:521
 #, python-format
 msgid "Cannot add a trunk segment '%s' as a member of another trunk segment"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:534
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:526
 #, python-format
 msgid "Cannot add vlan segment '%s' as a member of a vxlan trunk segment"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:540
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:532
 #, python-format
 msgid "Network UUID '%s' belongs to a different physical network"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:545
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:537
 #, python-format
 msgid "Cannot add vxlan segment '%s' as a member of a vlan trunk segment"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:550
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:542
 #, python-format
 msgid "Vlan tag '%s' is out of range"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:553
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:545
 #, python-format
 msgid "Vlan tag '%s' is not an integer value"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:558
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:550
 #, python-format
 msgid "%s is not a valid uuid"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:605
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:608
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:597
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:600
 msgid "n1kv:profile_id does not exist"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:620
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:612
 msgid "_send_create_logical_network"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:643
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:635
 #, python-format
 msgid "_send_create_network_profile_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:653
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:645
 #, python-format
 msgid "_send_update_network_profile_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:663
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:655
 #, python-format
 msgid "_send_delete_network_profile_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:678
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:670
 #, python-format
 msgid "_send_create_network_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:710
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:702
 #, python-format
 msgid "_send_update_network_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:732
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:724
 #, python-format
 msgid "add_segments=%s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:733
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:725
 #, python-format
 msgid "del_segments=%s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:757
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:749
 #, python-format
 msgid "_send_delete_network_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:797
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:789
 #, python-format
 msgid "_send_create_subnet_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:807
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:799
 #, python-format
 msgid "_send_update_subnet_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:818
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:810
 #, python-format
 msgid "_send_delete_subnet_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:844
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:836
 #, python-format
 msgid "_send_create_port_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:861
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:853
 #, python-format
 msgid "_send_update_port_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:877
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:869
 #, python-format
 msgid "_send_delete_port_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:908
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:900
 #, python-format
 msgid "Create network: profile_id=%s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:916
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:908
 #, python-format
 msgid ""
 "Physical_network %(phy_net)s, seg_type %(net_type)s, seg_id %(seg_id)s, "
 "multicast_ip %(multicast_ip)s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:928
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:938
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:920
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:930
 #, python-format
 msgid "Seg list %s "
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:978
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:970
 #: neutron/plugins/hyperv/hyperv_neutron_plugin.py:254
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:205
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:198
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:232
-#: neutron/plugins/mlnx/mlnx_plugin.py:361
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:511
+#: neutron/plugins/mlnx/mlnx_plugin.py:362
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:503
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1036
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1028
 #, python-format
 msgid "Updated network: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1051
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1043
 #, python-format
 msgid "Cannot delete network '%s' that is member of a trunk segment"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1055
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1047
 #, python-format
 msgid "Cannot delete network '%s' that is a member of a multi-segment network"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1068
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1060
 #, python-format
 msgid "Deleted network: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1078
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1070
 #, python-format
 msgid "Get network: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1100
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1092
 msgid "Get networks"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1150
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1142
 #, python-format
 msgid "Create port: profile_id=%s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1196
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:312
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1188
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:305
 #, python-format
 msgid "Created port: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1207
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1199
 #, python-format
 msgid "Update port: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1254
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1246
 #, python-format
 msgid "Get port: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1274
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1266
 msgid "Get ports"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1290
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1282
 msgid "Create subnet"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1298
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1290
 #, python-format
 msgid "Created subnet: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1309
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1301
 msgid "Update subnet"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1324
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1316
 #, python-format
 msgid "Delete subnet: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1339
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1331
 #, python-format
 msgid "Get subnet: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1359
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1351
 msgid "Get subnets"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1444
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1436
 #, python-format
 msgid "Scheduling router %s"
 msgstr ""
@@ -6426,10 +6266,10 @@ msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
 #: neutron/plugins/hyperv/hyperv_neutron_plugin.py:203
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:305
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:297
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
-#: neutron/plugins/mlnx/mlnx_plugin.py:179
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:350
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
@@ -6439,10 +6279,10 @@ msgstr ""
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/rpc_callbacks.py:80
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:120
-#: neutron/plugins/mlnx/rpc_callbacks.py:102
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:122
+#: neutron/plugins/hyperv/rpc_callbacks.py:71
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:112
+#: neutron/plugins/mlnx/rpc_callbacks.py:92
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:114
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
@@ -6484,151 +6324,149 @@ msgid ""
 "succeedes."
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:156
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:153
 #, python-format
 msgid "Failed reporting state! %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:191
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:188
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:212
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:209
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:218
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:221
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:218
 msgid "port_delete received"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:226
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:682
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:223
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:173
 msgid "port_update received"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:251
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:131
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:264
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:258
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:276
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:270
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:284
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:297
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:291
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:304
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:116
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:319
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:313
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:317
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:336
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:330
 #, python-format
 msgid "Port metrics enabled for port: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:340
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:334
 #, python-format
 msgid "Port metrics raw enabling for port: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:365
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:359
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:211
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:325
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:314
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:370
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:364
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:378
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:372
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:385
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:379
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:411
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:405
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:419
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:413
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:444
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:998
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:393
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1275
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1341
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:438
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:965
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:382
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1267
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1327
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:452
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1010
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:446
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:459
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:453
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:467
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:416
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:461
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:405
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:480
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:272
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1048
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:474
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1020
 #: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:158
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1525
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1511
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
@@ -6860,285 +6698,285 @@ msgstr ""
 msgid "Fake SDNVE controller: get controller"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:159
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:152
 msgid "Set a new controller if needed."
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:165
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:158
 #, python-format
 msgid "Set the controller to a new controller: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:173
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:166
 #, python-format
 msgid "Original SDN-VE HTTP request: %(orig)s; New request: %(new)s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:183
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:176
 #, python-format
 msgid "Create network in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:192
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:185
 msgid "Create net failed: no SDN-VE tenant."
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:203
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:196
 #, python-format
 msgid "Create net failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:210
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:203
 #, python-format
 msgid "Update network in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:230
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:223
 #, python-format
 msgid "Update net failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:236
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:229
 #, python-format
 msgid "Delete network in progress: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:246
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:239
 #, python-format
 msgid "Delete net failed after deleting the network in DB: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:251
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:244
 #, python-format
 msgid "Get network in progress: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:257
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:250
 msgid "Get networks in progress"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:267
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:260
 #, python-format
 msgid "Create port in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:283
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:276
 msgid "Create port does not have tenant id info"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:289
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:282
 #, python-format
 msgid "Create port does not have tenant id info; obtained is: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:310
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:303
 #, python-format
 msgid "Create port failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:317
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:310
 #, python-format
 msgid "Update port in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:344
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:337
 #, python-format
 msgid "Update port failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:350
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:343
 #, python-format
 msgid "Delete port in progress: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:363
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:356
 #, python-format
 msgid "Delete port operation failed in SDN-VE after deleting the port from DB: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:372
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:365
 #, python-format
 msgid "Create subnet in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:384
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:377
 #, python-format
 msgid "Create subnet failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:386
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:379
 #, python-format
 msgid "Subnet created: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:392
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:385
 #, python-format
 msgid "Update subnet in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:417
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:410
 #, python-format
 msgid "Update subnet failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:423
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:416
 #, python-format
 msgid "Delete subnet in progress: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:428
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:421
 #, python-format
 msgid ""
 "Delete subnet operation failed in SDN-VE after deleting the subnet from "
 "DB: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:437
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:430
 #, python-format
 msgid "Create router in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:440
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:433
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:450
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:443
 msgid "Create router failed: no SDN-VE tenant."
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:458
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:451
 #, python-format
 msgid "Create router failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:460
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:453
 #, python-format
 msgid "Router created: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:465
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:458
 #, python-format
 msgid "Update router in progress: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:472
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:465
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:496
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:489
 #, python-format
 msgid "Update router failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:502
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:495
 #, python-format
 msgid "Delete router in progress: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:509
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:502
 #, python-format
 msgid ""
 "Delete router operation failed in SDN-VE after deleting the router in DB:"
 " %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:514
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:507
 #, python-format
 msgid ""
 "Add router interface in progress: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:522
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:515
 #, python-format
 msgid "SdnvePluginV2.add_router_interface called. Port info: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:536
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:529
 #, python-format
 msgid "Update router-add-interface failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:539
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:532
 #, python-format
 msgid "Added router interface: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:543
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:536
 #, python-format
 msgid ""
 "Add router interface only called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:553
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:546
 msgid ""
 "SdnvePluginV2._add_router_interface_only: failed to add the interface in "
 "the roll back. of a remove_router_interface operation"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:559
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:552
 #, python-format
 msgid ""
 "Remove router interface in progress: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:568
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:561
 msgid "No port ID"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:570
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:563
 #, python-format
 msgid "SdnvePluginV2.remove_router_interface port: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:574
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:567
 msgid "No fixed IP"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:579
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:572
 #, python-format
 msgid "SdnvePluginV2.remove_router_interface subnet_id: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:602
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:595
 #, python-format
 msgid "Update router-remove-interface failed SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:623
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:616
 #, python-format
 msgid "Create floatingip in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:634
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:627
 #, python-format
 msgid "Creating floating ip operation failed in SDN-VE controller: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:637
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:630
 #, python-format
 msgid "Created floatingip : %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:642
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:635
 #, python-format
 msgid "Update floatingip in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:662
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:655
 #, python-format
 msgid "Update floating ip failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:668
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:661
 #, python-format
 msgid "Delete floatingip in progress: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:673
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:666
 #, python-format
 msgid "Delete floatingip failed in SDN-VE: %s"
 msgstr ""
@@ -7156,29 +6994,29 @@ msgstr ""
 msgid "info_update received. New controlleris set to be out of band"
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:198
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:195
 #, python-format
 msgid "Mapping physical network %(physical_network)s to interface %(interface)s"
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:204
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:201
 #, python-format
 msgid ""
 "Interface %(interface)s for physical network %(physical_network)s does "
 "not exist. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:222
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:219
 msgid "Agent in the rpc loop."
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:244
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:241
 #, python-format
 msgid "Controller IPs: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:266
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1512
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:263
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1498
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
@@ -7272,58 +7110,58 @@ msgstr ""
 msgid "The input does not contain nececessary info: %(msg)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:152
-#: neutron/plugins/ml2/rpc.py:179 neutron/plugins/ml2/rpc.py:201
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:130
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:155
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:120
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:144
+#: neutron/plugins/ml2/rpc.py:170 neutron/plugins/ml2/rpc.py:192
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:122
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:147
 #, python-format
 msgid "Device %(device)s not bound to the agent host %(host)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:146
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:149
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:138
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:141
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:266
-#: neutron/plugins/mlnx/mlnx_plugin.py:199
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:258
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:277
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:269
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:303
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:295
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:348
-#: neutron/plugins/mlnx/mlnx_plugin.py:243
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:410
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:244
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:357
-#: neutron/plugins/mlnx/mlnx_plugin.py:251
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:419
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:349
+#: neutron/plugins/mlnx/mlnx_plugin.py:252
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:411
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:364
-#: neutron/plugins/mlnx/mlnx_plugin.py:259
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:439
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:356
+#: neutron/plugins/mlnx/mlnx_plugin.py:260
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:431
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:370
-#: neutron/plugins/mlnx/mlnx_plugin.py:263
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:445
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:362
+#: neutron/plugins/mlnx/mlnx_plugin.py:264
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:437
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
@@ -7472,158 +7310,158 @@ msgstr ""
 msgid "Done deleting vxlan interface %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:534
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:569
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:524
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:559
 #, python-format
 msgid ""
 "Option \"%(option)s\" must be supported by command \"%(command)s\" to "
 "enable %(mode)s mode"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:546
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:536
 msgid "No valid Segmentation ID to perform UCAST test."
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:563
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:553
 msgid ""
 "VXLAN muticast group must be provided in vxlan_group option to enable "
 "VXLAN MCAST mode"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:588
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:578
 msgid ""
 "Linux kernel vxlan module and iproute2 3.8 or above are required to "
 "enable VXLAN."
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:598
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:588
 #, python-format
 msgid "Using %s VXLAN mode"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:675
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:665
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:276
 msgid "network_delete received"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:732
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:209
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:679
 #, python-format
-msgid "RPC timeout while updating port %s"
+msgid "port_update RPC received for port: %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:735
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:682
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:317
 msgid "fdb_add received"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:757
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:704
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:345
 msgid "fdb_remove received"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:779
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:726
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:424
 msgid "update chg_ip received"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:804
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:751
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:447
 msgid "fdb_update received"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:867
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:808
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:871
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:812
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:254
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:144
 #: neutron/plugins/oneconvergence/agent/nvsd_neutron_agent.py:109
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:920
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:871
 #, python-format
-msgid "Port %s added"
+msgid "Treating added or updated device: %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:926
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1077
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1116
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1114
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1153
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:877
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1069
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1108
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1100
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1139
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:932
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1083
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1120
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:883
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1075
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1106
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:964
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:985
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:379
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1103
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1165
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1140
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1202
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:915
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:936
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:368
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1095
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1157
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1126
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1188
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:971
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1133
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1150
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1170
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1187
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:922
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1125
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1142
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1156
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1173
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:979
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1140
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1157
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1177
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1194
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:930
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1132
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1149
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1163
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1180
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:983
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:377
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1162
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1199
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:934
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:366
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1154
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1185
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:993
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:960
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1005
-msgid "Update devices failed"
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:978
+#, python-format
+msgid "Agent loop found changes! %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1016
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:984
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1038
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1010
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:419
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1041
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:433
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1013
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
@@ -8102,232 +7940,232 @@ msgstr ""
 msgid "There is no %(name)s with ID %(id)s in MidoNet."
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:195
+#: neutron/plugins/midonet/plugin.py:185
 #: neutron/plugins/ml2/drivers/mech_arista/exceptions.py:23
 #: neutron/plugins/ml2/drivers/mech_arista/exceptions.py:27
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:217
 msgid "provider_router_id should be configured in the plugin config file"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:397
+#: neutron/plugins/midonet/plugin.py:387
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:438
+#: neutron/plugins/midonet/plugin.py:428
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:457
+#: neutron/plugins/midonet/plugin.py:447
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:464
+#: neutron/plugins/midonet/plugin.py:454
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:479
+#: neutron/plugins/midonet/plugin.py:469
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:488
+#: neutron/plugins/midonet/plugin.py:478
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:497
+#: neutron/plugins/midonet/plugin.py:487
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:505
+#: neutron/plugins/midonet/plugin.py:495
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:510
+#: neutron/plugins/midonet/plugin.py:500
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:515
+#: neutron/plugins/midonet/plugin.py:505
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:523
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid "Failed to delete neutron db, while Midonet bridge=%r had been deleted"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:528
+#: neutron/plugins/midonet/plugin.py:518
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:589
+#: neutron/plugins/midonet/plugin.py:579
 #, python-format
 msgid "Failed to create a port on network %(net_id)s: %(err)s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:594
+#: neutron/plugins/midonet/plugin.py:584
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:599
+#: neutron/plugins/midonet/plugin.py:589
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:606
+#: neutron/plugins/midonet/plugin.py:596
 #, python-format
 msgid "There is no port with ID %(id)s in MidoNet."
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:610
+#: neutron/plugins/midonet/plugin.py:600
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:615
+#: neutron/plugins/midonet/plugin.py:605
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:624
+#: neutron/plugins/midonet/plugin.py:614
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:658
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid "Failed to delete DHCP mapping for port %(id)s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:733
+#: neutron/plugins/midonet/plugin.py:723
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%(router)s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:780
+#: neutron/plugins/midonet/plugin.py:770
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: router_data=%(router_data)s."
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:792
+#: neutron/plugins/midonet/plugin.py:782
 #, python-format
 msgid ""
 "MidonetPluginV2.set_router_gateway called: id=%(id)s, "
 "gw_router=%(gw_router)s, gw_ip=%(gw_ip)s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:836
+#: neutron/plugins/midonet/plugin.py:826
 #, python-format
 msgid "MidonetPluginV2.remove_router_gateway called: id=%(id)s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:856
+#: neutron/plugins/midonet/plugin.py:846
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:896
+#: neutron/plugins/midonet/plugin.py:886
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: router=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:907
+#: neutron/plugins/midonet/plugin.py:897
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1007
+#: neutron/plugins/midonet/plugin.py:997
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1031
+#: neutron/plugins/midonet/plugin.py:1021
 msgid ""
 "DHCP agent is not working correctly. No port to reach the Metadata server"
 " on this network"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1040
+#: neutron/plugins/midonet/plugin.py:1030
 #, python-format
 msgid ""
 "Failed to create MidoNet resources to add router interface. "
 "info=%(info)s, router_id=%(router_id)s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1047
+#: neutron/plugins/midonet/plugin.py:1037
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: info=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1087
+#: neutron/plugins/midonet/plugin.py:1077
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1106
+#: neutron/plugins/midonet/plugin.py:1096
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1128
+#: neutron/plugins/midonet/plugin.py:1118
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1157
+#: neutron/plugins/midonet/plugin.py:1147
 #, python-format
 msgid "Failed to create MidoNet resources for sg %(sg)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1164
+#: neutron/plugins/midonet/plugin.py:1154
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1170
+#: neutron/plugins/midonet/plugin.py:1160
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1202
+#: neutron/plugins/midonet/plugin.py:1192
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1212
+#: neutron/plugins/midonet/plugin.py:1202
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1222
+#: neutron/plugins/midonet/plugin.py:1212
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sg_rule_id=%s"
 msgstr ""
@@ -8494,191 +8332,191 @@ msgstr ""
 msgid "Failed to bind port %(port)s on host %(host)s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:120
+#: neutron/plugins/ml2/plugin.py:121
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:151
+#: neutron/plugins/ml2/plugin.py:152
 msgid "network_type required"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:190
+#: neutron/plugins/ml2/plugin.py:191
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:253
+#: neutron/plugins/ml2/plugin.py:254
 msgid "binding:profile value too large"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:289
+#: neutron/plugins/ml2/plugin.py:290
 #, python-format
 msgid "Serialized vif_details DB value '%(value)s' for port %(port)s is invalid"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:300
+#: neutron/plugins/ml2/plugin.py:301
 #, python-format
 msgid "Serialized profile DB value '%(value)s' for port %(port)s is invalid"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:353
+#: neutron/plugins/ml2/plugin.py:354
 #, python-format
 msgid ""
 "In _notify_port_updated(), no bound segment for port %(port_id)s on "
 "network %(network_id)s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:395
+#: neutron/plugins/ml2/plugin.py:396
 #, python-format
 msgid "mechanism_manager.create_network_postcommit failed, deleting network '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:455
+#: neutron/plugins/ml2/plugin.py:456
 #, python-format
 msgid "Deleting network %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:467
+#: neutron/plugins/ml2/plugin.py:468
 #, python-format
 msgid "Ports to auto-delete: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:473 neutron/plugins/ml2/plugin.py:593
+#: neutron/plugins/ml2/plugin.py:474 neutron/plugins/ml2/plugin.py:594
 msgid "Tenant-owned ports exist"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:481
+#: neutron/plugins/ml2/plugin.py:482
 #, python-format
 msgid "Subnets to auto-delete: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:492
+#: neutron/plugins/ml2/plugin.py:493
 #, python-format
 msgid "Deleting network record %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:500 neutron/plugins/ml2/plugin.py:606
+#: neutron/plugins/ml2/plugin.py:501 neutron/plugins/ml2/plugin.py:607
 msgid "Committing transaction"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:506
+#: neutron/plugins/ml2/plugin.py:507
 msgid "A concurrent port creation has occurred"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:515
+#: neutron/plugins/ml2/plugin.py:516
 #, python-format
 msgid "Exception auto-deleting port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:523
+#: neutron/plugins/ml2/plugin.py:524
 #, python-format
 msgid "Exception auto-deleting subnet %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:532
+#: neutron/plugins/ml2/plugin.py:533
 msgid "mechanism_manager.delete_network_postcommit failed"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:546
+#: neutron/plugins/ml2/plugin.py:547
 #, python-format
 msgid "mechanism_manager.create_subnet_postcommit failed, deleting subnet '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:576
+#: neutron/plugins/ml2/plugin.py:577
 #, python-format
 msgid "Deleting subnet %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:587
+#: neutron/plugins/ml2/plugin.py:588
 #, python-format
 msgid "Ports to auto-deallocate: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:602
+#: neutron/plugins/ml2/plugin.py:603
 msgid "Deleting subnet record"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:622
+#: neutron/plugins/ml2/plugin.py:623
 #, python-format
 msgid "Exception deleting fixed_ip from port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:632
+#: neutron/plugins/ml2/plugin.py:633
 msgid "mechanism_manager.delete_subnet_postcommit failed"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:661
+#: neutron/plugins/ml2/plugin.py:662
 #, python-format
 msgid "mechanism_manager.create_port_postcommit failed, deleting port '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:717
+#: neutron/plugins/ml2/plugin.py:718
 #: neutron/tests/unit/ml2/test_ml2_plugin.py:131
 #, python-format
 msgid "Deleting port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:735
+#: neutron/plugins/ml2/plugin.py:736
 #: neutron/tests/unit/ml2/test_ml2_plugin.py:132
 #, python-format
 msgid "The port '%s' was deleted"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:744
+#: neutron/plugins/ml2/plugin.py:745
 msgid "Calling base delete_port"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:756
+#: neutron/plugins/ml2/plugin.py:757
 msgid "mechanism_manager.delete_port_postcommit failed"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:768
+#: neutron/plugins/ml2/plugin.py:769
 #, python-format
 msgid "Port %(port)s updated up by agent not found"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:97
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:106
+#: neutron/plugins/ml2/rpc.py:97
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:113
+#: neutron/plugins/ml2/rpc.py:104
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id)s with no segments"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:123
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s on network "
 "%(network_id)s not bound, vif_type: %(vif_type)s"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:134
+#: neutron/plugins/ml2/rpc.py:125
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s on network "
 "%(network_id)s invalid segment, vif_type: %(vif_type)s"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:158
+#: neutron/plugins/ml2/rpc.py:149
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:172
+#: neutron/plugins/ml2/rpc.py:163
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:196
+#: neutron/plugins/ml2/rpc.py:187
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
@@ -8962,7 +8800,7 @@ msgid "%(type)s ID ranges: %(range)s"
 msgstr ""
 
 #: neutron/plugins/ml2/drivers/type_tunnel.py:70
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:429
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:421
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
@@ -9628,65 +9466,65 @@ msgstr ""
 msgid "Sending update port message"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:116
+#: neutron/plugins/mlnx/mlnx_plugin.py:117
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:153
+#: neutron/plugins/mlnx/mlnx_plugin.py:154
 #, python-format
 msgid "Invalid physical network type %(type)s.Server terminated!"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:160
+#: neutron/plugins/mlnx/mlnx_plugin.py:161
 #, python-format
 msgid "Parsing physical_network_type failed: %s. Server terminated!"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:165
+#: neutron/plugins/mlnx/mlnx_plugin.py:166
 #, python-format
 msgid ""
 "Invalid physical network type %(type)s  for network %(net)s. Server "
 "terminated!"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:169
+#: neutron/plugins/mlnx/mlnx_plugin.py:170
 #, python-format
 msgid "Physical Network type mappings: %s"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:177
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:356
+#: neutron/plugins/mlnx/mlnx_plugin.py:178
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:348
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:315
+#: neutron/plugins/mlnx/mlnx_plugin.py:316
 #, python-format
 msgid "Unsupported vnic type %(vnic_type)s for physical network type %(net_type)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:319
+#: neutron/plugins/mlnx/mlnx_plugin.py:320
 msgid "Invalid vnic_type on port_create"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:321
+#: neutron/plugins/mlnx/mlnx_plugin.py:322
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:365
+#: neutron/plugins/mlnx/mlnx_plugin.py:366
 msgid "Update network"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:378
+#: neutron/plugins/mlnx/mlnx_plugin.py:379
 msgid "Delete network"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:426
+#: neutron/plugins/mlnx/mlnx_plugin.py:427
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: neutron/plugins/mlnx/rpc_callbacks.py:121
+#: neutron/plugins/mlnx/rpc_callbacks.py:111
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
@@ -9739,71 +9577,76 @@ msgstr ""
 msgid "Delete network %s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:302
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:209
+#, python-format
+msgid "RPC timeout while updating port %s"
+msgstr ""
+
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:291
 msgid "Ports added!"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:305
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 msgid "Ports removed!"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:330
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:319
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:337
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:326
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:343
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:332
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:344
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:333
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:357
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 #, python-format
 msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:353
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:372
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:361
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:387
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:376
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 msgid "Agent loop process devices!"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:405
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 msgid ""
 "Request timeout in agent event loop eSwitchD is not responding - "
 "exiting..."
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:438
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:427
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:443
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:432
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
@@ -10047,26 +9890,26 @@ msgid ""
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:736
+#: neutron/plugins/nec/nec_plugin.py:728
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:746
+#: neutron/plugins/nec/nec_plugin.py:738
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:766
+#: neutron/plugins/nec/nec_plugin.py:758
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:771
+#: neutron/plugins/nec/nec_plugin.py:763
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -10596,22 +10439,22 @@ msgstr ""
 msgid "Router %s does not hold net-partition assoc on VSD. extra-route failed"
 msgstr ""
 
-#: neutron/plugins/nuage/plugin.py:828
+#: neutron/plugins/nuage/plugin.py:837
 #, python-format
 msgid "One or more router still attached to net_partition %s."
 msgstr ""
 
-#: neutron/plugins/nuage/plugin.py:833
+#: neutron/plugins/nuage/plugin.py:842
 #, python-format
 msgid "NetPartition with %s does not exist"
 msgstr ""
 
-#: neutron/plugins/nuage/plugin.py:879
+#: neutron/plugins/nuage/plugin.py:888
 #, python-format
 msgid "router %s is not associated with any net-partition"
 msgstr ""
 
-#: neutron/plugins/nuage/plugin.py:894
+#: neutron/plugins/nuage/plugin.py:903
 msgid "Floating IP can not be associated to VM in different router context"
 msgstr ""
 
@@ -10669,7 +10512,7 @@ msgid "Agent failed to create agent config map"
 msgstr ""
 
 #: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:272
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1272
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1258
 #, python-format
 msgid "Unable to create tunnel port. Invalid remote IP: %s"
 msgstr ""
@@ -10685,9 +10528,9 @@ msgid "network_delete received network %s"
 msgstr ""
 
 #: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:317
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:552
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:544
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:607
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
@@ -10713,288 +10556,288 @@ msgstr ""
 msgid "tunnel_type %s not supported by agent"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:467
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:523
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:459
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:515
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:470
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:531
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:462
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:523
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:482
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:553
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:474
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:545
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:490
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:572
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:482
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:564
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:500
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:592
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:492
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:584
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:509
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:601
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:501
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:593
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:555
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:618
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:547
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:610
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:589
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:658
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:650
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:640
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:632
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:696
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:714
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:706
 #, python-format
 msgid "ancillary bridge list: %s."
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:804
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:792
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:796
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:778
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:888
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:905
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:880
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:891
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:894
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:911
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:886
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:897
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:962
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1000
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:954
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:986
 #, python-format
 msgid "Port '%(port_name)s' has lost its vlan tag '%(vlan_tag)d'!"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:991
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1029
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:983
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1015
 #, python-format
 msgid "VIF port: %s has no ofport configured, and might not be able to transmit"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:999
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1039
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:991
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1025
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1012
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1052
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1004
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1038
 #: neutron/tests/unit/ofagent/test_ofa_neutron_agent.py:683
-#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:765
+#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:763
 msgid "ofport should have a value that can be interpreted as an integer"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1015
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1055
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1007
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1041
 #: neutron/tests/unit/ofagent/test_ofa_neutron_agent.py:666
 #: neutron/tests/unit/ofagent/test_ofa_neutron_agent.py:686
-#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:748
-#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:768
-#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:785
+#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:746
+#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:766
+#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:783
 #, python-format
 msgid "Failed to set-up %(type)s tunnel port to %(ip)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1063
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1098
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1055
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1084
 #, python-format
 msgid "Processing port %s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1069
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1104
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1061
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1090
 #, python-format
 msgid ""
 "Port %s was not found on the integration bridge and will therefore not be"
 " processed"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1094
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1131
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1086
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1117
 #, python-format
 msgid "Setting status for %s to UP"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1098
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1135
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1090
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1121
 #, python-format
 msgid "Setting status for %s to DOWN"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1101
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1138
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1093
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1124
 #, python-format
 msgid "Configuration for device %s completed."
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1111
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1148
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1103
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1134
 #, python-format
 msgid "Ancillary Port %s added"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1186
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1178
 #, python-format
 msgid ""
 "process_network_ports - iteration:%(iter_num)d - "
 "treat_devices_added_or_updated completed in %(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1194
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1186
 #, python-format
 msgid ""
 "process_network_ports - iteration:%(iter_num)d - treat_devices_removed "
 "completed in %(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1207
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1250
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1199
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1236
 #, python-format
 msgid ""
 "process_ancillary_network_ports - iteration: %(iter_num)d - "
 "treat_ancillary_devices_added completed in %(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1216
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1259
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1208
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1245
 #, python-format
 msgid ""
 "process_ancillary_network_ports - iteration: %(iter_num)d - "
 "treat_ancillary_devices_removed completed in %(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1243
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1301
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1235
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1287
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1271
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1263
 #, python-format
 msgid "Agent ovsdb_monitor_loop - iteration:%d started"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1282
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1348
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1274
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1334
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1286
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1352
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1278
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1338
 msgid "Error while synchronizing tunnels"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1290
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1282
 #, python-format
 msgid ""
 "Agent ovsdb_monitor_loop - iteration:%(iter_num)d - starting polling. "
 "Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1303
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1295
 #, python-format
 msgid ""
 "Agent ovsdb_monitor_loop - iteration:%(iter_num)d - port information "
 "retrieved. Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1313
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1385
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1305
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1371
 #, python-format
 msgid "Starting to process devices in:%s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1317
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1309
 #, python-format
 msgid ""
 "Agent ovsdb_monitor_loop - iteration:%(iter_num)d - ports processed. "
 "Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1332
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1324
 #, python-format
 msgid ""
 "Agent ovsdb_monitor_loop - iteration:%(iter_num)d - ancillary port info "
 "retrieved. Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1342
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1334
 #, python-format
 msgid ""
 "Agent ovsdb_monitor_loop - iteration:%(iter_num)d - ancillary ports "
 "processed. Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1357
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1427
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1349
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1413
 msgid "Error while processing VIF ports"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1364
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1356
 #, python-format
 msgid ""
 "Agent ovsdb_monitor_loop - iteration:%(iter_num)d completed. Processed "
 "ports statistics:%(port_stats)s. Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1397
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1471
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1389
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1457
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1420
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1412
 #, python-format
 msgid "Invalid tunnel type specificed: %s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1423
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1497
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1415
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1483
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
@@ -11002,20 +10845,20 @@ msgstr ""
 msgid "Number of seconds to retry acquiring an Open vSwitch datapath"
 msgstr ""
 
-#: neutron/plugins/oneconvergence/plugin.py:244
+#: neutron/plugins/oneconvergence/plugin.py:240
 msgid "Failed to create subnet, deleting it from neutron"
 msgstr ""
 
-#: neutron/plugins/oneconvergence/plugin.py:308
+#: neutron/plugins/oneconvergence/plugin.py:304
 #, python-format
 msgid "Deleting newly created neutron port %s"
 msgstr ""
 
-#: neutron/plugins/oneconvergence/plugin.py:378
+#: neutron/plugins/oneconvergence/plugin.py:374
 msgid "Failed to create floatingip"
 msgstr ""
 
-#: neutron/plugins/oneconvergence/plugin.py:417
+#: neutron/plugins/oneconvergence/plugin.py:413
 msgid "Failed to create router"
 msgstr ""
 
@@ -11320,27 +11163,27 @@ msgstr ""
 msgid "Unable to generate a new tunnel id"
 msgstr ""
 
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:304
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:296
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:321
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:313
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:359
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:371
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:426
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:418
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
@@ -11359,80 +11202,80 @@ msgstr ""
 msgid "Action %s not supported"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:771
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:757
 #, python-format
 msgid "Adding %s to list of bridges."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:885
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:871
 #, python-format
 msgid ""
 "Creating an interface named %(name)s exceeds the %(limit)d character "
 "limitation. It was shortened to %(new_name)s to fit."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1229
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1215
 #, python-format
 msgid ""
 "process_network_ports - iteration:%(iter_num)d "
 "-treat_devices_added_or_updated completed in %(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1237
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1223
 #, python-format
 msgid ""
 "process_network_ports - iteration:%(iter_num)d -treat_devices_removed "
 "completed in %(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1338
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1324
 #, python-format
 msgid "Agent rpc_loop - iteration:%d started"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1362
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1348
 #, python-format
 msgid ""
 "Agent rpc_loop - iteration:%(iter_num)d - starting polling. "
 "Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1375
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1361
 #, python-format
 msgid ""
 "Agent rpc_loop - iteration:%(iter_num)d - port information retrieved. "
 "Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1376
 #, python-format
 msgid ""
 "Agent rpc_loop - iteration:%(iter_num)d -ports processed. "
 "Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1404
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1390
 #, python-format
 msgid ""
 "Agent rpc_loop - iteration:%(iter_num)d -ancillary port info retrieved. "
 "Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1413
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1399
 #, python-format
 msgid ""
 "Agent rpc_loop - iteration:%(iter_num)d - ancillary ports processed. "
 "Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1434
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1420
 #, python-format
 msgid ""
 "Agent rpc_loop - iteration:%(iter_num)d completed. Processed ports "
 "statistics: %(port_stats)s. Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1494
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1480
 #, python-format
 msgid "Invalid tunnel type specified: %s"
 msgstr ""
@@ -11708,12 +11551,12 @@ msgid ""
 "yet."
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:64
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:128
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:125
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -11731,36 +11574,36 @@ msgstr ""
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:220
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:217
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:221
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:218
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:297
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:294
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:301
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:298
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:307
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:304
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:310
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:307
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
@@ -11830,21 +11673,21 @@ msgstr ""
 msgid "Error '%(err)s' when connecting to controller(s): %(ctl)s."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcpmeta_modes.py:54
+#: neutron/plugins/vmware/dhcpmeta_modes.py:55
 #, python-format
 msgid "Invalid agent_mode: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcpmeta_modes.py:104
+#: neutron/plugins/vmware/dhcpmeta_modes.py:106
 msgid "network_auto_schedule has been disabled"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcpmeta_modes.py:125
+#: neutron/plugins/vmware/dhcpmeta_modes.py:127
 #, python-format
 msgid "Unable to run Neutron with config option '%s', as NSX does not support it"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcpmeta_modes.py:128
+#: neutron/plugins/vmware/dhcpmeta_modes.py:130
 #, python-format
 msgid "Unmet dependency for config option '%s'"
 msgstr ""
@@ -12922,29 +12765,29 @@ msgstr ""
 msgid "Metadata for router %s handled successfully"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/rpc.py:86
+#: neutron/plugins/vmware/dhcp_meta/rpc.py:77
 #, python-format
 msgid "Subnet %s does not have a gateway, the metadata route will not be created"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/rpc.py:110
+#: neutron/plugins/vmware/dhcp_meta/rpc.py:101
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/rpc.py:113
+#: neutron/plugins/vmware/dhcp_meta/rpc.py:104
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/rpc.py:133
+#: neutron/plugins/vmware/dhcp_meta/rpc.py:124
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/rpc.py:141
+#: neutron/plugins/vmware/dhcp_meta/rpc.py:132
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
@@ -13018,17 +12861,17 @@ msgstr ""
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/__init__.py:78
+#: neutron/plugins/vmware/nsxlib/__init__.py:77
 #, python-format
 msgid "Error. %(type)s exception: %(exc)s."
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/__init__.py:82
+#: neutron/plugins/vmware/nsxlib/__init__.py:81
 #, python-format
 msgid "locals=[%s]"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/lsn.py:174
+#: neutron/plugins/vmware/nsxlib/lsn.py:173
 #, python-format
 msgid ""
 "Attempt to plug Logical Services Node %(lsn)s into network with port "
@@ -13091,81 +12934,81 @@ msgid ""
 "port:%s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/secgroup.py:95
+#: neutron/plugins/vmware/nsxlib/secgroup.py:94
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/secgroup.py:121
+#: neutron/plugins/vmware/nsxlib/secgroup.py:120
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/secgroup.py:141
+#: neutron/plugins/vmware/nsxlib/secgroup.py:140
 #, python-format
 msgid "Unable to find security profile %s on NSX backend"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:131
+#: neutron/plugins/vmware/nsxlib/switch.py:130
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:151
-#: neutron/plugins/vmware/nsxlib/switch.py:166
+#: neutron/plugins/vmware/nsxlib/switch.py:150
+#: neutron/plugins/vmware/nsxlib/switch.py:165
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:189
+#: neutron/plugins/vmware/nsxlib/switch.py:188
 msgid "Port or Network not found"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:248
+#: neutron/plugins/vmware/nsxlib/switch.py:247
 #, python-format
 msgid "Lswitch %s not found in NSX"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:257
+#: neutron/plugins/vmware/nsxlib/switch.py:256
 msgid "Unable to get ports"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:274
+#: neutron/plugins/vmware/nsxlib/switch.py:273
 #, python-format
 msgid ""
 "Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:282
+#: neutron/plugins/vmware/nsxlib/switch.py:281
 #, python-format
 msgid ""
 "Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:291
+#: neutron/plugins/vmware/nsxlib/switch.py:290
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:299
-#: neutron/plugins/vmware/nsxlib/switch.py:330
+#: neutron/plugins/vmware/nsxlib/switch.py:298
+#: neutron/plugins/vmware/nsxlib/switch.py:329
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:325
+#: neutron/plugins/vmware/nsxlib/switch.py:324
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:360
+#: neutron/plugins/vmware/nsxlib/switch.py:359
 #, python-format
 msgid "Created logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:372
+#: neutron/plugins/vmware/nsxlib/switch.py:371
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
@@ -14568,37 +14411,37 @@ msgstr ""
 msgid "Default provider is not specified for service type %s"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:48
+#: neutron/services/firewall/fwaas_plugin.py:45
 msgid "set_firewall_status() called"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:56
+#: neutron/services/firewall/fwaas_plugin.py:53
 #, python-format
 msgid "Firewall %(fw_id)s in PENDING_DELETE state, not changing to %(status)s"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:71
+#: neutron/services/firewall/fwaas_plugin.py:68
 msgid "firewall_deleted() called"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:79
+#: neutron/services/firewall/fwaas_plugin.py:76
 #, python-format
 msgid "Firewall %(fw)s unexpectedly deleted by agent, status was %(status)s"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:87
+#: neutron/services/firewall/fwaas_plugin.py:84
 msgid "get_firewalls_for_tenant() called"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:96
+#: neutron/services/firewall/fwaas_plugin.py:93
 msgid "get_firewalls_for_tenant_without_rules() called"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:102
+#: neutron/services/firewall/fwaas_plugin.py:99
 msgid "get_tenants_with_firewalls() called"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:150
+#: neutron/services/firewall/fwaas_plugin.py:147
 #, python-format
 msgid ""
 "Exceeded allowed count of firewalls for tenant %(tenant_id)s. Only one "
@@ -15017,30 +14860,30 @@ msgstr ""
 msgid "Device driver for agent should be specified in plugin driver."
 msgstr ""
 
-#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:77
+#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:74
 #, python-format
 msgid "Multiple lbaas agents found on host %s"
 msgstr ""
 
-#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:157
+#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:154
 #, python-format
 msgid "Unknown object type: %s"
 msgstr ""
 
-#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:168
+#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:165
 #, python-format
 msgid ""
 "Cannot update status: %(obj_type)s %(obj_id)s not found in the DB, it was"
 " probably deleted concurrently"
 msgstr ""
 
-#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:191
+#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:188
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:215
-#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:232
+#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:212
+#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:229
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
@@ -15786,173 +15629,173 @@ msgstr ""
 msgid "Found CSR for router %(router)s: %(info)s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:215
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:213
 #, python-format
 msgid "Loaded %(num)d Cisco CSR configuration%(plural)s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:219
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:217
 #, python-format
 msgid "No Cisco CSR configurations found in: %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:233
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:228
 #, python-format
 msgid "Handling VPN service update notification '%s'"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:255
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:250
 #, python-format
 msgid "Update: Existing connection %s changed"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:262
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:257
 #, python-format
 msgid "Update: Connection %s no longer admin down"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:268
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:263
 #, python-format
 msgid "Update: Connection %s forced to admin down"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:276
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:271
 #, python-format
 msgid "Update: Created new connection %s in admin down state"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:281
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:276
 #, python-format
 msgid "Update: Created new connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:293
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:288
 #, python-format
 msgid ""
 "Update: Skipping VPN service %(service)s as it's router (%(csr_id)s is "
 "not associated with a Cisco CSR"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:299
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:294
 #, python-format
 msgid "Update: Existing VPN service %s detected"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:303
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:298
 #, python-format
 msgid "Update: New VPN service %s detected"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:312
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:307
 msgid "Update: Completed update processing"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:342
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:337
 #, python-format
 msgid "Mark: %(service)d VPN services and %(conn)d IPSec connections marked dirty"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:364
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:359
 #, python-format
 msgid ""
 "Sweep: Removed %(service)d dirty VPN service%(splural)s and %(conn)d "
 "dirty IPSec connection%(cplural)s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:379
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:374
 #, python-format
 msgid "Report: Collecting status for IPSec connections on VPN service %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:385
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:380
 #, python-format
 msgid "Connection %s forced down"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:389
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:384
 #, python-format
 msgid "Connection %(conn)s reported %(status)s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:394
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:389
 #, python-format
 msgid "Report: Adding info for IPSec connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:414
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:409
 #, python-format
 msgid "Report: Adding info for VPN service %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:436
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:431
 msgid "Report: Starting status report processing"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:438
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:433
 #, python-format
 msgid "Report: Collecting status for VPN service %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:444
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:439
 msgid "Sending status report update to plugin"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:446
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:441
 msgid "Report: Completed status report processing"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:741
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:736
 #, python-format
 msgid "Unable to create %(resource)s %(which)s: %(status)d"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:754
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:782
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:749
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:777
 #, python-format
 msgid "Internal error - '%s' is not defined"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:767
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:762
 #, python-format
 msgid "Unable to delete %(resource)s %(which)s: %(status)d"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:776
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:771
 #, python-format
 msgid "Performing rollback action %(action)s for resource %(resource)s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:802
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:797
 #, python-format
 msgid "Creating IPSec connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:835
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:830
 #, python-format
 msgid "FAILED: Create of IPSec site-to-site connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:838
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:833
 #, python-format
 msgid "SUCCESS: Created IPSec site-to-site connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:847
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:842
 #, python-format
 msgid "Deleting IPSec connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:849
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:844
 #, python-format
 msgid "Unable to find connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:853
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:848
 #, python-format
 msgid "SUCCESS: Deleted IPSec site-to-site connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:861
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:856
 #, python-format
 msgid "Unable to change %(tunnel)s admin state to %(state)s"
 msgstr ""
@@ -16050,7 +15893,7 @@ msgid ""
 "'%(value)s'"
 msgstr ""
 
-#: neutron/services/vpn/service_drivers/cisco_ipsec.py:165
+#: neutron/services/vpn/service_drivers/cisco_ipsec.py:160
 #, python-format
 msgid "IPSec connection %s validated for Cisco CSR"
 msgstr ""
@@ -16060,24 +15903,24 @@ msgstr ""
 msgid "Unmapped error"
 msgstr ""
 
-#: neutron/tests/unit/bigswitch/fake_server.py:75
+#: neutron/tests/unit/bigswitch/fake_server.py:74
 #, python-format
 msgid ""
 "Request: action=%(action)s, uri=%(uri)r, body=%(body)s, "
 "headers=%(headers)s"
 msgstr ""
 
-#: neutron/tests/unit/bigswitch/fake_server.py:127
+#: neutron/tests/unit/bigswitch/fake_server.py:126
 #, python-format
 msgid "No floating IPs in requesturi=%(uri)s, body=%(body)s"
 msgstr ""
 
-#: neutron/tests/unit/bigswitch/fake_server.py:136
+#: neutron/tests/unit/bigswitch/fake_server.py:135
 #, python-format
 msgid "Expected floating IPs from multiple tenants.uri=%(uri)s, body=%(body)s"
 msgstr ""
 
-#: neutron/tests/unit/bigswitch/fake_server.py:181
+#: neutron/tests/unit/bigswitch/fake_server.py:180
 #, python-format
 msgid "No host cert for %(server)s in cert %(cert)s"
 msgstr ""
@@ -16261,26 +16104,26 @@ msgstr ""
 msgid "list_router_routes: routes=%s"
 msgstr ""
 
-#: neutron/tests/unit/nec/test_ofc_client.py:89
+#: neutron/tests/unit/nec/test_ofc_client.py:88
 msgid "The specified OFC resource (/somewhere) is not found."
 msgstr ""
 
-#: neutron/tests/unit/nec/test_ofc_client.py:93
-#: neutron/tests/unit/nec/test_ofc_client.py:99
-#: neutron/tests/unit/nec/test_ofc_client.py:108
+#: neutron/tests/unit/nec/test_ofc_client.py:92
+#: neutron/tests/unit/nec/test_ofc_client.py:98
+#: neutron/tests/unit/nec/test_ofc_client.py:107
 msgid "An OFC exception has occurred: Operation on OFC failed"
 msgstr ""
 
-#: neutron/tests/unit/nec/test_ofc_client.py:115
+#: neutron/tests/unit/nec/test_ofc_client.py:114
 msgid "An OFC exception has occurred: Failed to connect OFC : "
 msgstr ""
 
-#: neutron/tests/unit/vmware/apiclient/fake.py:407
+#: neutron/tests/unit/vmware/apiclient/fake.py:406
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: neutron/tests/unit/vmware/apiclient/fake.py:416
+#: neutron/tests/unit/vmware/apiclient/fake.py:415
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""

diff --git a/neutron/locale/neutron.pot b/neutron/locale/neutron.pot
index b70e4631410f44ffe693eff898b2f4e91d6e7f98..6255c19d3c21d849d2e10a3de9fa8e75cadef732 100644 (file)
--- a/neutron/locale/neutron.pot
+++ b/neutron/locale/neutron.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2014.2.dev102.gad67acf\n"
+"Project-Id-Version: neutron 2014.2.dev124.g431937c\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-06-20 06:08+0000\n"
+"POT-Creation-Date: 2014-06-21 06:08+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"
@@ -530,8 +530,8 @@ msgstr ""
 #: neutron/agent/dhcp_agent.py:588 neutron/agent/l3_agent.py:966
 #: neutron/agent/metadata/agent.py:369
 #: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:111
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:857
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:259
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:798
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:250
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:182
 #: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:265
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:240
@@ -758,7 +758,7 @@ msgid ""
 msgstr ""
 
 #: neutron/agent/ovs_cleanup_util.py:75
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:678
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:668
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:278
 #, python-format
 msgid "Delete %s"
@@ -1842,7 +1842,7 @@ msgid "'%s' is not a valid input"
 msgstr ""
 
 #: neutron/api/v2/attributes.py:357
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:559
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:551
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
@@ -2881,8 +2881,8 @@ msgid ""
 msgstr ""
 
 #: neutron/db/l3_db.py:416 neutron/db/l3_db.py:542
-#: neutron/plugins/bigswitch/plugin.py:992
-#: neutron/plugins/bigswitch/plugin.py:1001
+#: neutron/plugins/bigswitch/plugin.py:989
+#: neutron/plugins/bigswitch/plugin.py:998
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
@@ -3010,97 +3010,97 @@ msgid ""
 "sort '%(resource)s'"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:234
+#: neutron/db/firewall/firewall_db.py:241
 #: neutron/plugins/vmware/plugins/service.py:915
-#: neutron/services/firewall/fwaas_plugin.py:234
+#: neutron/services/firewall/fwaas_plugin.py:229
 msgid "create_firewall() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:250
+#: neutron/db/firewall/firewall_db.py:257
 #: neutron/plugins/vmware/plugins/service.py:942
-#: neutron/services/firewall/fwaas_plugin.py:249
+#: neutron/services/firewall/fwaas_plugin.py:244
 msgid "update_firewall() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:260
+#: neutron/db/firewall/firewall_db.py:267
 #: neutron/plugins/vmware/plugins/service.py:968
-#: neutron/services/firewall/fwaas_plugin.py:264
+#: neutron/services/firewall/fwaas_plugin.py:259
 msgid "delete_firewall() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:270
+#: neutron/db/firewall/firewall_db.py:277
 msgid "get_firewall() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:275
+#: neutron/db/firewall/firewall_db.py:282
 msgid "get_firewalls() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:281
+#: neutron/db/firewall/firewall_db.py:288
 msgid "get_firewalls_count() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:286
+#: neutron/db/firewall/firewall_db.py:293
 msgid "create_firewall_policy() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:302
+#: neutron/db/firewall/firewall_db.py:309
 #: neutron/plugins/vmware/plugins/service.py:1030
-#: neutron/services/firewall/fwaas_plugin.py:273
+#: neutron/services/firewall/fwaas_plugin.py:268
 msgid "update_firewall_policy() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:314
+#: neutron/db/firewall/firewall_db.py:321
 msgid "delete_firewall_policy() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:326
+#: neutron/db/firewall/firewall_db.py:333
 msgid "get_firewall_policy() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:331
+#: neutron/db/firewall/firewall_db.py:338
 msgid "get_firewall_policies() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:337
+#: neutron/db/firewall/firewall_db.py:344
 msgid "get_firewall_policies_count() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:342
+#: neutron/db/firewall/firewall_db.py:349
 msgid "create_firewall_rule() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:370
+#: neutron/db/firewall/firewall_db.py:378
 #: neutron/plugins/vmware/plugins/service.py:1004
-#: neutron/services/firewall/fwaas_plugin.py:281
+#: neutron/services/firewall/fwaas_plugin.py:276
 msgid "update_firewall_rule() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:394
+#: neutron/db/firewall/firewall_db.py:402
 msgid "delete_firewall_rule() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:402
+#: neutron/db/firewall/firewall_db.py:410
 msgid "get_firewall_rule() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:407
+#: neutron/db/firewall/firewall_db.py:415
 msgid "get_firewall_rules() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:413
+#: neutron/db/firewall/firewall_db.py:421
 msgid "get_firewall_rules_count() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:422
+#: neutron/db/firewall/firewall_db.py:430
 #: neutron/plugins/vmware/plugins/service.py:1057
-#: neutron/services/firewall/fwaas_plugin.py:291
+#: neutron/services/firewall/fwaas_plugin.py:286
 msgid "insert_rule() called"
 msgstr ""
 
-#: neutron/db/firewall/firewall_db.py:462
+#: neutron/db/firewall/firewall_db.py:470
 #: neutron/plugins/vmware/plugins/service.py:1086
-#: neutron/services/firewall/fwaas_plugin.py:299
+#: neutron/services/firewall/fwaas_plugin.py:294
 msgid "remove_rule() called"
 msgstr ""
 
@@ -3117,7 +3117,7 @@ msgstr ""
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: neutron/db/metering/metering_rpc.py:49
+#: neutron/db/metering/metering_rpc.py:46
 #, python-format
 msgid "Unable to find agent %s."
 msgstr ""
@@ -3427,44 +3427,49 @@ msgstr ""
 
 #: neutron/extensions/firewall.py:82
 #, python-format
+msgid "%(param)s are not allowed when protocol is set to ICMP."
+msgstr ""
+
+#: neutron/extensions/firewall.py:87
+#, python-format
 msgid "Invalid value for port %(port)s."
 msgstr ""
 
-#: neutron/extensions/firewall.py:86
+#: neutron/extensions/firewall.py:91
 msgid "Missing rule info argument for insert/remove rule operation."
 msgstr ""
 
-#: neutron/extensions/firewall.py:96
+#: neutron/extensions/firewall.py:101
 #, python-format
 msgid "%(driver)s: Internal driver error."
 msgstr ""
 
-#: neutron/extensions/firewall.py:145
+#: neutron/extensions/firewall.py:150
 #, python-format
 msgid "Port '%s' is not a valid number"
 msgstr ""
 
-#: neutron/extensions/firewall.py:149
+#: neutron/extensions/firewall.py:154
 #, python-format
 msgid "Invalid port '%s'"
 msgstr ""
 
-#: neutron/extensions/firewall.py:163
+#: neutron/extensions/firewall.py:168
 #, python-format
 msgid "%(msg_ip)s and %(msg_subnet)s"
 msgstr ""
 
-#: neutron/extensions/firewall.py:284
+#: neutron/extensions/firewall.py:289
 msgid "Number of firewalls allowed per tenant. A negative value means unlimited."
 msgstr ""
 
-#: neutron/extensions/firewall.py:288
+#: neutron/extensions/firewall.py:293
 msgid ""
 "Number of firewall policies allowed per tenant. A negative value means "
 "unlimited."
 msgstr ""
 
-#: neutron/extensions/firewall.py:292
+#: neutron/extensions/firewall.py:297
 msgid ""
 "Number of firewall rules allowed per tenant. A negative value means "
 "unlimited."
@@ -3726,7 +3731,7 @@ msgid "Port does not have port security binding."
 msgstr ""
 
 #: neutron/extensions/providernet.py:54
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:297
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:289
 msgid "Plugin does not support updating provider attributes"
 msgstr ""
 
@@ -4238,171 +4243,6 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: neutron/openstack/common/notifier/api.py:125
-#, python-format
-msgid "%s not in valid priorities"
-msgstr ""
-
-#: neutron/openstack/common/notifier/api.py:141
-#, python-format
-msgid ""
-"Problem '%(e)s' attempting to send to notification system. "
-"Payload=%(payload)s"
-msgstr ""
-
-#: neutron/openstack/common/notifier/api.py:171
-#, python-format
-msgid "Failed to load notifier %s. These notifications will not be sent."
-msgstr ""
-
-#: neutron/openstack/common/notifier/rabbit_notifier.py:27
-msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
-msgstr ""
-
-#: neutron/openstack/common/notifier/rpc_notifier.py:45
-#: neutron/openstack/common/notifier/rpc_notifier2.py:51
-#, python-format
-msgid "Could not send notification to %(topic)s. Payload=%(message)s"
-msgstr ""
-
-#: neutron/openstack/common/rpc/amqp.py:202
-#, python-format
-msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
-msgstr ""
-
-#: neutron/openstack/common/rpc/amqp.py:205
-#, python-format
-msgid "_call_waiters: %s"
-msgstr ""
-
-#: neutron/openstack/common/rpc/amqp.py:212
-#, python-format
-msgid ""
-"Number of call waiters is greater than warning threshold: %d. There could"
-" be a MulticallProxyWaiter leak."
-msgstr ""
-
-#: neutron/openstack/common/rpc/amqp.py:443
-#, python-format
-msgid "no method for message: %s"
-msgstr ""
-
-#: neutron/openstack/common/rpc/amqp.py:444
-#, python-format
-msgid "No method for message: %s"
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:76
-msgid "An unknown RPC related exception occurred."
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:106
-#, python-format
-msgid ""
-"Remote error: %(exc_type)s %(value)s\n"
-"%(traceback)s."
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:123
-#, python-format
-msgid ""
-"Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
-" \"%(method)s\" info: \"%(info)s\""
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:140
-#: neutron/openstack/common/rpc/common.py:141
-#: neutron/openstack/common/rpc/common.py:142
-msgid "<unknown>"
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:146
-#, python-format
-msgid "Found duplicate message(%(msg_id)s). Skipping it."
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:150
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:154
-#, python-format
-msgid "Specified RPC version, %(version)s, not supported by this endpoint."
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:159
-#, python-format
-msgid ""
-"Specified RPC envelope version, %(version)s, not supported by this "
-"endpoint."
-msgstr ""
-
-#: neutron/openstack/common/rpc/common.py:164
-#, python-format
-msgid "Specified RPC version cap, %(version_cap)s, is too low"
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_kombu.py:557
-#, python-format
-msgid ""
-"Unable to connect to AMQP server on %(hostname)s:%(port)d after "
-"%(max_retries)d tries: %(err_str)s"
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_qpid.py:87
-#, python-format
-msgid "Invalid value for qpid_topology_version: %d"
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:146
-msgid "Could not open socket."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:200
-msgid "You cannot recv on this socket."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:205
-msgid "You cannot send on this socket."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:444
-msgid "Topic contained dangerous characters."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:692
-msgid "Unsupported or unknown ZMQ envelope returned."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:699
-msgid "RPC Message Invalid."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:729
-msgid "No matchmaker results. Not casting."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:732
-msgid "No match from matchmaker."
-msgstr ""
-
-#: neutron/openstack/common/rpc/impl_zmq.py:814
-#, python-format
-msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
-msgstr ""
-
-#: neutron/openstack/common/rpc/matchmaker.py:46
-msgid "Match not found by MatchMaker."
-msgstr ""
-
-#: neutron/openstack/common/rpc/matchmaker.py:80
-msgid "Matchmaker does not implement registration or heartbeat."
-msgstr ""
-
-#: neutron/openstack/common/rpc/matchmaker.py:228
-msgid "Register before starting heartbeat."
-msgstr ""
-
 #: neutron/plugins/bigswitch/config.py:33
 msgid ""
 "A comma separated list of Big Switch or Floodlight servers and port "
@@ -4524,140 +4364,140 @@ msgstr ""
 msgid "Syntax error in server config file, aborting plugin"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:135 neutron/plugins/ml2/db.py:100
+#: neutron/plugins/bigswitch/plugin.py:132 neutron/plugins/ml2/db.py:100
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:241
+#: neutron/plugins/bigswitch/plugin.py:238
 #, python-format
 msgid "Unable to update remote topology: %s"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:325
+#: neutron/plugins/bigswitch/plugin.py:322
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:331
+#: neutron/plugins/bigswitch/plugin.py:328
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:356
+#: neutron/plugins/bigswitch/plugin.py:353
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs."
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:402
+#: neutron/plugins/bigswitch/plugin.py:399
 #: neutron/plugins/ml2/drivers/mech_bigswitch/driver.py:98
 msgid "Iconsistency with backend controller triggering full synchronization."
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:419
+#: neutron/plugins/bigswitch/plugin.py:416
 #, python-format
 msgid "NeutronRestProxyV2: Unable to create port: %s"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:470
+#: neutron/plugins/bigswitch/plugin.py:467
 #, python-format
 msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:497
+#: neutron/plugins/bigswitch/plugin.py:494
 msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:539
+#: neutron/plugins/bigswitch/plugin.py:536
 msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:581
+#: neutron/plugins/bigswitch/plugin.py:578
 msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:608
+#: neutron/plugins/bigswitch/plugin.py:605
 msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:645
+#: neutron/plugins/bigswitch/plugin.py:642
 msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:736
+#: neutron/plugins/bigswitch/plugin.py:733
 msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:795
+#: neutron/plugins/bigswitch/plugin.py:792
 msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:811
+#: neutron/plugins/bigswitch/plugin.py:808
 msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:827
+#: neutron/plugins/bigswitch/plugin.py:824
 msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:845
+#: neutron/plugins/bigswitch/plugin.py:842
 msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:883
+#: neutron/plugins/bigswitch/plugin.py:880
 msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:905
+#: neutron/plugins/bigswitch/plugin.py:902
 msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:927
+#: neutron/plugins/bigswitch/plugin.py:924
 msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:956
+#: neutron/plugins/bigswitch/plugin.py:953
 msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:984
+#: neutron/plugins/bigswitch/plugin.py:981
 msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1017
+#: neutron/plugins/bigswitch/plugin.py:1014
 msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1034
+#: neutron/plugins/bigswitch/plugin.py:1031
 #, python-format
 msgid "NeutronRestProxyV2: Unable to create remote floating IP: %s"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1040
+#: neutron/plugins/bigswitch/plugin.py:1037
 msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1056
+#: neutron/plugins/bigswitch/plugin.py:1053
 msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1071
+#: neutron/plugins/bigswitch/plugin.py:1068
 msgid "NeutronRestProxyV2: diassociate_floatingips() called"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1101
+#: neutron/plugins/bigswitch/plugin.py:1098
 msgid "NeutronRestProxyV2: too many external networks"
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1116
+#: neutron/plugins/bigswitch/plugin.py:1113
 msgid "Adding host route: "
 msgstr ""
 
-#: neutron/plugins/bigswitch/plugin.py:1117
+#: neutron/plugins/bigswitch/plugin.py:1114
 #, python-format
 msgid "Destination:%(dst)s nexthop:%(next)s"
 msgstr ""
@@ -4861,7 +4701,7 @@ msgid "Encountered an error checking controller health."
 msgstr ""
 
 #: neutron/plugins/bigswitch/agent/restproxy_agent.py:116
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:238
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:235
 msgid "Port update received"
 msgstr ""
 
@@ -4876,24 +4716,24 @@ msgid "Port %s found. Refreshing firewall."
 msgstr ""
 
 #: neutron/plugins/bigswitch/agent/restproxy_agent.py:151
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:271
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:268
 msgid "Agent loop has new device"
 msgstr ""
 
 #: neutron/plugins/bigswitch/agent/restproxy_agent.py:155
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:409
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:398
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:225
 #: neutron/plugins/oneconvergence/agent/nvsd_neutron_agent.py:159
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:275
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:272
 msgid "Error in agent event loop"
 msgstr ""
 
 #: neutron/plugins/bigswitch/agent/restproxy_agent.py:161
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:229
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1024
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1373
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1443
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:281
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:226
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:996
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1365
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1429
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:278
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
@@ -4977,52 +4817,52 @@ msgstr ""
 msgid "The network interface to use when creatinga port"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:132
-#: neutron/plugins/hyperv/rpc_callbacks.py:56
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:87
-#: neutron/plugins/mlnx/rpc_callbacks.py:73
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/hyperv/rpc_callbacks.py:47
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:79
+#: neutron/plugins/mlnx/rpc_callbacks.py:63
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:87
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:146
-#: neutron/plugins/brocade/NeutronPlugin.py:163
-#: neutron/plugins/hyperv/rpc_callbacks.py:72
-#: neutron/plugins/hyperv/rpc_callbacks.py:91
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:110
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:137
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:160
-#: neutron/plugins/mlnx/rpc_callbacks.py:95
-#: neutron/plugins/mlnx/rpc_callbacks.py:114
-#: neutron/plugins/mlnx/rpc_callbacks.py:129
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:163
+#: neutron/plugins/brocade/NeutronPlugin.py:138
+#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/hyperv/rpc_callbacks.py:63
+#: neutron/plugins/hyperv/rpc_callbacks.py:82
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:102
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:129
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:152
+#: neutron/plugins/mlnx/rpc_callbacks.py:85
+#: neutron/plugins/mlnx/rpc_callbacks.py:104
+#: neutron/plugins/mlnx/rpc_callbacks.py:119
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:132
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:155
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:298
-#: neutron/plugins/brocade/NeutronPlugin.py:342
-#: neutron/plugins/brocade/NeutronPlugin.py:395
-#: neutron/plugins/brocade/NeutronPlugin.py:425
+#: neutron/plugins/brocade/NeutronPlugin.py:290
+#: neutron/plugins/brocade/NeutronPlugin.py:334
+#: neutron/plugins/brocade/NeutronPlugin.py:387
+#: neutron/plugins/brocade/NeutronPlugin.py:417
 msgid "Brocade NOS driver error"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:299
+#: neutron/plugins/brocade/NeutronPlugin.py:291
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:302
-#: neutron/plugins/brocade/NeutronPlugin.py:343
-#: neutron/plugins/brocade/NeutronPlugin.py:396
-#: neutron/plugins/brocade/NeutronPlugin.py:427
+#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:335
+#: neutron/plugins/brocade/NeutronPlugin.py:388
+#: neutron/plugins/brocade/NeutronPlugin.py:419
 msgid "Brocade plugin raised exception, check logs"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:308
+#: neutron/plugins/brocade/NeutronPlugin.py:300
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -5772,311 +5612,311 @@ msgstr ""
 msgid "VSM: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:154
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:146
 msgid "_setup_vsm"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:173
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:165
 msgid "_populate_policy_profiles"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:200
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:192
 msgid "No policy profile populated from VSM"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:237
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:344
-#: neutron/plugins/mlnx/mlnx_plugin.py:218
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:406
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:229
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:219
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:398
 msgid "provider:network_type required"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:241
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:255
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:354
-#: neutron/plugins/mlnx/mlnx_plugin.py:248
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:416
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:435
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:233
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:247
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:249
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:427
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:244
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:236
 msgid "provider:segmentation_id out of range (1 through 4094)"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:249
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:241
 msgid "provider:physical_network specified for Overlay network"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:258
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:250
 msgid "provider:segmentation_id out of range (5000+)"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:262
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:376
-#: neutron/plugins/mlnx/mlnx_plugin.py:234
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:451
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:254
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:368
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:443
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:273
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:382
-#: neutron/plugins/mlnx/mlnx_plugin.py:274
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:457
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:265
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:374
+#: neutron/plugins/mlnx/mlnx_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:449
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:277
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:388
-#: neutron/plugins/mlnx/mlnx_plugin.py:280
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:463
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:269
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:380
+#: neutron/plugins/mlnx/mlnx_plugin.py:281
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:455
 msgid "provider:physical_network required"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:455
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:447
 #, python-format
 msgid "_populate_member_segments %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:494
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:486
 msgid "Invalid pairing supplied"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:499
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:491
 #, python-format
 msgid "Invalid UUID supplied in %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:500
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:492
 msgid "Invalid UUID supplied"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:529
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:521
 #, python-format
 msgid "Cannot add a trunk segment '%s' as a member of another trunk segment"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:534
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:526
 #, python-format
 msgid "Cannot add vlan segment '%s' as a member of a vxlan trunk segment"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:540
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:532
 #, python-format
 msgid "Network UUID '%s' belongs to a different physical network"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:545
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:537
 #, python-format
 msgid "Cannot add vxlan segment '%s' as a member of a vlan trunk segment"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:550
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:542
 #, python-format
 msgid "Vlan tag '%s' is out of range"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:553
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:545
 #, python-format
 msgid "Vlan tag '%s' is not an integer value"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:558
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:550
 #, python-format
 msgid "%s is not a valid uuid"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:605
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:608
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:597
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:600
 msgid "n1kv:profile_id does not exist"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:620
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:612
 msgid "_send_create_logical_network"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:643
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:635
 #, python-format
 msgid "_send_create_network_profile_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:653
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:645
 #, python-format
 msgid "_send_update_network_profile_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:663
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:655
 #, python-format
 msgid "_send_delete_network_profile_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:678
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:670
 #, python-format
 msgid "_send_create_network_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:710
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:702
 #, python-format
 msgid "_send_update_network_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:732
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:724
 #, python-format
 msgid "add_segments=%s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:733
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:725
 #, python-format
 msgid "del_segments=%s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:757
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:749
 #, python-format
 msgid "_send_delete_network_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:797
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:789
 #, python-format
 msgid "_send_create_subnet_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:807
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:799
 #, python-format
 msgid "_send_update_subnet_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:818
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:810
 #, python-format
 msgid "_send_delete_subnet_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:844
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:836
 #, python-format
 msgid "_send_create_port_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:861
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:853
 #, python-format
 msgid "_send_update_port_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:877
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:869
 #, python-format
 msgid "_send_delete_port_request: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:908
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:900
 #, python-format
 msgid "Create network: profile_id=%s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:916
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:908
 #, python-format
 msgid ""
 "Physical_network %(phy_net)s, seg_type %(net_type)s, seg_id %(seg_id)s, "
 "multicast_ip %(multicast_ip)s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:928
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:938
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:920
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:930
 #, python-format
 msgid "Seg list %s "
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:978
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:970
 #: neutron/plugins/hyperv/hyperv_neutron_plugin.py:254
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:205
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:198
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:232
-#: neutron/plugins/mlnx/mlnx_plugin.py:361
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:511
+#: neutron/plugins/mlnx/mlnx_plugin.py:362
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:503
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1036
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1028
 #, python-format
 msgid "Updated network: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1051
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1043
 #, python-format
 msgid "Cannot delete network '%s' that is member of a trunk segment"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1055
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1047
 #, python-format
 msgid "Cannot delete network '%s' that is a member of a multi-segment network"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1068
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1060
 #, python-format
 msgid "Deleted network: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1078
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1070
 #, python-format
 msgid "Get network: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1100
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1092
 msgid "Get networks"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1150
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1142
 #, python-format
 msgid "Create port: profile_id=%s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1196
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:312
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1188
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:305
 #, python-format
 msgid "Created port: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1207
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1199
 #, python-format
 msgid "Update port: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1254
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1246
 #, python-format
 msgid "Get port: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1274
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1266
 msgid "Get ports"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1290
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1282
 msgid "Create subnet"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1298
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1290
 #, python-format
 msgid "Created subnet: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1309
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1301
 msgid "Update subnet"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1324
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1316
 #, python-format
 msgid "Delete subnet: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1339
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1331
 #, python-format
 msgid "Get subnet: %s"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1359
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1351
 msgid "Get subnets"
 msgstr ""
 
-#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1444
+#: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:1436
 #, python-format
 msgid "Scheduling router %s"
 msgstr ""
@@ -6425,10 +6265,10 @@ msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
 #: neutron/plugins/hyperv/hyperv_neutron_plugin.py:203
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:305
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:297
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
-#: neutron/plugins/mlnx/mlnx_plugin.py:179
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:350
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
@@ -6438,10 +6278,10 @@ msgstr ""
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/rpc_callbacks.py:80
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:120
-#: neutron/plugins/mlnx/rpc_callbacks.py:102
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:122
+#: neutron/plugins/hyperv/rpc_callbacks.py:71
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:112
+#: neutron/plugins/mlnx/rpc_callbacks.py:92
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:114
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
@@ -6483,151 +6323,149 @@ msgid ""
 "succeedes."
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:156
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:153
 #, python-format
 msgid "Failed reporting state! %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:191
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:188
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:212
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:209
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:218
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:221
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:218
 msgid "port_delete received"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:226
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:682
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:223
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:173
 msgid "port_update received"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:251
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:131
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:264
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:258
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:276
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:270
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:284
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:297
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:291
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:304
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:116
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:319
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:313
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:317
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:336
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:330
 #, python-format
 msgid "Port metrics enabled for port: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:340
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:334
 #, python-format
 msgid "Port metrics raw enabling for port: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:365
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:359
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:211
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:325
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:314
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:370
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:364
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:378
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:372
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:385
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:379
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:411
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:405
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:419
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:413
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:444
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:998
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:393
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1275
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1341
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:438
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:965
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:382
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1267
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1327
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:452
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1010
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:446
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:459
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:453
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:467
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:416
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:461
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:405
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:480
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:272
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1048
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:474
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1020
 #: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:158
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1525
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1511
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
@@ -6859,285 +6697,285 @@ msgstr ""
 msgid "Fake SDNVE controller: get controller"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:159
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:152
 msgid "Set a new controller if needed."
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:165
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:158
 #, python-format
 msgid "Set the controller to a new controller: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:173
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:166
 #, python-format
 msgid "Original SDN-VE HTTP request: %(orig)s; New request: %(new)s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:183
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:176
 #, python-format
 msgid "Create network in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:192
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:185
 msgid "Create net failed: no SDN-VE tenant."
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:203
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:196
 #, python-format
 msgid "Create net failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:210
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:203
 #, python-format
 msgid "Update network in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:230
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:223
 #, python-format
 msgid "Update net failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:236
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:229
 #, python-format
 msgid "Delete network in progress: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:246
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:239
 #, python-format
 msgid "Delete net failed after deleting the network in DB: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:251
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:244
 #, python-format
 msgid "Get network in progress: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:257
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:250
 msgid "Get networks in progress"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:267
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:260
 #, python-format
 msgid "Create port in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:283
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:276
 msgid "Create port does not have tenant id info"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:289
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:282
 #, python-format
 msgid "Create port does not have tenant id info; obtained is: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:310
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:303
 #, python-format
 msgid "Create port failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:317
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:310
 #, python-format
 msgid "Update port in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:344
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:337
 #, python-format
 msgid "Update port failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:350
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:343
 #, python-format
 msgid "Delete port in progress: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:363
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:356
 #, python-format
 msgid "Delete port operation failed in SDN-VE after deleting the port from DB: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:372
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:365
 #, python-format
 msgid "Create subnet in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:384
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:377
 #, python-format
 msgid "Create subnet failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:386
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:379
 #, python-format
 msgid "Subnet created: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:392
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:385
 #, python-format
 msgid "Update subnet in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:417
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:410
 #, python-format
 msgid "Update subnet failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:423
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:416
 #, python-format
 msgid "Delete subnet in progress: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:428
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:421
 #, python-format
 msgid ""
 "Delete subnet operation failed in SDN-VE after deleting the subnet from "
 "DB: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:437
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:430
 #, python-format
 msgid "Create router in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:440
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:433
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:450
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:443
 msgid "Create router failed: no SDN-VE tenant."
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:458
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:451
 #, python-format
 msgid "Create router failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:460
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:453
 #, python-format
 msgid "Router created: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:465
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:458
 #, python-format
 msgid "Update router in progress: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:472
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:465
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:496
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:489
 #, python-format
 msgid "Update router failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:502
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:495
 #, python-format
 msgid "Delete router in progress: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:509
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:502
 #, python-format
 msgid ""
 "Delete router operation failed in SDN-VE after deleting the router in DB:"
 " %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:514
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:507
 #, python-format
 msgid ""
 "Add router interface in progress: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:522
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:515
 #, python-format
 msgid "SdnvePluginV2.add_router_interface called. Port info: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:536
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:529
 #, python-format
 msgid "Update router-add-interface failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:539
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:532
 #, python-format
 msgid "Added router interface: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:543
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:536
 #, python-format
 msgid ""
 "Add router interface only called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:553
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:546
 msgid ""
 "SdnvePluginV2._add_router_interface_only: failed to add the interface in "
 "the roll back. of a remove_router_interface operation"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:559
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:552
 #, python-format
 msgid ""
 "Remove router interface in progress: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:568
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:561
 msgid "No port ID"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:570
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:563
 #, python-format
 msgid "SdnvePluginV2.remove_router_interface port: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:574
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:567
 msgid "No fixed IP"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:579
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:572
 #, python-format
 msgid "SdnvePluginV2.remove_router_interface subnet_id: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:602
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:595
 #, python-format
 msgid "Update router-remove-interface failed SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:623
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:616
 #, python-format
 msgid "Create floatingip in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:634
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:627
 #, python-format
 msgid "Creating floating ip operation failed in SDN-VE controller: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:637
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:630
 #, python-format
 msgid "Created floatingip : %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:642
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:635
 #, python-format
 msgid "Update floatingip in progress: %r"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:662
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:655
 #, python-format
 msgid "Update floating ip failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:668
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:661
 #, python-format
 msgid "Delete floatingip in progress: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/sdnve_neutron_plugin.py:673
+#: neutron/plugins/ibm/sdnve_neutron_plugin.py:666
 #, python-format
 msgid "Delete floatingip failed in SDN-VE: %s"
 msgstr ""
@@ -7155,29 +6993,29 @@ msgstr ""
 msgid "info_update received. New controlleris set to be out of band"
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:198
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:195
 #, python-format
 msgid "Mapping physical network %(physical_network)s to interface %(interface)s"
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:204
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:201
 #, python-format
 msgid ""
 "Interface %(interface)s for physical network %(physical_network)s does "
 "not exist. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:222
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:219
 msgid "Agent in the rpc loop."
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:244
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:241
 #, python-format
 msgid "Controller IPs: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:266
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1512
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:263
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1498
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
@@ -7271,58 +7109,58 @@ msgstr ""
 msgid "The input does not contain nececessary info: %(msg)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:152
-#: neutron/plugins/ml2/rpc.py:179 neutron/plugins/ml2/rpc.py:201
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:130
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:155
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:120
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:144
+#: neutron/plugins/ml2/rpc.py:170 neutron/plugins/ml2/rpc.py:192
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:122
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:147
 #, python-format
 msgid "Device %(device)s not bound to the agent host %(host)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:146
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:149
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:138
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:141
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:266
-#: neutron/plugins/mlnx/mlnx_plugin.py:199
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:258
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:277
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:269
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:303
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:295
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:348
-#: neutron/plugins/mlnx/mlnx_plugin.py:243
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:410
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:244
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:357
-#: neutron/plugins/mlnx/mlnx_plugin.py:251
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:419
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:349
+#: neutron/plugins/mlnx/mlnx_plugin.py:252
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:411
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:364
-#: neutron/plugins/mlnx/mlnx_plugin.py:259
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:439
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:356
+#: neutron/plugins/mlnx/mlnx_plugin.py:260
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:431
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:370
-#: neutron/plugins/mlnx/mlnx_plugin.py:263
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:445
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:362
+#: neutron/plugins/mlnx/mlnx_plugin.py:264
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:437
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
@@ -7471,158 +7309,158 @@ msgstr ""
 msgid "Done deleting vxlan interface %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:534
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:569
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:524
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:559
 #, python-format
 msgid ""
 "Option \"%(option)s\" must be supported by command \"%(command)s\" to "
 "enable %(mode)s mode"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:546
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:536
 msgid "No valid Segmentation ID to perform UCAST test."
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:563
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:553
 msgid ""
 "VXLAN muticast group must be provided in vxlan_group option to enable "
 "VXLAN MCAST mode"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:588
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:578
 msgid ""
 "Linux kernel vxlan module and iproute2 3.8 or above are required to "
 "enable VXLAN."
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:598
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:588
 #, python-format
 msgid "Using %s VXLAN mode"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:675
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:665
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:276
 msgid "network_delete received"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:732
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:209
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:679
 #, python-format
-msgid "RPC timeout while updating port %s"
+msgid "port_update RPC received for port: %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:735
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:682
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:317
 msgid "fdb_add received"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:757
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:704
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:345
 msgid "fdb_remove received"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:779
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:726
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:424
 msgid "update chg_ip received"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:804
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:751
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:447
 msgid "fdb_update received"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:867
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:808
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:871
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:812
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:254
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:144
 #: neutron/plugins/oneconvergence/agent/nvsd_neutron_agent.py:109
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:920
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:871
 #, python-format
-msgid "Port %s added"
+msgid "Treating added or updated device: %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:926
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1077
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1116
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1114
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1153
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:877
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1069
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1108
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1100
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1139
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:932
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1083
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1120
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:883
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1075
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1106
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:964
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:985
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:379
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1103
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1165
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1140
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1202
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:915
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:936
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:368
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1095
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1157
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1126
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1188
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:971
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1133
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1150
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1170
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1187
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:922
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1125
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1142
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1156
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1173
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:979
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1140
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1157
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1177
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1194
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:930
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1132
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1149
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1163
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1180
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:983
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:377
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1162
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1199
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:934
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:366
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1154
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1185
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:993
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:960
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1005
-msgid "Update devices failed"
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:978
+#, python-format
+msgid "Agent loop found changes! %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1016
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:984
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1038
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:430
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1010
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:419
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1041
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:433
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1013
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:422
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
@@ -8101,232 +7939,232 @@ msgstr ""
 msgid "There is no %(name)s with ID %(id)s in MidoNet."
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:195
+#: neutron/plugins/midonet/plugin.py:185
 #: neutron/plugins/ml2/drivers/mech_arista/exceptions.py:23
 #: neutron/plugins/ml2/drivers/mech_arista/exceptions.py:27
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:217
 msgid "provider_router_id should be configured in the plugin config file"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:397
+#: neutron/plugins/midonet/plugin.py:387
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:438
+#: neutron/plugins/midonet/plugin.py:428
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:457
+#: neutron/plugins/midonet/plugin.py:447
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:464
+#: neutron/plugins/midonet/plugin.py:454
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:479
+#: neutron/plugins/midonet/plugin.py:469
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:488
+#: neutron/plugins/midonet/plugin.py:478
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:497
+#: neutron/plugins/midonet/plugin.py:487
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:505
+#: neutron/plugins/midonet/plugin.py:495
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:510
+#: neutron/plugins/midonet/plugin.py:500
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:515
+#: neutron/plugins/midonet/plugin.py:505
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:523
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid "Failed to delete neutron db, while Midonet bridge=%r had been deleted"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:528
+#: neutron/plugins/midonet/plugin.py:518
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:589
+#: neutron/plugins/midonet/plugin.py:579
 #, python-format
 msgid "Failed to create a port on network %(net_id)s: %(err)s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:594
+#: neutron/plugins/midonet/plugin.py:584
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:599
+#: neutron/plugins/midonet/plugin.py:589
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:606
+#: neutron/plugins/midonet/plugin.py:596
 #, python-format
 msgid "There is no port with ID %(id)s in MidoNet."
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:610
+#: neutron/plugins/midonet/plugin.py:600
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:615
+#: neutron/plugins/midonet/plugin.py:605
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:624
+#: neutron/plugins/midonet/plugin.py:614
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:658
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid "Failed to delete DHCP mapping for port %(id)s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:733
+#: neutron/plugins/midonet/plugin.py:723
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%(router)s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:780
+#: neutron/plugins/midonet/plugin.py:770
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: router_data=%(router_data)s."
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:792
+#: neutron/plugins/midonet/plugin.py:782
 #, python-format
 msgid ""
 "MidonetPluginV2.set_router_gateway called: id=%(id)s, "
 "gw_router=%(gw_router)s, gw_ip=%(gw_ip)s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:836
+#: neutron/plugins/midonet/plugin.py:826
 #, python-format
 msgid "MidonetPluginV2.remove_router_gateway called: id=%(id)s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:856
+#: neutron/plugins/midonet/plugin.py:846
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:896
+#: neutron/plugins/midonet/plugin.py:886
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: router=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:907
+#: neutron/plugins/midonet/plugin.py:897
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1007
+#: neutron/plugins/midonet/plugin.py:997
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1031
+#: neutron/plugins/midonet/plugin.py:1021
 msgid ""
 "DHCP agent is not working correctly. No port to reach the Metadata server"
 " on this network"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1040
+#: neutron/plugins/midonet/plugin.py:1030
 #, python-format
 msgid ""
 "Failed to create MidoNet resources to add router interface. "
 "info=%(info)s, router_id=%(router_id)s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1047
+#: neutron/plugins/midonet/plugin.py:1037
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: info=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1087
+#: neutron/plugins/midonet/plugin.py:1077
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1106
+#: neutron/plugins/midonet/plugin.py:1096
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1128
+#: neutron/plugins/midonet/plugin.py:1118
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1157
+#: neutron/plugins/midonet/plugin.py:1147
 #, python-format
 msgid "Failed to create MidoNet resources for sg %(sg)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1164
+#: neutron/plugins/midonet/plugin.py:1154
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1170
+#: neutron/plugins/midonet/plugin.py:1160
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1202
+#: neutron/plugins/midonet/plugin.py:1192
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1212
+#: neutron/plugins/midonet/plugin.py:1202
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule=%r"
 msgstr ""
 
-#: neutron/plugins/midonet/plugin.py:1222
+#: neutron/plugins/midonet/plugin.py:1212
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sg_rule_id=%s"
 msgstr ""
@@ -8493,191 +8331,191 @@ msgstr ""
 msgid "Failed to bind port %(port)s on host %(host)s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:120
+#: neutron/plugins/ml2/plugin.py:121
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:151
+#: neutron/plugins/ml2/plugin.py:152
 msgid "network_type required"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:190
+#: neutron/plugins/ml2/plugin.py:191
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:253
+#: neutron/plugins/ml2/plugin.py:254
 msgid "binding:profile value too large"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:289
+#: neutron/plugins/ml2/plugin.py:290
 #, python-format
 msgid "Serialized vif_details DB value '%(value)s' for port %(port)s is invalid"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:300
+#: neutron/plugins/ml2/plugin.py:301
 #, python-format
 msgid "Serialized profile DB value '%(value)s' for port %(port)s is invalid"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:353
+#: neutron/plugins/ml2/plugin.py:354
 #, python-format
 msgid ""
 "In _notify_port_updated(), no bound segment for port %(port_id)s on "
 "network %(network_id)s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:395
+#: neutron/plugins/ml2/plugin.py:396
 #, python-format
 msgid "mechanism_manager.create_network_postcommit failed, deleting network '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:455
+#: neutron/plugins/ml2/plugin.py:456
 #, python-format
 msgid "Deleting network %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:467
+#: neutron/plugins/ml2/plugin.py:468
 #, python-format
 msgid "Ports to auto-delete: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:473 neutron/plugins/ml2/plugin.py:593
+#: neutron/plugins/ml2/plugin.py:474 neutron/plugins/ml2/plugin.py:594
 msgid "Tenant-owned ports exist"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:481
+#: neutron/plugins/ml2/plugin.py:482
 #, python-format
 msgid "Subnets to auto-delete: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:492
+#: neutron/plugins/ml2/plugin.py:493
 #, python-format
 msgid "Deleting network record %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:500 neutron/plugins/ml2/plugin.py:606
+#: neutron/plugins/ml2/plugin.py:501 neutron/plugins/ml2/plugin.py:607
 msgid "Committing transaction"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:506
+#: neutron/plugins/ml2/plugin.py:507
 msgid "A concurrent port creation has occurred"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:515
+#: neutron/plugins/ml2/plugin.py:516
 #, python-format
 msgid "Exception auto-deleting port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:523
+#: neutron/plugins/ml2/plugin.py:524
 #, python-format
 msgid "Exception auto-deleting subnet %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:532
+#: neutron/plugins/ml2/plugin.py:533
 msgid "mechanism_manager.delete_network_postcommit failed"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:546
+#: neutron/plugins/ml2/plugin.py:547
 #, python-format
 msgid "mechanism_manager.create_subnet_postcommit failed, deleting subnet '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:576
+#: neutron/plugins/ml2/plugin.py:577
 #, python-format
 msgid "Deleting subnet %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:587
+#: neutron/plugins/ml2/plugin.py:588
 #, python-format
 msgid "Ports to auto-deallocate: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:602
+#: neutron/plugins/ml2/plugin.py:603
 msgid "Deleting subnet record"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:622
+#: neutron/plugins/ml2/plugin.py:623
 #, python-format
 msgid "Exception deleting fixed_ip from port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:632
+#: neutron/plugins/ml2/plugin.py:633
 msgid "mechanism_manager.delete_subnet_postcommit failed"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:661
+#: neutron/plugins/ml2/plugin.py:662
 #, python-format
 msgid "mechanism_manager.create_port_postcommit failed, deleting port '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:717
+#: neutron/plugins/ml2/plugin.py:718
 #: neutron/tests/unit/ml2/test_ml2_plugin.py:131
 #, python-format
 msgid "Deleting port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:735
+#: neutron/plugins/ml2/plugin.py:736
 #: neutron/tests/unit/ml2/test_ml2_plugin.py:132
 #, python-format
 msgid "The port '%s' was deleted"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:744
+#: neutron/plugins/ml2/plugin.py:745
 msgid "Calling base delete_port"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:756
+#: neutron/plugins/ml2/plugin.py:757
 msgid "mechanism_manager.delete_port_postcommit failed"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:768
+#: neutron/plugins/ml2/plugin.py:769
 #, python-format
 msgid "Port %(port)s updated up by agent not found"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:97
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:106
+#: neutron/plugins/ml2/rpc.py:97
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:113
+#: neutron/plugins/ml2/rpc.py:104
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id)s with no segments"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:123
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s on network "
 "%(network_id)s not bound, vif_type: %(vif_type)s"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:134
+#: neutron/plugins/ml2/rpc.py:125
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s on network "
 "%(network_id)s invalid segment, vif_type: %(vif_type)s"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:158
+#: neutron/plugins/ml2/rpc.py:149
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:172
+#: neutron/plugins/ml2/rpc.py:163
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/ml2/rpc.py:196
+#: neutron/plugins/ml2/rpc.py:187
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
@@ -8961,7 +8799,7 @@ msgid "%(type)s ID ranges: %(range)s"
 msgstr ""
 
 #: neutron/plugins/ml2/drivers/type_tunnel.py:70
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:429
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:421
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
@@ -9627,65 +9465,65 @@ msgstr ""
 msgid "Sending update port message"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:116
+#: neutron/plugins/mlnx/mlnx_plugin.py:117
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:153
+#: neutron/plugins/mlnx/mlnx_plugin.py:154
 #, python-format
 msgid "Invalid physical network type %(type)s.Server terminated!"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:160
+#: neutron/plugins/mlnx/mlnx_plugin.py:161
 #, python-format
 msgid "Parsing physical_network_type failed: %s. Server terminated!"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:165
+#: neutron/plugins/mlnx/mlnx_plugin.py:166
 #, python-format
 msgid ""
 "Invalid physical network type %(type)s  for network %(net)s. Server "
 "terminated!"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:169
+#: neutron/plugins/mlnx/mlnx_plugin.py:170
 #, python-format
 msgid "Physical Network type mappings: %s"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:177
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:356
+#: neutron/plugins/mlnx/mlnx_plugin.py:178
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:348
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:315
+#: neutron/plugins/mlnx/mlnx_plugin.py:316
 #, python-format
 msgid "Unsupported vnic type %(vnic_type)s for physical network type %(net_type)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:319
+#: neutron/plugins/mlnx/mlnx_plugin.py:320
 msgid "Invalid vnic_type on port_create"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:321
+#: neutron/plugins/mlnx/mlnx_plugin.py:322
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:365
+#: neutron/plugins/mlnx/mlnx_plugin.py:366
 msgid "Update network"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:378
+#: neutron/plugins/mlnx/mlnx_plugin.py:379
 msgid "Delete network"
 msgstr ""
 
-#: neutron/plugins/mlnx/mlnx_plugin.py:426
+#: neutron/plugins/mlnx/mlnx_plugin.py:427
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: neutron/plugins/mlnx/rpc_callbacks.py:121
+#: neutron/plugins/mlnx/rpc_callbacks.py:111
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
@@ -9738,71 +9576,76 @@ msgstr ""
 msgid "Delete network %s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:302
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:209
+#, python-format
+msgid "RPC timeout while updating port %s"
+msgstr ""
+
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:291
 msgid "Ports added!"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:305
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 msgid "Ports removed!"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:330
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:319
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:337
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:326
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:343
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:332
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:344
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:333
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:357
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 #, python-format
 msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:353
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:372
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:361
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:387
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:376
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:400
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 msgid "Agent loop process devices!"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:405
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 msgid ""
 "Request timeout in agent event loop eSwitchD is not responding - "
 "exiting..."
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:438
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:427
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:443
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:432
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
@@ -10046,26 +9889,26 @@ msgid ""
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:736
+#: neutron/plugins/nec/nec_plugin.py:728
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:746
+#: neutron/plugins/nec/nec_plugin.py:738
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:766
+#: neutron/plugins/nec/nec_plugin.py:758
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:771
+#: neutron/plugins/nec/nec_plugin.py:763
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -10595,22 +10438,22 @@ msgstr ""
 msgid "Router %s does not hold net-partition assoc on VSD. extra-route failed"
 msgstr ""
 
-#: neutron/plugins/nuage/plugin.py:828
+#: neutron/plugins/nuage/plugin.py:837
 #, python-format
 msgid "One or more router still attached to net_partition %s."
 msgstr ""
 
-#: neutron/plugins/nuage/plugin.py:833
+#: neutron/plugins/nuage/plugin.py:842
 #, python-format
 msgid "NetPartition with %s does not exist"
 msgstr ""
 
-#: neutron/plugins/nuage/plugin.py:879
+#: neutron/plugins/nuage/plugin.py:888
 #, python-format
 msgid "router %s is not associated with any net-partition"
 msgstr ""
 
-#: neutron/plugins/nuage/plugin.py:894
+#: neutron/plugins/nuage/plugin.py:903
 msgid "Floating IP can not be associated to VM in different router context"
 msgstr ""
 
@@ -10668,7 +10511,7 @@ msgid "Agent failed to create agent config map"
 msgstr ""
 
 #: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:272
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1272
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1258
 #, python-format
 msgid "Unable to create tunnel port. Invalid remote IP: %s"
 msgstr ""
@@ -10684,9 +10527,9 @@ msgid "network_delete received network %s"
 msgstr ""
 
 #: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:317
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:552
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:544
 #: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:607
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
@@ -10712,288 +10555,288 @@ msgstr ""
 msgid "tunnel_type %s not supported by agent"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:467
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:523
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:459
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:515
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:470
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:531
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:462
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:523
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:482
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:553
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:474
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:545
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:490
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:572
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:482
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:564
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:500
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:592
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:492
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:584
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:509
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:601
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:501
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:593
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:555
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:618
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:547
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:610
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:589
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:658
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:650
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:640
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:632
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:696
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:714
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:706
 #, python-format
 msgid "ancillary bridge list: %s."
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:804
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:792
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:796
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:778
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:888
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:905
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:880
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:891
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:894
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:911
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:886
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:897
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:962
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1000
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:954
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:986
 #, python-format
 msgid "Port '%(port_name)s' has lost its vlan tag '%(vlan_tag)d'!"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:991
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1029
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:983
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1015
 #, python-format
 msgid "VIF port: %s has no ofport configured, and might not be able to transmit"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:999
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1039
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:991
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1025
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1012
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1052
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1004
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1038
 #: neutron/tests/unit/ofagent/test_ofa_neutron_agent.py:683
-#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:765
+#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:763
 msgid "ofport should have a value that can be interpreted as an integer"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1015
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1055
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1007
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1041
 #: neutron/tests/unit/ofagent/test_ofa_neutron_agent.py:666
 #: neutron/tests/unit/ofagent/test_ofa_neutron_agent.py:686
-#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:748
-#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:768
-#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:785
+#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:746
+#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:766
+#: neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py:783
 #, python-format
 msgid "Failed to set-up %(type)s tunnel port to %(ip)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1063
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1098
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1055
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1084
 #, python-format
 msgid "Processing port %s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1069
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1104
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1061
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1090
 #, python-format
 msgid ""
 "Port %s was not found on the integration bridge and will therefore not be"
 " processed"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1094
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1131
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1086
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1117
 #, python-format
 msgid "Setting status for %s to UP"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1098
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1135
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1090
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1121
 #, python-format
 msgid "Setting status for %s to DOWN"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1101
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1138
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1093
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1124
 #, python-format
 msgid "Configuration for device %s completed."
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1111
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1148
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1103
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1134
 #, python-format
 msgid "Ancillary Port %s added"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1186
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1178
 #, python-format
 msgid ""
 "process_network_ports - iteration:%(iter_num)d - "
 "treat_devices_added_or_updated completed in %(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1194
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1186
 #, python-format
 msgid ""
 "process_network_ports - iteration:%(iter_num)d - treat_devices_removed "
 "completed in %(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1207
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1250
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1199
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1236
 #, python-format
 msgid ""
 "process_ancillary_network_ports - iteration: %(iter_num)d - "
 "treat_ancillary_devices_added completed in %(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1216
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1259
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1208
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1245
 #, python-format
 msgid ""
 "process_ancillary_network_ports - iteration: %(iter_num)d - "
 "treat_ancillary_devices_removed completed in %(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1243
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1301
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1235
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1287
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1271
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1263
 #, python-format
 msgid "Agent ovsdb_monitor_loop - iteration:%d started"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1282
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1348
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1274
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1334
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1286
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1352
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1278
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1338
 msgid "Error while synchronizing tunnels"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1290
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1282
 #, python-format
 msgid ""
 "Agent ovsdb_monitor_loop - iteration:%(iter_num)d - starting polling. "
 "Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1303
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1295
 #, python-format
 msgid ""
 "Agent ovsdb_monitor_loop - iteration:%(iter_num)d - port information "
 "retrieved. Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1313
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1385
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1305
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1371
 #, python-format
 msgid "Starting to process devices in:%s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1317
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1309
 #, python-format
 msgid ""
 "Agent ovsdb_monitor_loop - iteration:%(iter_num)d - ports processed. "
 "Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1332
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1324
 #, python-format
 msgid ""
 "Agent ovsdb_monitor_loop - iteration:%(iter_num)d - ancillary port info "
 "retrieved. Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1342
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1334
 #, python-format
 msgid ""
 "Agent ovsdb_monitor_loop - iteration:%(iter_num)d - ancillary ports "
 "processed. Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1357
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1427
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1349
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1413
 msgid "Error while processing VIF ports"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1364
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1356
 #, python-format
 msgid ""
 "Agent ovsdb_monitor_loop - iteration:%(iter_num)d completed. Processed "
 "ports statistics:%(port_stats)s. Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1397
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1471
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1389
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1457
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1420
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1412
 #, python-format
 msgid "Invalid tunnel type specificed: %s"
 msgstr ""
 
-#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1423
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1497
+#: neutron/plugins/ofagent/agent/ofa_neutron_agent.py:1415
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1483
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
@@ -11001,20 +10844,20 @@ msgstr ""
 msgid "Number of seconds to retry acquiring an Open vSwitch datapath"
 msgstr ""
 
-#: neutron/plugins/oneconvergence/plugin.py:244
+#: neutron/plugins/oneconvergence/plugin.py:240
 msgid "Failed to create subnet, deleting it from neutron"
 msgstr ""
 
-#: neutron/plugins/oneconvergence/plugin.py:308
+#: neutron/plugins/oneconvergence/plugin.py:304
 #, python-format
 msgid "Deleting newly created neutron port %s"
 msgstr ""
 
-#: neutron/plugins/oneconvergence/plugin.py:378
+#: neutron/plugins/oneconvergence/plugin.py:374
 msgid "Failed to create floatingip"
 msgstr ""
 
-#: neutron/plugins/oneconvergence/plugin.py:417
+#: neutron/plugins/oneconvergence/plugin.py:413
 msgid "Failed to create router"
 msgstr ""
 
@@ -11319,27 +11162,27 @@ msgstr ""
 msgid "Unable to generate a new tunnel id"
 msgstr ""
 
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:304
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:296
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:321
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:313
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:359
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:371
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:426
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:418
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
@@ -11358,80 +11201,80 @@ msgstr ""
 msgid "Action %s not supported"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:771
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:757
 #, python-format
 msgid "Adding %s to list of bridges."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:885
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:871
 #, python-format
 msgid ""
 "Creating an interface named %(name)s exceeds the %(limit)d character "
 "limitation. It was shortened to %(new_name)s to fit."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1229
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1215
 #, python-format
 msgid ""
 "process_network_ports - iteration:%(iter_num)d "
 "-treat_devices_added_or_updated completed in %(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1237
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1223
 #, python-format
 msgid ""
 "process_network_ports - iteration:%(iter_num)d -treat_devices_removed "
 "completed in %(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1338
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1324
 #, python-format
 msgid "Agent rpc_loop - iteration:%d started"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1362
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1348
 #, python-format
 msgid ""
 "Agent rpc_loop - iteration:%(iter_num)d - starting polling. "
 "Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1375
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1361
 #, python-format
 msgid ""
 "Agent rpc_loop - iteration:%(iter_num)d - port information retrieved. "
 "Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1376
 #, python-format
 msgid ""
 "Agent rpc_loop - iteration:%(iter_num)d -ports processed. "
 "Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1404
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1390
 #, python-format
 msgid ""
 "Agent rpc_loop - iteration:%(iter_num)d -ancillary port info retrieved. "
 "Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1413
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1399
 #, python-format
 msgid ""
 "Agent rpc_loop - iteration:%(iter_num)d - ancillary ports processed. "
 "Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1434
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1420
 #, python-format
 msgid ""
 "Agent rpc_loop - iteration:%(iter_num)d completed. Processed ports "
 "statistics: %(port_stats)s. Elapsed:%(elapsed).3f"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1494
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1480
 #, python-format
 msgid "Invalid tunnel type specified: %s"
 msgstr ""
@@ -11707,12 +11550,12 @@ msgid ""
 "yet."
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:64
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:128
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:125
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -11730,36 +11573,36 @@ msgstr ""
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:220
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:217
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:221
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:218
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:297
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:294
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:301
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:298
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:307
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:304
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:310
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:307
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
@@ -11829,21 +11672,21 @@ msgstr ""
 msgid "Error '%(err)s' when connecting to controller(s): %(ctl)s."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcpmeta_modes.py:54
+#: neutron/plugins/vmware/dhcpmeta_modes.py:55
 #, python-format
 msgid "Invalid agent_mode: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcpmeta_modes.py:104
+#: neutron/plugins/vmware/dhcpmeta_modes.py:106
 msgid "network_auto_schedule has been disabled"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcpmeta_modes.py:125
+#: neutron/plugins/vmware/dhcpmeta_modes.py:127
 #, python-format
 msgid "Unable to run Neutron with config option '%s', as NSX does not support it"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcpmeta_modes.py:128
+#: neutron/plugins/vmware/dhcpmeta_modes.py:130
 #, python-format
 msgid "Unmet dependency for config option '%s'"
 msgstr ""
@@ -12921,29 +12764,29 @@ msgstr ""
 msgid "Metadata for router %s handled successfully"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/rpc.py:86
+#: neutron/plugins/vmware/dhcp_meta/rpc.py:77
 #, python-format
 msgid "Subnet %s does not have a gateway, the metadata route will not be created"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/rpc.py:110
+#: neutron/plugins/vmware/dhcp_meta/rpc.py:101
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/rpc.py:113
+#: neutron/plugins/vmware/dhcp_meta/rpc.py:104
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/rpc.py:133
+#: neutron/plugins/vmware/dhcp_meta/rpc.py:124
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/rpc.py:141
+#: neutron/plugins/vmware/dhcp_meta/rpc.py:132
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
@@ -13017,17 +12860,17 @@ msgstr ""
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/__init__.py:78
+#: neutron/plugins/vmware/nsxlib/__init__.py:77
 #, python-format
 msgid "Error. %(type)s exception: %(exc)s."
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/__init__.py:82
+#: neutron/plugins/vmware/nsxlib/__init__.py:81
 #, python-format
 msgid "locals=[%s]"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/lsn.py:174
+#: neutron/plugins/vmware/nsxlib/lsn.py:173
 #, python-format
 msgid ""
 "Attempt to plug Logical Services Node %(lsn)s into network with port "
@@ -13090,81 +12933,81 @@ msgid ""
 "port:%s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/secgroup.py:95
+#: neutron/plugins/vmware/nsxlib/secgroup.py:94
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/secgroup.py:121
+#: neutron/plugins/vmware/nsxlib/secgroup.py:120
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/secgroup.py:141
+#: neutron/plugins/vmware/nsxlib/secgroup.py:140
 #, python-format
 msgid "Unable to find security profile %s on NSX backend"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:131
+#: neutron/plugins/vmware/nsxlib/switch.py:130
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:151
-#: neutron/plugins/vmware/nsxlib/switch.py:166
+#: neutron/plugins/vmware/nsxlib/switch.py:150
+#: neutron/plugins/vmware/nsxlib/switch.py:165
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:189
+#: neutron/plugins/vmware/nsxlib/switch.py:188
 msgid "Port or Network not found"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:248
+#: neutron/plugins/vmware/nsxlib/switch.py:247
 #, python-format
 msgid "Lswitch %s not found in NSX"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:257
+#: neutron/plugins/vmware/nsxlib/switch.py:256
 msgid "Unable to get ports"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:274
+#: neutron/plugins/vmware/nsxlib/switch.py:273
 #, python-format
 msgid ""
 "Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:282
+#: neutron/plugins/vmware/nsxlib/switch.py:281
 #, python-format
 msgid ""
 "Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:291
+#: neutron/plugins/vmware/nsxlib/switch.py:290
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:299
-#: neutron/plugins/vmware/nsxlib/switch.py:330
+#: neutron/plugins/vmware/nsxlib/switch.py:298
+#: neutron/plugins/vmware/nsxlib/switch.py:329
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:325
+#: neutron/plugins/vmware/nsxlib/switch.py:324
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:360
+#: neutron/plugins/vmware/nsxlib/switch.py:359
 #, python-format
 msgid "Created logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: neutron/plugins/vmware/nsxlib/switch.py:372
+#: neutron/plugins/vmware/nsxlib/switch.py:371
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
@@ -14567,37 +14410,37 @@ msgstr ""
 msgid "Default provider is not specified for service type %s"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:48
+#: neutron/services/firewall/fwaas_plugin.py:45
 msgid "set_firewall_status() called"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:56
+#: neutron/services/firewall/fwaas_plugin.py:53
 #, python-format
 msgid "Firewall %(fw_id)s in PENDING_DELETE state, not changing to %(status)s"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:71
+#: neutron/services/firewall/fwaas_plugin.py:68
 msgid "firewall_deleted() called"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:79
+#: neutron/services/firewall/fwaas_plugin.py:76
 #, python-format
 msgid "Firewall %(fw)s unexpectedly deleted by agent, status was %(status)s"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:87
+#: neutron/services/firewall/fwaas_plugin.py:84
 msgid "get_firewalls_for_tenant() called"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:96
+#: neutron/services/firewall/fwaas_plugin.py:93
 msgid "get_firewalls_for_tenant_without_rules() called"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:102
+#: neutron/services/firewall/fwaas_plugin.py:99
 msgid "get_tenants_with_firewalls() called"
 msgstr ""
 
-#: neutron/services/firewall/fwaas_plugin.py:150
+#: neutron/services/firewall/fwaas_plugin.py:147
 #, python-format
 msgid ""
 "Exceeded allowed count of firewalls for tenant %(tenant_id)s. Only one "
@@ -15016,30 +14859,30 @@ msgstr ""
 msgid "Device driver for agent should be specified in plugin driver."
 msgstr ""
 
-#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:77
+#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:74
 #, python-format
 msgid "Multiple lbaas agents found on host %s"
 msgstr ""
 
-#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:157
+#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:154
 #, python-format
 msgid "Unknown object type: %s"
 msgstr ""
 
-#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:168
+#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:165
 #, python-format
 msgid ""
 "Cannot update status: %(obj_type)s %(obj_id)s not found in the DB, it was"
 " probably deleted concurrently"
 msgstr ""
 
-#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:191
+#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:188
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:215
-#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:232
+#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:212
+#: neutron/services/loadbalancer/drivers/common/agent_driver_base.py:229
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
@@ -15785,173 +15628,173 @@ msgstr ""
 msgid "Found CSR for router %(router)s: %(info)s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:215
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:213
 #, python-format
 msgid "Loaded %(num)d Cisco CSR configuration%(plural)s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:219
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:217
 #, python-format
 msgid "No Cisco CSR configurations found in: %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:233
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:228
 #, python-format
 msgid "Handling VPN service update notification '%s'"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:255
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:250
 #, python-format
 msgid "Update: Existing connection %s changed"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:262
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:257
 #, python-format
 msgid "Update: Connection %s no longer admin down"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:268
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:263
 #, python-format
 msgid "Update: Connection %s forced to admin down"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:276
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:271
 #, python-format
 msgid "Update: Created new connection %s in admin down state"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:281
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:276
 #, python-format
 msgid "Update: Created new connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:293
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:288
 #, python-format
 msgid ""
 "Update: Skipping VPN service %(service)s as it's router (%(csr_id)s is "
 "not associated with a Cisco CSR"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:299
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:294
 #, python-format
 msgid "Update: Existing VPN service %s detected"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:303
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:298
 #, python-format
 msgid "Update: New VPN service %s detected"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:312
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:307
 msgid "Update: Completed update processing"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:342
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:337
 #, python-format
 msgid "Mark: %(service)d VPN services and %(conn)d IPSec connections marked dirty"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:364
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:359
 #, python-format
 msgid ""
 "Sweep: Removed %(service)d dirty VPN service%(splural)s and %(conn)d "
 "dirty IPSec connection%(cplural)s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:379
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:374
 #, python-format
 msgid "Report: Collecting status for IPSec connections on VPN service %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:385
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:380
 #, python-format
 msgid "Connection %s forced down"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:389
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:384
 #, python-format
 msgid "Connection %(conn)s reported %(status)s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:394
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:389
 #, python-format
 msgid "Report: Adding info for IPSec connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:414
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:409
 #, python-format
 msgid "Report: Adding info for VPN service %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:436
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:431
 msgid "Report: Starting status report processing"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:438
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:433
 #, python-format
 msgid "Report: Collecting status for VPN service %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:444
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:439
 msgid "Sending status report update to plugin"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:446
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:441
 msgid "Report: Completed status report processing"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:741
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:736
 #, python-format
 msgid "Unable to create %(resource)s %(which)s: %(status)d"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:754
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:782
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:749
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:777
 #, python-format
 msgid "Internal error - '%s' is not defined"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:767
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:762
 #, python-format
 msgid "Unable to delete %(resource)s %(which)s: %(status)d"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:776
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:771
 #, python-format
 msgid "Performing rollback action %(action)s for resource %(resource)s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:802
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:797
 #, python-format
 msgid "Creating IPSec connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:835
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:830
 #, python-format
 msgid "FAILED: Create of IPSec site-to-site connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:838
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:833
 #, python-format
 msgid "SUCCESS: Created IPSec site-to-site connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:847
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:842
 #, python-format
 msgid "Deleting IPSec connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:849
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:844
 #, python-format
 msgid "Unable to find connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:853
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:848
 #, python-format
 msgid "SUCCESS: Deleted IPSec site-to-site connection %s"
 msgstr ""
 
-#: neutron/services/vpn/device_drivers/cisco_ipsec.py:861
+#: neutron/services/vpn/device_drivers/cisco_ipsec.py:856
 #, python-format
 msgid "Unable to change %(tunnel)s admin state to %(state)s"
 msgstr ""
@@ -16049,7 +15892,7 @@ msgid ""
 "'%(value)s'"
 msgstr ""
 
-#: neutron/services/vpn/service_drivers/cisco_ipsec.py:165
+#: neutron/services/vpn/service_drivers/cisco_ipsec.py:160
 #, python-format
 msgid "IPSec connection %s validated for Cisco CSR"
 msgstr ""
@@ -16059,24 +15902,24 @@ msgstr ""
 msgid "Unmapped error"
 msgstr ""
 
-#: neutron/tests/unit/bigswitch/fake_server.py:75
+#: neutron/tests/unit/bigswitch/fake_server.py:74
 #, python-format
 msgid ""
 "Request: action=%(action)s, uri=%(uri)r, body=%(body)s, "
 "headers=%(headers)s"
 msgstr ""
 
-#: neutron/tests/unit/bigswitch/fake_server.py:127
+#: neutron/tests/unit/bigswitch/fake_server.py:126
 #, python-format
 msgid "No floating IPs in requesturi=%(uri)s, body=%(body)s"
 msgstr ""
 
-#: neutron/tests/unit/bigswitch/fake_server.py:136
+#: neutron/tests/unit/bigswitch/fake_server.py:135
 #, python-format
 msgid "Expected floating IPs from multiple tenants.uri=%(uri)s, body=%(body)s"
 msgstr ""
 
-#: neutron/tests/unit/bigswitch/fake_server.py:181
+#: neutron/tests/unit/bigswitch/fake_server.py:180
 #, python-format
 msgid "No host cert for %(server)s in cert %(cert)s"
 msgstr ""
@@ -16260,26 +16103,26 @@ msgstr ""
 msgid "list_router_routes: routes=%s"
 msgstr ""
 
-#: neutron/tests/unit/nec/test_ofc_client.py:89
+#: neutron/tests/unit/nec/test_ofc_client.py:88
 msgid "The specified OFC resource (/somewhere) is not found."
 msgstr ""
 
-#: neutron/tests/unit/nec/test_ofc_client.py:93
-#: neutron/tests/unit/nec/test_ofc_client.py:99
-#: neutron/tests/unit/nec/test_ofc_client.py:108
+#: neutron/tests/unit/nec/test_ofc_client.py:92
+#: neutron/tests/unit/nec/test_ofc_client.py:98
+#: neutron/tests/unit/nec/test_ofc_client.py:107
 msgid "An OFC exception has occurred: Operation on OFC failed"
 msgstr ""
 
-#: neutron/tests/unit/nec/test_ofc_client.py:115
+#: neutron/tests/unit/nec/test_ofc_client.py:114
 msgid "An OFC exception has occurred: Failed to connect OFC : "
 msgstr ""
 
-#: neutron/tests/unit/vmware/apiclient/fake.py:407
+#: neutron/tests/unit/vmware/apiclient/fake.py:406
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: neutron/tests/unit/vmware/apiclient/fake.py:416
+#: neutron/tests/unit/vmware/apiclient/fake.py:415
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""